From: Greg Kroah-Hartman Date: Mon, 8 Mar 2021 12:27:02 +0000 (+0100) Subject: 5.11-stable patches X-Git-Tag: v5.4.104~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f889ae4262130c08cafbe8e55535f8bdd2e28d9;p=thirdparty%2Fkernel%2Fstable-queue.git 5.11-stable patches added patches: r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch --- diff --git a/queue-5.11/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch b/queue-5.11/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch new file mode 100644 index 00000000000..3ee7e7c8c58 --- /dev/null +++ b/queue-5.11/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_main.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/ethernet/realtek/r8169_main.c ++++ b/drivers/net/ethernet/realtek/r8169_main.c +@@ -2208,6 +2208,7 @@ static void rtl_pll_power_down(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: +@@ -2235,6 +2236,7 @@ static void rtl_pll_power_up(struct rtl8 + { + 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-5.11/series b/queue-5.11/series index 556015f9c69..b1e55446d17 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -41,3 +41,4 @@ iommu-don-t-use-lazy-flush-for-untrusted-device.patch iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch btrfs-zoned-use-sector_t-for-zone-sectors.patch tomoyo-recognize-kernel-threads-correctly.patch +r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch