[PATCH 4/8] qla2xxx: Fix re-using LoopID when handle is in use

[Himanshu Madhani]

From: Quinn Tran <quinn.t...@cavium.com>

This patch fixes issue where driver clears Nport ID map
instead of marking handle in use. Once driver clears
NPort ID from the database, it can reuse same NPort ID
resulting in a PLOGI failure.

Fixes: a084fd68e1d2 ("scsi: qla2xxx: Fix re-login for Nport Handle in use")
Cc: <sta...@vger.kernel.org>
Signed-of-by: Quinn Tran <quinn.t...@cavium.com>
Signed-off-by: Himanshu Madhani <hmadh...@redhat.com>
---
 drivers/scsi/qla2xxx/qla_init.c   | 18 ++++--------------
 drivers/scsi/qla2xxx/qla_target.c |  3 ++-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index b934977c5c26..dbeb85f161e3 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1952,25 +1952,15 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host 
*vha, struct event_arg *ea)
                cid.b.rsvd_1 = 0;
 
                ql_dbg(ql_dbg_disc, vha, 0x20ec,
-                   "%s %d %8phC LoopID 0x%x in use post gnl\n",
+                   "%s %d %8phC lid %#x in use with pid %06x post gnl\n",
                    __func__, __LINE__, ea->fcport->port_name,
-                   ea->fcport->loop_id);
+                   ea->fcport->loop_id, cid.b24);
 
-               if (IS_SW_RESV_ADDR(cid)) {
-                       set_bit(ea->fcport->loop_id, vha->hw->loop_id_map);
-                       ea->fcport->loop_id = FC_NO_LOOP_ID;
-               } else {
-                       qla2x00_clear_loop_id(ea->fcport);
-               }
+               set_bit(ea->fcport->loop_id, vha->hw->loop_id_map);
+               ea->fcport->loop_id = FC_NO_LOOP_ID;
                qla24xx_post_gnl_work(vha, ea->fcport);
                break;
        case MBS_PORT_ID_USED:
-               ql_dbg(ql_dbg_disc, vha, 0x20ed,
-                   "%s %d %8phC NPortId %02x%02x%02x inuse post gidpn\n",
-                   __func__, __LINE__, ea->fcport->port_name,
-                   ea->fcport->d_id.b.domain, ea->fcport->d_id.b.area,
-                   ea->fcport->d_id.b.al_pa);
-
                lid = ea->iop[1] & 0xffff;
                qlt_find_sess_invalidate_other(vha,
                    wwn_to_u64(ea->fcport->port_name),
diff --git a/drivers/scsi/qla2xxx/qla_target.c 
b/drivers/scsi/qla2xxx/qla_target.c
index 8c811b251d42..d2888b30a8a3 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1261,7 +1261,8 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)
        qla24xx_chk_fcp_state(sess);
 
        ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
-           "Scheduling sess %p for deletion\n", sess);
+           "Scheduling sess %p for deletion %8phC\n",
+           sess, sess->port_name);
 
        INIT_WORK(&sess->del_work, qla24xx_delete_sess_fn);
        WARN_ON(!queue_work(sess->vha->hw->wq, &sess->del_work));
-- 
2.12.0