On Wed, 2019-01-30 at 09:50 -0800, Himanshu Madhani wrote:
> From: Giridhar Malavali <gmalavali@xxxxxxxxxxx>
>
> This patch adds new BIT detection to enable FC-NVMe feature in
> the driver.
>
> Signed-off-by: Giridhar Malavali <gmalalvali@xxxxxxxxxxx>
> Signed-off-by: Himanshu Madhani <hmadhani@xxxxxxxxxxx>
> ---
> Hi Martin,
>
> This patch adds additional bit to enable FC-NVMe in the driver.
>
> Please apply this patch to 5.1/scsi-queue at your earliest convenience.
>
> Thanks,
> Himanshu
> ---
> drivers/scsi/qla2xxx/qla_def.h | 3 +++
> drivers/scsi/qla2xxx/qla_mbx.c | 4 +++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
> index 05b5c6fa011d..199713f29cbd 100644
> --- a/drivers/scsi/qla2xxx/qla_def.h
> +++ b/drivers/scsi/qla2xxx/qla_def.h
> @@ -3958,6 +3958,9 @@ struct qla_hw_data {
> uint16_t fw_subminor_version;
> uint16_t fw_attributes;
> uint16_t fw_attributes_h;
> +#define FW_ATTR_H_NVME BIT_10
> +#define FW_ATTR_H_NVME_UPDATED BIT_14
> +
> uint16_t fw_attributes_ext[2];
> uint32_t fw_memory_size;
> uint32_t fw_transfer_size;
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index 3181235c3a32..f4adf6baee69 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -1109,7 +1109,9 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
> * FW supports nvme and driver load parameter requested nvme.
> * BIT 26 of fw_attributes indicates NVMe support.
> */
> - if ((ha->fw_attributes_h & 0x400) && ql2xnvmeenable) {
> + if ((ha->fw_attributes_h &
> + (FW_ATTR_H_NVME | FW_ATTR_H_NVME_UPDATED)) &&
> + ql2xnvmeenable) {
> vha->flags.nvme_enabled = 1;
> ql_log(ql_log_info, vha, 0xd302,
> "%s: FC-NVMe is Enabled (0x%x)\n",
Reviewed-by: Ewan D. Milne <emilne@xxxxxxxxxx>
