Re: [PATCH v2 net-next] net: fix dma operation mode config for older versions
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2017-03-21 18:56:47
On 03/21/2017 11:02 AM, Joao Pinto wrote:
This patch fixes a bug introduced in:
commit 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple
queues")
So even though this is against net-next which is the only tree so far
having the offending commit, it is nice to see this appear later in the
commit messages as:
Fixes: 6deee2221e11 ("net: stmmac: prepare dma op mode config for
multiple queues")
Also, your subject for this patch should be:
net: stmmac: fix dma operation mode config for older versions
quoted hunk ↗ jump to hunk
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. Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> Signed-off-by: Joao Pinto <redacted> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d3a2151..225a3a3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c@@ -1945,9 +1945,6 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) /* Enable MAC RX Queues */ if (rx_queues_count > 1 && 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); } /**@@ -2014,6 +2011,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) {
-- Florian