From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 8 Sep 2021 14:36:35 +0000 (+0200)
Subject: 5.14-stable patches
X-Git-Tag: v5.4.145~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b16b2a3861bf61aa3778551996ae486f727690ba;p=thirdparty%2Fkernel%2Fstable-queue.git

5.14-stable patches

added patches:
	revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch
---

diff --git a/queue-5.14/revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch b/queue-5.14/revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch
new file mode 100644
index 00000000000..dabdfa67b16
--- /dev/null
+++ b/queue-5.14/revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch
@@ -0,0 +1,30 @@
+From 2115d3d482656ea702f7cf308c0ded3500282903 Mon Sep 17 00:00:00 2001
+From: Hayes Wang <hayeswang@realtek.com>
+Date: Fri, 6 Aug 2021 17:15:55 +0800
+Subject: Revert "r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM"
+
+From: Hayes Wang <hayeswang@realtek.com>
+
+commit 2115d3d482656ea702f7cf308c0ded3500282903 upstream.
+
+This reverts commit 1ee8856de82faec9bc8bd0f2308a7f27e30ba207.
+
+This is used to re-enable ASPM on RTL8106e, if it is possible.
+
+Signed-off-by: Hayes Wang <hayeswang@realtek.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 |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -3489,6 +3489,7 @@ static void rtl_hw_start_8402(struct rtl
+ 	rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);
+ 
+ 	rtl_pcie_state_l2l3_disable(tp);
++	rtl_hw_aspm_clkreq_enable(tp, true);
+ }
+ 
+ static void rtl_hw_start_8106(struct rtl8169_private *tp)
diff --git a/queue-5.14/series b/queue-5.14/series
index d467cc08424..bbec9b27497 100644
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -1,3 +1,4 @@
 firmware-dmi-move-product_sku-info-to-the-end-of-the-modalias.patch
 can-c_can-fix-null-ptr-deref-on-ioctl.patch
 igmp-add-ip_mc_list-lock-in-ip_check_mc_rcu.patch
+revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch