Skip to contentSkip to conversation

r8169: fix network error on resume from suspend

PATCH Applied Heiner Kallweit 2 participants 2 messages May 19, 2018 – May 20, 2018

Subsystems (3)
Networking Network drivers 8169 10/100/1000 gigabit Ethernet driver
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: fix network error on resume from suspend

This commit removed calls to rtl_set_rx_mode(). This is ok for the standard path if the link is brought up, however it breaks system resume from suspend. Link comes up but no network traffic.

Meanwhile common code from rtl_hw_start_8169/8101/8168() was moved to rtl_hw_start(), therefore re-add the call to rtl_set_rx_mode() there.

Due to adding this call we have to move definition of rtl_hw_start() after definition of rtl_set_rx_mode().

Signed-off-by Heiner Kallweit <[email protected]>
Fixes 82d3ff6dd199 ("r8169: remove calls to rtl_set_rx_mode")
---
 drivers/net/ethernet/realtek/r8169.c | 39 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 19 deletions(-)
drivers/net/ethernet/realtek/r8169.c +20 -19
index 2c2f0c5b3..75dfac024 100644
@@ -5064,25 +5064,6 @@ static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp)
 	RTL_W32(tp, RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32));
 }
 
-static void rtl_hw_start(struct  rtl8169_private *tp)
-{
-	RTL_W8(tp, Cfg9346, Cfg9346_Unlock);
-
-	tp->hw_start(tp);
-
-	rtl_set_rx_max_size(tp);
-	rtl_set_rx_tx_desc_registers(tp);
-	rtl_set_rx_tx_config_registers(tp);
-	RTL_W8(tp, Cfg9346, Cfg9346_Lock);
-
-	/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
-	RTL_R8(tp, IntrMask);
-	RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
-	/* no early-rx interrupts */
-	RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000);
-	rtl_irq_enable_all(tp);
-}
-
 static void rtl8169_set_magic_reg(struct rtl8169_private *tp, unsigned mac_version)
 {
 	static const struct rtl_cfg2_info {

@@ -5160,6 +5141,26 @@ static void rtl_set_rx_mode(struct net_device *dev)
 	RTL_W32(tp, RxConfig, tmp);
 }
 
+static void rtl_hw_start(struct  rtl8169_private *tp)
+{
+	RTL_W8(tp, Cfg9346, Cfg9346_Unlock);
+
+	tp->hw_start(tp);
+
+	rtl_set_rx_max_size(tp);
+	rtl_set_rx_tx_desc_registers(tp);
+	rtl_set_rx_tx_config_registers(tp);
+	RTL_W8(tp, Cfg9346, Cfg9346_Lock);
+
+	/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
+	RTL_R8(tp, IntrMask);
+	RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
+	rtl_set_rx_mode(tp->dev);
+	/* no early-rx interrupts */
+	RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000);
+	rtl_irq_enable_all(tp);
+}
+
 static void rtl_hw_start_8169(struct rtl8169_private *tp)
 {
 	if (tp->mac_version == RTL_GIGA_MAC_VER_05)
Signature · 1 line
2.17.0
maintainer Applied
#1 lore raw

From: Heiner Kallweit <[email protected]>
Date: Sat, 19 May 2018 10:29:33 +0200

Quoted 8 lines

This commit removed calls to rtl_set_rx_mode(). This is ok for the standard path if the link is brought up, however it breaks system resume from suspend. Link comes up but no network traffic.

Meanwhile common code from rtl_hw_start_8169/8101/8168() was moved to rtl_hw_start(), therefore re-add the call to rtl_set_rx_mode() there.

Quoted 5 lines

Due to adding this call we have to move definition of rtl_hw_start() after definition of rtl_set_rx_mode().

Signed-off-by Heiner Kallweit <[email protected]>
Fixes 82d3ff6dd199 ("r8169: remove calls to rtl_set_rx_mode")

Applied, thank you.