Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2019-05-03 11:25:36 +0200
committerHannes Reinecke <hare@suse.de>2019-05-03 11:25:36 +0200
commit0222aa2c4b0d5bcd8416a0797d56917372111920 (patch)
treebe3518d443bfa3ae1f0a249b0e6abb306b0f27ec
parent3673108c567e6ef572eb5e802c4108e107a64c97 (diff)
scsi: qla2xxx: Add new FC-NVMe enable BIT to enable FC-NVMe
feature (bsc#1130579).
-rw-r--r--patches.drivers/scsi-qla2xxx-Add-new-FC-NVMe-enable-BIT-to-enable-FC.patch54
-rw-r--r--series.conf1
2 files changed, 55 insertions, 0 deletions
diff --git a/patches.drivers/scsi-qla2xxx-Add-new-FC-NVMe-enable-BIT-to-enable-FC.patch b/patches.drivers/scsi-qla2xxx-Add-new-FC-NVMe-enable-BIT-to-enable-FC.patch
new file mode 100644
index 0000000000..c68b653d5e
--- /dev/null
+++ b/patches.drivers/scsi-qla2xxx-Add-new-FC-NVMe-enable-BIT-to-enable-FC.patch
@@ -0,0 +1,54 @@
+From: Giridhar Malavali <gmalavali@marvell.com>
+Date: Wed, 30 Jan 2019 09:50:44 -0800
+Subject: [PATCH] scsi: qla2xxx: Add new FC-NVMe enable BIT to enable FC-NVMe
+ feature
+Git-commit: 171e4909eac7912c8d9ffaec9a2872b3271dd6e9
+Patch-Mainline: v5.1-rc1
+References: bsc#1130579
+
+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>
+Acked-by: Hannes Reinecke <hare@suse.com>
+---
+ 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 97f66b142ff2..8858bb1ea1b2 100644
+--- a/drivers/scsi/qla2xxx/qla_def.h
++++ b/drivers/scsi/qla2xxx/qla_def.h
+@@ -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;
+diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
+index 191b6b7c8747..f753aa495753 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",
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 5035ee855e..4a1d1a9ee4 100644
--- a/series.conf
+++ b/series.conf
@@ -21248,6 +21248,7 @@
patches.drivers/IB-core-Unregister-notifier-before-freeing-MAD-secur.patch
patches.drivers/IB-core-Fix-potential-memory-leak-while-creating-MAD.patch
patches.drivers/IB-hfi1-Close-race-condition-on-user-context-disable.patch
+ patches.drivers/scsi-qla2xxx-Add-new-FC-NVMe-enable-BIT-to-enable-FC.patch
patches.drivers/iommu-vt-d-check-identity-map-for-hot-added-devices
patches.drivers/iommu-vt-d-fix-null-pointer-reference-in-intel_svm_bind_mm
patches.suse/msft-hv-1847-x86-Hyper-V-Set-x2apic-destination-mode-to-physical-.patch