projects/linux·commit e5a44df8

[SCSI] hpsa: Disable ASPM

e5a44df8 · Matthew Garrett <[email protected]> · 2011-11-11 11:14:23 -05:00

The Windows driver .inf disables ASPM on hpsa devices. Do the same because the
selection of a non default ASPM policy can cause the device to hang.

Signed-off-by: Matthew Garrett <[email protected]>
Cc: [email protected]
Acked-by: Mike Miller <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
Commit
e5a44df85e8d78e5c2d3d2e4f59b460905691e2f
Parents
cf16123c

Changes

1 files changed · +5 −0

FileStatusAddDelContent
drivers/scsi/hpsa.cmodified+5−0View file

drivers/scsi/hpsa.c

View file
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");