From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 11 Nov 2011 21:05:54 +0000 (+0100)
Subject: The Windows driver .inf disables ASPM on all cciss devices. Do the same.
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~727
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5a970ea48e686a045bff009103eba52e9026ff38;p=users%2Fjedix%2Flinux-maple.git

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

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: iss_storagedev@hp.com
Acked-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit 193733585692301f38d489b8ad8724c2f88349c0)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index dfbe10b61f4c..87b9daaa1ec9 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>
@@ -4365,6 +4366,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");