| Message ID | 1440119306-6789-1-git-send-email-jaedon.shin@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 20/08/15 18:08, Jaedon Shin wrote: > Clean the dma flags of multiq ring buffer int the interface stop > process. This patch fixes that the genet is not running while the > interface is re-enabled. > > $ ifup eth0 - running after booting > $ ifdown eth0 > $ ifup eth0 - not running and occur tx_timeout > > The bcmgenet_dma_disable() in bcmgenet_open() do clean ring16 dma flag > only. If the genet has multiq, the dma register is not cleaned. and > bcmgenet_init_dma() is not done correctly. in case > GENET_V2(tx_queues=4), tdma_ctrl has 0x1e after running > bcmgenet_dma_disable(). > > Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Thanks!
From: Jaedon Shin <jaedon.shin@gmail.com> Date: Fri, 21 Aug 2015 10:08:26 +0900 > Clean the dma flags of multiq ring buffer int the interface stop > process. This patch fixes that the genet is not running while the > interface is re-enabled. > > $ ifup eth0 - running after booting > $ ifdown eth0 > $ ifup eth0 - not running and occur tx_timeout > > The bcmgenet_dma_disable() in bcmgenet_open() do clean ring16 dma flag > only. If the genet has multiq, the dma register is not cleaned. and > bcmgenet_init_dma() is not done correctly. in case > GENET_V2(tx_queues=4), tdma_ctrl has 0x1e after running > bcmgenet_dma_disable(). > > Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 64c1e9db6b0b..4812565c783e 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2126,6 +2126,8 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) int ret = 0; int timeout = 0; u32 reg; + u32 dma_ctrl; + int i; /* Disable TDMA to stop add more frames in TX DMA */ reg = bcmgenet_tdma_readl(priv, DMA_CTRL); @@ -2169,6 +2171,20 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) ret = -ETIMEDOUT; } + dma_ctrl = 0; + 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); + + dma_ctrl = 0; + 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); + return ret; }
Clean the dma flags of multiq ring buffer int the interface stop process. This patch fixes that the genet is not running while the interface is re-enabled. $ ifup eth0 - running after booting $ ifdown eth0 $ ifup eth0 - not running and occur tx_timeout The bcmgenet_dma_disable() in bcmgenet_open() do clean ring16 dma flag only. If the genet has multiq, the dma register is not cleaned. and bcmgenet_init_dma() is not done correctly. in case GENET_V2(tx_queues=4), tdma_ctrl has 0x1e after running bcmgenet_dma_disable(). Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)