Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-06-18 07:05:27 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-06-18 07:05:27 +0200
commitc2f5a0fd322cd401dddf25b3114e6a941a9120c5 (patch)
tree5b21ceeca96b7b9bd87956a8d9d947540e7dae30
parent3edfd41d06e057e3a2edb3859e8ca96e7a0179aa (diff)
parenta2277ad354e0be5464d75df78123b74730625a2b (diff)
Merge branch 'SLE15' into openSUSE-15.0openSUSE-15.0
-rw-r--r--patches.drivers/scsi-qla2xxx-Fix-FC-AL-connection-target-discovery.patch44
-rw-r--r--patches.drivers/scsi-qla2xxx-Fix-N2N-target-discovery-with-Local-loo.patch36
-rw-r--r--series.conf2
3 files changed, 82 insertions, 0 deletions
diff --git a/patches.drivers/scsi-qla2xxx-Fix-FC-AL-connection-target-discovery.patch b/patches.drivers/scsi-qla2xxx-Fix-FC-AL-connection-target-discovery.patch
new file mode 100644
index 0000000000..6901738b6f
--- /dev/null
+++ b/patches.drivers/scsi-qla2xxx-Fix-FC-AL-connection-target-discovery.patch
@@ -0,0 +1,44 @@
+From: Quinn Tran <qtran@marvell.com>
+Date: Fri, 15 Mar 2019 15:04:18 -0700
+Subject: [PATCH] scsi: qla2xxx: Fix FC-AL connection target discovery
+Git-commit: 4705f10e82c63924bd84a9b31d15839ec9ba3d06
+Patch-Mainline: v5.1-rc2
+References: bsc#1094555
+
+Commit 7f147f9bfd44 ("scsi: qla2xxx: Fix N2N target discovery with Local
+loop") fixed N2N target discovery for local loop. However, same code is
+used for FC-AL discovery as well. Added check to make sure we are bypassing
+area and domain check only in N2N topology for target discovery.
+
+Fixes: 7f147f9bfd44 ("scsi: qla2xxx: Fix N2N target discovery with Local loop")
+Cc: stable@vger.kernel.org # 5.0+
+Signed-off-by: Quinn Tran <qtran@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_init.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
+index 420045155ba0..0c700b140ce7 100644
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -4991,6 +4991,13 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
+ if ((domain & 0xf0) == 0xf0)
+ continue;
+
++ /* Bypass if not same domain and area of adapter. */
++ if (area && domain && ((area != vha->d_id.b.area) ||
++ (domain != vha->d_id.b.domain)) &&
++ (ha->current_topology == ISP_CFG_NL))
++ continue;
++
++
+ /* Bypass invalid local loop ID. */
+ if (loop_id > LAST_LOCAL_LOOP_ID)
+ continue;
+--
+2.16.4
+
diff --git a/patches.drivers/scsi-qla2xxx-Fix-N2N-target-discovery-with-Local-loo.patch b/patches.drivers/scsi-qla2xxx-Fix-N2N-target-discovery-with-Local-loo.patch
new file mode 100644
index 0000000000..5a50ea7566
--- /dev/null
+++ b/patches.drivers/scsi-qla2xxx-Fix-N2N-target-discovery-with-Local-loo.patch
@@ -0,0 +1,36 @@
+From: Himanshu Madhani <hmadhani@marvell.com>
+Date: Thu, 24 Jan 2019 23:23:39 -0800
+Subject: [PATCH] scsi: qla2xxx: Fix N2N target discovery with Local loop
+Git-commit: 7f147f9bfd44d048e22e8c65877d2b5590e6cf3d
+Patch-Mainline: v5.1-rc1
+References: bsc#1094555
+
+This patch fixes the issue where Dell-EMC Target will fail to discover LUNs
+if domain and area of port ID is not same as adapter's.
+
+Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/scsi/qla2xxx/qla_init.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
+index 364bb52ed2a6..58b4bfe01202 100644
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -5046,11 +5046,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
+ if ((domain & 0xf0) == 0xf0)
+ continue;
+
+- /* Bypass if not same domain and area of adapter. */
+- if (area && domain &&
+- (area != vha->d_id.b.area || domain != vha->d_id.b.domain))
+- continue;
+-
+ /* Bypass invalid local loop ID. */
+ if (loop_id > LAST_LOCAL_LOOP_ID)
+ continue;
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index e6e86a6e6e..47c1b3c359 100644
--- a/series.conf
+++ b/series.conf
@@ -21661,6 +21661,7 @@
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/scsi-qla2xxx-Fix-N2N-target-discovery-with-Local-loo.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
@@ -21831,6 +21832,7 @@
patches.arch/powerpc-vdso64-Fix-CLOCK_MONOTONIC-inconsistencies-a.patch
patches.arch/powerpc-security-Fix-spectre_v2-reporting.patch
patches.fixes/libceph-wait-for-latest-osdmap-in-ceph_monc_blacklist_add.patch
+ patches.drivers/scsi-qla2xxx-Fix-FC-AL-connection-target-discovery.patch
patches.drivers/ibmvscsi-Protect-ibmvscsi_head-from-concurrent-modif.patch
patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch
patches.drivers/auxdisplay-hd44780-Fix-memory-leak-on-remove.patch