diff options
| author |   Ivan Vecera <ivecera@redhat.com> | 2011-01-27 12:24:11 +0100 |
|---|---|---|
| committer |   Francois Romieu <romieu@fr.zoreil.com> | 2011-02-04 10:38:06 +0100 |
| commit | b5ba6d12bdac21bc0620a5089e0f24e362645efd (patch) | |
| tree | cf05af9501d60e87977e9ff808bdabe05da85f92 | |
| parent | include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument (diff) | |
| download | linux-dev-b5ba6d12bdac21bc0620a5089e0f24e362645efd.tar.xz linux-dev-b5ba6d12bdac21bc0620a5089e0f24e362645efd.zip | |
r8169: use RxFIFO overflow workaround for 8168c chipset.
I found that one of the 8168c chipsets (concretely XID 1c4000c0) starts
generating RxFIFO overflow errors. The result is an infinite loop in
interrupt handler as the RxFIFOOver is handled only for ...MAC_VER_11.
With the workaround everything goes fine.
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes <hayeswang@realtek.com>
| -rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index bde7d61f1930..9ab3b43c7d04 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3757,7 +3757,8 @@ 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) { + if (tp->mac_version == RTL_GIGA_MAC_VER_11 || + tp->mac_version == RTL_GIGA_MAC_VER_22) { tp->intr_event |= RxFIFOOver | PCSTimeout; tp->intr_event &= ~RxOverflow; } @@ -4641,7 +4642,8 @@ 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)) { + (tp->mac_version == RTL_GIGA_MAC_VER_11 || + tp->mac_version == RTL_GIGA_MAC_VER_22)) { netif_stop_queue(dev); rtl8169_tx_timeout(dev); break; |