]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: qla2xxx: fix inconsistent TMF timeout
authorQuinn Tran <qutran@marvell.com>
Fri, 14 Jul 2023 07:01:03 +0000 (12:31 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Sep 2023 10:27:55 +0000 (12:27 +0200)
commit 009e7fe4a1ed52276b332842a6b6e23b07200f2d upstream.

Different behavior were experienced of session being torn down vs not when
TMF is timed out. When FW detects the time out, the session is torn down.
When driver detects the time out, the session is not torn down.

Allow TMF error to return to upper layer without session tear down.

Cc: stable@vger.kernel.org
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Link: https://lore.kernel.org/r/20230714070104.40052-10-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/qla2xxx/qla_isr.c

index b41d604ca9bc8fb4d72c363cd7b1a1d787709622..246e74cb929f11fe8203018482cdc409485d5cee 100644 (file)
@@ -2539,7 +2539,6 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, void *tsk)
        case CS_PORT_BUSY:
        case CS_INCOMPLETE:
        case CS_PORT_UNAVAILABLE:
-       case CS_TIMEOUT:
        case CS_RESET:
                if (atomic_read(&fcport->state) == FCS_ONLINE) {
                        ql_dbg(ql_dbg_disc, fcport->vha, 0x3021,