diff options
| author |   Mike Miller <mike.miller@hp.com> | 2011-10-20 22:19:17 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2011-10-20 22:21:52 +0200 |
| commit | ab5dbebe33e0c353e8545f09c34553ac3351dad6 (patch) | |
| tree | 628b7956eac1b3a22850f0a2f2446ca29b69250b /drivers/block/cciss.c | |
| parent | Merge branch 'stable/for-jens-3.2' of git://oss.oracle.com/git/kwilk/xen into for-3.2/drivers (diff) | |
| download | linux-dev-ab5dbebe33e0c353e8545f09c34553ac3351dad6.tar.xz linux-dev-ab5dbebe33e0c353e8545f09c34553ac3351dad6.zip | |
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>
Diffstat (limited to 'drivers/block/cciss.c')
| -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, 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; } |