From: Mike Miller Date: Thu, 20 Oct 2011 20:19:17 +0000 (+0200) Subject: cciss: add small delay when using PCI Power Management to reset for kump X-Git-Tag: v2.6.39-400.9.0~823^2~207 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c1d120b049376c6accf0b61833eb4ad57d076a4;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 2b94c92873f6..7956711d578c 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4561,6 +4561,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; }