]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: netsec: initialize tx ring on ndo_open
authorIlias Apalodimas <ilias.apalodimas@linaro.org>
Wed, 19 Jun 2019 10:04:00 +0000 (13:04 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jun 2019 14:28:20 +0000 (10:28 -0400)
Since we changed the Tx ring handling and now depends on bit31 to figure
out the owner of the descriptor, we should initialize this every time
the device goes down-up instead of doing it once on driver init. If the
value is not correctly initialized the device won't have any available
descriptors

Changes since v1:
- Typo fixes

Fixes: 35e07d234739 ("net: socionext: remove mmio reads on Tx")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/socionext/netsec.c

index cba5881b2746a36da1b710c5be14ed8ba5a7c080..a10ef700f16d2ae10e7ab6cd6be7dde28889d1cb 100644 (file)
@@ -1029,7 +1029,6 @@ static void netsec_free_dring(struct netsec_priv *priv, int id)
 static int netsec_alloc_dring(struct netsec_priv *priv, enum ring_id id)
 {
        struct netsec_desc_ring *dring = &priv->desc_ring[id];
-       int i;
 
        dring->vaddr = dma_alloc_coherent(priv->dev, DESC_SZ * DESC_NUM,
                                          &dring->desc_dma, GFP_KERNEL);
@@ -1040,19 +1039,6 @@ static int netsec_alloc_dring(struct netsec_priv *priv, enum ring_id id)
        if (!dring->desc)
                goto err;
 
-       if (id == NETSEC_RING_TX) {
-               for (i = 0; i < DESC_NUM; i++) {
-                       struct netsec_de *de;
-
-                       de = dring->vaddr + (DESC_SZ * i);
-                       /* de->attr is not going to be accessed by the NIC
-                        * until netsec_set_tx_de() is called.
-                        * No need for a dma_wmb() here
-                        */
-                       de->attr = 1U << NETSEC_TX_SHIFT_OWN_FIELD;
-               }
-       }
-
        return 0;
 err:
        netsec_free_dring(priv, id);
@@ -1060,6 +1046,23 @@ err:
        return -ENOMEM;
 }
 
+static void netsec_setup_tx_dring(struct netsec_priv *priv)
+{
+       struct netsec_desc_ring *dring = &priv->desc_ring[NETSEC_RING_TX];
+       int i;
+
+       for (i = 0; i < DESC_NUM; i++) {
+               struct netsec_de *de;
+
+               de = dring->vaddr + (DESC_SZ * i);
+               /* de->attr is not going to be accessed by the NIC
+                * until netsec_set_tx_de() is called.
+                * No need for a dma_wmb() here
+                */
+               de->attr = 1U << NETSEC_TX_SHIFT_OWN_FIELD;
+       }
+}
+
 static int netsec_setup_rx_dring(struct netsec_priv *priv)
 {
        struct netsec_desc_ring *dring = &priv->desc_ring[NETSEC_RING_RX];
@@ -1361,6 +1364,7 @@ static int netsec_netdev_open(struct net_device *ndev)
 
        pm_runtime_get_sync(priv->dev);
 
+       netsec_setup_tx_dring(priv);
        ret = netsec_setup_rx_dring(priv);
        if (ret) {
                netif_err(priv, probe, priv->ndev,