浏览代码

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 <clabbe.montjoie@gmail.com>
Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Joao Pinto 8 年之前
父节点
当前提交
b4f0a66155
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+ 3 - 3
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)
 	if (priv->hw->mac->rx_queue_enable)
 		stmmac_mac_enable_rx_queues(priv);
 		stmmac_mac_enable_rx_queues(priv);
 
 
-	/* Set the HW DMA mode and the COE */
-	stmmac_dma_operation_mode(priv);
-
 	/* Set RX priorities */
 	/* Set RX priorities */
 	if (rx_queues_count > 1 && priv->hw->mac->rx_queue_prio)
 	if (rx_queues_count > 1 && priv->hw->mac->rx_queue_prio)
 		stmmac_mac_config_rx_queues_prio(priv);
 		stmmac_mac_config_rx_queues_prio(priv);
@@ -2468,6 +2465,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
 	else
 	else
 		stmmac_set_mac(priv->ioaddr, true);
 		stmmac_set_mac(priv->ioaddr, true);
 
 
+	/* Set the HW DMA mode and the COE */
+	stmmac_dma_operation_mode(priv);
+
 	stmmac_mmc_setup(priv);
 	stmmac_mmc_setup(priv);
 
 
 	if (init_ptp) {
 	if (init_ptp) {