summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2011-10-21 08:19:43 +0200
committerJens Axboe <axboe@kernel.dk>2011-10-21 08:21:50 +0200
commitc4853efec665134b2e6fc9c13447323240980351 (patch)
tree375b2ebcdec0e7f6e9f8321716389181611fc720 /drivers/scsi/hpsa.c
parentab5dbebe33e0c353e8545f09c34553ac3351dad6 (diff)
downloadop-kernel-dev-c4853efec665134b2e6fc9c13447323240980351.zip
op-kernel-dev-c4853efec665134b2e6fc9c13447323240980351.tar.gz
hpsa: add small delay when using PCI Power Management to reset for kump
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 <mike.miller@hp.com> Cc: stable@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r--drivers/scsi/hpsa.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index ec61bdb..3819298 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3283,6 +3283,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;
}
OpenPOWER on IntegriCloud