diff options
author | Kevin Baradon <kevin.baradon@gmail.com> | 2012-10-10 06:50:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-11 15:18:49 -0400 |
commit | aac9453b65c5d41eac133095586379be5b923a1e (patch) | |
tree | c154060bb904d97ad58f24564de5b3986bcff80e /drivers/net | |
parent | 0d0d0b160c389574f67cdcf6766ba9597102495d (diff) |
net/ethernet/jme: disable ASPM
Based on patch from Matthew Garrett <mjg@redhat.com> (https://lkml.org/lkml/2011/11/11/168).
http://driveragent.com/archive/30421/7-0-14 indicates that ASPM is
disabled on the 250 and 260. Duplicate for sanity.
Fixes random RX engine hangs I experienced with JMC250 on Clevo W270HU.
Signed-off-by: Kevin Baradon <kevin.baradon@gmail.com>
Cc: Guo-Fu Tseng <cooldavid@cooldavid.org>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/jme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index c911d883c27e..f8064df10cc4 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
30 | #include <linux/pci-aspm.h> | ||
30 | #include <linux/netdevice.h> | 31 | #include <linux/netdevice.h> |
31 | #include <linux/etherdevice.h> | 32 | #include <linux/etherdevice.h> |
32 | #include <linux/ethtool.h> | 33 | #include <linux/ethtool.h> |
@@ -2973,6 +2974,9 @@ jme_init_one(struct pci_dev *pdev, | |||
2973 | /* | 2974 | /* |
2974 | * set up PCI device basics | 2975 | * set up PCI device basics |
2975 | */ | 2976 | */ |
2977 | pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 | | ||
2978 | PCIE_LINK_STATE_CLKPM); | ||
2979 | |||
2976 | rc = pci_enable_device(pdev); | 2980 | rc = pci_enable_device(pdev); |
2977 | if (rc) { | 2981 | if (rc) { |
2978 | pr_err("Cannot enable PCI device\n"); | 2982 | pr_err("Cannot enable PCI device\n"); |