Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801e147c authored by Matthew Garrett's avatar Matthew Garrett Committed by David S. Miller
Browse files

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.

Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84176b7b

drivers/net/r8169.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2934,7 +2934,7 @@ static const struct rtl_cfg_info { 
		.hw_start	= rtl_hw_start_8168,

		.hw_start	= rtl_hw_start_8168,

		.region		= 2,

		.region		= 2,

		.align		= 8,

		.align		= 8,

		.intr_event	= SYSErr | LinkChg | RxOverflow |

		.intr_event	= SYSErr | RxFIFOOver | LinkChg | RxOverflow |

				  TxErr | TxOK | RxOK | RxErr,

				  TxErr | TxOK | RxOK | RxErr,

		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,

		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,

		.features	= RTL_FEATURE_GMII | RTL_FEATURE_MSI,

		.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 */

		/* Work around for rx fifo overflow */

		if (unlikely(status & RxFIFOOver) &&

		if (unlikely(status & RxFIFOOver)) {

		(tp->mac_version == RTL_GIGA_MAC_VER_11)) {

			netif_stop_queue(dev);

			netif_stop_queue(dev);

			rtl8169_tx_timeout(dev);

			rtl8169_tx_timeout(dev);

			break;

			break;