|
|
@@ -0,0 +1,39 @@
|
|
|
+From 10ce0db787004875f4dba068ea952207d1d8abeb Mon Sep 17 00:00:00 2001
|
|
|
+From: Heiner Kallweit <[email protected]>
|
|
|
+Date: Fri, 18 Oct 2024 11:08:16 +0200
|
|
|
+Subject: [PATCH] r8169: avoid unsolicited interrupts
|
|
|
+
|
|
|
+It was reported that after resume from suspend a PCI error is logged
|
|
|
+and connectivity is broken. Error message is:
|
|
|
+PCI error (cmd = 0x0407, status_errs = 0x0000)
|
|
|
+The message seems to be a red herring as none of the error bits is set,
|
|
|
+and the PCI command register value also is normal. Exception handling
|
|
|
+for a PCI error includes a chip reset what apparently brakes connectivity
|
|
|
+here. The interrupt status bit triggering the PCI error handling isn't
|
|
|
+actually used on PCIe chip versions, so it's not clear why this bit is
|
|
|
+set by the chip. Fix this by ignoring this bit on PCIe chip versions.
|
|
|
+
|
|
|
+Fixes: 0e4851502f84 ("r8169: merge with version 8.001.00 of Realtek's r8168 driver")
|
|
|
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219388
|
|
|
+Tested-by: Atlas Yu <[email protected]>
|
|
|
+Signed-off-by: Heiner Kallweit <[email protected]>
|
|
|
+Reviewed-by: Simon Horman <[email protected]>
|
|
|
+Link: https://patch.msgid.link/[email protected]
|
|
|
+Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
+---
|
|
|
+ drivers/net/ethernet/realtek/r8169_main.c | 4 +++-
|
|
|
+ 1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
+
|
|
|
+--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
|
++++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
|
+@@ -4683,7 +4683,9 @@ static irqreturn_t rtl8169_interrupt(int
|
|
|
+ if ((status & 0xffff) == 0xffff || !(status & tp->irq_mask))
|
|
|
+ return IRQ_NONE;
|
|
|
+
|
|
|
+- if (unlikely(status & SYSErr)) {
|
|
|
++ /* At least RTL8168fp may unexpectedly set the SYSErr bit */
|
|
|
++ if (unlikely(status & SYSErr &&
|
|
|
++ tp->mac_version <= RTL_GIGA_MAC_VER_06)) {
|
|
|
+ rtl8169_pcierr_interrupt(tp->dev);
|
|
|
+ goto out;
|
|
|
+ }
|