This is a note to let you know that I've just added the patch titled
net/sonic: Prevent tx watchdog timeout
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-sonic-prevent-tx-watchdog-timeout.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 686f85d71d095f1d26b807e23b0f0bfd22042c45 Mon Sep 17 00:00:00 2001
From: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 23 Jan 2020 09:07:26 +1100
Subject: net/sonic: Prevent tx watchdog timeout
From: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
commit 686f85d71d095f1d26b807e23b0f0bfd22042c45 upstream.
Section 5.5.3.2 of the datasheet says,
If FIFO Underrun, Byte Count Mismatch, Excessive Collision, or
Excessive Deferral (if enabled) errors occur, transmission ceases.
In this situation, the chip asserts a TXER interrupt rather than TXDN.
But the handler for the TXDN is the only way that the transmit queue
gets restarted. Hence, an aborted transmission can result in a watchdog
timeout.
This problem can be reproduced on congested link, as that can result in
excessive transmitter collisions. Another way to reproduce this is with
a FIFO Underrun, which may be caused by DMA latency.
In event of a TXER interrupt, prevent a watchdog timeout by restarting
transmission.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Tested-by: Stan Johnson <userm57@xxxxxxxxx>
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/natsemi/sonic.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
--- a/drivers/net/ethernet/natsemi/sonic.c
+++ b/drivers/net/ethernet/natsemi/sonic.c
@@ -414,10 +414,19 @@ static irqreturn_t sonic_interrupt(int i
lp->stats.rx_missed_errors += 65536;
/* transmit error */
- if (status & SONIC_INT_TXER)
- if (SONIC_READ(SONIC_TCR) & SONIC_TCR_FU)
- netif_dbg(lp, tx_err, dev, "%s: tx fifo underrun\n",
- __func__);
+ if (status & SONIC_INT_TXER) {
+ u16 tcr = SONIC_READ(SONIC_TCR);
+
+ netif_dbg(lp, tx_err, dev, "%s: TXER intr, TCR %04x\n",
+ __func__, tcr);
+
+ if (tcr & (SONIC_TCR_EXD | SONIC_TCR_EXC |
+ SONIC_TCR_FU | SONIC_TCR_BCM)) {
+ /* Aborted transmission. Try again. */
+ netif_stop_queue(dev);
+ SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP);
+ }
+ }
/* bus retry */
if (status & SONIC_INT_BR) {
Patches currently in stable-queue which might be from fthain@xxxxxxxxxxxxxxxxxxx are
queue-4.19/net-sonic-fix-receive-buffer-handling.patch
queue-4.19/net-sonic-use-mmio-accessors.patch
queue-4.19/net-sonic-prevent-tx-watchdog-timeout.patch
queue-4.19/net-sonic-clear-interrupt-flags-immediately.patch
queue-4.19/net-sonic-fix-command-register-usage.patch
queue-4.19/net-sonic-fix-cam-initialization.patch
queue-4.19/net-sonic-fix-interface-error-stats-collection.patch
queue-4.19/net-sonic-quiesce-sonic-before-re-initializing-descriptor-memory.patch
queue-4.19/net-sonic-add-mutual-exclusion-for-accessing-shared-state.patch
queue-4.19/net-sonic-fix-receive-buffer-replenishment.patch
queue-4.19/net-sonic-avoid-needless-receive-descriptor-eol-flag-updates.patch
queue-4.19/net-sonic-improve-receive-descriptor-status-flag-check.patch
