Skip to contentSkip to conversation

r8169: Handle rxfifo errors on 8168 chips

PATCH Applied Matthew Garrett 3 participants 3 messages Sep 14, 2010 – Sep 16, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 r8169: Handle rxfifo errors on 8168 chips

The Thinkpad X100e seems to have some odd behaviour when the display is powered off - the onboard r8169 starts generating rxfifo overflow errors. The root cause of this has not yet been identified and may well be a hardware design bug on the platform, but r8169 should be more resiliant to this. This patch enables the rxfifo interrupt on 8168 devices and removes the MAC version check in the interrupt handler, and the machine no longer crashes when under network load while the screen turns off.

---
 drivers/net/r8169.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/r8169.c +2 -3
index 078bbf4..a0da4a1 100644
@@ -2934,7 +2934,7 @@ static const struct rtl_cfg_info {
 		.hw_start	= rtl_hw_start_8168,
 		.region		= 2,
 		.align		= 8,
-		.intr_event	= SYSErr | LinkChg | RxOverflow |
+		.intr_event	= SYSErr | RxFIFOOver | LinkChg | RxOverflow |
 				  TxErr | TxOK | RxOK | RxErr,
 		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,
 		.features	= RTL_FEATURE_GMII | RTL_FEATURE_MSI,
@@ -4625,8 +4625,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 		}
 
 		/* Work around for rx fifo overflow */
-		if (unlikely(status & RxFIFOOver) &&
-		(tp->mac_version == RTL_GIGA_MAC_VER_11)) {
+		if (unlikely(status & RxFIFOOver)) {
 			netif_stop_queue(dev);
 			rtl8169_tx_timeout(dev);
 			break;
Signature · 1 line
1.7.2.3
Acked-by on v1 1/1
#1 lore raw

Matthew Garrett <[email protected]> :
[...]

Quoted 4 lines
drivers/net/r8169.c +0 -0
index 078bbf4..a0da4a1 100644

[...]

drivers/net/r8169.c static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) · line 4631

Quoted 10 lines
drivers/net/r8169.c +1 -2
@@ -4625,8 +4625,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 		}
 
 		/* Work around for rx fifo overflow */
-		if (unlikely(status & RxFIFOOver) &&
-		(tp->mac_version == RTL_GIGA_MAC_VER_11)) {
+		if (unlikely(status & RxFIFOOver)) {
 			netif_stop_queue(dev);
 			rtl8169_tx_timeout(dev);
 			break;

Realtek's driver does something similar with the revision RTL_GIGA_MAC_VER_11 of the 8168.

Signature · 1 line
Ueimor
maintainer Applied
#2 lore raw

From: Francois Romieu <[email protected]>
Date: Thu, 16 Sep 2010 00:27:19 +0200

Quoted 21 lines

Matthew Garrett <[email protected]> :
[...]

Quoted 4 lines
drivers/net/r8169.c +0 -0
index 078bbf4..a0da4a1 100644

[...]

drivers/net/r8169.c static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) · line 4631

Quoted 10 lines
drivers/net/r8169.c +1 -2
@@ -4625,8 +4625,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 		}
 
 		/* Work around for rx fifo overflow */
-		if (unlikely(status & RxFIFOOver) &&
-		(tp->mac_version == RTL_GIGA_MAC_VER_11)) {
+		if (unlikely(status & RxFIFOOver)) {
 			netif_stop_queue(dev);
 			rtl8169_tx_timeout(dev);
 			break;
Quoted 2 lines

Realtek's driver does something similar with the revision RTL_GIGA_MAC_VER_11 of the 8168.

Applied, thanks everyone.