]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Revert "r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM"
authorHayes Wang <hayeswang@realtek.com>
Fri, 6 Aug 2021 09:15:55 +0000 (17:15 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 1 Oct 2021 09:34:02 +0000 (11:34 +0200)
BugLink: https://bugs.launchpad.net/bugs/1945517
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/realtek/r8169_main.c

index 6ab8e352ea08c07f206b4df18a3165470f337442..a4793dd7c54559c8678b6de6db6e2ebc5ce6203a 100644 (file)
@@ -4684,6 +4684,7 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp)
        rtl_eri_clear_bits(tp, 0x1b0, ERIAR_MASK_0011, BIT(12));
 
        rtl_pcie_state_l2l3_disable(tp);
+       rtl_hw_aspm_clkreq_enable(tp, true);
 }
 
 static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)