You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From 02638b2627104cd02aff7484bb250d029e05dc5f Mon Sep 17 00:00:00 2001
|
|
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
Date: Tue, 3 Apr 2018 18:08:48 +0300
|
|
Subject: [PATCH] soc/fsl/qman: map FQD and PFDR areas in the iommu
|
|
|
|
Add a one-to-one iommu mapping for qman private data memory areas
|
|
(FQD and PFDR). This is required for QMAN to work without faults
|
|
behind an iommu.
|
|
|
|
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
---
|
|
drivers/soc/fsl/qbman/qman_ccsr.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
--- a/drivers/soc/fsl/qbman/qman_ccsr.c
|
|
+++ b/drivers/soc/fsl/qbman/qman_ccsr.c
|
|
@@ -29,6 +29,7 @@
|
|
*/
|
|
|
|
#include "qman_priv.h"
|
|
+#include <linux/iommu.h>
|
|
|
|
u16 qman_ip_rev;
|
|
EXPORT_SYMBOL(qman_ip_rev);
|
|
@@ -755,6 +756,7 @@ static int fsl_qman_probe(struct platfor
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct device_node *node = dev->of_node;
|
|
+ struct iommu_domain *domain;
|
|
struct resource *res;
|
|
int ret, err_irq;
|
|
u16 id;
|
|
@@ -834,6 +836,19 @@ static int fsl_qman_probe(struct platfor
|
|
}
|
|
dev_dbg(dev, "Allocated PFDR 0x%llx 0x%zx\n", pfdr_a, pfdr_sz);
|
|
|
|
+ /* Create an 1-to-1 iommu mapping for fqd and pfdr areas */
|
|
+ domain = iommu_get_domain_for_dev(dev);
|
|
+ if (domain) {
|
|
+ ret = iommu_map(domain, fqd_a, fqd_a, fqd_sz,
|
|
+ IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
|
|
+ if (ret)
|
|
+ dev_warn(dev, "iommu_map(fqd) failed %d\n", ret);
|
|
+ ret = iommu_map(domain, pfdr_a, pfdr_a, pfdr_sz,
|
|
+ IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
|
|
+ if (ret)
|
|
+ dev_warn(dev, "iommu_map(pfdr) failed %d\n", ret);
|
|
+ }
|
|
+
|
|
ret = qman_init_ccsr(dev);
|
|
if (ret) {
|
|
dev_err(dev, "CCSR setup failed\n");
|