[V2] Disable ASPM on various devices

[V2] Disable ASPM on various devices

[Matthew Garrett]

If the firmware has given us control of PCIe capabilities then it's 
valid for an operating system to configure ASPM more aggressively than
the firmware did. A small number of devices object to this and exhibit
various failure modes. Windows provides a mechanism to disable ASPM in
the driver, indicated by the Needs=PciASPMOptOut statement in the .inf
file. Trawling through Windows drivers has indicated the following set
of hardware that disables ASPM in Windows but doesn't currently disable
it in Linux. It makes sense for us to mimic Windows in this situation.

(V2: send the version that actually builds)

[PATCH V2 1/6] net/ethernet/atl1c: Disable ASPM on various chipsets

[Matthew Garrett]

The Windows driver disables ASPM support for various chipsets supported
by atl1c. This adds the same set of logic to the Linux driver. ASPM is
disabled on l1c, l2c, l2cb and l2cb2 devices except for those in Toshiba
or Lenovo devices. Data taken from
http://www.atheros.cz/atheros-inf-file.php?inf=199&chipset=51&system=6

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: netdev@vger.kernel.org
Cc: jcliburn@gmail.com
Cc: chris.snook@gmail.com
---
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 02c7ed8..d91dabd 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -19,6 +19,7 @@
  * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include <linux/pci-aspm.h>
 #include "atl1c.h"
 
 #define ATL1C_DRV_VERSION "1.0.1.0-NAPI"
@@ -2652,6 +2653,20 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
 
 	int err = 0;
 
+	switch (pdev->device) {
+	case PCI_DEVICE_ID_ATTANSIC_L1C:
+	case PCI_DEVICE_ID_ATTANSIC_L2C:
+	case PCI_DEVICE_ID_ATHEROS_L2C_B:
+	case PCI_DEVICE_ID_ATHEROS_L2C_B2:
+		if (pdev->subsystem_vendor == PCI_VENDOR_ID_TOSHIBA ||
+		    pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO)
+			break;
+		pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
+				       PCIE_LINK_STATE_L1 |
+				       PCIE_LINK_STATE_CLKPM);
+		break;
+	}
+
 	/* enable device (incl. PCI PM wakeup and hotplug setup) */
 	err = pci_enable_device_mem(pdev);
 	if (err) {
-- 
1.7.7.1

Re: [PATCH V2 1/6] net/ethernet/atl1c: Disable ASPM on various chipsets

[David Miller]

From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 11 Nov 2011 11:14:19 -0500

> The Windows driver disables ASPM support for various chipsets supported
> by atl1c. This adds the same set of logic to the Linux driver. ASPM is
> disabled on l1c, l2c, l2cb and l2cb2 devices except for those in Toshiba
> or Lenovo devices. Data taken from
> http://www.atheros.cz/atheros-inf-file.php?inf=199&chipset=51&system=6
> 
> Signed-off-by: Matthew Garrett <mjg@redhat.com>

Applied.

Re: [PATCH V2 1/6] net/ethernet/atl1c: Disable ASPM on various chipsets

[David Miller]

I'm reverting all of these.

You do all of that work to research the inf files and whatnot, then
you don't even build test the patches you submit?

Forget it, for something as potentially fragile as this stuff might
be, I simply cannot trust you if you can't even do due diligence
wrt. the build validation.

[PATCH V2 2/6] net/ethernet/atl1e: Disable ASPM

[Matthew Garrett]

http://www.atheros.cz/atheros-inf-file.php?inf=209&chipset=45&system=6
indicates that ASPM is disabled on all L1E hardware. Duplicate for sanity.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: netdev@vger.kernel.org
Cc: jcliburn@gmail.com
Cc: chris.snook@gmail.com
---
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 95483bc..fc74dd1 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -2264,6 +2264,9 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
 
 	int err = 0;
 
+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+			       PCIE_LINK_STATE_CLKPM);
+
 	err = pci_enable_device(pdev);
 	if (err) {
 		dev_err(&pdev->dev, "cannot enable PCI device\n");
-- 
1.7.7.1

Re: [PATCH V2 2/6] net/ethernet/atl1e: Disable ASPM

[David Miller]

From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 11 Nov 2011 11:14:20 -0500

> http://www.atheros.cz/atheros-inf-file.php?inf=209&chipset=45&system=6
> indicates that ASPM is disabled on all L1E hardware. Duplicate for sanity.
> 
> Signed-off-by: Matthew Garrett <mjg@redhat.com>

Applied.

Re: [PATCH V2 2/6] net/ethernet/atl1e: Disable ASPM

[David Miller]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: Text/Plain; charset=iso-8859-7, Size: 1341 bytes --]

From: David Miller <davem@davemloft.net>
Date: Mon, 14 Nov 2011 00:31:13 -0500 (EST)

> From: Matthew Garrett <mjg@redhat.com>
> Date: Fri, 11 Nov 2011 11:14:20 -0500
> 
>> http://www.atheros.cz/atheros-inf-file.php?inf=209&chipset=45&system=6
>> indicates that ASPM is disabled on all L1E hardware. Duplicate for sanity.
>> 
>> Signed-off-by: Matthew Garrett <mjg@redhat.com>
> 
> Applied.

Ummm, -ENOBUILDTESTING?!??!

drivers/net/ethernet/atheros/atl1e/atl1e_main.c: In function ¡atl1e_probe¢:
drivers/net/ethernet/atheros/atl1e/atl1e_main.c:2267:2: error: implicit declaration of function ¡pci_disable_link_state¢ [-Werror=implicit-function-declaration]
drivers/net/ethernet/atheros/atl1e/atl1e_main.c:2267:31: error: ¡PCIE_LINK_STATE_L0S¢ undeclared (first use in this function)
drivers/net/ethernet/atheros/atl1e/atl1e_main.c:2267:31: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/ethernet/atheros/atl1e/atl1e_main.c:2267:53: error: ¡PCIE_LINK_STATE_L1¢ undeclared (first use in this function)
drivers/net/ethernet/atheros/atl1e/atl1e_main.c:2268:11: error: ¡PCIE_LINK_STATE_CLKPM¢ undeclared (first use in this function)
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH V2 2/6] net/ethernet/atl1e: Disable ASPM

[Matthew Garrett]

Sorry, I screwed up there - it looks like I tested atl1c twice. Still 
inexcusable, and apologies for the wasted time.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

[PATCH V2 3/6] net/ethernet/jme: Disable ASPM

[Matthew Garrett]

http://driveragent.com/archive/30421/7-0-14 indicates that ASPM is
disabled on the 250 and 260. Duplicate for sanity.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: netdev@vger.kernel.org
Cc: cooldavid@cooldavid.org
---
 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 7becff1..88e7ce1 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -2860,6 +2861,9 @@ jme_init_one(struct pci_dev *pdev,
 	/*
 	 * set up PCI device basics
 	 */
+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+			       PCIE_LINK_STATE_CLKPM);
+
 	rc = pci_enable_device(pdev);
 	if (rc) {
 		pr_err("Cannot enable PCI device\n");
-- 
1.7.7.1

Re: [PATCH V2 3/6] net/ethernet/jme: Disable ASPM

[David Miller]

From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 11 Nov 2011 11:14:21 -0500

> http://driveragent.com/archive/30421/7-0-14 indicates that ASPM is
> disabled on the 250 and 260. Duplicate for sanity.
> 
> Signed-off-by: Matthew Garrett <mjg@redhat.com>

Applied.

[PATCH V2 4/6] block/cciss: Disable ASPM

[Matthew Garrett]

The Windows driver .inf disables ASPM on all cciss devices. Do the same.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: mike.miller@hp.com
Cc: iss_storagedev@hp.com
Cc: axboe@kernel.dk
---
 drivers/block/cciss.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 486f94e..92d8a2f 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -4319,6 +4320,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
 		return -ENODEV;
 	}
+
+	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
+			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+
 	err = pci_enable_device(h->pdev);
 	if (err) {
 		dev_warn(&h->pdev->dev, "Unable to Enable PCI device\n");
-- 
1.7.7.1

Re: [PATCH V2 4/6] block/cciss: Disable ASPM

[Mike Miller]

On 11/11/2011 10:14 AM, Matthew Garrett wrote:
> The Windows driver .inf disables ASPM on all cciss devices. Do the same.
>
> Signed-off-by: Matthew Garrett<mjg@redhat.com>
> Cc: mike.miller@hp.com
> Cc: iss_storagedev@hp.com
> Cc: axboe@kernel.dk
> ---
>   drivers/block/cciss.c |    5 +++++
>   1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> index 486f94e..92d8a2f 100644
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -24,6 +24,7 @@
>   #include<linux/interrupt.h>
>   #include<linux/types.h>
>   #include<linux/pci.h>
> +#include<linux/pci-aspm.h>
>   #include<linux/kernel.h>
>   #include<linux/slab.h>
>   #include<linux/delay.h>
> @@ -4319,6 +4320,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
>   		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
>   		return -ENODEV;
>   	}
> +
> +	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
> +			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
> +
>   	err = pci_enable_device(h->pdev);
>   	if (err) {
>   		dev_warn(&h->pdev->dev, "Unable to Enable PCI device\n");

Acked-by: Mike Miller <mike.miller@hp.com>

Re: [PATCH V2 4/6] block/cciss: Disable ASPM

[Jens Axboe]

On 2011-11-11 17:15, Mike Miller wrote:
> On 11/11/2011 10:14 AM, Matthew Garrett wrote:
>> The Windows driver .inf disables ASPM on all cciss devices. Do the same.
>>
>> Signed-off-by: Matthew Garrett<mjg@redhat.com>
>> Cc: mike.miller@hp.com
>> Cc: iss_storagedev@hp.com
>> Cc: axboe@kernel.dk
>> ---
>>   drivers/block/cciss.c |    5 +++++
>>   1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
>> index 486f94e..92d8a2f 100644
>> --- a/drivers/block/cciss.c
>> +++ b/drivers/block/cciss.c
>> @@ -24,6 +24,7 @@
>>   #include<linux/interrupt.h>
>>   #include<linux/types.h>
>>   #include<linux/pci.h>
>> +#include<linux/pci-aspm.h>
>>   #include<linux/kernel.h>
>>   #include<linux/slab.h>
>>   #include<linux/delay.h>
>> @@ -4319,6 +4320,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
>>           dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
>>           return -ENODEV;
>>       }
>> +
>> +    pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
>> +                   PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
>> +
>>       err = pci_enable_device(h->pdev);
>>       if (err) {
>>           dev_warn(&h->pdev->dev, "Unable to Enable PCI device\n");
> 
> Acked-by: Mike Miller <mike.miller@hp.com>

Applied for 3.2, thanks.

-- 
Jens Axboe

[PATCH V2 5/6] scsi/hpsa: Disable ASPM

[Matthew Garrett]

The Windows driver .inf disables ASPM on hpsa devices. Do the same.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: scameron@beardog.cce.hp.com
Cc: iss_storagedev@hp.com
Cc: linux-scsi@vger.kernel.org
---
 drivers/scsi/hpsa.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index e76107b..865d452 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -3922,6 +3923,10 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
 		return -ENODEV;
 	}
+
+	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
+			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+
 	err = pci_enable_device(h->pdev);
 	if (err) {
 		dev_warn(&h->pdev->dev, "unable to enable PCI device\n");
-- 
1.7.7.1

Re: [PATCH V2 5/6] scsi/hpsa: Disable ASPM

[Mike Miller]

On 11/11/2011 10:14 AM, Matthew Garrett wrote:
> The Windows driver .inf disables ASPM on hpsa devices. Do the same.
>
> Signed-off-by: Matthew Garrett<mjg@redhat.com>
> Cc: scameron@beardog.cce.hp.com
> Cc: iss_storagedev@hp.com
> Cc: linux-scsi@vger.kernel.org
> ---
>   drivers/scsi/hpsa.c |    5 +++++
>   1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index e76107b..865d452 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -23,6 +23,7 @@
>   #include<linux/interrupt.h>
>   #include<linux/types.h>
>   #include<linux/pci.h>
> +#include<linux/pci-aspm.h>
>   #include<linux/kernel.h>
>   #include<linux/slab.h>
>   #include<linux/delay.h>
> @@ -3922,6 +3923,10 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
>   		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
>   		return -ENODEV;
>   	}
> +
> +	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
> +			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
> +
>   	err = pci_enable_device(h->pdev);
>   	if (err) {
>   		dev_warn(&h->pdev->dev, "unable to enable PCI device\n");

Acked-by: Mike Miller <mike.miller@hp.com>

[PATCH V2 6/6] infiniband/nes: Disable ASPM

[Matthew Garrett]

The Windows driver .inf disables ASPM on hpsa devices. Do the same.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: faisal.latif@intel.com
Cc: linux-rdma@vger.kernel.org
---
 drivers/infiniband/hw/nes/nes.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 5965b3d..ea320f5 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -45,6 +45,7 @@
 #include <linux/if_arp.h>
 #include <linux/highmem.h>
 #include <linux/slab.h>
+#include <linux/pci-aspm.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/byteorder.h>
@@ -463,6 +464,9 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
 	printk(KERN_INFO PFX "NetEffect RNIC driver v%s loading. (%s)\n",
 			DRV_VERSION, pci_name(pcidev));
 
+	pci_disable_link_state(pcidev, PCIE_LINK_STATE_L0S |
+			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+
 	ret = pci_enable_device(pcidev);
 	if (ret) {
 		printk(KERN_ERR PFX "Unable to enable PCI device. (%s)\n", pci_name(pcidev));
-- 
1.7.7.1