MLK-14770 net: fec: revert the patch "net: fec: avoid mac re-inited after system...

The patch commit:586fbe526860 introduce the issue that suspend/resume
is failed on i.MX6SX sabreauto/sdb board. Now revert it.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 15dcf48..158d80f 100644 (file)
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -550,7 +550,6 @@ struct fec_enet_private {
        struct device_node *phy_node;
        int     link;
        bool    fixed_link;
-       bool    require_init;
        int     full_duplex;
        int     speed;
        struct  completion mdio_done;

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index ec49f16..c1698cc 100644 (file)
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1774,13 +1774,11 @@ static void fec_enet_adjust_link(struct net_device *ndev)
 
                if (fep->full_duplex != phy_dev->duplex) {
                        fep->full_duplex = phy_dev->duplex;
-                       fep->require_init = true;
                        status_change = 1;
                }
 
                if (phy_dev->speed != fep->speed) {
                        fep->speed = phy_dev->speed;
-                       fep->require_init = true;
                        status_change = 1;
                }
 
@@ -1788,9 +1786,7 @@ static void fec_enet_adjust_link(struct net_device *ndev)
                if (status_change) {
                        napi_disable(&fep->napi);
                        netif_tx_lock_bh(ndev);
-                       /* avoid to re-init MAC after resume back */
-                       if (fep->require_init)
-                               fec_restart(ndev);
+                       fec_restart(ndev);
                        netif_wake_queue(ndev);
                        netif_tx_unlock_bh(ndev);
                        napi_enable(&fep->napi);
@@ -3803,7 +3799,6 @@ static int __maybe_unused fec_resume(struct device *dev)
                        pinctrl_pm_select_default_state(&fep->pdev->dev);
                }
                fec_restart(ndev);
-               fep->require_init = false;
                netif_tx_lock_bh(ndev);
                netif_device_attach(ndev);
                netif_tx_unlock_bh(ndev);