Commit 90ca51e8 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h 

This effectively reverts 4b5f82f6. On a number of systems ASPM L1
causes tx timeouts with RTL8168h, see referenced bug report.

Fixes: 4b5f82f6 ("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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec1b9088

drivers/net/ethernet/realtek/r8169_main.c

+0 −4
Original line number Diff line number Diff line
@@ -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;