From patchwork Wed Sep 26 13:22:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 975110 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42KzGN2h31z9sBZ for ; Wed, 26 Sep 2018 23:25:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728694AbeIZTfv (ORCPT ); Wed, 26 Sep 2018 15:35:51 -0400 Received: from inva021.nxp.com ([92.121.34.21]:57614 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728322AbeIZTfu (ORCPT ); Wed, 26 Sep 2018 15:35:50 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 31426200255; Wed, 26 Sep 2018 15:22:52 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 24859200253; Wed, 26 Sep 2018 15:22:52 +0200 (CEST) Received: from fsr-ub1864-101.ea.freescale.net (fsr-ub1864-101.ea.freescale.net [10.171.82.97]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 7D6C2203C2; Wed, 26 Sep 2018 15:22:51 +0200 (CEST) From: laurentiu.tudor@nxp.com To: devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: roy.pledge@nxp.com, madalin.bucur@nxp.com, davem@davemloft.net, shawnguo@kernel.org, leoyang.li@nxp.com, robin.murphy@arm.com, bharat.bhushan@nxp.com, Laurentiu Tudor Subject: [PATCH v2 04/22] soc/fsl/qman-portal: map CENA area in the iommu Date: Wed, 26 Sep 2018 16:22:29 +0300 Message-Id: <20180926132247.10971-5-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180926132247.10971-1-laurentiu.tudor@nxp.com> References: <20180926132247.10971-1-laurentiu.tudor@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Laurentiu Tudor Add a one-to-one iommu mapping for qman portal CENA register area. This is required for QMAN stashing to work without faults behind an iommu. Signed-off-by: Laurentiu Tudor --- drivers/soc/fsl/qbman/qman_portal.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c index a120002b630e..6d9da3b1b5ad 100644 --- a/drivers/soc/fsl/qbman/qman_portal.c +++ b/drivers/soc/fsl/qbman/qman_portal.c @@ -29,6 +29,7 @@ */ #include "qman_priv.h" +#include struct qman_portal *qman_dma_portal; EXPORT_SYMBOL(qman_dma_portal); @@ -222,6 +223,7 @@ static int qman_portal_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *node = dev->of_node; + struct iommu_domain *domain; struct qm_portal_config *pcfg; struct resource *addr_phys[2]; int irq, cpu, err; @@ -276,6 +278,21 @@ static int qman_portal_probe(struct platform_device *pdev) goto err_ioremap2; } + /* Create an 1-to-1 iommu mapping for cena portal area */ + domain = iommu_get_domain_for_dev(dev); + if (domain) { + /* + * Note: not mapping this as cacheable triggers the infamous + * QMan CIDE error. + */ + err = iommu_map(domain, + addr_phys[0]->start, addr_phys[0]->start, + resource_size(addr_phys[0]), + IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE); + if (err) + dev_warn(dev, "failed to iommu_map() %d\n", err); + } + pcfg->pools = qm_get_pools_sdqcr(); spin_lock(&qman_lock);