diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-02-22 02:00:11 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-03 11:55:43 -0800 |
commit | ba04c7c93bbcb48ce880cf75b6e9dffcd79d4c7b (patch) | |
tree | 32accc8c42e605628367efb5bfbf4fbf2fce4f80 /drivers/net/r8169.c | |
parent | f009918a1c1bbf8607b8aab3959876913a30193a (diff) | |
download | linux-ba04c7c93bbcb48ce880cf75b6e9dffcd79d4c7b.tar.gz linux-ba04c7c93bbcb48ce880cf75b6e9dffcd79d4c7b.tar.bz2 linux-ba04c7c93bbcb48ce880cf75b6e9dffcd79d4c7b.zip |
r8169: disable ASPM
For some time is known that ASPM is causing troubles on r8169, i.e. make
device randomly stop working without any errors in dmesg.
Currently Tomi Leppikangas reports that system with r8169 device hangs
with MCE errors when ASPM is enabled:
https://bugzilla.redhat.com/show_bug.cgi?id=642861#c4
Lets disable ASPM for r8169 devices at all, to avoid problems with
r8169 PCIe devices at least for some users.
Reported-by: Tomi Leppikangas <tomi.leppikangas@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index ef2133b16f8c..7ffdb80adf40 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -25,6 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include <linux/firmware.h> +#include <linux/pci-aspm.h> #include <asm/system.h> #include <asm/io.h> @@ -3020,6 +3021,11 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) mii->reg_num_mask = 0x1f; mii->supports_gmii = !!(cfg->features & RTL_FEATURE_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 = pci_enable_device(pdev); if (rc < 0) { |