---

yaml --- r: 210511 b: refs/heads/master c: 75230ff h: refs/heads/master i: 210509: 173e089 210507: 7646647 210503: 4374eba 210495: 8f5fc53 v: v3
git-mirror · Aug 23, 2010 · a5afb6c · a5afb6c
1 parent 0da925b
commit a5afb6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;