amd-xgbe: Be sure driver shuts down cleanly on module removal

Sometimes when the driver is being unloaded while the devices are still
up the driver can issue errors.  This is based on timing and the double
invocation of some routines.  The phy_exit() call needs to be run after
the network device has been closed and unregistered from the system.
Also, the phy_exit() does not need to invoke phy_stop() since that will
be called as part of the device closing, so remove that call.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index 500147d9e3c8c1791dba586c71e87661b4d3af09..53a425cc7a2d2fc9190d2766e92e6a9e2bafe599 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -458,6 +458,8 @@ void xgbe_deconfig_netdev(struct xgbe_prv_data *pdata)
        if (IS_REACHABLE(CONFIG_PTP_1588_CLOCK))
                xgbe_ptp_unregister(pdata);
 
+       unregister_netdev(netdev);
+
        pdata->phy_if.phy_exit(pdata);
 
        flush_workqueue(pdata->an_workqueue);
@@ -465,8 +467,6 @@ void xgbe_deconfig_netdev(struct xgbe_prv_data *pdata)
 
        flush_workqueue(pdata->dev_workqueue);
        destroy_workqueue(pdata->dev_workqueue);
-
-       unregister_netdev(netdev);
 }
 
 static int __init xgbe_mod_init(void)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
index 2222bbf8d0a448e7dec9d46dd91b9c2ed0311e08..24092020f119a4fe0ce5764c2a9514163b052dc8 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
@@ -1533,8 +1533,6 @@ static int xgbe_phy_best_advertised_speed(struct xgbe_prv_data *pdata)
 
 static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
 {
-       xgbe_phy_stop(pdata);
-
        pdata->phy_if.phy_impl.exit(pdata);
 }