| From 6d94db208949541a2f733a341b88abdc7a8c12e0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 11 Sep 2018 10:18:13 -0700 |
| Subject: scsi: qla2xxx: Increase abort timeout value |
| |
| From: Quinn Tran <quinn.tran@cavium.com> |
| |
| [ Upstream commit 8bccfe0d21b5adbba6ec4fe1776160b80d09f78a ] |
| |
| Abort IOCB request can take up to 40s or 2 ABTS timeout. We will wait for |
| ABTS response for 20s. On a timeout, second ABTS can go out with another 20s |
| timeout. On 2nd ABTS timeout FW will automatically do Logout. |
| |
| Signed-off-by: Quinn Tran <quinn.tran@cavium.com> |
| Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/qla2xxx/qla_init.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c |
| index 733a55c09b1ca..8f502505aa796 100644 |
| --- a/drivers/scsi/qla2xxx/qla_init.c |
| +++ b/drivers/scsi/qla2xxx/qla_init.c |
| @@ -1789,7 +1789,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) |
| |
| abt_iocb->timeout = qla24xx_abort_iocb_timeout; |
| init_completion(&abt_iocb->u.abt.comp); |
| - qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha)); |
| + /* FW can send 2 x ABTS's timeout/20s */ |
| + qla2x00_init_timer(sp, 42); |
| |
| abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; |
| abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id); |
| -- |
| 2.20.1 |
| |
