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:
authorDaniel Golle <daniel@makrotopia.org>2022-03-21 01:16:48 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-03-21 13:11:56 +0000
commit786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch)
tree926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch
parent9470160c350d15f765c33d6c1db15d6c4709a64c (diff)
downloadupstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all kernel configuration as well as patches for Linux 5.4. There were no targets still actively using Linux 5.4. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
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, 0 insertions, 90 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
deleted file mode 100644
index e8ef62951b..0000000000
--- a/target/linux/layerscape/patches-5.4/701-net-0346-staging-dpaa2-ethsw-ordered-workqueue-should-be-per-.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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 */