From: Mike Miller Date: Fri, 21 Oct 2011 06:19:43 +0000 (+0200) Subject: hpsa: add small delay when using PCI Power Management to reset for kump X-Git-Tag: v2.6.39-400.9.0~823^2~189 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3899a4290748e9f3d486466af1ea19a0cdb44b20;p=users%2Fjedix%2Flinux-maple.git hpsa: add small delay when using PCI Power Management to reset for kump commit c4853efec665134b2e6fc9c13447323240980351 upstream. The P600 requires a small delay when changing states. Otherwise we may think the board did not reset and we bail. This for kdump only and is particular to the P600. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 62a1ebfae486..b571592e3a82 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -3304,6 +3304,13 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev, pmcsr &= ~PCI_PM_CTRL_STATE_MASK; pmcsr |= PCI_D0; pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); + + /* + * The P600 requires a small delay when changing states. + * Otherwise we may think the board did not reset and we bail. + * This for kdump only and is particular to the P600. + */ + msleep(500); } return 0; }