From 145798ed83c4a43cfe5add060789ea49cb9aed85 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Wed, 25 Aug 2010 10:44:14 -0500
Subject: [PATCH] --- yaml --- r: 210601 b: refs/heads/master c:
 36ed2176fedaa180b8ea3cdacf68c958e0090a3c h: refs/heads/master i:   210599:
 006a199b78f6b87463cd111a8fb520ec0e75f700 v: v3

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

diff --git a/[refs] b/[refs]
index 71c012a91b39..d0879e6e6776 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b15d05b0d358cedf9c4d420a60d2ee2d0f530788
+refs/heads/master: 36ed2176fedaa180b8ea3cdacf68c958e0090a3c
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 4f5551b5fe53..c5d0606ad097 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -3231,6 +3231,12 @@ static __devinit int hpsa_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 = hpsa_controller_hard_reset(pdev, vaddr, use_doorbell);
 	if (rc)
 		goto unmap_cfgtable;