1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 9825ecf34957..bbdc9f960a66 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3300,6 +3300,13 @@ static int hpsa_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;
 }