From: Joao Pinto Date: Wed, 22 Mar 2017 11:56:05 +0000 (+0000) Subject: net: stmmac: fix dma operation mode config for older versions X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b4f0a66155564aaf7e98492e027efad9f797c244;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Thierry Reding Signed-off-by: Joao Pinto Tested-by: Corentin Labbe Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 98e0f80de9d8..4b418d2aec38 100644 --- 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) {