From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joao Pinto Subject: [PATCH v3 net-next] net: stmmac: fix dma operation mode config for older versions Date: Wed, 22 Mar 2017 11:56:05 +0000 Message-ID: <3b8aeab69d2987db68c74f48a3ac13c7241e1542.1490183441.git.jpinto@synopsys.com> Cc: peppe.cavallaro@st.com, alexandre.torgue@st.com, clabbe.montjoie@gmail.com, thierry.reding@gmail.com, sergei.shtylyov@cogentembedded.com, f.fainelli@gmail.com, netdev@vger.kernel.org, Joao Pinto To: davem@davemloft.net Return-path: Received: from smtprelay4.synopsys.com ([198.182.47.9]:40433 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751054AbdCVL4e (ORCPT ); Wed, 22 Mar 2017 07:56:34 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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 --- changes v2->v3: - Commit ID and title should be under a 'Fixes' tag changes v1->v2: - commit id did not have 12 digits 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) { -- 2.9.3