[PATCH net-next] r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM

It has been reported that on RTL8106e the link-up interrupt may be
significantly delayed if the user enables ASPM L1. Per default ASPM
is disabled. The change leaves L1 enabled on the PCIe link (thus still
allowing to reach higher package power saving states), but the
NIC won't actively trigger it.

Reported-by: Koba Ko <redacted>
Tested-by: Koba Ko <redacted>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 64f94a3fe..6a9fe9f7e 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c

@@ -3508,7 +3508,6 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)
 	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)

-- 
2.32.0

On Fri, Jun 11, 2021 at 4:57 AM Heiner Kallweit [off-list ref] wrote:

As per 0866cd15029b, this also affects the intel soc idle state.
Even the result is positive currently, I think this modification would
have higher risk.

 DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond)
--
2.32.0

On 11.06.2021 10:04, Koba Ko wrote:

On Fri, Jun 11, 2021 at 4:57 AM Heiner Kallweit [off-list ref] wrote:

quoted

It has been reported that on RTL8106e the link-up interrupt may be
significantly delayed if the user enables ASPM L1. Per default ASPM
is disabled. The change leaves L1 enabled on the PCIe link (thus still
allowing to reach higher package power saving states), but the
NIC won't actively trigger it.

Reported-by: Koba Ko <redacted>
Tested-by: Koba Ko <redacted>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 64f94a3fe..6a9fe9f7e 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c

@@ -3508,7 +3508,6 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)
        rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);

        rtl_pcie_state_l2l3_disable(tp);
-       rtl_hw_aspm_clkreq_enable(tp, true);
 }

As per 0866cd15029b, this also affects the intel soc idle state.
Even the result is positive currently, I think this modification would
have higher risk.

At the time of 0866cd15029b ASPM was enabled in r8169. Interesting that
after 0866cd15029b nobody reported the link-up issue you're facing.
A few months later (with b75bb8a5b755) we had to disable ASPM again
because of several problem reports. Since then 0866cd15029b has no
practical relevance in mainline.

quoted

 DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond)
--
2.32.0

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Thu, 10 Jun 2021 22:56:59 +0200 you wrote:

It has been reported that on RTL8106e the link-up interrupt may be
significantly delayed if the user enables ASPM L1. Per default ASPM
is disabled. The change leaves L1 enabled on the PCIe link (thus still
allowing to reach higher package power saving states), but the
NIC won't actively trigger it.

Reported-by: Koba Ko <redacted>
Tested-by: Koba Ko <redacted>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

[...]

Here is the summary with links:
  - [net-next] r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM
    https://git.kernel.org/netdev/net-next/c/1ee8856de82f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html