| Message ID | 20220308082048.9774-12-njavali@marvell.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qla2xxx driver fixes | expand |
> On Mar 8, 2022, at 12:20 AM, Nilesh Javali <njavali@marvell.com> wrote: > > From: Manish Rangankar <mrangankar@marvell.com> > > During SNS Register FC-4 Features (RFF_ID) for initiator driver was > sending incorrect type field for nvme supported device. Use correct > feature type field. > > Cc: stable@vger.kernel.org Fixes tags perhaps missing? > Signed-off-by: Manish Rangankar <mrangankar@marvell.com> > Signed-off-by: Nilesh Javali <njavali@marvell.com> > --- > drivers/scsi/qla2xxx/qla_gs.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c > index a812f4a45232..6b67bd561810 100644 > --- a/drivers/scsi/qla2xxx/qla_gs.c > +++ b/drivers/scsi/qla2xxx/qla_gs.c > @@ -676,8 +676,7 @@ qla2x00_rff_id(scsi_qla_host_t *vha, u8 type) > return (QLA_SUCCESS); > } > > - return qla_async_rffid(vha, &vha->d_id, qlt_rff_id(vha), > - FC4_TYPE_FCP_SCSI); > + return qla_async_rffid(vha, &vha->d_id, qlt_rff_id(vha), type); > } > > static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id, > @@ -729,7 +728,7 @@ static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id, > /* Prepare CT arguments -- port_id, FC-4 feature, FC-4 type */ > ct_req->req.rff_id.port_id = port_id_to_be_id(*d_id); > ct_req->req.rff_id.fc4_feature = fc4feature; > - ct_req->req.rff_id.fc4_type = fc4type; /* SCSI - FCP */ > + ct_req->req.rff_id.fc4_type = fc4type; /* SCSI-FCP or FC-NVMe */ > > sp->u.iocb_cmd.u.ctarg.req_size = RFF_ID_REQ_SIZE; > sp->u.iocb_cmd.u.ctarg.rsp_size = RFF_ID_RSP_SIZE; > -- > 2.19.0.rc0 > -- Himanshu Madhani Oracle Linux Engineering
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index a812f4a45232..6b67bd561810 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -676,8 +676,7 @@ qla2x00_rff_id(scsi_qla_host_t *vha, u8 type) return (QLA_SUCCESS); } - return qla_async_rffid(vha, &vha->d_id, qlt_rff_id(vha), - FC4_TYPE_FCP_SCSI); + return qla_async_rffid(vha, &vha->d_id, qlt_rff_id(vha), type); } static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id, @@ -729,7 +728,7 @@ static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id, /* Prepare CT arguments -- port_id, FC-4 feature, FC-4 type */ ct_req->req.rff_id.port_id = port_id_to_be_id(*d_id); ct_req->req.rff_id.fc4_feature = fc4feature; - ct_req->req.rff_id.fc4_type = fc4type; /* SCSI - FCP */ + ct_req->req.rff_id.fc4_type = fc4type; /* SCSI-FCP or FC-NVMe */ sp->u.iocb_cmd.u.ctarg.req_size = RFF_ID_REQ_SIZE; sp->u.iocb_cmd.u.ctarg.rsp_size = RFF_ID_RSP_SIZE;