UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: smartpqi: update timeout on admin commands 

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>
This commit is contained in:
Kevin Barnett 2017-05-03 18:55:13 -05:00 committed by Martin K. Petersen
parent f5b6320625
commit 13bede676b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/smartpqi/smartpqi_init.c
View File

@ -3425,6 +3425,8 @@ static void pqi_submit_admin_request(struct pqi_ctrl_info *ctrl_info,
writel(iq_pi, admin_queues->iq_pi); 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, static int pqi_poll_for_admin_response(struct pqi_ctrl_info *ctrl_info,
struct pqi_general_admin_response *response) struct pqi_general_admin_response *response)
{ {
@ -3436,7 +3438,7 @@ static int pqi_poll_for_admin_response(struct pqi_ctrl_info *ctrl_info,
admin_queues = &ctrl_info->admin_queues; admin_queues = &ctrl_info->admin_queues;
oq_ci = admin_queues->oq_ci_copy; oq_ci = admin_queues->oq_ci_copy;
timeout = (3 * HZ) + jiffies; timeout = (PQI_ADMIN_REQUEST_TIMEOUT_SECS * HZ) + jiffies;
while (1) { while (1) {
oq_pi = *admin_queues->oq_pi; oq_pi = *admin_queues->oq_pi;
@ -3447,6 +3449,8 @@ static int pqi_poll_for_admin_response(struct pqi_ctrl_info *ctrl_info,
"timed out waiting for admin response\n"); "timed out waiting for admin response\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
if (!sis_is_firmware_running(ctrl_info))
return -ENXIO;
usleep_range(1000, 2000); usleep_range(1000, 2000);
} }