| From 2b452550a203d88112eaf0ba9fc4b750a000b496 Mon Sep 17 00:00:00 2001 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Thu, 8 Jul 2021 18:55:32 -0700 |
| Subject: net: bcmgenet: Ensure all TX/RX queues DMAs are disabled |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| 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: Maxime Ripard <maxime@cerno.tech> |
| Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c |
| +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c |
| @@ -2790,15 +2790,21 @@ static void bcmgenet_set_hw_addr(struct |
| /* 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); |
