From: Greg Kroah-Hartman Date: Mon, 8 Mar 2021 12:26:05 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v5.4.104~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c7d1e9f6fc3bc3c2c9ac938d5cf9e7e57231ae9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch --- diff --git a/queue-4.19/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch b/queue-4.19/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch new file mode 100644 index 00000000000..c7ae9ff0b1b --- /dev/null +++ b/queue-4.19/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch @@ -0,0 +1,41 @@ +From d2a04370817fc7b0172dad2ef2decf907e1a304e Mon Sep 17 00:00:00 2001 +From: Heiner Kallweit +Date: Sun, 14 Feb 2021 17:38:30 +0100 +Subject: r8169: fix resuming from suspend on RTL8105e if machine runs on battery + +From: Heiner Kallweit + +commit d2a04370817fc7b0172dad2ef2decf907e1a304e upstream. + +Armin reported that after referenced commit his RTL8105e is dead when +resuming from suspend and machine runs on battery. This patch has been +confirmed to fix the issue. + +Fixes: e80bd76fbf56 ("r8169: work around power-saving bug on some chip versions") +Reported-by: Armin Wolf +Tested-by: Armin Wolf +Signed-off-by: Heiner Kallweit +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/realtek/r8169.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/ethernet/realtek/r8169.c ++++ b/drivers/net/ethernet/realtek/r8169.c +@@ -4238,6 +4238,7 @@ static void r8168_pll_power_down(struct + + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26: ++ case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30: + case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33: + case RTL_GIGA_MAC_VER_37: + case RTL_GIGA_MAC_VER_39: +@@ -4265,6 +4266,7 @@ static void r8168_pll_power_up(struct rt + { + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26: ++ case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30: + case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33: + case RTL_GIGA_MAC_VER_37: + case RTL_GIGA_MAC_VER_39: diff --git a/queue-4.19/series b/queue-4.19/series index bce4a7a449d..26da1616452 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -17,3 +17,4 @@ alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch rdma-rxe-fix-missing-kconfig-dependency-on-crypto.patch rsxx-return-efault-if-copy_to_user-fails.patch dm-verity-fix-fec-for-rs-roots-unaligned-to-block-size.patch +r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch