Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ddf1d77 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

[SCSI] hpsa: do not require board "not ready" status after hard reset 



Immediately following a hard board reset, There are some
mandatory delays during which we must not access the board
and during which we might miss the "not ready" status,
therefore it is a mistake to look for and expect to see
the "not ready" status.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 28e13446

drivers/scsi/hpsa.c

+0 −17
Original line number Diff line number Diff line
@@ -4048,23 +4048,6 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) 
	   need a little pause here */

	msleep(HPSA_POST_RESET_PAUSE_MSECS);



	if (!use_doorbell) {

		/* Wait for board to become not ready, then ready.

		 * (if we used the doorbell, then we already waited 5 secs

		 * so the "not ready" state is already gone by so we

		 * won't catch it.)

		 */

		dev_info(&pdev->dev, "Waiting for board to reset.\n");

		rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY);

		if (rc) {

			dev_warn(&pdev->dev,

				"failed waiting for board to reset."

				" Will try soft reset.\n");

			/* Not expected, but try soft reset later */

			rc = -ENOTSUPP;

			goto unmap_cfgtable;

		}

	}

	rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY);

	if (rc) {

		dev_warn(&pdev->dev,