[PATCH 1/2] hpsa: Disable ASPM

[Matthew Garrett <mjg@redhat.com>]

https://bugzilla.redhat.com/show_bug.cgi?id=618612 indicates that current
hpsa hardware has problems if ASPM is enabled. Disable it to avoid crashes.

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

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 12deffc..30fb46a 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>
@@ -3733,6 +3734,9 @@ static int __devinit hpsa_init_one(struct pci_dev *pdev,
 	if (number_of_controllers == 0)
 		printk(KERN_INFO DRIVER_NAME "\n");
 
+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+			       PCIE_LINK_STATE_CLKPM);
+
 	rc = hpsa_init_reset_devices(pdev);
 	if (rc)
 		return rc;
-- 
1.7.4