aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>2018-10-11 10:02:10 -0400
committerDavid S. Miller <davem@davemloft.net>2018-10-11 15:08:04 -0400
commit511cfd580f23b0e0fcd5659931ef14c6e2c062b0 (patch)
treebc23d803d7d71a1eebfe1eb370af75eeb3a64f87
parent2a1e89df785082a0fd7264ca6d3d834abe84fa25 (diff)
r8169: set RX_MULTI_EN bit in RxConfig for 8168F-family chips
It has been reported that since commit 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") at least RTL_GIGA_MAC_VER_38 NICs work erratically after a resume from suspend. The problem has been traced to a missing RX_MULTI_EN bit in the RxConfig register. We already set this bit for RTL_GIGA_MAC_VER_35 NICs of the same 8168F chip family so let's do it also for its other siblings: RTL_GIGA_MAC_VER_36 and RTL_GIGA_MAC_VER_38. Curiously, the NIC seems to work fine after a system boot without having this bit set as long as the system isn't suspended and resumed. Fixes: 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") Reported-by: Chris Clayton <chris2553@googlemail.com> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com> Tested-by: Chris Clayton <chris2553@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 9a5e2969df61..3a5e6160bf0d 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4282,8 +4282,8 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
4282 RTL_W32(tp, RxConfig, RX_FIFO_THRESH | RX_DMA_BURST); 4282 RTL_W32(tp, RxConfig, RX_FIFO_THRESH | RX_DMA_BURST);
4283 break; 4283 break;
4284 case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24: 4284 case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24:
4285 case RTL_GIGA_MAC_VER_34: 4285 case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_36:
4286 case RTL_GIGA_MAC_VER_35: 4286 case RTL_GIGA_MAC_VER_38:
4287 RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST); 4287 RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);
4288 break; 4288 break;
4289 case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: 4289 case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: