From 20b991c3022904b7c2fd38c49ecfdaf17bc1d2f0 Mon Sep 17 00:00:00 2001 From: Karan Tilak Kumar Date: Fri, 24 Jul 2026 10:48:02 -0700 Subject: [PATCH] scsi: fnic: Advertise NVMe initiator service parameters Set FC service parameters according to the selected initiator role. Keep FCP retry and confirmation bits for FCP initiators, and advertise NVMe initiator and SLER bits for NVMe initiators. Reviewed-by: Sesidhar Baddela Reviewed-by: Arulprabhu Ponnusamy Reviewed-by: Gian Carlo Boffa Reviewed-by: Arun Easi Reviewed-by: Hannes Reinecke Reviewed-by: Lee Duncan Signed-off-by: Karan Tilak Kumar Co-developed-by: Hannes Reinecke Link: https://patch.msgid.link/20260724174811.5118-5-kartilak@cisco.com Signed-off-by: Martin K. Petersen --- drivers/scsi/fnic/fdls_fc.h | 3 +++ drivers/scsi/fnic/fnic_main.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/fnic/fdls_fc.h b/drivers/scsi/fnic/fdls_fc.h index 012f43afd083..e33c829545fb 100644 --- a/drivers/scsi/fnic/fdls_fc.h +++ b/drivers/scsi/fnic/fdls_fc.h @@ -39,6 +39,9 @@ #define FNIC_FCP_SP_CONF_CMPL 0x00000080 #define FNIC_FCP_SP_RETRY 0x00000100 +#define FNIC_NVME_SP_INITIATOR 0x00000020 +#define FNIC_NVME_SP_SLER 0x00000100 + #define FNIC_FC_CONCUR_SEQS (0xFF) #define FNIC_FC_RO_INFO (0x1F) diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 3a365ea455b1..5850d51b0e8f 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -1016,11 +1016,16 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iport->max_flogi_retries = fnic->config.flogi_retries; iport->max_plogi_retries = fnic->config.plogi_retries; iport->plogi_timeout = fnic->config.plogi_timeout; - iport->service_params = - (FNIC_FCP_SP_INITIATOR | FNIC_FCP_SP_RD_XRDY_DIS | - FNIC_FCP_SP_CONF_CMPL); - if (fnic->config.flags & VFCF_FCP_SEQ_LVL_ERR) - iport->service_params |= FNIC_FCP_SP_RETRY; + if (IS_FNIC_FCP_INITIATOR(fnic)) { + iport->service_params = (FNIC_FCP_SP_INITIATOR | + FNIC_FCP_SP_RD_XRDY_DIS | FNIC_FCP_SP_CONF_CMPL); + if (fnic->config.flags & VFCF_FCP_SEQ_LVL_ERR) + iport->service_params |= FNIC_FCP_SP_RETRY; + } else if (IS_FNIC_NVME_INITIATOR(fnic)) { + iport->service_params = (FNIC_NVME_SP_INITIATOR); + if (fnic->config.flags & VFCF_FCP_SEQ_LVL_ERR) + iport->service_params |= FNIC_NVME_SP_SLER; + } iport->boot_time = jiffies; iport->e_d_tov = fnic->config.ed_tov;