| Message ID | 20221214045014.19362-9-njavali@marvell.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Misc. qla2xxx driver bug fixes | expand |
> On Dec 13, 2022, at 8:50 PM, Nilesh Javali <njavali@marvell.com> wrote: > > From: Quinn Tran <qutran@marvell.com> > > After adapter reset, the appearance of link is not recovered, > the devices were not rediscovered. > This is result of a race condition between adapter reset (abort_isp) > and the topology scan. > During adapter reset, the ABORT_ISP_ACTIVE flag is set. > Topology scan usually occurred after adapter reset. > In this case, the topology scan came earlier than usual where it > ran into problem due to ABORT_ISP_ACTIVE flag was still set. > > kernel: qla2xxx [0000:13:00.0]-1005:1: Cmd 0x6a aborted with timeout since ISP Abort is pending > kernel: qla2xxx [0000:13:00.0]-28a0:1: MBX_GET_PORT_NAME failed, No FL Port. > kernel: qla2xxx [0000:13:00.0]-286b:1: qla2x00_configure_loop: exiting normally. local port wwpn 51402ec0123d9a80 id 012300) > kernel: qla2xxx [0000:13:00.0]-8017:1: ADAPTER RESET SUCCEEDED nexus=1:0:15. > > Allow adapter reset to complete before any scan can start. > > Cc: stable@vger.kernel.org > Signed-off-by: Quinn Tran <qutran@marvell.com> > Signed-off-by: Nilesh Javali <njavali@marvell.com> > --- > drivers/scsi/qla2xxx/qla_os.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index 1fc4e6209db7..6e33dc16ce6f 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -7095,9 +7095,12 @@ qla2x00_do_dpc(void *data) > } > } > loop_resync_check: > - if (test_and_clear_bit(LOOP_RESYNC_NEEDED, > + if (!qla2x00_reset_active(base_vha) && > + test_and_clear_bit(LOOP_RESYNC_NEEDED, > &base_vha->dpc_flags)) { > - > + /* > + * Allow abort_isp to complete before moving on to scanning. > + */ > ql_dbg(ql_dbg_dpc, base_vha, 0x400f, > "Loop resync scheduled.\n"); > > -- > 2.19.0.rc0 > Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 1fc4e6209db7..6e33dc16ce6f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -7095,9 +7095,12 @@ qla2x00_do_dpc(void *data) } } loop_resync_check: - if (test_and_clear_bit(LOOP_RESYNC_NEEDED, + if (!qla2x00_reset_active(base_vha) && + test_and_clear_bit(LOOP_RESYNC_NEEDED, &base_vha->dpc_flags)) { - + /* + * Allow abort_isp to complete before moving on to scanning. + */ ql_dbg(ql_dbg_dpc, base_vha, 0x400f, "Loop resync scheduled.\n");