net: stmmac: fix dma operation mode config for older versions

The dma operation mode configuration routine was wrongly moved to a
function (stmmac_mtl_configuration) that is only executed if the
core version is >= 4.00.

Fixes: 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple queues")
Reported-by: Corentin Labbe <[email protected]>
Reviewed-by: Thierry Reding <[email protected]>
Signed-off-by: Joao Pinto <[email protected]>
Tested-by: Corentin Labbe <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 98e0f80de9d8dd3c45313924962e0c687447ae23..4b418d2aec3808f70fb307b008830dccfb349801 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2388,9 +2388,6 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv)
        if (priv->hw->mac->rx_queue_enable)
                stmmac_mac_enable_rx_queues(priv);
 
-       /* Set the HW DMA mode and the COE */
-       stmmac_dma_operation_mode(priv);
-
        /* Set RX priorities */
        if (rx_queues_count > 1 && priv->hw->mac->rx_queue_prio)
                stmmac_mac_config_rx_queues_prio(priv);
@@ -2468,6 +2465,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
        else
                stmmac_set_mac(priv->ioaddr, true);
 
+       /* Set the HW DMA mode and the COE */
+       stmmac_dma_operation_mode(priv);
+
        stmmac_mmc_setup(priv);
 
        if (init_ptp) {