2023-03-17 11:42:38

by Harini Katakam

Subject: [PATCH net-next v2] net: macb: Reset TX when TX halt times out

From: Harini Katakam <[email protected]>

Reset TX when halt times out i.e. disable TX, clean up TX BDs,
interrupts (already done) and enable TX.
This addresses the issue observed when iperf is run at 10Mps Half
duplex where, after multiple collisions and retries, TX halts.

Signed-off-by: Harini Katakam <[email protected]>
Signed-off-by: Michal Simek <[email protected]>
Signed-off-by: Radhey Shyam Pandey <[email protected]>
Reviewed-by: Michal Swiatkowski <[email protected]>
Acked-by: Nicolas Ferre <[email protected]>
---
v2:
- Re-ordered declaration for reverse christmas tree.
- Added review tags

drivers/net/ethernet/cadence/macb_main.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 96fd2aa9ee90..7b9aea50e9bd 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1015,6 +1015,7 @@ static void macb_tx_error_task(struct work_struct *work)
{
struct macb_queue *queue = container_of(work, struct macb_queue,
tx_error_task);
+ bool halt_timeout = false;
struct macb *bp = queue->bp;
struct macb_tx_skb *tx_skb;
struct macb_dma_desc *desc;
@@ -1042,9 +1043,11 @@ static void macb_tx_error_task(struct work_struct *work)
* (in case we have just queued new packets)
* macb/gem must be halted to write TBQP register
*/
- if (macb_halt_tx(bp))
- /* Just complain for now, reinitializing TX path can be good */
+ if (macb_halt_tx(bp)) {
netdev_err(bp->dev, "BUG: halt tx timed out\n");
+ macb_writel(bp, NCR, macb_readl(bp, NCR) & (~MACB_BIT(TE)));
+ halt_timeout = true;
+ }

/* Treat frames in TX queue including the ones that caused the error.
* Free transmit buffers in upper layer.
@@ -1115,6 +1118,9 @@ static void macb_tx_error_task(struct work_struct *work)
macb_writel(bp, TSR, macb_readl(bp, TSR));
queue_writel(queue, IER, MACB_TX_INT_FLAGS);

+ if (halt_timeout)
+ macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TE));
+
/* Now we are ready to start transmission again */
netif_tx_start_all_queues(bp->dev);
macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));
--
2.17.1

2023-03-19 11:00:26

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next v2] net: macb: Reset TX when TX halt times out

Hello:

This patch was applied to netdev/net-next.git (main)
by David S. Miller <[email protected]>:

On Fri, 17 Mar 2023 17:09:43 +0530 you wrote:
> From: Harini Katakam <[email protected]>
>
> Reset TX when halt times out i.e. disable TX, clean up TX BDs,
> interrupts (already done) and enable TX.
> This addresses the issue observed when iperf is run at 10Mps Half
> duplex where, after multiple collisions and retries, TX halts.
>
> [...]

Here is the summary with links:
- [net-next,v2] net: macb: Reset TX when TX halt times out
https://git.kernel.org/netdev/net-next/c/72abf2179969

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html