diff options
| author | Mike Miller <mike.miller@hp.com> | 2011-10-20 22:19:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:36:58 -0800 |
| commit | fa7e2a6289195e502003f59768837107a59678c0 (patch) | |
| tree | 8157d84c2ae0d28d6f24800fddb100fed99d2f36 | |
| parent | 5432c16a57990f12d41f57ed99ba194c368c30d0 (diff) | |
| download | kernel_samsung_crespo-fa7e2a6289195e502003f59768837107a59678c0.zip kernel_samsung_crespo-fa7e2a6289195e502003f59768837107a59678c0.tar.gz kernel_samsung_crespo-fa7e2a6289195e502003f59768837107a59678c0.tar.bz2 | |
cciss: add small delay when using PCI Power Management to reset for kump
commit ab5dbebe33e0c353e8545f09c34553ac3351dad6 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: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/block/cciss.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 8f4ef65..c2f9b3e 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4533,6 +4533,13 @@ static int cciss_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; } |