| Message ID | d198a4d6-0c91-7870-9648-5a087fe634aa@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 90ca51e8c654699b672ba61aeaa418dfb3252e5e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 25 Aug 2023 21:44:01 +0200 you wrote: > This effectively reverts 4b5f82f6aaef. On a number of systems ASPM L1 > causes tx timeouts with RTL8168h, see referenced bug report. > > Fixes: 4b5f82f6aaef ("r8169: enable ASPM L1/L1.1 from RTL8168h") > Cc: stable@vger.kernel.org > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217814 > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > [...] Here is the summary with links: - [net] r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h https://git.kernel.org/netdev/net/c/90ca51e8c654 You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 5eb50b265..6351a2dc1 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5239,13 +5239,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* Disable ASPM L1 as that cause random device stop working * problems as well as full system hangs for some PCIe devices users. - * Chips from RTL8168h partially have issues with L1.2, but seem - * to work fine with L1 and L1.1. */ if (rtl_aspm_is_safe(tp)) rc = 0; - else if (tp->mac_version >= RTL_GIGA_MAC_VER_46) - rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2); else rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1); tp->aspm_manageable = !rc;
This effectively reverts 4b5f82f6aaef. On a number of systems ASPM L1 causes tx timeouts with RTL8168h, see referenced bug report. Fixes: 4b5f82f6aaef ("r8169: enable ASPM L1/L1.1 from RTL8168h") Cc: stable@vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217814 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 4 ---- 1 file changed, 4 deletions(-)