aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.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-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.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-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch b/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch
new file mode 100644
index 0000000000..459d145afc
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch
@@ -0,0 +1,68 @@
+From e35e9d1a3dd2cc4f06f03ec4c3fae781bb0c5075 Mon Sep 17 00:00:00 2001
+From: Ioana Ciornei <ioana.ciornei@nxp.com>
+Date: Mon, 11 Nov 2019 18:50:56 +0200
+Subject: [PATCH] staging: dpaa2-ethsw: move port switchdev notifier per ethsw
+
+Register a different switchdev notifier block per ethsw instance.
+When probing multiple dpaa2-ethsw instances, without this the register
+will fail.
+
+Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
+Link: https://lore.kernel.org/r/1573491058-24766-3-git-send-email-ioana.ciornei@nxp.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 11 ++++-------
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 +
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
++++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+@@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event
+ return NOTIFY_DONE;
+ }
+
+-static struct notifier_block port_switchdev_nb = {
+- .notifier_call = port_switchdev_event,
+-};
+-
+ static struct notifier_block port_switchdev_blocking_nb = {
+ .notifier_call = port_switchdev_blocking_event,
+ };
+@@ -1334,7 +1330,8 @@ static int ethsw_register_notifier(struc
+ return err;
+ }
+
+- err = register_switchdev_notifier(&port_switchdev_nb);
++ ethsw->port_switchdev_nb.notifier_call = port_switchdev_event;
++ err = register_switchdev_notifier(&ethsw->port_switchdev_nb);
+ if (err) {
+ dev_err(dev, "Failed to register switchdev notifier\n");
+ goto err_switchdev_nb;
+@@ -1349,7 +1346,7 @@ static int ethsw_register_notifier(struc
+ return 0;
+
+ err_switchdev_blocking_nb:
+- unregister_switchdev_notifier(&port_switchdev_nb);
++ unregister_switchdev_notifier(&ethsw->port_switchdev_nb);
+ err_switchdev_nb:
+ unregister_netdevice_notifier(&ethsw->port_nb);
+ return err;
+@@ -1499,7 +1496,7 @@ static void ethsw_unregister_notifier(st
+ dev_err(dev,
+ "Failed to unregister switchdev blocking notifier (%d)\n", err);
+
+- err = unregister_switchdev_notifier(&port_switchdev_nb);
++ err = unregister_switchdev_notifier(&ethsw->port_switchdev_nb);
+ if (err)
+ dev_err(dev,
+ "Failed to unregister switchdev notifier (%d)\n", err);
+--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
++++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+@@ -68,6 +68,7 @@ struct ethsw_core {
+ bool learning;
+
+ struct notifier_block port_nb;
++ struct notifier_block port_switchdev_nb;
+ };
+
+ #endif /* __ETHSW_H */