The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 868c3b95afef4883bfb66c9397482da6840b5baf # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023112427-rubbing-storage-3833@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 868c3b95afef ("r8169: fix network lost after resume on DASH systems") f658b90977d2 ("r8169: fix DMA being used after buffer free if WoL is enabled") 7257c977c811 ("r8169: clean up rtl_pll_power_down/up functions") 128735a1530e ("r8169: improve handling D3 PLL power-down") 9224d97183d9 ("r8169: enable PLL power-down for chip versions 34, 35, 36, 42") acb58657c869 ("r8169: improve RTL8168g PHY suspend quirk") e80bd76fbf56 ("r8169: work around power-saving bug on some chip versions") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 868c3b95afef4883bfb66c9397482da6840b5baf Mon Sep 17 00:00:00 2001 From: ChunHao Lin <hau@xxxxxxxxxxx> Date: Fri, 10 Nov 2023 01:34:00 +0800 Subject: [PATCH] r8169: fix network lost after resume on DASH systems Device that support DASH may be reseted or powered off during suspend. So driver needs to handle DASH during system suspend and resume. Or DASH firmware will influence device behavior and causes network lost. Fixes: b646d90053f8 ("r8169: magic.") Cc: stable@xxxxxxxxxxxxxxx Reviewed-by: Heiner Kallweit <hkallweit1@xxxxxxxxx> Signed-off-by: ChunHao Lin <hau@xxxxxxxxxxx> Link: https://lore.kernel.org/r/20231109173400.4573-3-hau@xxxxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index cfcb40d90920..b9bb1d2f0237 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4661,10 +4661,16 @@ static void rtl8169_down(struct rtl8169_private *tp) rtl8169_cleanup(tp); rtl_disable_exit_l1(tp); rtl_prepare_power_down(tp); + + if (tp->dash_type != RTL_DASH_NONE) + rtl8168_driver_stop(tp); } static void rtl8169_up(struct rtl8169_private *tp) { + if (tp->dash_type != RTL_DASH_NONE) + rtl8168_driver_start(tp); + pci_set_master(tp->pci_dev); phy_init_hw(tp->phydev); phy_resume(tp->phydev);
