net: socionext: reset hardware in ndo_stop

When the interface is down, head/tail of the descriptor
ring address is set to 0 in netsec_netdev_stop().
But netsec hardware still keeps the previous descriptor
ring address, so there is inconsistency between driver
and hardware after interface is up at a later time.
To address this inconsistency, add netsec_reset_hardware()
when the interface is down.

In addition, to minimize the reset process,
add flag to decide whether driver loads the netsec microcode.
Even if driver resets the netsec hardware, netsec microcode
keeps resident on RAM, so it is ok we only load the microcode
at initialization.

This patch is critical for installation over network.

Signed-off-by: Masahisa KOJIMA <masahisa.kojima@linaro.org>
Fixes: 533dd11a12f6 ("net: socionext: Add Synquacer NetSec driver")
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index f6fe70edbbfe542ff70b25ad17baedeebed4d369..aa50331b7607f876aeed43817a09f275c28b5c46 100644 (file)
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1057,7 +1057,8 @@ static int netsec_netdev_load_microcode(struct netsec_priv *priv)
        return 0;
 }
 
        return 0;
 }
 

-static int netsec_reset_hardware(struct netsec_priv *priv)
+static int netsec_reset_hardware(struct netsec_priv *priv,
+                                bool load_ucode)

 {
        u32 value;
        int err;
 {
        u32 value;
        int err;


@@ -1102,11 +1103,14 @@ static int netsec_reset_hardware(struct netsec_priv *priv)
        netsec_write(priv, NETSEC_REG_NRM_RX_CONFIG,
                     1 << NETSEC_REG_DESC_ENDIAN);
 
        netsec_write(priv, NETSEC_REG_NRM_RX_CONFIG,
                     1 << NETSEC_REG_DESC_ENDIAN);
 

-       err = netsec_netdev_load_microcode(priv);
-       if (err) {
-               netif_err(priv, probe, priv->ndev,
-                         "%s: failed to load microcode (%d)\n", __func__, err);
-               return err;
+       if (load_ucode) {
+               err = netsec_netdev_load_microcode(priv);
+               if (err) {
+                       netif_err(priv, probe, priv->ndev,
+                                 "%s: failed to load microcode (%d)\n",
+                                 __func__, err);
+                       return err;
+               }

        }
 
        /* start DMA engines */
        }
 
        /* start DMA engines */


@@ -1328,6 +1332,7 @@ err1:
 
 static int netsec_netdev_stop(struct net_device *ndev)
 {
 
 static int netsec_netdev_stop(struct net_device *ndev)
 {

+       int ret;

        struct netsec_priv *priv = netdev_priv(ndev);
 
        netif_stop_queue(priv->ndev);
        struct netsec_priv *priv = netdev_priv(ndev);
 
        netif_stop_queue(priv->ndev);


@@ -1343,12 +1348,14 @@ static int netsec_netdev_stop(struct net_device *ndev)
        netsec_uninit_pkt_dring(priv, NETSEC_RING_TX);
        netsec_uninit_pkt_dring(priv, NETSEC_RING_RX);
 
        netsec_uninit_pkt_dring(priv, NETSEC_RING_TX);
        netsec_uninit_pkt_dring(priv, NETSEC_RING_RX);
 

+       ret = netsec_reset_hardware(priv, false);
+

        phy_stop(ndev->phydev);
        phy_disconnect(ndev->phydev);
 
        pm_runtime_put_sync(priv->dev);
 
        phy_stop(ndev->phydev);
        phy_disconnect(ndev->phydev);
 
        pm_runtime_put_sync(priv->dev);
 

-       return 0;
+       return ret;

 }
 
 static int netsec_netdev_init(struct net_device *ndev)
 }
 
 static int netsec_netdev_init(struct net_device *ndev)


@@ -1364,7 +1371,7 @@ static int netsec_netdev_init(struct net_device *ndev)
        if (ret)
                goto err1;
 
        if (ret)
                goto err1;
 

-       ret = netsec_reset_hardware(priv);
+       ret = netsec_reset_hardware(priv, true);

        if (ret)
                goto err2;
 
        if (ret)
                goto err2;