| From ab5dbebe33e0c353e8545f09c34553ac3351dad6 Mon Sep 17 00:00:00 2001 |
| From: Mike Miller <mike.miller@hp.com> |
| Date: Thu, 20 Oct 2011 22:19:17 +0200 |
| Subject: cciss: add small delay when using PCI Power Management to reset for kump |
| |
| From: Mike Miller <mike.miller@hp.com> |
| |
| 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> |
| |
| --- |
| drivers/block/cciss.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- a/drivers/block/cciss.c |
| +++ b/drivers/block/cciss.c |
| @@ -4533,6 +4533,13 @@ static int cciss_controller_hard_reset(s |
| 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; |
| } |