| From b08abbd9f5996309f021684f9ca74da30dcca36a Mon Sep 17 00:00:00 2001 |
| From: Quinn Tran <quinn.tran@cavium.com> |
| Date: Wed, 18 Jul 2018 14:29:54 -0700 |
| Subject: scsi: qla2xxx: Fix ISP recovery on unload |
| |
| From: Quinn Tran <quinn.tran@cavium.com> |
| |
| commit b08abbd9f5996309f021684f9ca74da30dcca36a upstream. |
| |
| During unload process, the chip can encounter problem where a FW dump would |
| be captured. For this case, the full reset sequence will be skip to bring |
| the chip back to full operational state. |
| |
| Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring") |
| Cc: <stable@vger.kernel.org> |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/qla2xxx/qla_os.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/scsi/qla2xxx/qla_os.c |
| +++ b/drivers/scsi/qla2xxx/qla_os.c |
| @@ -5218,8 +5218,9 @@ qla2x00_do_dpc(void *data) |
| } |
| } |
| |
| - if (test_and_clear_bit(ISP_ABORT_NEEDED, |
| - &base_vha->dpc_flags)) { |
| + if (test_and_clear_bit |
| + (ISP_ABORT_NEEDED, &base_vha->dpc_flags) && |
| + !test_bit(UNLOADING, &base_vha->dpc_flags)) { |
| |
| ql_dbg(ql_dbg_dpc, base_vha, 0x4007, |
| "ISP abort scheduled.\n"); |
