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

[Jens Axboe <axboe@kernel.dk>]

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