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

Commit ba04c7c9 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by David S. Miller
Browse files

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: default avatarTomi Leppikangas <tomi.leppikangas@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f009918a

drivers/net/r8169.c

+6 −0
Original line number Diff line number Diff line
@@ -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) {