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: v3.1.1~59 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9b6bdf987c633aad39d5ce70835679014a5b27d;p=karo-tx-linux.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 8f4ef656a1af..c2f9b3e3dec7 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; }