cciss: do not use bit 2 doorbell reset

It causes NMIs which are undesirable at best, unsurvivable at worst.
Prefer the soft reset instead.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 865484e40841956f1b0861d34ef0a53eb3fda671..9528e94dc8b27d4ab0cff159b07f4e3eb316f4ff 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4673,8 +4673,14 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev)
                use_doorbell = DOORBELL_CTLR_RESET2;
        } else {
                use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;
-               if (use_doorbell)
-                       use_doorbell = DOORBELL_CTLR_RESET;
+               if (use_doorbell) {
+                       dev_warn(&pdev->dev, "Controller claims that "
+                               "'Bit 2 doorbell reset' is "
+                               "supported, but not 'bit 5 doorbell reset'.  "
+                               "Firmware update is recommended.\n");
+                       rc = -ENOTSUPP; /* use the soft reset */
+                       goto unmap_cfgtable;
+               }
        }
 
        rc = cciss_controller_hard_reset(pdev, vaddr, use_doorbell);