layerscape: add patches-5.4

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 701-net-0002-soc-fsl-bman-map-FBPR-area-in-the-iommu.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0002-soc-fsl-bman-map-FBPR-area-in-the-iommu.patch b/target/linux/layerscape/patches-5.4/701-net-0002-soc-fsl-bman-map-FBPR-area-in-the-iommu.patch
new file mode 100644 (file)
index 0000000..afafe92
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0002-soc-fsl-bman-map-FBPR-area-in-the-iommu.patch
@@ -0,0 +1,47 @@
+From 55705ace9136e1c24d92d7ab23e513439eb766e7 Mon Sep 17 00:00:00 2001
+From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
+Date: Tue, 3 Apr 2018 17:55:00 +0300
+Subject: [PATCH] soc/fsl/bman: map FBPR area in the iommu
+
+Add a one-to-one iommu mapping for bman private data memory (FBPR).
+This is required for BMAN to work without faults behind an iommu.
+
+Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
+---
+ drivers/soc/fsl/qbman/bman_ccsr.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/drivers/soc/fsl/qbman/bman_ccsr.c
++++ b/drivers/soc/fsl/qbman/bman_ccsr.c
+@@ -29,6 +29,7 @@
+  */
+ 
+ #include "bman_priv.h"
++#include <linux/iommu.h>
+ 
+ u16 bman_ip_rev;
+ EXPORT_SYMBOL(bman_ip_rev);
+@@ -210,6 +211,7 @@ static int fsl_bman_probe(struct platfor
+       int ret, err_irq;
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->of_node;
++      struct iommu_domain *domain;
+       struct resource *res;
+       u16 id, bm_pool_cnt;
+       u8 major, minor;
+@@ -257,6 +259,15 @@ static int fsl_bman_probe(struct platfor
+ 
+       dev_dbg(dev, "Allocated FBPR 0x%llx 0x%zx\n", fbpr_a, fbpr_sz);
+ 
++      /* Create an 1-to-1 iommu mapping for FBPR area */
++      domain = iommu_get_domain_for_dev(dev);
++      if (domain) {
++              ret = iommu_map(domain, fbpr_a, fbpr_a, fbpr_sz,
++                              IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
++              if (ret)
++                      dev_warn(dev, "failed to iommu_map() %d\n", ret);
++      }
++
+       bm_set_memory(fbpr_a, fbpr_sz);
+ 
+       err_irq = platform_get_irq(pdev, 0);