aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorIvan Vecera <ivecera@redhat.com>2011-01-27 06:24:11 -0500
committerFrancois Romieu <romieu@fr.zoreil.com>2011-02-04 04:38:06 -0500
commitb5ba6d12bdac21bc0620a5089e0f24e362645efd (patch)
treecf05af9501d60e87977e9ff808bdabe05da85f92 /drivers/net
parent38db9e1db1c91c953b2a539130257ce91533c9f6 (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r8169.c6
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)
3757 RTL_W16(IntrMitigate, 0x5151); 3757 RTL_W16(IntrMitigate, 0x5151);
3758 3758
3759 /* Work around for RxFIFO overflow. */ 3759 /* Work around for RxFIFO overflow. */
3760 if (tp->mac_version == RTL_GIGA_MAC_VER_11) { 3760 if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
3761 tp->mac_version == RTL_GIGA_MAC_VER_22) {
3761 tp->intr_event |= RxFIFOOver | PCSTimeout; 3762 tp->intr_event |= RxFIFOOver | PCSTimeout;
3762 tp->intr_event &= ~RxOverflow; 3763 tp->intr_event &= ~RxOverflow;
3763 } 3764 }
@@ -4641,7 +4642,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
4641 4642
4642 /* Work around for rx fifo overflow */ 4643 /* Work around for rx fifo overflow */
4643 if (unlikely(status & RxFIFOOver) && 4644 if (unlikely(status & RxFIFOOver) &&
4644 (tp->mac_version == RTL_GIGA_MAC_VER_11)) { 4645 (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
4646 tp->mac_version == RTL_GIGA_MAC_VER_22)) {
4645 netif_stop_queue(dev); 4647 netif_stop_queue(dev);
4646 rtl8169_tx_timeout(dev); 4648 rtl8169_tx_timeout(dev);
4647 break; 4649 break;