Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 171e4909 authored by Giridhar Malavali's avatar Giridhar Malavali Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Add new FC-NVMe enable BIT to enable FC-NVMe feature 



This patch adds new BIT detection to enable FC-NVMe feature in the driver.

[mkp: fixed Giridhar's SoB]

Signed-off-by: default avatarGiridhar Malavali <gmalavali@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ede2afb9

drivers/scsi/qla2xxx/qla_def.h

+3 −0
Original line number Diff line number Diff line
@@ -3966,6 +3966,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;

drivers/scsi/qla2xxx/qla_mbx.c

+3 −1
Original line number Diff line number Diff line
@@ -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",