scsi: qla2xxx: Fix FC-NVMe IO abort during driver reset
Signed-off-by: Darren Trapp <darren.trapp@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
1cbc0efcd9
commit
623ee824e5
|
@ -489,6 +489,9 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
|
||||||
|
|
||||||
vha = fcport->vha;
|
vha = fcport->vha;
|
||||||
|
|
||||||
|
if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
|
||||||
|
return rval;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we know the dev is going away while the transport is still sending
|
* If we know the dev is going away while the transport is still sending
|
||||||
* IO's return busy back to stall the IO Q. This happens when the
|
* IO's return busy back to stall the IO Q. This happens when the
|
||||||
|
@ -597,14 +600,18 @@ static int qla_nvme_wait_on_command(srb_t *sp)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp)
|
void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp, int res)
|
||||||
{
|
{
|
||||||
int rval;
|
int rval;
|
||||||
|
|
||||||
rval = ha->isp_ops->abort_command(sp);
|
if (!test_bit(ABORT_ISP_ACTIVE, &sp->vha->dpc_flags)) {
|
||||||
if (!rval && !qla_nvme_wait_on_command(sp))
|
rval = ha->isp_ops->abort_command(sp);
|
||||||
ql_log(ql_log_warn, NULL, 0x2112,
|
if (!rval && !qla_nvme_wait_on_command(sp))
|
||||||
"nvme_wait_on_comand timed out waiting on sp=%p\n", sp);
|
ql_log(ql_log_warn, NULL, 0x2112,
|
||||||
|
"timed out waiting on sp=%p\n", sp);
|
||||||
|
} else {
|
||||||
|
sp->done(sp, res);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qla_nvme_unregister_remote_port(struct work_struct *work)
|
static void qla_nvme_unregister_remote_port(struct work_struct *work)
|
||||||
|
|
|
@ -145,7 +145,7 @@ struct pt_ls4_rx_unsol {
|
||||||
void qla_nvme_register_hba(struct scsi_qla_host *);
|
void qla_nvme_register_hba(struct scsi_qla_host *);
|
||||||
int qla_nvme_register_remote(struct scsi_qla_host *, struct fc_port *);
|
int qla_nvme_register_remote(struct scsi_qla_host *, struct fc_port *);
|
||||||
void qla_nvme_delete(struct scsi_qla_host *);
|
void qla_nvme_delete(struct scsi_qla_host *);
|
||||||
void qla_nvme_abort(struct qla_hw_data *, struct srb *sp);
|
void qla_nvme_abort(struct qla_hw_data *, struct srb *sp, int res);
|
||||||
void qla24xx_nvme_ls4_iocb(struct scsi_qla_host *, struct pt_ls4_request *,
|
void qla24xx_nvme_ls4_iocb(struct scsi_qla_host *, struct pt_ls4_request *,
|
||||||
struct req_que *);
|
struct req_que *);
|
||||||
void qla24xx_async_gffid_sp_done(void *, int);
|
void qla24xx_async_gffid_sp_done(void *, int);
|
||||||
|
|
|
@ -1734,7 +1734,7 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)
|
||||||
sp_get(sp);
|
sp_get(sp);
|
||||||
spin_unlock_irqrestore(qp->qp_lock_ptr,
|
spin_unlock_irqrestore(qp->qp_lock_ptr,
|
||||||
flags);
|
flags);
|
||||||
qla_nvme_abort(ha, sp);
|
qla_nvme_abort(ha, sp, res);
|
||||||
spin_lock_irqsave(qp->qp_lock_ptr,
|
spin_lock_irqsave(qp->qp_lock_ptr,
|
||||||
flags);
|
flags);
|
||||||
} else if (GET_CMD_SP(sp) &&
|
} else if (GET_CMD_SP(sp) &&
|
||||||
|
|
Loading…
Reference in a new issue