From: Arun Easi <aeasi@marvell.com>

Date: Wed, 15 Jun 2022 22:35:06 -0700

Subject: scsi: qla2xxx: Fix losing FCP-2 targets on long port disable with

 I/Os

Patch-mainline: v5.20-rc1

Git-commit: 2416ccd3815ba1613e10a6da0a24ef21acfe5633

References: bsc#1201958

FCP-2 devices were not coming back online once they were lost, login

retries exhausted, and then came back up.  Fix this by accepting RSCN when

the device is not online.

Link: https://lore.kernel.org/r/20220616053508.27186-10-njavali@marvell.com

Fixes: 44c57f205876 ("scsi: qla2xxx: Changes to support FCP2 Target")

Cc: stable@vger.kernel.org

Signed-off-by: Arun Easi <aeasi@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_init.c |   12 ++++++++----

 1 file changed, 8 insertions(+), 4 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -1835,7 +1835,8 @@ void qla2x00_handle_rscn(scsi_qla_host_t

 	case RSCN_PORT_ADDR:

 		fcport = qla2x00_find_fcport_by_nportid(vha, &ea->id, 1);

 		if (fcport) {

-			if (fcport->flags & FCF_FCP2_DEVICE) {

+			if (fcport->flags & FCF_FCP2_DEVICE &&

+			    atomic_read(&fcport->state) == FCS_ONLINE) {

 				ql_dbg(ql_dbg_disc, vha, 0x2115,

 				       "Delaying session delete for FCP2 portid=%06x %8phC ",

 					fcport->d_id.b24, fcport->port_name);

@@ -1867,7 +1868,8 @@ void qla2x00_handle_rscn(scsi_qla_host_t

 		break;

 	case RSCN_AREA_ADDR:

 		list_for_each_entry(fcport, &vha->vp_fcports, list) {

-			if (fcport->flags & FCF_FCP2_DEVICE)

+			if (fcport->flags & FCF_FCP2_DEVICE &&

+			    atomic_read(&fcport->state) == FCS_ONLINE)

 				continue;

 			if ((ea->id.b24 & 0xffff00) == (fcport->d_id.b24 & 0xffff00)) {

@@ -1878,7 +1880,8 @@ void qla2x00_handle_rscn(scsi_qla_host_t

 		break;

 	case RSCN_DOM_ADDR:

 		list_for_each_entry(fcport, &vha->vp_fcports, list) {

-			if (fcport->flags & FCF_FCP2_DEVICE)

+			if (fcport->flags & FCF_FCP2_DEVICE &&

+			    atomic_read(&fcport->state) == FCS_ONLINE)

 				continue;

 			if ((ea->id.b24 & 0xff0000) == (fcport->d_id.b24 & 0xff0000)) {

@@ -1890,7 +1893,8 @@ void qla2x00_handle_rscn(scsi_qla_host_t

 	case RSCN_FAB_ADDR:

 	default:

 		list_for_each_entry(fcport, &vha->vp_fcports, list) {

-			if (fcport->flags & FCF_FCP2_DEVICE)

+			if (fcport->flags & FCF_FCP2_DEVICE &&

+			    atomic_read(&fcport->state) == FCS_ONLINE)

 				continue;

 			fcport->scan_needed = 1;