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

Commit d5dc50ca authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: Ensure all TX/RX queues DMAs are disabled 



commit 2b452550a203d88112eaf0ba9fc4b750a000b496 upstream.

Make sure that we disable each of the TX and RX queues in the TDMA and
RDMA control registers. This is a correctness change to be symmetrical
with the code that enables the TX and RX queues.

Tested-by: default avatarMaxime Ripard <maxime@cerno.tech>
Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ecd4080

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+6 −0
Original line number Diff line number Diff line
@@ -2783,15 +2783,21 @@ static void bcmgenet_set_hw_addr(struct bcmgenet_priv *priv, 
/* Returns a reusable dma control register value */

static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv)

{

	unsigned int i;

	u32 reg;

	u32 dma_ctrl;



	/* disable DMA */

	dma_ctrl = 1 << (DESC_INDEX + DMA_RING_BUF_EN_SHIFT) | DMA_EN;

	for (i = 0; i < priv->hw_params->tx_queues; i++)

		dma_ctrl |= (1 << (i + DMA_RING_BUF_EN_SHIFT));

	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);

	reg &= ~dma_ctrl;

	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);



	dma_ctrl = 1 << (DESC_INDEX + DMA_RING_BUF_EN_SHIFT) | DMA_EN;

	for (i = 0; i < priv->hw_params->rx_queues; i++)

		dma_ctrl |= (1 << (i + DMA_RING_BUF_EN_SHIFT));

	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);

	reg &= ~dma_ctrl;

	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);