Revert "net: keystone: Clean up network interface shutdown"

This reverts commit 5d2e762de355ab33fc1a767a2dc0d6dccd40f135, which
destabilizes the RT kernel.

1 files changed, 7 insertions, 21 deletions

diff --git a/drivers/net/ethernet/ti/keystone_ethss.c b/drivers/net/ethernet/ti/keystone_ethss.c
index 4d36264c246..7fa411db024 100644
--- a/drivers/net/ethernet/ti/keystone_ethss.c
+++ b/drivers/net/ethernet/ti/keystone_ethss.c
@@ -2147,14 +2147,14 @@ static int cpsw_port_reset(struct cpsw_slave *slave)
         u32 i, v;
 
         /* Set the soft reset bit */
-        __iowmb();
-        __raw_writel(SOFT_RESET, &slave->sliver->soft_reset);
-        __iowmb();
+        __raw_writel(SOFT_RESET,
+                     &slave->sliver->soft_reset);
 
         /* Wait for the bit to clear */
         for (i = 0; i < DEVICE_EMACSL_RESET_POLL_COUNT; i++) {
                 v = __raw_readl(&slave->sliver->soft_reset);
-                if ((v & SOFT_RESET_MASK) != SOFT_RESET)
+                if ((v & SOFT_RESET_MASK) !=
+                    SOFT_RESET)
                         return 0;
         }
 
@@ -2172,24 +2172,12 @@ static void cpsw_port_config(struct cpsw_slave *slave, int max_rx_len)
 
         __raw_writel(max_rx_len, &slave->sliver->rx_maxlen);
 
-        __iowmb();
         __raw_writel(MACSL_ENABLE | MACSL_RX_ENABLE_EXT_CTL |
                      MACSL_RX_ENABLE_CSF, &slave->sliver->mac_control);
 }
 
-static void cpsw_slave_stop(struct cpsw_slave *slave,
-                            struct cpsw_intf *cpsw_intf)
+static void cpsw_slave_stop(struct cpsw_slave *slave, struct cpsw_priv *priv)
 {
-        struct cpsw_priv *priv = cpsw_intf->cpsw_priv;
-        void __iomem *sgmii_port_regs;
-
-        if (slave->slave_num < 2)
-                sgmii_port_regs = priv->sgmii_port_regs;
-        else
-                sgmii_port_regs = priv->sgmii_port34_regs;
-
-        keystone_sgmii_rtreset(sgmii_port_regs, slave->slave_num, true);
-
         cpsw_port_reset(slave);
 
         if (!slave->phy)
@@ -2232,8 +2220,6 @@ static void cpsw_slave_open(struct cpsw_slave *slave,
 
         cpsw_port_reset(slave);
 
-        keystone_sgmii_rtreset(sgmii_port_regs, slave->slave_num, false);
-
         cpsw_port_config(slave, priv->rx_packet_max);
 
         cpsw_set_slave_mac(slave, cpsw_intf);
@@ -3069,7 +3055,7 @@ static int cpsw_open(void *intf_priv, struct net_device *ndev)
 
         for_each_slave(cpsw_intf, cpsw_slave_init, cpsw_dev);
 
-        for_each_slave(cpsw_intf, cpsw_slave_stop, cpsw_intf);
+        for_each_slave(cpsw_intf, cpsw_slave_stop, cpsw_dev);
 
         /* Serdes init */
         if (cpsw_dev->init_serdes_at_probe == 0)
@@ -3134,7 +3120,7 @@ static int cpsw_close(void *intf_priv, struct net_device *ndev)
         if (!cpsw_dev->ale_refcnt)
                 cpsw_ale_stop(cpsw_dev->ale);
 
-        for_each_slave(cpsw_intf, cpsw_slave_stop, cpsw_intf);
+        for_each_slave(cpsw_intf, cpsw_slave_stop, cpsw_dev);
 
         if(!cpsw_dev->force_no_hwtstamp)
                 netcp_unregister_rxhook(netcp, CPSW_RXHOOK_ORDER,