From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 11 Aug 2022 13:28:21 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.15.61~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d9f191b6727b2ff3a06c588f43adee767ed80f8;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch
---

diff --git a/queue-5.4/scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch b/queue-5.4/scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch
new file mode 100644
index 00000000000..8c863a997f9
--- /dev/null
+++ b/queue-5.4/scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch
@@ -0,0 +1,67 @@
+From 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 Mon Sep 17 00:00:00 2001
+From: Nilesh Javali <njavali@marvell.com>
+Date: Tue, 12 Jul 2022 22:20:36 -0700
+Subject: scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
+
+From: Nilesh Javali <njavali@marvell.com>
+
+commit 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 upstream.
+
+This fixes the regression of NVMe discovery failure during driver load
+time.
+
+This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99.
+
+Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com
+Cc: stable@vger.kernel.org
+Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
+Signed-off-by: Nilesh Javali <njavali@marvell.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/qla2xxx/qla_init.c |    5 ++---
+ drivers/scsi/qla2xxx/qla_nvme.c |    5 -----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -5388,8 +5388,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t
+ 	if (atomic_read(&fcport->state) == FCS_ONLINE)
+ 		return;
+ 
+-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+-
+ 	rport_ids.node_name = wwn_to_u64(fcport->node_name);
+ 	rport_ids.port_name = wwn_to_u64(fcport->port_name);
+ 	rport_ids.port_id = fcport->d_id.b.domain << 16 |
+@@ -5485,7 +5483,6 @@ qla2x00_update_fcport(scsi_qla_host_t *v
+ 		qla2x00_reg_remote_port(vha, fcport);
+ 		break;
+ 	case MODE_TARGET:
+-		qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+ 		if (!vha->vha_tgt.qla_tgt->tgt_stop &&
+ 			!vha->vha_tgt.qla_tgt->tgt_stopped)
+ 			qlt_fc_port_added(vha, fcport);
+@@ -5500,6 +5497,8 @@ qla2x00_update_fcport(scsi_qla_host_t *v
+ 		break;
+ 	}
+ 
++	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
++
+ 	if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {
+ 		if (fcport->id_changed) {
+ 			fcport->id_changed = 0;
+--- a/drivers/scsi/qla2xxx/qla_nvme.c
++++ b/drivers/scsi/qla2xxx/qla_nvme.c
+@@ -36,11 +36,6 @@ int qla_nvme_register_remote(struct scsi
+ 		(fcport->nvme_flag & NVME_FLAG_REGISTERED))
+ 		return 0;
+ 
+-	if (atomic_read(&fcport->state) == FCS_ONLINE)
+-		return 0;
+-
+-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+-
+ 	fcport->nvme_flag &= ~NVME_FLAG_RESETTING;
+ 
+ 	memset(&req, 0, sizeof(struct nvme_fc_port_info));
diff --git a/queue-5.4/series b/queue-5.4/series
index 2f510f3243e..8a1f2bd7b28 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,2 +1,3 @@
 makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch
 x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch
+scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch