[patch] aacraid: controller hangs if kernel uses non-default ASPM policy

[Vasily Averin <vvs@parallels.com>]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

Patch from RHEL6 kernel
- [scsi] aacraid: Disable ASPM by default (Matthew Garrett) [599735]
aacraid controller hangs if kernel uses non-default ASPM policy

Signed-off-by:	Vasily Averin <vvs@sw.ru>
CC: Matthew Garrett <mjg@redhat.com>

[-- Attachment #2: diff-v31-aacraid-aspm-disable-20111110 --]
[-- Type: text/plain, Size: 656 bytes --]

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 3382475..c7b6fed 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
@@ -1108,6 +1109,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 		unique_id++;
 	}
 
+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+			       PCIE_LINK_STATE_CLKPM);
+
 	error = pci_enable_device(pdev);
 	if (error)
 		goto out;