Commit 56612139 authored Apr 15, 2019 by Lars Persson Committed by Greg Kroah-Hartman Apr 20, 2019

net: stmmac: Set dma ring length before enabling the DMA



This was fixed in upstream by commit 7d9e6c5afab6 ("net: stmmac: Integrate
XGMAC into main driver flow") that is a new feature commit.

We found a race condition in the DMA init sequence that hits if the
PHY already has link up during stmmac_hw_setup. Since the ring length
was programmed after enabling the RX path, we might receive a packet
before the correct ring length is programmed. When that happened we
could not get reliable interrupts for DMA RX and the MTL complained
about RX FIFO overrun.

Signed-off-by: Lars Persson <larper@axis.com>
Cc: stable@vger.kernel.org # 4.14.x
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 03f11a51

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2536,9 +2536,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
		netdev_warn(priv->dev, "%s: failed debugFS registration\n",
		__func__);
		#endif
		/* Start the ball rolling... */
		stmmac_start_all_dma(priv);

		priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS;

		if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) {
		@@ -2558,6 +2555,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
		priv->hw->dma->enable_tso(priv->ioaddr, 1, chan);
		}

		/* Start the ball rolling... */
		stmmac_start_all_dma(priv);

		return 0;
		}