scsi: smartpqi: update timeout on admin commands

Orabug: 26191021, 26447813

Increase the timeout on admin commands from 3 seconds to 60
seconds and added a check for controller crash in the loop
where the driver polls for admin command completion.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 13bede676b98d595a43d36a34e1835b686d0d140)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 479eeeda1970e411a82457d88f84915ae269b82d..ec5c3e68ed142790c22ad55535988b774cc13b1e 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -3466,6 +3466,8 @@ static void pqi_submit_admin_request(struct pqi_ctrl_info *ctrl_info,
        writel(iq_pi, admin_queues->iq_pi);
 }
 
+#define PQI_ADMIN_REQUEST_TIMEOUT_SECS 60
+
 static int pqi_poll_for_admin_response(struct pqi_ctrl_info *ctrl_info,
        struct pqi_general_admin_response *response)
 {
@@ -3477,7 +3479,7 @@ static int pqi_poll_for_admin_response(struct pqi_ctrl_info *ctrl_info,
        admin_queues = &ctrl_info->admin_queues;
        oq_ci = admin_queues->oq_ci_copy;
 
-       timeout = (3 * HZ) + jiffies;
+       timeout = (PQI_ADMIN_REQUEST_TIMEOUT_SECS * HZ) + jiffies;
 
        while (1) {
                oq_pi = *admin_queues->oq_pi;
@@ -3488,6 +3490,8 @@ static int pqi_poll_for_admin_response(struct pqi_ctrl_info *ctrl_info,
                                "timed out waiting for admin response\n");
                        return -ETIMEDOUT;
                }
+               if (!sis_is_firmware_running(ctrl_info))
+                       return -ENXIO;
                usleep_range(1000, 2000);
        }