aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch b/target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch
new file mode 100644
index 0000000000..1752d1e304
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0112-sdk_dpaa-Rework-QBMan-portal-mappings.patch
@@ -0,0 +1,65 @@
+From d0e3e315f49a0a35c7e0bdae934f33ee6b3042a0 Mon Sep 17 00:00:00 2001
+From: Roy Pledge <roy.pledge@nxp.com>
+Date: Wed, 1 May 2019 16:08:53 -0400
+Subject: [PATCH] sdk_dpaa: Rework QBMan portal mappings
+
+Rework the QBMan portal mappings in the SDK driver to
+match the mechanism used in the upstream varient.
+
+Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
+---
+ drivers/staging/fsl_qbman/bman_driver.c | 16 ++++++++--------
+ drivers/staging/fsl_qbman/qman_driver.c | 17 +++++++++--------
+ 2 files changed, 17 insertions(+), 16 deletions(-)
+
+--- a/drivers/staging/fsl_qbman/bman_driver.c
++++ b/drivers/staging/fsl_qbman/bman_driver.c
+@@ -199,14 +199,14 @@ static struct bm_portal_config * __init
+ resource_size(&pcfg->addr_phys[DPA_PORTAL_CI]));
+
+ #else
+- pcfg->addr_virt[DPA_PORTAL_CE] = ioremap_prot(
+- pcfg->addr_phys[DPA_PORTAL_CE].start,
+- (unsigned long)len,
+- 0);
+- pcfg->addr_virt[DPA_PORTAL_CI] = ioremap_prot(
+- pcfg->addr_phys[DPA_PORTAL_CI].start,
+- resource_size(&pcfg->addr_phys[DPA_PORTAL_CI]),
+- _PAGE_GUARDED | _PAGE_NO_CACHE);
++ pcfg->addr_virt[DPA_PORTAL_CE] =
++ memremap(pcfg->addr_phys[DPA_PORTAL_CE].start,
++ (unsigned long)len, MEMREMAP_WB);
++
++ pcfg->addr_virt[DPA_PORTAL_CI] =
++ ioremap(pcfg->addr_phys[DPA_PORTAL_CI].start,
++ resource_size(&pcfg->addr_phys[DPA_PORTAL_CI]));
++
+ #endif
+ /* disable bp depletion */
+ __raw_writel(0x0, pcfg->addr_virt[DPA_PORTAL_CI] + BM_REG_SCN(0));
+--- a/drivers/staging/fsl_qbman/qman_driver.c
++++ b/drivers/staging/fsl_qbman/qman_driver.c
+@@ -459,14 +459,15 @@ static struct qm_portal_config * __init
+ pcfg->addr_phys[DPA_PORTAL_CI].start,
+ resource_size(&pcfg->addr_phys[DPA_PORTAL_CI]));
+ #else
+- pcfg->addr_virt[DPA_PORTAL_CE] = ioremap_prot(
+- pcfg->addr_phys[DPA_PORTAL_CE].start,
+- (unsigned long)len,
+- 0);
+- pcfg->addr_virt[DPA_PORTAL_CI] = ioremap_prot(
+- pcfg->addr_phys[DPA_PORTAL_CI].start,
+- resource_size(&pcfg->addr_phys[DPA_PORTAL_CI]),
+- _PAGE_GUARDED | _PAGE_NO_CACHE);
++
++ pcfg->addr_virt[DPA_PORTAL_CE] =
++ memremap(pcfg->addr_phys[DPA_PORTAL_CE].start,
++ (unsigned long)len, MEMREMAP_WB);
++
++ pcfg->addr_virt[DPA_PORTAL_CI] =
++ ioremap(pcfg->addr_phys[DPA_PORTAL_CI].start,
++ resource_size(&pcfg->addr_phys[DPA_PORTAL_CI]));
++
+ #endif
+ return pcfg;
+ err: