Commit 12006848 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: fix failing WoL 



Th referenced change added an extra hw reset to rtl8169_net_suspend()
what makes WoL fail on few chip versions. Therefore skip the extra
reset if we're going down and WoL is enabled.
In rtl_shutdown() rtl8169_hw_reset() is called by rtl8169_net_suspend()
already if needed, therefore avoid issues issue by removing the extra
call. The fix was tested on a system with RTL8168g.

Meanwhile rtl8169_hw_reset() does more than a hw reset and should be
renamed. But that's net-next material.

Fixes: 8ac8e8c6 ("r8169: make rtl8169_down central chip quiesce function")
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6c1fb0a

drivers/net/ethernet/realtek/r8169_main.c

+7 −6
Original line number Diff line number Diff line
@@ -3928,7 +3928,7 @@ static void rtl8169_tx_clear(struct rtl8169_private *tp) 
	netdev_reset_queue(tp->dev);

}



static void rtl8169_hw_reset(struct rtl8169_private *tp)

static void rtl8169_hw_reset(struct rtl8169_private *tp, bool going_down)

{

	/* Give a racing hard_start_xmit a few cycles to complete. */

	synchronize_rcu();
@@ -3938,6 +3938,9 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp) 


	rtl_rx_close(tp);



	if (going_down && tp->dev->wol_enabled)

		goto no_reset;



	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_27:

	case RTL_GIGA_MAC_VER_28:
@@ -3959,7 +3962,7 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp) 
	}



	rtl_hw_reset(tp);



no_reset:

	rtl8169_tx_clear(tp);

	rtl8169_init_ring_indexes(tp);

}
@@ -3972,7 +3975,7 @@ static void rtl_reset_work(struct rtl8169_private *tp) 
	napi_disable(&tp->napi);

	netif_stop_queue(dev);



	rtl8169_hw_reset(tp);

	rtl8169_hw_reset(tp, false);



	for (i = 0; i < NUM_RX_DESC; i++)

		rtl8169_mark_to_asic(tp->RxDescArray + i);
@@ -4637,7 +4640,7 @@ static void rtl8169_down(struct rtl8169_private *tp) 
	phy_stop(tp->phydev);

	napi_disable(&tp->napi);



	rtl8169_hw_reset(tp);

	rtl8169_hw_reset(tp, true);



	rtl_pll_power_down(tp);
@@ -4942,8 +4945,6 @@ static void rtl_shutdown(struct pci_dev *pdev) 
	/* Restore original MAC address */

	rtl_rar_set(tp, tp->dev->perm_addr);



	rtl8169_hw_reset(tp);



	if (system_state == SYSTEM_POWER_OFF) {

		if (tp->saved_wolopts) {

			rtl_wol_suspend_quirk(tp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE