scsi: smartpqi: Fix kdump issue when controller is locked up

Avoid dropping into shell if the controller is in locked up state.

Driver issues SIS soft reset to bring back the controller to SIS mode while
OS boots into kdump mode.

If the controller is in lockup state, SIS soft reset does not work.

Since the controller lockup code has not been cleared, driver considers the
firmware is no longer up and running. Driver returns back an error code to
OS and the kdump fails.

Link: https://lore.kernel.org/r/164375212337.440833.11955356190354940369.stgit@brunhilda.pdev.net
Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Mahesh Rajashekhara <mahesh.rajashekhara@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index de53180fab9c3773c96a575cfd6709244e5189e6..8bd4de6306db12670827ee4e93a4347db383e069 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -7986,6 +7986,21 @@ static int pqi_force_sis_mode(struct pqi_ctrl_info *ctrl_info)
        return pqi_revert_to_sis_mode(ctrl_info);
 }
 
+static void pqi_perform_lockup_action(void)
+{
+       switch (pqi_lockup_action) {
+       case PANIC:
+               panic("FATAL: Smart Family Controller lockup detected");
+               break;
+       case REBOOT:
+               emergency_restart();
+               break;
+       case NONE:
+       default:
+               break;
+       }
+}
+
 static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)
 {
        int rc;
@@ -8010,8 +8025,15 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)
         * commands.
         */
        rc = sis_wait_for_ctrl_ready(ctrl_info);
-       if (rc)
+       if (rc) {
+               if (reset_devices) {
+                       dev_err(&ctrl_info->pci_dev->dev,
+                               "kdump init failed with error %d\n", rc);
+                       pqi_lockup_action = REBOOT;
+                       pqi_perform_lockup_action();
+               }
                return rc;
+       }
 
        /*
         * Get the controller properties.  This allows us to determine
@@ -8736,21 +8758,6 @@ static int pqi_ofa_ctrl_restart(struct pqi_ctrl_info *ctrl_info, unsigned int de
        return pqi_ctrl_init_resume(ctrl_info);
 }
 
-static void pqi_perform_lockup_action(void)
-{
-       switch (pqi_lockup_action) {
-       case PANIC:
-               panic("FATAL: Smart Family Controller lockup detected");
-               break;
-       case REBOOT:
-               emergency_restart();
-               break;
-       case NONE:
-       default:
-               break;
-       }
-}
-
 static struct pqi_raid_error_info pqi_ctrl_offline_raid_error_info = {
        .data_out_result = PQI_DATA_IN_OUT_HARDWARE_ERROR,
        .status = SAM_STAT_CHECK_CONDITION,