tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Giridhar Malavali and committed by
Martin K. Petersen 171e4909 ede2afb9

+6 -1
+3
drivers/scsi/qla2xxx/qla_def.h
··· 3966 3966 uint16_t fw_subminor_version; 3967 3967 uint16_t fw_attributes; 3968 3968 uint16_t fw_attributes_h; 3969 + #define FW_ATTR_H_NVME BIT_10 3970 + #define FW_ATTR_H_NVME_UPDATED BIT_14 3971 + 3969 3972 uint16_t fw_attributes_ext[2]; 3970 3973 uint32_t fw_memory_size; 3971 3974 uint32_t fw_transfer_size;
+3 -1
drivers/scsi/qla2xxx/qla_mbx.c
··· 1109 1109 * FW supports nvme and driver load parameter requested nvme. 1110 1110 * BIT 26 of fw_attributes indicates NVMe support. 1111 1111 */ 1112 - if ((ha->fw_attributes_h & 0x400) && ql2xnvmeenable) { 1112 + if ((ha->fw_attributes_h & 1113 + (FW_ATTR_H_NVME | FW_ATTR_H_NVME_UPDATED)) && 1114 + ql2xnvmeenable) { 1113 1115 vha->flags.nvme_enabled = 1; 1114 1116 ql_log(ql_log_info, vha, 0xd302, 1115 1117 "%s: FC-NVMe is Enabled (0x%x)\n",