scsi: qla2xxx: Use correct feature type field during RFF_ID processing

BugLink: https://bugs.launchpad.net/bugs/1969110
commit a7e05f7a1bcbe4ee055479242de46c5c16ab03b1 upstream.

During SNS Register FC-4 Features (RFF_ID) the initiator driver was sending
incorrect type field for NVMe supported device. Use correct feature type
field.

Link: https://lore.kernel.org/r/20220310092604.22950-12-njavali@marvell.com
Fixes: e374f9f59281 ("scsi: qla2xxx: Migrate switch registration commands away from mailbox interface")
Cc: stable@vger.kernel.org
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Manish Rangankar <mrangankar@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 89dad346c241b3654b199a3b9fd19f2413b94576)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 452f420332bb11ea91d4ae1832fe9d8bdd4a61f4..da7080c4bd0087f43b726fb72ac9ec48dedc1d7c 100644 (file)
--- 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;