diff options
| author | Mike Miller <mike.miller@hp.com> | 2011-10-21 08:19:43 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-21 08:21:50 +0200 |
| commit | c4853efec665134b2e6fc9c13447323240980351 (patch) | |
| tree | 375b2ebcdec0e7f6e9f8321716389181611fc720 | |
| parent | cciss: add small delay when using PCI Power Management to reset for kump (diff) | |
| download | linux-c4853efec665134b2e6fc9c13447323240980351.tar.xz linux-c4853efec665134b2e6fc9c13447323240980351.zip | |
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>
| -rw-r--r-- | drivers/scsi/hpsa.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index ec61bdb833ac..381929813cbd 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; } |