[4/4,SRU,OEM-OSP1-B] UBUNTU: SAUCE: Revert "r8169: disable ASPM again"
diff mbox series

Message ID 20190710094014.18416-5-acelan.kao@canonical.com
State New
Headers show
Series
  • enable realtek ethernet device ASPM function
Related show

Commit Message

AceLan Kao July 10, 2019, 9:40 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1836030

This reverts commit 8b60fe9c63d2b1dc55412bfbc7e4a899063f61c3.

PCI/ASPM have been merged, so we rely on the PCI ASPM setting from BIOS,
and don't need to enable/disable ASPM function on r8169 driver.

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 drivers/net/ethernet/realtek/r8169.c | 6 ------
 1 file changed, 6 deletions(-)

Patch
diff mbox series

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 365cddbfc684..f294c5c9c206 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -28,7 +28,6 @@ 
 #include <linux/pm_runtime.h>
 #include <linux/firmware.h>
 #include <linux/prefetch.h>
-#include <linux/pci-aspm.h>
 #include <linux/ipv6.h>
 #include <net/ip6_checksum.h>
 
@@ -7225,11 +7224,6 @@  static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 			return rc;
 	}
 
-	/* Disable ASPM completely as that cause random device stop working
-	 * problems as well as full system hangs for some PCIe devices users.
-	 */
-	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
-
 	/* enable device (incl. PCI PM wakeup and hotplug setup) */
 	rc = pcim_enable_device(pdev);
 	if (rc < 0) {