1 From 3a39dbe0c0c41f8dba5246ce6e2c5c4bcd6ba661 Mon Sep 17 00:00:00 2001
2 From: Ioana Ciornei <ioana.ciornei@nxp.com>
3 Date: Thu, 21 Nov 2019 21:15:25 +0200
4 Subject: [PATCH 1/4] dpaa2-eth: do not hold rtnl_lock on phylink_create() or
7 The rtnl_lock should not be held when calling phylink_create() or
8 phylink_destroy() since it leads to the deadlock listed below:
10 [ 18.656576] rtnl_lock+0x18/0x20
11 [ 18.659798] sfp_bus_add_upstream+0x28/0x90
12 [ 18.663974] phylink_create+0x2cc/0x828
13 [ 18.667803] dpaa2_mac_connect+0x14c/0x2a8
14 [ 18.671890] dpaa2_eth_connect_mac+0x94/0xd8
16 Fix this by moving the _lock() and _unlock() calls just outside of
17 phylink_of_phy_connect() and phylink_disconnect_phy().
19 Fixes: 719479230893 ("dpaa2-eth: add MAC/PHY support through phylink")
20 Reported-by: Russell King <linux@armlinux.org.uk>
21 Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
22 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
24 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 ----
25 drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 4 ++++
26 2 files changed, 4 insertions(+), 4 deletions(-)
28 diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
29 index 8b7a29e1e221..20e65053f036 100644
30 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
31 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
32 @@ -4214,12 +4214,10 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
33 dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
34 dpaa2_eth_update_tx_fqids(priv);
37 if (dpaa2_eth_has_mac(priv))
38 dpaa2_eth_disconnect_mac(priv);
40 dpaa2_eth_connect_mac(priv);
45 @@ -4513,9 +4511,7 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)
48 unregister_netdev(net_dev);
50 dpaa2_eth_disconnect_mac(priv);
53 dpaa2_eth_dl_port_del(priv);
54 dpaa2_eth_dl_traps_unregister(priv);
55 diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
56 index ae6d382d8735..8fe32ed4f6dc 100644
57 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
58 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
59 @@ -351,7 +351,9 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
61 phylink_set_pcs(mac->phylink, &mac->pcs->pcs);
64 err = phylink_fwnode_phy_connect(mac->phylink, dpmac_node, 0);
67 netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);
68 goto err_phylink_destroy;
69 @@ -372,7 +374,9 @@ void dpaa2_mac_disconnect(struct dpaa2_mac *mac)
74 phylink_disconnect_phy(mac->phylink);
76 phylink_destroy(mac->phylink);
77 dpaa2_pcs_destroy(mac);