]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.13-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Sep 2021 14:36:19 +0000 (16:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Sep 2021 14:36:19 +0000 (16:36 +0200)
added patches:
revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch

queue-5.13/revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch [new file with mode: 0644]
queue-5.13/series

diff --git a/queue-5.13/revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch b/queue-5.13/revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch
new file mode 100644 (file)
index 0000000..5d70a1c
--- /dev/null
@@ -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
+@@ -3510,6 +3510,7 @@ static void rtl_hw_start_8106(struct rtl
+       rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);
+       rtl_pcie_state_l2l3_disable(tp);
++      rtl_hw_aspm_clkreq_enable(tp, true);
+ }
+ DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond)
index 52f07de8f476b069b3e8ca5af3c604fa64a74df0..066342391c206c6d9b649dd185e5b41f19cfabbb 100644 (file)
@@ -1,3 +1,4 @@
 firmware-dmi-move-product_sku-info-to-the-end-of-the-modalias.patch
 igmp-add-ip_mc_list-lock-in-ip_check_mc_rcu.patch
 net-ll_temac-remove-left-over-debug-message.patch
+revert-r8169-avoid-link-up-interrupt-issue-on-rtl8106e-if-user-enables-aspm.patch