scsi: qla2xxx: Changes to support FCP2 Target

Add changes to support FCP2 Target.

Link: https://lore.kernel.org/r/20210810043720.1137-5-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index f2d05592c1e2f96f0e22b0d3f8bbf413126a4156..25549a8a2d72dd7bbe1ad05a34c80f082bcf3403 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -12,8 +12,7 @@
  * ----------------------------------------------------------------------
  * | Module Init and Probe        |       0x0199       |                |
  * | Mailbox commands             |       0x1206       | 0x11a5-0x11ff |
- * | Device Discovery             |       0x2134       | 0x210e-0x2116  |
- * |                             |                    | 0x211a         |
+ * | Device Discovery             |       0x2134       | 0x210e-0x2115  |
  * |                              |                    | 0x211c-0x2128  |
  * |                              |                    | 0x212c-0x2134  |
  * | Queue Command and IO tracing |       0x3074       | 0x300b         |

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index ad0d3f536a317ce1d2822efa403fc44fa09092fa..89b3bc900b22d7fdb62d1b2759406cf92d242fdc 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1787,6 +1787,12 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)
 
        fcport = qla2x00_find_fcport_by_nportid(vha, &ea->id, 1);
        if (fcport) {
+               if (fcport->flags & FCF_FCP2_DEVICE) {
+                       ql_dbg(ql_dbg_disc, vha, 0x2115,
+                              "Delaying session delete for FCP2 portid=%06x %8phC ",
+                              fcport->d_id.b24, fcport->port_name);
+                       return;
+               }
                fcport->scan_needed = 1;
                fcport->rscn_gen++;
        }

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 68da8c6b0cb83aa74f958516483c9029f2b5b21f..4db7e433bb38985fca03719b6e5481832bbd7753 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3981,6 +3981,16 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha)
            "Mark all dev lost\n");
 
        list_for_each_entry(fcport, &vha->vp_fcports, list) {
+               if (fcport->loop_id != FC_NO_LOOP_ID &&
+                   (fcport->flags & FCF_FCP2_DEVICE) &&
+                   fcport->port_type == FCT_TARGET &&
+                   !qla2x00_reset_active(vha)) {
+                       ql_dbg(ql_dbg_disc, vha, 0x211a,
+                              "Delaying session delete for FCP2 flags 0x%x port_type = 0x%x port_id=%06x %phC",
+                              fcport->flags, fcport->port_type,
+                              fcport->d_id.b24, fcport->port_name);
+                       continue;
+               }
                fcport->scan_state = 0;
                qlt_schedule_sess_for_deletion(fcport);
        }