From 67ae92535d59bf7e345a525d8e000e6b4b314020 Mon Sep 17 00:00:00 2001
From: Mike Miller <mike.miller@hp.com>
Date: Thu, 20 Oct 2011 22:19:17 +0200
Subject: [PATCH] --- yaml --- r: 273846 b: refs/heads/master c:
 ab5dbebe33e0c353e8545f09c34553ac3351dad6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf859d3366bf..e926da28cea8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8d8bdfe31a67981bbc398a4886ccc67aff521d5
+refs/heads/master: ab5dbebe33e0c353e8545f09c34553ac3351dad6
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 6da7edea700a..486f94ef24d4 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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;
 }