Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c629882a authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: prevent dma init stuck in case of failures. 



Add a limit when perform the DMA reset procedure
so, in case of problems (i.e. PHY reset failed) the
Kernel won't hang on the stmmac DMA initialisation
blocking the Kernels execution.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebbb293f

drivers/net/stmmac/dwmac1000_dma.c

+9 −1
Original line number Diff line number Diff line
@@ -33,10 +33,18 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx, 
			      u32 dma_rx)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);

	int limit;



	/* DMA SW reset */

	value |= DMA_BUS_MODE_SFT_RESET;

	writel(value, ioaddr + DMA_BUS_MODE);

	do {} while ((readl(ioaddr + DMA_BUS_MODE) & DMA_BUS_MODE_SFT_RESET));

	limit = 15000;

	while (limit--) {

		if (!(readl(ioaddr + DMA_BUS_MODE) & DMA_BUS_MODE_SFT_RESET))

			break;

	}

	if (limit < 0)

		return -EBUSY;



	value = /* DMA_BUS_MODE_FB | */ DMA_BUS_MODE_4PBL |

	    ((pbl << DMA_BUS_MODE_PBL_SHIFT) |

drivers/net/stmmac/dwmac100_dma.c

+9 −1
Original line number Diff line number Diff line
@@ -35,10 +35,18 @@ static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx, 
			     u32 dma_rx)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);

	int limit;



	/* DMA SW reset */

	value |= DMA_BUS_MODE_SFT_RESET;

	writel(value, ioaddr + DMA_BUS_MODE);

	do {} while ((readl(ioaddr + DMA_BUS_MODE) & DMA_BUS_MODE_SFT_RESET));

	limit = 15000;

	while (limit--) {

		if (!(readl(ioaddr + DMA_BUS_MODE) & DMA_BUS_MODE_SFT_RESET))

			break;

	}

	if (limit < 0)

		return -EBUSY;



	/* Enable Application Access by writing to DMA CSR0 */

	writel(DMA_BUS_MODE_DEFAULT | (pbl << DMA_BUS_MODE_PBL_SHIFT),