| Message ID | 20200902072548.11491-13-njavali@marvell.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qla2xxx misc features and bug fixes | expand |
> On Sep 2, 2020, at 2:25 AM, Nilesh Javali <njavali@marvell.com> wrote: > > From: Saurav Kashyap <skashyap@marvell.com> > > - BIT_13 of extended FW attribute informs about NVMe-2 support. > - Set BIT_15 of specical feature control block for enabling SLER in FW. > - Set bit 8 (SLER supported) to 1 for the service parameter information > when sending NVMe PRLI request. > - Set BIT_14 of special feature control block for enabling > PI Control in FW. > - Driver should set bit 9 (PI Control supported) to 1 for the service > parameter information when sending NVMe PRLI request. > - Set BIT_13 for NVMe Async events. > Please correct the “-“ from the commit message > Signed-off-by: Saurav Kashyap <skashyap@marvell.com> > Signed-off-by: Nilesh Javali <njavali@marvell.com> > --- > drivers/scsi/qla2xxx/qla_dbg.c | 2 +- > drivers/scsi/qla2xxx/qla_def.h | 4 ++++ > drivers/scsi/qla2xxx/qla_iocb.c | 8 ++++++++ > drivers/scsi/qla2xxx/qla_mbx.c | 21 +++++++++++++++++++-- > drivers/scsi/qla2xxx/qla_nvme.c | 16 ++++++++++++++-- > drivers/scsi/qla2xxx/qla_nvme.h | 1 + > drivers/scsi/qla2xxx/qla_os.c | 1 + > 7 files changed, 48 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c > index 1be811a5d69d..369040250ab9 100644 > --- a/drivers/scsi/qla2xxx/qla_dbg.c > +++ b/drivers/scsi/qla2xxx/qla_dbg.c > @@ -16,7 +16,7 @@ > * | Device Discovery | 0x2134 | 0x210e-0x2116 | > * | | | 0x211a | > * | | | 0x211c-0x2128 | > - * | | | 0x212a-0x2134 | > + * | | | 0x212c-0x2134 | > * | Queue Command and IO tracing | 0x3074 | 0x300b | > * | | | 0x3027-0x3028 | > * | | | 0x303d-0x3041 | > diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h > index 863b9c7766e1..19b5c0e3dc99 100644 > --- a/drivers/scsi/qla2xxx/qla_def.h > +++ b/drivers/scsi/qla2xxx/qla_def.h > @@ -2476,6 +2476,8 @@ typedef struct fc_port { > > struct completion nvme_del_done; > uint32_t nvme_prli_service_param; > +#define NVME_PRLI_SP_PI_CTRL BIT_9 > +#define NVME_PRLI_SP_SLER BIT_8 > #define NVME_PRLI_SP_CONF BIT_7 > #define NVME_PRLI_SP_INITIATOR BIT_5 > #define NVME_PRLI_SP_TARGET BIT_4 > @@ -4308,6 +4310,7 @@ struct qla_hw_data { > #define FW_ATTR_EXT0_SCM_BROCADE 0x00001000 > /* Cisco fabric attached */ > #define FW_ATTR_EXT0_SCM_CISCO 0x00002000 > +#define FW_ATTR_EXT0_NVME2 BIT_13 > uint16_t fw_attributes_ext[2]; > uint32_t fw_memory_size; > uint32_t fw_transfer_size; > @@ -4657,6 +4660,7 @@ typedef struct scsi_qla_host { > uint32_t qpairs_rsp_created:1; > uint32_t nvme_enabled:1; > uint32_t nvme_first_burst:1; > + uint32_t nvme2_enabled:1; > } flags; > > atomic_t loop_state; > diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c > index b60a332e5846..a46f01a25582 100644 > --- a/drivers/scsi/qla2xxx/qla_iocb.c > +++ b/drivers/scsi/qla2xxx/qla_iocb.c > @@ -2378,6 +2378,14 @@ qla24xx_prli_iocb(srb_t *sp, struct logio_entry_24xx *logio) > if (sp->vha->flags.nvme_first_burst) > logio->io_parameter[0] = > cpu_to_le32(NVME_PRLI_SP_FIRST_BURST); > + if (sp->vha->flags.nvme2_enabled) { > + /* Set service parameter BIT_8 for SLER support */ > + logio->io_parameter[0] |= > + cpu_to_le32(NVME_PRLI_SP_SLER); > + /* Set service parameter BIT_9 for PI control support */ > + logio->io_parameter[0] |= > + cpu_to_le32(NVME_PRLI_SP_PI_CTRL); > + } > } > Comment should be at the same indentation as src to make it readable. Please fix it > logio->nport_handle = cpu_to_le16(sp->fcport->loop_id); > diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c > index ab7dbbc99c22..e5a47d5147fc 100644 > --- a/drivers/scsi/qla2xxx/qla_mbx.c > +++ b/drivers/scsi/qla2xxx/qla_mbx.c > @@ -1093,6 +1093,17 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) > "%s: FC-NVMe is Enabled (0x%x)\n", > __func__, ha->fw_attributes_h); > } > + > + /* BIT_13 of Extended FW Attributes informs about NVMe2 support */ > + if (ha->fw_attributes_ext[0] & FW_ATTR_EXT0_NVME2) { > + ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1191, > + "%s: Firmware supports NVMe2 0x%x\n", > + __func__, ha->fw_attributes_ext[0]); Why not just drop this message to reduce noise when MBX+Verbose bits are on, because the log message on the following line is going to be logged every time. > + ql_log(ql_log_info, vha, 0xd302, > + "Firmware supports NVMe2 0x%x\n”, > + ha->fw_attributes_ext[0]); > + vha->flags.nvme2_enabled = 1; > + } > } > > if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) { > @@ -1122,12 +1133,18 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) > if (ha->flags.scm_supported_a && > (ha->fw_attributes_ext[0] & FW_ATTR_EXT0_SCM_SUPPORTED)) { > ha->flags.scm_supported_f = 1; > - memset(ha->sf_init_cb, 0, sizeof(struct init_sf_cb)); > ha->sf_init_cb->flags |= BIT_13; > } > ql_log(ql_log_info, vha, 0x11a3, "SCM in FW: %s\n", > (ha->flags.scm_supported_f) ? "Supported" : > "Not Supported"); > + > + if (vha->flags.nvme2_enabled) { > + /* set BIT_15 of special feature control block for SLER */ > + ha->sf_init_cb->flags |= BIT_15; > + /* set BIT_14 of special feature control block for PI CTRL*/ > + ha->sf_init_cb->flags |= BIT_14; > + } > } > This looks like copy paste from earlier.. Please fix it > failed: > @@ -1823,7 +1840,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size) > mcp->out_mb |= MBX_14|MBX_13|MBX_12|MBX_11|MBX_10; > } > > - if (ha->flags.scm_supported_f) { > + if (ha->flags.scm_supported_f || vha->flags.nvme2_enabled) { > mcp->mb[1] |= BIT_1; > mcp->mb[16] = MSW(ha->sf_init_cb_dma); > mcp->mb[17] = LSW(ha->sf_init_cb_dma); > diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c > index 675f2b1180e8..0d73c285a4d1 100644 > --- a/drivers/scsi/qla2xxx/qla_nvme.c > +++ b/drivers/scsi/qla2xxx/qla_nvme.c > @@ -69,6 +69,14 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) > return ret; > } > > + if (fcport->nvme_prli_service_param & NVME_PRLI_SP_SLER) > + ql_log(ql_log_info, vha, 0x212a, > + "PortID:%06x Supports SLER\n", req.port_id); > + > + if (fcport->nvme_prli_service_param & NVME_PRLI_SP_PI_CTRL) > + ql_log(ql_log_info, vha, 0x212b, > + "PortID:%06x Supports PI control\n", req.port_id); > + > rport = fcport->nvme_remote_port->private; > rport->fcport = fcport; > > @@ -368,6 +376,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) > struct srb_iocb *nvme = &sp->u.iocb_cmd; > struct scatterlist *sgl, *sg; > struct nvmefc_fcp_req *fd = nvme->u.nvme.desc; > + struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; > uint32_t rval = QLA_SUCCESS; > > /* Setup qpair pointers */ > @@ -399,8 +408,6 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) > } > > if (unlikely(!fd->sqid)) { > - struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; > - > if (cmd->sqe.common.opcode == nvme_admin_async_event) { > nvme->u.nvme.aen_op = 1; > atomic_inc(&ha->nvme_active_aen_cnt); > @@ -446,6 +453,11 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) > } else if (fd->io_dir == 0) { > cmd_pkt->control_flags = 0; > } > + /* Set BIT_13 of control flags for Async event */ > + if (vha->flags.nvme2_enabled && > + cmd->sqe.common.opcode == nvme_admin_async_event) { > + cmd_pkt->control_flags |= cpu_to_le16(CF_ADMIN_ASYNC_EVENT); > + } > > /* Set NPORT-ID */ > cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id); > diff --git a/drivers/scsi/qla2xxx/qla_nvme.h b/drivers/scsi/qla2xxx/qla_nvme.h > index cf45a5b277f1..5d5f115a77c3 100644 > --- a/drivers/scsi/qla2xxx/qla_nvme.h > +++ b/drivers/scsi/qla2xxx/qla_nvme.h > @@ -54,6 +54,7 @@ struct cmd_nvme { > uint64_t rsvd; > > __le16 control_flags; /* Control Flags */ > +#define CF_ADMIN_ASYNC_EVENT BIT_13 > #define CF_NVME_FIRST_BURST_ENABLE BIT_11 > #define CF_DIF_SEG_DESCR_ENABLE BIT_3 > #define CF_DATA_SEG_DESCR_ENABLE BIT_2 > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index a4d737b92ec1..a186c3a55088 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -4231,6 +4231,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, > &ha->sf_init_cb_dma); > if (!ha->sf_init_cb) > goto fail_sf_init_cb; > + memset(ha->sf_init_cb, 0, sizeof(struct init_sf_cb)); > ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0199, > "sf_init_cb=%p.\n", ha->sf_init_cb); > } > -- > 2.19.0.rc0 > -- Himanshu Madhani Oracle Linux Engineering
Hi Himanshu, > -----Original Message----- > From: linux-scsi-owner@vger.kernel.org <linux-scsi-owner@vger.kernel.org> > On Behalf Of Himanshu Madhani > Sent: Wednesday, September 2, 2020 11:27 PM > To: Nilesh Javali <njavali@marvell.com> > Cc: Martin K. Petersen <martin.petersen@oracle.com>; linux- > scsi@vger.kernel.org; GR-QLogic-Storage-Upstream <GR-QLogic-Storage- > Upstream@marvell.com> > Subject: Re: [PATCH v2 12/13] qla2xxx: Add SLER and PI control support > > > > > On Sep 2, 2020, at 2:25 AM, Nilesh Javali <njavali@marvell.com> wrote: > > > > From: Saurav Kashyap <skashyap@marvell.com> > > > > - BIT_13 of extended FW attribute informs about NVMe-2 support. > > - Set BIT_15 of specical feature control block for enabling SLER in FW. > > - Set bit 8 (SLER supported) to 1 for the service parameter information > > when sending NVMe PRLI request. > > - Set BIT_14 of special feature control block for enabling > > PI Control in FW. > > - Driver should set bit 9 (PI Control supported) to 1 for the service > > parameter information when sending NVMe PRLI request. > > - Set BIT_13 for NVMe Async events. > > > > Please correct the “-“ from the commit message > > > Signed-off-by: Saurav Kashyap <skashyap@marvell.com> > > Signed-off-by: Nilesh Javali <njavali@marvell.com> > > --- > > drivers/scsi/qla2xxx/qla_dbg.c | 2 +- > > drivers/scsi/qla2xxx/qla_def.h | 4 ++++ > > drivers/scsi/qla2xxx/qla_iocb.c | 8 ++++++++ > > drivers/scsi/qla2xxx/qla_mbx.c | 21 +++++++++++++++++++-- > > drivers/scsi/qla2xxx/qla_nvme.c | 16 ++++++++++++++-- > > drivers/scsi/qla2xxx/qla_nvme.h | 1 + > > drivers/scsi/qla2xxx/qla_os.c | 1 + > > 7 files changed, 48 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c > > index 1be811a5d69d..369040250ab9 100644 > > --- a/drivers/scsi/qla2xxx/qla_dbg.c > > +++ b/drivers/scsi/qla2xxx/qla_dbg.c > > @@ -16,7 +16,7 @@ > > * | Device Discovery | 0x2134 | 0x210e-0x2116 | > > * | | | 0x211a | > > * | | | 0x211c-0x2128 | > > - * | | | 0x212a-0x2134 | > > + * | | | 0x212c-0x2134 | > > * | Queue Command and IO tracing | 0x3074 | 0x300b | > > * | | | 0x3027-0x3028 | > > * | | | 0x303d-0x3041 | > > diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h > > index 863b9c7766e1..19b5c0e3dc99 100644 > > --- a/drivers/scsi/qla2xxx/qla_def.h > > +++ b/drivers/scsi/qla2xxx/qla_def.h > > @@ -2476,6 +2476,8 @@ typedef struct fc_port { > > > > struct completion nvme_del_done; > > uint32_t nvme_prli_service_param; > > +#define NVME_PRLI_SP_PI_CTRL BIT_9 > > +#define NVME_PRLI_SP_SLER BIT_8 > > #define NVME_PRLI_SP_CONF BIT_7 > > #define NVME_PRLI_SP_INITIATOR BIT_5 > > #define NVME_PRLI_SP_TARGET BIT_4 > > @@ -4308,6 +4310,7 @@ struct qla_hw_data { > > #define FW_ATTR_EXT0_SCM_BROCADE 0x00001000 > > /* Cisco fabric attached */ > > #define FW_ATTR_EXT0_SCM_CISCO 0x00002000 > > +#define FW_ATTR_EXT0_NVME2 BIT_13 > > uint16_t fw_attributes_ext[2]; > > uint32_t fw_memory_size; > > uint32_t fw_transfer_size; > > @@ -4657,6 +4660,7 @@ typedef struct scsi_qla_host { > > uint32_t qpairs_rsp_created:1; > > uint32_t nvme_enabled:1; > > uint32_t nvme_first_burst:1; > > + uint32_t nvme2_enabled:1; > > } flags; > > > > atomic_t loop_state; > > diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c > > index b60a332e5846..a46f01a25582 100644 > > --- a/drivers/scsi/qla2xxx/qla_iocb.c > > +++ b/drivers/scsi/qla2xxx/qla_iocb.c > > @@ -2378,6 +2378,14 @@ qla24xx_prli_iocb(srb_t *sp, struct > logio_entry_24xx *logio) > > if (sp->vha->flags.nvme_first_burst) > > logio->io_parameter[0] = > > cpu_to_le32(NVME_PRLI_SP_FIRST_BURST); > > + if (sp->vha->flags.nvme2_enabled) { > > + /* Set service parameter BIT_8 for SLER support */ > > + logio->io_parameter[0] |= > > + cpu_to_le32(NVME_PRLI_SP_SLER); > > + /* Set service parameter BIT_9 for PI control support */ > > + logio->io_parameter[0] |= > > + cpu_to_le32(NVME_PRLI_SP_PI_CTRL); > > + } > > } > > > > Comment should be at the same indentation as src to make it readable. Please > fix it > > > logio->nport_handle = cpu_to_le16(sp->fcport->loop_id); > > diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c > > index ab7dbbc99c22..e5a47d5147fc 100644 > > --- a/drivers/scsi/qla2xxx/qla_mbx.c > > +++ b/drivers/scsi/qla2xxx/qla_mbx.c > > @@ -1093,6 +1093,17 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) > > "%s: FC-NVMe is Enabled (0x%x)\n", > > __func__, ha->fw_attributes_h); > > } > > + > > + /* BIT_13 of Extended FW Attributes informs about NVMe2 > support */ > > + if (ha->fw_attributes_ext[0] & FW_ATTR_EXT0_NVME2) { > > + ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1191, > > + "%s: Firmware supports NVMe2 0x%x\n", > > + __func__, ha->fw_attributes_ext[0]); > > Why not just drop this message to reduce noise when MBX+Verbose bits are on, > because the log message on the following line is going to be logged every time. > > > + ql_log(ql_log_info, vha, 0xd302, > > + "Firmware supports NVMe2 0x%x\n”, > > + ha->fw_attributes_ext[0]); > > + vha->flags.nvme2_enabled = 1; > > + } > > } > > > > if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) { > > @@ -1122,12 +1133,18 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) > > if (ha->flags.scm_supported_a && > > (ha->fw_attributes_ext[0] & > FW_ATTR_EXT0_SCM_SUPPORTED)) { > > ha->flags.scm_supported_f = 1; > > - memset(ha->sf_init_cb, 0, sizeof(struct init_sf_cb)); > > ha->sf_init_cb->flags |= BIT_13; > > } > > ql_log(ql_log_info, vha, 0x11a3, "SCM in FW: %s\n", > > (ha->flags.scm_supported_f) ? "Supported" : > > "Not Supported"); > > + > > + if (vha->flags.nvme2_enabled) { > > + /* set BIT_15 of special feature control block for SLER */ > > + ha->sf_init_cb->flags |= BIT_15; > > + /* set BIT_14 of special feature control block for PI CTRL*/ > > + ha->sf_init_cb->flags |= BIT_14; > > + } > > } > > > > This looks like copy paste from earlier.. Please fix it > > > failed: > > @@ -1823,7 +1840,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, > uint16_t size) > > mcp->out_mb |= > MBX_14|MBX_13|MBX_12|MBX_11|MBX_10; > > } > > > > - if (ha->flags.scm_supported_f) { > > + if (ha->flags.scm_supported_f || vha->flags.nvme2_enabled) { > > mcp->mb[1] |= BIT_1; > > mcp->mb[16] = MSW(ha->sf_init_cb_dma); > > mcp->mb[17] = LSW(ha->sf_init_cb_dma); > > diff --git a/drivers/scsi/qla2xxx/qla_nvme.c > b/drivers/scsi/qla2xxx/qla_nvme.c > > index 675f2b1180e8..0d73c285a4d1 100644 > > --- a/drivers/scsi/qla2xxx/qla_nvme.c > > +++ b/drivers/scsi/qla2xxx/qla_nvme.c > > @@ -69,6 +69,14 @@ int qla_nvme_register_remote(struct scsi_qla_host > *vha, struct fc_port *fcport) > > return ret; > > } > > > > + if (fcport->nvme_prli_service_param & NVME_PRLI_SP_SLER) > > + ql_log(ql_log_info, vha, 0x212a, > > + "PortID:%06x Supports SLER\n", req.port_id); > > + > > + if (fcport->nvme_prli_service_param & NVME_PRLI_SP_PI_CTRL) > > + ql_log(ql_log_info, vha, 0x212b, > > + "PortID:%06x Supports PI control\n", req.port_id); > > + > > rport = fcport->nvme_remote_port->private; > > rport->fcport = fcport; > > > > @@ -368,6 +376,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) > > struct srb_iocb *nvme = &sp->u.iocb_cmd; > > struct scatterlist *sgl, *sg; > > struct nvmefc_fcp_req *fd = nvme->u.nvme.desc; > > + struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; > > uint32_t rval = QLA_SUCCESS; > > > > /* Setup qpair pointers */ > > @@ -399,8 +408,6 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) > > } > > > > if (unlikely(!fd->sqid)) { > > - struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; > > - > > if (cmd->sqe.common.opcode == nvme_admin_async_event) { > > nvme->u.nvme.aen_op = 1; > > atomic_inc(&ha->nvme_active_aen_cnt); > > @@ -446,6 +453,11 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) > > } else if (fd->io_dir == 0) { > > cmd_pkt->control_flags = 0; > > } > > + /* Set BIT_13 of control flags for Async event */ > > + if (vha->flags.nvme2_enabled && > > + cmd->sqe.common.opcode == nvme_admin_async_event) { > > + cmd_pkt->control_flags |= > cpu_to_le16(CF_ADMIN_ASYNC_EVENT); > > + } > > > > /* Set NPORT-ID */ > > cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id); > > diff --git a/drivers/scsi/qla2xxx/qla_nvme.h > b/drivers/scsi/qla2xxx/qla_nvme.h > > index cf45a5b277f1..5d5f115a77c3 100644 > > --- a/drivers/scsi/qla2xxx/qla_nvme.h > > +++ b/drivers/scsi/qla2xxx/qla_nvme.h > > @@ -54,6 +54,7 @@ struct cmd_nvme { > > uint64_t rsvd; > > > > __le16 control_flags; /* Control Flags */ > > +#define CF_ADMIN_ASYNC_EVENT BIT_13 > > #define CF_NVME_FIRST_BURST_ENABLE BIT_11 > > #define CF_DIF_SEG_DESCR_ENABLE BIT_3 > > #define CF_DATA_SEG_DESCR_ENABLE BIT_2 > > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > > index a4d737b92ec1..a186c3a55088 100644 > > --- a/drivers/scsi/qla2xxx/qla_os.c > > +++ b/drivers/scsi/qla2xxx/qla_os.c > > @@ -4231,6 +4231,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, > uint16_t req_len, uint16_t rsp_len, > > &ha->sf_init_cb_dma); > > if (!ha->sf_init_cb) > > goto fail_sf_init_cb; > > + memset(ha->sf_init_cb, 0, sizeof(struct init_sf_cb)); > > ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0199, > > "sf_init_cb=%p.\n", ha->sf_init_cb); > > } > > -- > > 2.19.0.rc0 > > > > -- > Himanshu Madhani Oracle Linux Engineering Thanks for the review, all comments make sense, will submit an updated patch. Thanks, ~Saurav
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 1be811a5d69d..369040250ab9 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -16,7 +16,7 @@ * | Device Discovery | 0x2134 | 0x210e-0x2116 | * | | | 0x211a | * | | | 0x211c-0x2128 | - * | | | 0x212a-0x2134 | + * | | | 0x212c-0x2134 | * | Queue Command and IO tracing | 0x3074 | 0x300b | * | | | 0x3027-0x3028 | * | | | 0x303d-0x3041 | diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 863b9c7766e1..19b5c0e3dc99 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -2476,6 +2476,8 @@ typedef struct fc_port { struct completion nvme_del_done; uint32_t nvme_prli_service_param; +#define NVME_PRLI_SP_PI_CTRL BIT_9 +#define NVME_PRLI_SP_SLER BIT_8 #define NVME_PRLI_SP_CONF BIT_7 #define NVME_PRLI_SP_INITIATOR BIT_5 #define NVME_PRLI_SP_TARGET BIT_4 @@ -4308,6 +4310,7 @@ struct qla_hw_data { #define FW_ATTR_EXT0_SCM_BROCADE 0x00001000 /* Cisco fabric attached */ #define FW_ATTR_EXT0_SCM_CISCO 0x00002000 +#define FW_ATTR_EXT0_NVME2 BIT_13 uint16_t fw_attributes_ext[2]; uint32_t fw_memory_size; uint32_t fw_transfer_size; @@ -4657,6 +4660,7 @@ typedef struct scsi_qla_host { uint32_t qpairs_rsp_created:1; uint32_t nvme_enabled:1; uint32_t nvme_first_burst:1; + uint32_t nvme2_enabled:1; } flags; atomic_t loop_state; diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index b60a332e5846..a46f01a25582 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2378,6 +2378,14 @@ qla24xx_prli_iocb(srb_t *sp, struct logio_entry_24xx *logio) if (sp->vha->flags.nvme_first_burst) logio->io_parameter[0] = cpu_to_le32(NVME_PRLI_SP_FIRST_BURST); + if (sp->vha->flags.nvme2_enabled) { + /* Set service parameter BIT_8 for SLER support */ + logio->io_parameter[0] |= + cpu_to_le32(NVME_PRLI_SP_SLER); + /* Set service parameter BIT_9 for PI control support */ + logio->io_parameter[0] |= + cpu_to_le32(NVME_PRLI_SP_PI_CTRL); + } } logio->nport_handle = cpu_to_le16(sp->fcport->loop_id); diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index ab7dbbc99c22..e5a47d5147fc 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -1093,6 +1093,17 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) "%s: FC-NVMe is Enabled (0x%x)\n", __func__, ha->fw_attributes_h); } + + /* BIT_13 of Extended FW Attributes informs about NVMe2 support */ + if (ha->fw_attributes_ext[0] & FW_ATTR_EXT0_NVME2) { + ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1191, + "%s: Firmware supports NVMe2 0x%x\n", + __func__, ha->fw_attributes_ext[0]); + ql_log(ql_log_info, vha, 0xd302, + "Firmware supports NVMe2 0x%x\n", + ha->fw_attributes_ext[0]); + vha->flags.nvme2_enabled = 1; + } } if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) { @@ -1122,12 +1133,18 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) if (ha->flags.scm_supported_a && (ha->fw_attributes_ext[0] & FW_ATTR_EXT0_SCM_SUPPORTED)) { ha->flags.scm_supported_f = 1; - memset(ha->sf_init_cb, 0, sizeof(struct init_sf_cb)); ha->sf_init_cb->flags |= BIT_13; } ql_log(ql_log_info, vha, 0x11a3, "SCM in FW: %s\n", (ha->flags.scm_supported_f) ? "Supported" : "Not Supported"); + + if (vha->flags.nvme2_enabled) { + /* set BIT_15 of special feature control block for SLER */ + ha->sf_init_cb->flags |= BIT_15; + /* set BIT_14 of special feature control block for PI CTRL*/ + ha->sf_init_cb->flags |= BIT_14; + } } failed: @@ -1823,7 +1840,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size) mcp->out_mb |= MBX_14|MBX_13|MBX_12|MBX_11|MBX_10; } - if (ha->flags.scm_supported_f) { + if (ha->flags.scm_supported_f || vha->flags.nvme2_enabled) { mcp->mb[1] |= BIT_1; mcp->mb[16] = MSW(ha->sf_init_cb_dma); mcp->mb[17] = LSW(ha->sf_init_cb_dma); diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index 675f2b1180e8..0d73c285a4d1 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -69,6 +69,14 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) return ret; } + if (fcport->nvme_prli_service_param & NVME_PRLI_SP_SLER) + ql_log(ql_log_info, vha, 0x212a, + "PortID:%06x Supports SLER\n", req.port_id); + + if (fcport->nvme_prli_service_param & NVME_PRLI_SP_PI_CTRL) + ql_log(ql_log_info, vha, 0x212b, + "PortID:%06x Supports PI control\n", req.port_id); + rport = fcport->nvme_remote_port->private; rport->fcport = fcport; @@ -368,6 +376,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) struct srb_iocb *nvme = &sp->u.iocb_cmd; struct scatterlist *sgl, *sg; struct nvmefc_fcp_req *fd = nvme->u.nvme.desc; + struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; uint32_t rval = QLA_SUCCESS; /* Setup qpair pointers */ @@ -399,8 +408,6 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) } if (unlikely(!fd->sqid)) { - struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; - if (cmd->sqe.common.opcode == nvme_admin_async_event) { nvme->u.nvme.aen_op = 1; atomic_inc(&ha->nvme_active_aen_cnt); @@ -446,6 +453,11 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) } else if (fd->io_dir == 0) { cmd_pkt->control_flags = 0; } + /* Set BIT_13 of control flags for Async event */ + if (vha->flags.nvme2_enabled && + cmd->sqe.common.opcode == nvme_admin_async_event) { + cmd_pkt->control_flags |= cpu_to_le16(CF_ADMIN_ASYNC_EVENT); + } /* Set NPORT-ID */ cmd_pkt->nport_handle = cpu_to_le16(sp->fcport->loop_id); diff --git a/drivers/scsi/qla2xxx/qla_nvme.h b/drivers/scsi/qla2xxx/qla_nvme.h index cf45a5b277f1..5d5f115a77c3 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.h +++ b/drivers/scsi/qla2xxx/qla_nvme.h @@ -54,6 +54,7 @@ struct cmd_nvme { uint64_t rsvd; __le16 control_flags; /* Control Flags */ +#define CF_ADMIN_ASYNC_EVENT BIT_13 #define CF_NVME_FIRST_BURST_ENABLE BIT_11 #define CF_DIF_SEG_DESCR_ENABLE BIT_3 #define CF_DATA_SEG_DESCR_ENABLE BIT_2 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index a4d737b92ec1..a186c3a55088 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4231,6 +4231,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, &ha->sf_init_cb_dma); if (!ha->sf_init_cb) goto fail_sf_init_cb; + memset(ha->sf_init_cb, 0, sizeof(struct init_sf_cb)); ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0199, "sf_init_cb=%p.\n", ha->sf_init_cb); }