aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-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-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-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-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch90
1 files changed, 90 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch b/target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch
new file mode 100644
index 0000000000..e8ef62951b
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch
@@ -0,0 +1,90 @@
+From 6e0b1cafcfc1bf343cf4957a93850178ba9ea165 Mon Sep 17 00:00:00 2001
+From: Ioana Ciornei <ioana.ciornei@nxp.com>
+Date: Mon, 11 Nov 2019 18:50:58 +0200
+Subject: [PATCH] staging: dpaa2-ethsw: ordered workqueue should be per ethsw
+
+Create a different ordered workqueue per dpaa2-ethsw instance. Without
+this change, we overwrite the global queue and leak memory when probing
+multiple instances of the driver.
+
+Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
+Link: https://lore.kernel.org/r/1573491058-24766-5-git-send-email-ioana.ciornei@nxp.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 17 +++++++++--------
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 +
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
++++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+@@ -18,8 +18,6 @@
+
+ #include "ethsw.h"
+
+-static struct workqueue_struct *ethsw_owq;
+-
+ /* Minimal supported DPSW version */
+ #define DPSW_MIN_VER_MAJOR 8
+ #define DPSW_MIN_VER_MINOR 1
+@@ -1229,8 +1227,10 @@ static int port_switchdev_event(struct n
+ unsigned long event, void *ptr)
+ {
+ struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
++ struct ethsw_port_priv *port_priv = netdev_priv(dev);
+ struct ethsw_switchdev_event_work *switchdev_work;
+ struct switchdev_notifier_fdb_info *fdb_info = ptr;
++ struct ethsw_core *ethsw = port_priv->ethsw_data;
+
+ if (!ethsw_port_dev_check(dev))
+ return NOTIFY_DONE;
+@@ -1266,7 +1266,7 @@ static int port_switchdev_event(struct n
+ return NOTIFY_DONE;
+ }
+
+- queue_work(ethsw_owq, &switchdev_work->work);
++ queue_work(ethsw->workqueue, &switchdev_work->work);
+
+ return NOTIFY_DONE;
+
+@@ -1427,9 +1427,10 @@ static int ethsw_init(struct fsl_mc_devi
+ }
+ }
+
+- ethsw_owq = alloc_ordered_workqueue("%s_ordered", WQ_MEM_RECLAIM,
+- "ethsw");
+- if (!ethsw_owq) {
++ ethsw->workqueue = alloc_ordered_workqueue("%s_%d_ordered",
++ WQ_MEM_RECLAIM, "ethsw",
++ ethsw->sw_attr.id);
++ if (!ethsw->workqueue) {
+ err = -ENOMEM;
+ goto err_close;
+ }
+@@ -1441,7 +1442,7 @@ static int ethsw_init(struct fsl_mc_devi
+ return 0;
+
+ err_destroy_ordered_workqueue:
+- destroy_workqueue(ethsw_owq);
++ destroy_workqueue(ethsw->workqueue);
+
+ err_close:
+ dpsw_close(ethsw->mc_io, 0, ethsw->dpsw_handle);
+@@ -1529,7 +1530,7 @@ static int ethsw_remove(struct fsl_mc_de
+
+ ethsw_teardown_irqs(sw_dev);
+
+- destroy_workqueue(ethsw_owq);
++ destroy_workqueue(ethsw->workqueue);
+
+ dpsw_disable(ethsw->mc_io, 0, ethsw->dpsw_handle);
+
+--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
++++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+@@ -70,6 +70,7 @@ struct ethsw_core {
+ struct notifier_block port_nb;
+ struct notifier_block port_switchdev_nb;
+ struct notifier_block port_switchdevb_nb;
++ struct workqueue_struct *workqueue;
+ };
+
+ #endif /* __ETHSW_H */