Re: [bug?] r8169: hangs under heavy load
From: Lucas Stach <dev@lynxeye.de>
Date: 2011-11-29 19:09:49
[please cc me on every answer, I'm not subscribed to the list] Hello Francois and others,
quoted hunk
Gerd, can you try the patch below ? It should match Haye's description.diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 6f06aa1..97b5593 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c@@ -4885,8 +4885,7 @@ static void rtl_hw_start_8168(struct net_device *dev)RTL_W16(IntrMitigate, 0x5151); /* Work around for RxFIFO overflow. */ - if (tp->mac_version == RTL_GIGA_MAC_VER_11 || - tp->mac_version == RTL_GIGA_MAC_VER_22) { + if (tp->mac_version == RTL_GIGA_MAC_VER_11) { tp->intr_event |= RxFIFOOver | PCSTimeout; tp->intr_event &= ~RxOverflow; }@@ -5804,6 +5803,10 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)*/ status = RTL_R16(IntrStatus); while (status && status != 0xffff) { + status &= ~tp->intr_event; + if (!status) + break; + handled = 1; /* Handle all of the error cases first. These will reset@@ -5818,7 +5821,6 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)switch (tp->mac_version) { /* Work around for rx fifo overflow */ case RTL_GIGA_MAC_VER_11: - case RTL_GIGA_MAC_VER_22: case RTL_GIGA_MAC_VER_26: netif_stop_queue(dev); rtl8169_tx_timeout(dev);@@ -5828,6 +5830,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)case RTL_GIGA_MAC_VER_19: case RTL_GIGA_MAC_VER_20: case RTL_GIGA_MAC_VER_21: + case RTL_GIGA_MAC_VER_22:
case RTL_GIGA_MAC_VER_23: case RTL_GIGA_MAC_VER_24: case RTL_GIGA_MAC_VER_27: I have tried the above patch in an attempt to solve my problem described in message "Lockups with r8169 driver (Was: Hangs with Linux 3.2.0-rc3)", which are really similar to the problem described in this thread. The patch doesn't help, in fact it renders the ethernet adapter unusable, as it is failing even the media detect (according to network manager). I will gladly test any other patches you come up with. Thanks, Lucas