diff options
author | Mike Miller <mike.miller@hp.com> | 2011-10-20 16:19:17 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-10-20 16:21:52 -0400 |
commit | ab5dbebe33e0c353e8545f09c34553ac3351dad6 (patch) | |
tree | 628b7956eac1b3a22850f0a2f2446ca29b69250b | |
parent | b8d8bdfe31a67981bbc398a4886ccc67aff521d5 (diff) |
cciss: 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.
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-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 6da7edea700a..486f94ef24d4 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -4557,6 +4557,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev, | |||
4557 | pmcsr &= ~PCI_PM_CTRL_STATE_MASK; | 4557 | pmcsr &= ~PCI_PM_CTRL_STATE_MASK; |
4558 | pmcsr |= PCI_D0; | 4558 | pmcsr |= PCI_D0; |
4559 | pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); | 4559 | pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); |
4560 | |||
4561 | /* | ||
4562 | * The P600 requires a small delay when changing states. | ||
4563 | * Otherwise we may think the board did not reset and we bail. | ||
4564 | * This for kdump only and is particular to the P600. | ||
4565 | */ | ||
4566 | msleep(500); | ||
4560 | } | 4567 | } |
4561 | return 0; | 4568 | return 0; |
4562 | } | 4569 | } |