| Message ID | 20200806111014.28434-9-njavali@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | qla2xxx driver bug fixes | expand |
> On Aug 6, 2020, at 6:10 AM, Nilesh Javali <njavali@marvell.com> wrote: > > From: Saurav Kashyap <skashyap@marvell.com> > > OS boot during Boot from SAN was stuck at dracut emergency shell > after enabling nvme driver parameter. For non MQ support the driver > was enabling MQ. Add a check to confirm if FW supports MQ. > > Signed-off-by: Saurav Kashyap <skashyap@marvell.com> > Signed-off-by: Nilesh Javali <njavali@marvell.com> > --- > drivers/scsi/qla2xxx/qla_os.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index 9b59f032a569..fda812b9b564 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -2017,6 +2017,11 @@ qla2x00_iospace_config(struct qla_hw_data *ha) > /* Determine queue resources */ > ha->max_req_queues = ha->max_rsp_queues = 1; > ha->msix_count = QLA_BASE_VECTORS; > + > + /* Check if FW supports MQ or not */ > + if (!(ha->fw_attributes & BIT_6)) > + goto mqiobase_exit; > + > if (!ql2xmqsupport || !ql2xnvmeenable || > (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) > goto mqiobase_exit; > -- > 2.19.0.rc0 > Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> -- Himanshu Madhani Oracle Linux Engineering
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 9b59f032a569..fda812b9b564 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2017,6 +2017,11 @@ qla2x00_iospace_config(struct qla_hw_data *ha) /* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues = 1; ha->msix_count = QLA_BASE_VECTORS; + + /* Check if FW supports MQ or not */ + if (!(ha->fw_attributes & BIT_6)) + goto mqiobase_exit; + if (!ql2xmqsupport || !ql2xnvmeenable || (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) goto mqiobase_exit;