2019-11-11 16:52:19

by Ioana Ciornei

Subject: [PATCH 2/4] 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 <[email protected]>
---
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 11 ++++-------
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 +
2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index b25520173fec..abbfcbf81241 100644
--- 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(struct notifier_block *unused,
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(struct device *dev)
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(struct device *dev)
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(struct device *dev)
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);
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index 39a3f542c8ee..e050589758b1 100644
--- 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 */
--
1.9.1