r8169: fix RTL8127 hang on suspend/shutdown

There have been reports that RTL8127 hangs on suspend and shutdown,
partially disappearing from lspci until power-cycling.
According to Realtek disabling PLL's when switching to D3 should be
avoided on that chip version. Fix this by aligning disabling PLL's
with the vendor drivers, what in addition results in PLL's not being
disabled when switching to D3hot on other chip versions.

Fixes: f24f7b2f3af9 ("r8169: add support for RTL8127A")
Tested-by: Fabio Baltieri <fabio.baltieri@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/d7faae7e-66bc-404a-a432-3a496600575f@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index d18734fe12e42ab6af85a2c735314ec9e7b4e7c1..853aabedb128dad2a84f2b82fe648d17999d2316 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -1514,11 +1514,20 @@ static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp)
 
 static void rtl_set_d3_pll_down(struct rtl8169_private *tp, bool enable)
 {
-       if (tp->mac_version >= RTL_GIGA_MAC_VER_25 &&
-           tp->mac_version != RTL_GIGA_MAC_VER_28 &&
-           tp->mac_version != RTL_GIGA_MAC_VER_31 &&
-           tp->mac_version != RTL_GIGA_MAC_VER_38)
-               r8169_mod_reg8_cond(tp, PMCH, D3_NO_PLL_DOWN, !enable);
+       switch (tp->mac_version) {
+       case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_24:
+       case RTL_GIGA_MAC_VER_28:
+       case RTL_GIGA_MAC_VER_31:
+       case RTL_GIGA_MAC_VER_38:
+               break;
+       case RTL_GIGA_MAC_VER_80:
+               r8169_mod_reg8_cond(tp, PMCH, D3_NO_PLL_DOWN, true);
+               break;
+       default:
+               r8169_mod_reg8_cond(tp, PMCH, D3HOT_NO_PLL_DOWN, true);
+               r8169_mod_reg8_cond(tp, PMCH, D3COLD_NO_PLL_DOWN, !enable);
+               break;
+       }
 }
 
 static void rtl_reset_packet_filter(struct rtl8169_private *tp)