Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a44df8 authored by Matthew Garrett's avatar Matthew Garrett Committed by James Bottomley
Browse files

[SCSI] hpsa: Disable ASPM 



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: default avatarMatthew Garrett <mjg@redhat.com>
Cc: stable@kernel.org
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent cf16123c

drivers/scsi/hpsa.c

+5 −0
Original line number Diff line number Diff line
@@ -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");