From 0ddf1d77505fd97daa7fc70bb0498c54a5c33725 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Wed, 4 Dec 2013 17:10:31 -0600 Subject: [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: Stephen M. Cameron Signed-off-by: James Bottomley --- drivers/scsi/hpsa.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index b146cafc50b1..d5f2ff9918fa 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -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, -- cgit v1.2.3