Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 671646c1 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by David S. Miller
Browse files

r8169: Don't disable ASPM in the driver 



Enable or disable ASPM should be done in PCI core instead of in the
device driver.

Commit ba04c7c9 ("r8169: disable ASPM") uses
pci_disable_link_state() to disable ASPM, but it's not the best way to
do it. If the device really wants to disable ASPM, we can use a quirk in
PCI core to prevent the PCI core from setting ASPM before probe.

Let's remove pci_disable_link_state() for now. Use PCI core quirks if
any regression happens.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cadefe5f

drivers/net/ethernet/realtek/r8169.c

+0 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/pm_runtime.h>

#include <linux/firmware.h>

#include <linux/pci-aspm.h>

#include <linux/prefetch.h>

#include <linux/ipv6.h>

#include <net/ip6_checksum.h>
@@ -7647,11 +7646,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	mii->reg_num_mask = 0x1f;

	mii->supports_gmii = cfg->has_gmii;



	/* 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 |

				     PCIE_LINK_STATE_CLKPM);



	/* enable device (incl. PCI PM wakeup and hotplug setup) */

	rc = pcim_enable_device(pdev);

	if (rc < 0) {