Commit 063d2cf7 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

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: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent ec52d5f1

drivers/block/cciss.c

+8 −2
Original line number Diff line number Diff line
@@ -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);