net: stmmac: move initialisation of dma_cfg->atds

Move the initialisation of priv->plat->dma_cfg->atds, which indicates
that 8 32-bit word descriptors are being used for pre-v4.0 cores, after
the call to stmmac_hwif_init(), which will initialise priv->extend_desc
and priv->mode (the descriptor mode.)

We don't need to re-evaluate this in stmmac_init_dma_engine() - as the
state that it depends on only changes in stmmac_hwif_init() which is
only called in the probe path. Also, once set, no code clears this
flag.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vvuXt-0000000Avnc-0UYC@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1ab958769b96b2db2552100dceb6fed7fe4384c4..027b566bb9c0391b612055bbf87a12dd5d95aa33 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3249,9 +3249,6 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
                return -EINVAL;
        }
 
-       if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
-               priv->plat->dma_cfg->atds = 1;
-
        ret = stmmac_prereset_configure(priv);
        if (ret)
                return ret;
@@ -7444,6 +7441,13 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
                        return ret;
        }
 
+       /* Set alternate descriptor size (which tells the hardware that
+        * descriptors are 8 32-bit words) when using extended descriptors
+        * with ring mode. Only applicable for pre-v4.0 cores.
+        */
+       if (priv->extend_desc && priv->mode == STMMAC_RING_MODE)
+               priv->plat->dma_cfg->atds = 1;
+
        /* Rx Watchdog is available in the COREs newer than the 3.40.
         * In some case, for example on bugged HW this feature
         * has to be disable and this can be done by passing the