5.10-stable patches

added patches:
	r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch

diff --git a/queue-5.10/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch b/queue-5.10/r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch
new file mode 100644 (file)
index 0000000..1531722
--- /dev/null
+++ b/queue-5.10/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 <hkallweit1@gmail.com>
+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 <hkallweit1@gmail.com>
+
+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 <W_Armin@gmx.de>
+Tested-by: Armin Wolf <W_Armin@gmx.de>
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -2244,6 +2244,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:
+@@ -2271,6 +2272,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.10/series b/queue-5.10/series
index f14d9e86a07c0187fd0d08d944760eb90c223af8..2de18d953a30229e19c92bec2db33bf536355147 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -39,3 +39,4 @@ iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch
 revert-arm64-dts-amlogic-add-missing-ethernet-reset-id.patch
 of-unittest-fix-build-on-architectures-without-config_of_address.patch
 tomoyo-recognize-kernel-threads-correctly.patch
+r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch