From a5afb6cab74443f6b137189063fbf5d36dc219c8 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Mon, 23 Aug 2010 11:02:17 +0200
Subject: [PATCH] --- yaml --- r: 210511 b: refs/heads/master c:
 75230ff2751e88d594a13a70eae2c146f45e323b h: refs/heads/master i:   210509:
 173e0899dcdfd5a5fe252893b5da68000af1218e   210507:
 76466473d11e09588904cbc2d201fffe36960d8d   210503:
 4374ebafe8791dbe37c4ad8eb43376e4bf6b3c57   210495:
 8f5fc534f3aa0a7f35d24ad4c2e1ae8fdfa39203 v: v3

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

diff --git a/[refs] b/[refs]
index 75ac3a444368..59d4ee34a41d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96aa1b419d47286db446f292cf898bb1a8b27f24
+refs/heads/master: 75230ff2751e88d594a13a70eae2c146f45e323b
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 31064df1370a..ce1a75df5902 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4519,6 +4519,12 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev)
 	misc_fw_support = readl(&cfgtable->misc_fw_support);
 	use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;
 
+	/* The doorbell reset seems to cause lockups on some Smart
+	 * Arrays (e.g. P410, P410i, maybe others).  Until this is
+	 * fixed or at least isolated, avoid the doorbell reset.
+	 */
+	use_doorbell = 0;
+
 	rc = cciss_controller_hard_reset(pdev, vaddr, use_doorbell);
 	if (rc)
 		goto unmap_cfgtable;