* [PATCH] net: bcmgenet: fix uncleaned dma flags
@ 2015-08-20 3:17 Jaedon Shin
2015-08-20 22:04 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Jaedon Shin @ 2015-08-20 3:17 UTC (permalink / raw)
To: David Miller, Florian Fainelli, Petri Gynther, netdev; +Cc: Jaedon Shin
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(+)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 64c1e9db6b0b..81bde6fa70b7 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2174,6 +2174,8 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv)
static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
{
+ u32 dma_ctrl;
+ u32 reg;
int i;
bcmgenet_fini_rx_napi(priv);
@@ -2182,6 +2184,20 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
/* disable DMA */
bcmgenet_dma_teardown(priv);
+ 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);
+
for (i = 0; i < priv->num_tx_bds; i++) {
if (priv->tx_cbs[i].skb != NULL) {
dev_kfree_skb(priv->tx_cbs[i].skb);
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: bcmgenet: fix uncleaned dma flags
2015-08-20 3:17 [PATCH] net: bcmgenet: fix uncleaned dma flags Jaedon Shin
@ 2015-08-20 22:04 ` Florian Fainelli
2015-08-21 1:12 ` Jaedon Shin
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2015-08-20 22:04 UTC (permalink / raw)
To: Jaedon Shin, David Miller, Petri Gynther, netdev
On 19/08/15 20:17, 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().
It sounds like this should be moved to bcmgenet_dma_disable() where we
are already modifying DMA_CTRL and returning a dma_ctrl value back to
the caller, or at the very last bcmgenet_dma_teardown().
Thanks!
>
> Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
> ---
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 64c1e9db6b0b..81bde6fa70b7 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -2174,6 +2174,8 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv)
>
> static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
> {
> + u32 dma_ctrl;
> + u32 reg;
> int i;
>
> bcmgenet_fini_rx_napi(priv);
> @@ -2182,6 +2184,20 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
> /* disable DMA */
> bcmgenet_dma_teardown(priv);
>
> + 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);
> +
> for (i = 0; i < priv->num_tx_bds; i++) {
> if (priv->tx_cbs[i].skb != NULL) {
> dev_kfree_skb(priv->tx_cbs[i].skb);
>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: bcmgenet: fix uncleaned dma flags
2015-08-20 22:04 ` Florian Fainelli
@ 2015-08-21 1:12 ` Jaedon Shin
0 siblings, 0 replies; 3+ messages in thread
From: Jaedon Shin @ 2015-08-21 1:12 UTC (permalink / raw)
To: Florian Fainelli; +Cc: David Miller, Petri Gynther, netdev
> 2015. 8. 21., 오전 7:04, Florian Fainelli <f.fainelli@gmail.com> 작성:
>
> On 19/08/15 20:17, 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().
>
> It sounds like this should be moved to bcmgenet_dma_disable() where we
> are already modifying DMA_CTRL and returning a dma_ctrl value back to
> the caller, or at the very last bcmgenet_dma_teardown().
>
> Thanks!
>
I will send the changes immediately.
Thanks.
>>
>> Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
>> ---
>> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++++++++++++
>> 1 file changed, 16 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
>> index 64c1e9db6b0b..81bde6fa70b7 100644
>> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
>> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
>> @@ -2174,6 +2174,8 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv)
>>
>> static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
>> {
>> + u32 dma_ctrl;
>> + u32 reg;
>> int i;
>>
>> bcmgenet_fini_rx_napi(priv);
>> @@ -2182,6 +2184,20 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
>> /* disable DMA */
>> bcmgenet_dma_teardown(priv);
>>
>> + 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);
>> +
>> for (i = 0; i < priv->num_tx_bds; i++) {
>> if (priv->tx_cbs[i].skb != NULL) {
>> dev_kfree_skb(priv->tx_cbs[i].skb);
>>
>
>
> --
> Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-21 1:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-20 3:17 [PATCH] net: bcmgenet: fix uncleaned dma flags Jaedon Shin
2015-08-20 22:04 ` Florian Fainelli
2015-08-21 1:12 ` Jaedon Shin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).