2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Ivan Vecera <[email protected]> commit b5ba6d12bdac21bc0620a5089e0f24e362645efd upstream. 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 <[email protected]> Acked-by: Francois Romieu <[email protected]> Signed-off-by: Andi Kleen <[email protected]> Cc: Hayes <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/net/r8169.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/drivers/net/r8169.c =================================================================== --- linux-2.6.35.y.orig/drivers/net/r8169.c 2011-03-29 23:03:01.765255002 -0700 +++ linux-2.6.35.y/drivers/net/r8169.c 2011-03-29 23:03:01.995249117 -0700 @@ -3750,7 +3750,8 @@ 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; } @@ -4637,7 +4638,8 @@ /* 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; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
