scsi: qla2xxx: Cleanup debug message IDs
authorQuinn Tran <quinn.tran@cavium.com>
Fri, 2 Jun 2017 16:12:01 +0000 (09:12 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 13 Jun 2017 00:48:07 +0000 (20:48 -0400)
Assign unique id to all traces and logs for debug purpose.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_attr.c
drivers/scsi/qla2xxx/qla_bsg.c
drivers/scsi/qla2xxx/qla_dbg.c
drivers/scsi/qla2xxx/qla_dfs.c
drivers/scsi/qla2xxx/qla_gs.c
drivers/scsi/qla2xxx/qla_init.c
drivers/scsi/qla2xxx/qla_isr.c
drivers/scsi/qla2xxx/qla_mbx.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qla2xxx/qla_target.c

index 7c8d6c54ab7052e4b6ec7b63d01538ec62964da5..a93eb42718e5f377c21a91310056e23ee38d0e4a 100644 (file)
@@ -769,7 +769,7 @@ qla2x00_issue_logo(struct file *filp, struct kobject *kobj,
        did.b.area = (type & 0x0000ff00) >> 8;
        did.b.al_pa = (type & 0x000000ff);
 
-       ql_log(ql_log_info, vha, 0x70e3, "portid=%02x%02x%02x done\n",
+       ql_log(ql_log_info, vha, 0xd04d, "portid=%02x%02x%02x done\n",
            did.b.domain, did.b.area, did.b.al_pa);
 
        ql_log(ql_log_info, vha, 0x70e4, "%s: %d\n", __func__, type);
index ca3420de5a013f4e39760fb6da1edbb5358d26b1..e093795a037144136656264df34b25b424db30df 100644 (file)
@@ -2135,7 +2135,7 @@ qla8044_serdes_op(struct bsg_job *bsg_job)
                bsg_reply->reply_payload_rcv_len = sizeof(sr);
                break;
        default:
-               ql_dbg(ql_dbg_user, vha, 0x70cf,
+               ql_dbg(ql_dbg_user, vha, 0x7020,
                    "Unknown serdes cmd %x.\n", sr.cmd);
                rval = -EINVAL;
                break;
index 88748a6ab73f6fc59f4a2b9fb202fa9efe24c7de..11e097e123bdc2c3c7c6cb3ab4d15f656388fc0d 100644 (file)
@@ -62,7 +62,7 @@
  * | Misc                         |       0xd301       | 0xd031-0xd0ff |
  * |                              |                    | 0xd101-0xd1fe |
  * |                              |                    | 0xd214-0xd2fe |
- * | Target Mode                 |       0xe080       |                |
+ * | Target Mode                 |       0xe081       |                |
  * | Target Mode Management      |       0xf09b       | 0xf002         |
  * |                              |                    | 0xf046-0xf049  |
  * | Target Mode Task Management  |      0x1000d      |                |
index 989e17b0758cd51ec029204c48eddf37c55c180a..391c50be22971a90156d2831ac207311b31ba0c1 100644 (file)
@@ -70,7 +70,7 @@ qla2x00_dfs_tgt_port_database_show(struct seq_file *s, void *unused)
                    qla2x00_gid_list_size(ha),
                    &gid_list_dma, GFP_KERNEL);
                if (!gid_list) {
-                       ql_dbg(ql_dbg_user, vha, 0x705c,
+                       ql_dbg(ql_dbg_user, vha, 0x7018,
                            "DMA allocation failed for %u\n",
                             qla2x00_gid_list_size(ha));
                        return 0;
@@ -370,7 +370,7 @@ create_nodes:
        ha->tgt.dfs_tgt_port_database = debugfs_create_file("tgt_port_database",
            S_IRUSR,  ha->dfs_dir, vha, &dfs_tgt_port_database_ops);
        if (!ha->tgt.dfs_tgt_port_database) {
-               ql_log(ql_log_warn, vha, 0xffff,
+               ql_log(ql_log_warn, vha, 0xd03f,
                    "Unable to create debugFS tgt_port_database node.\n");
                goto out;
        }
@@ -386,8 +386,8 @@ create_nodes:
        ha->tgt.dfs_tgt_sess = debugfs_create_file("tgt_sess",
                S_IRUSR, ha->dfs_dir, vha, &dfs_tgt_sess_ops);
        if (!ha->tgt.dfs_tgt_sess) {
-               ql_log(ql_log_warn, vha, 0xffff,
-                       "Unable to create debugFS tgt_sess node.\n");
+               ql_log(ql_log_warn, vha, 0xd040,
+                   "Unable to create debugFS tgt_sess node.\n");
                goto out;
        }
 
index ef8e8891d54ff225dd806403d29a82cf954cec4c..540fec524ccb595d63818abf43306c5f39618c47 100644 (file)
@@ -2024,7 +2024,7 @@ qla2x00_fdmiv2_rhba(scsi_qla_host_t *vha)
        eiter->len = cpu_to_be16(4 + alen);
        size += 4 + alen;
 
-       ql_dbg(ql_dbg_disc, vha, 0x20b1,
+       ql_dbg(ql_dbg_disc, vha, 0x201b,
            "Vendor Identifier = %s.\n", eiter->a.vendor_identifier);
 
        /* Update MS request size. */
@@ -2236,7 +2236,7 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha)
        }
        size += 4 + 4;
 
-       ql_dbg(ql_dbg_disc, vha, 0x20bc,
+       ql_dbg(ql_dbg_disc, vha, 0x2017,
            "Current_Speed = %x.\n", eiter->a.cur_speed);
 
        /* Max frame size. */
@@ -2281,7 +2281,7 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha)
        eiter->len = cpu_to_be16(4 + alen);
        size += 4 + alen;
 
-       ql_dbg(ql_dbg_disc, vha, 0x203d,
+       ql_dbg(ql_dbg_disc, vha, 0x201a,
            "HostName=%s.\n", eiter->a.host_name);
 
        /* Node Name */
@@ -2388,13 +2388,13 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha)
        eiter->len = cpu_to_be16(4 + 4);
        size += 4 + 4;
 
-       ql_dbg(ql_dbg_disc, vha, 0x20c8,
+       ql_dbg(ql_dbg_disc, vha, 0x201c,
            "Port Id = %x.\n", eiter->a.port_id);
 
        /* Update MS request size. */
        qla2x00_update_ms_fdmi_iocb(vha, size + 16);
 
-       ql_dbg(ql_dbg_disc, vha, 0x203e,
+       ql_dbg(ql_dbg_disc, vha, 0x2018,
            "RPA portname= %8phN size=%d.\n", ct_req->req.rpa.port_name, size);
        ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x20ca,
            entries, size);
@@ -2767,13 +2767,13 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
 {
        fc_port_t *fcport = ea->fcport;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "%s %8phC login state %d \n",
-               __func__, fcport->port_name, fcport->fw_login_state);
+       ql_dbg(ql_dbg_disc, vha, 0x201d,
+           "%s %8phC login state %d\n",
+           __func__, fcport->port_name, fcport->fw_login_state);
 
        if (ea->sp->gen2 != fcport->login_gen) {
                /* PLOGI/PRLI/LOGO came in while cmd was out.*/
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
+               ql_dbg(ql_dbg_disc, vha, 0x201e,
                    "%s %8phC generation changed rscn %d|%d login %d|%d \n",
                    __func__, fcport->port_name, fcport->last_rscn_gen,
                    fcport->rscn_gen, fcport->last_login_gen, fcport->login_gen);
@@ -2797,7 +2797,7 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                        if (atomic_read(&fcport->state) ==
                                            FCS_ONLINE)
                                                break;
-                                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                                       ql_dbg(ql_dbg_disc, vha, 0x201f,
                                            "%s %d %8phC post gnl\n",
                                            __func__, __LINE__, fcport->port_name);
                                        qla24xx_post_gnl_work(vha, fcport);
@@ -2806,14 +2806,14 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
                        } else { /* fcport->d_id.b24 != ea->id.b24 */
                                fcport->d_id.b24 = ea->id.b24;
                                if (fcport->deleted == QLA_SESS_DELETED) {
-                                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                                       ql_dbg(ql_dbg_disc, vha, 0x2021,
                                            "%s %d %8phC post del sess\n",
                                            __func__, __LINE__, fcport->port_name);
                                        qlt_schedule_sess_for_deletion_lock(fcport);
                                }
                        }
                } else { /* ea->sp->gen1 != fcport->rscn_gen */
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x2022,
                            "%s %d %8phC post gidpn\n",
                            __func__, __LINE__, fcport->port_name);
                        /* rscn came in while cmd was out */
@@ -2823,18 +2823,18 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
                /* cable pulled */
                if (ea->sp->gen1 == fcport->rscn_gen) {
                        if (ea->sp->gen2 == fcport->login_gen) {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x2042,
                                    "%s %d %8phC post del sess\n", __func__,
                                    __LINE__, fcport->port_name);
                                qlt_schedule_sess_for_deletion_lock(fcport);
                        } else {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x2045,
                                    "%s %d %8phC login\n", __func__, __LINE__,
                                    fcport->port_name);
                                qla24xx_fcport_handle_login(vha, fcport);
                        }
                } else {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x2049,
                            "%s %d %8phC post gidpn\n", __func__, __LINE__,
                            fcport->port_name);
                        qla24xx_post_gidpn_work(vha, fcport);
@@ -2861,7 +2861,7 @@ static void qla2x00_async_gidpn_sp_done(void *s, int res)
        ea.rc = res;
        ea.event = FCME_GIDPN_DONE;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x204f,
            "Async done-%s res %x, WWPN %8phC ID %3phC \n",
            sp->name, res, fcport->port_name, id);
 
@@ -2917,11 +2917,11 @@ int qla24xx_async_gidpn(scsi_qla_host_t *vha, fc_port_t *fcport)
        if (rval != QLA_SUCCESS)
                goto done_free_sp;
 
-       ql_dbg(ql_dbg_disc, vha, 0x206f,
-               "Async-%s - %8phC hdl=%x loopid=%x portid %02x%02x%02x.\n",
-               sp->name, fcport->port_name,
-               sp->handle, fcport->loop_id, fcport->d_id.b.domain,
-               fcport->d_id.b.area, fcport->d_id.b.al_pa);
+       ql_dbg(ql_dbg_disc, vha, 0x20a4,
+           "Async-%s - %8phC hdl=%x loopid=%x portid %02x%02x%02x.\n",
+           sp->name, fcport->port_name,
+           sp->handle, fcport->loop_id, fcport->d_id.b.domain,
+           fcport->d_id.b.area, fcport->d_id.b.al_pa);
        return rval;
 
 done_free_sp:
@@ -2972,7 +2972,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)
 
        ct_rsp = &fcport->ct_desc.ct_sns->p.rsp;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x2053,
            "Async done-%s res %x, WWPN %8phC \n",
            sp->name, res, fcport->port_name);
 
@@ -2985,10 +2985,9 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)
                if ((ct_rsp->header.reason_code ==
                         CT_REASON_INVALID_COMMAND_CODE) ||
                        (ct_rsp->header.reason_code ==
-                        CT_REASON_COMMAND_UNSUPPORTED)) {
-                       ql_dbg(ql_dbg_disc, vha, 0x205a,
-                               "GPSC command unsupported, disabling "
-                               "query.\n");
+                       CT_REASON_COMMAND_UNSUPPORTED)) {
+                       ql_dbg(ql_dbg_disc, vha, 0x2019,
+                           "GPSC command unsupported, disabling query.\n");
                        ha->flags.gpsc_supported = 0;
                        res = QLA_SUCCESS;
                }
@@ -3017,12 +3016,11 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)
                        break;
                }
 
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async-%s OUT WWPN %8phC speeds=%04x speed=%04x.\n",
-                       sp->name,
-                       fcport->fabric_port_name,
-                       be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
-                       be16_to_cpu(ct_rsp->rsp.gpsc.speed));
+               ql_dbg(ql_dbg_disc, vha, 0x2054,
+                   "Async-%s OUT WWPN %8phC speeds=%04x speed=%04x.\n",
+                   sp->name, fcport->fabric_port_name,
+                   be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
+                   be16_to_cpu(ct_rsp->rsp.gpsc.speed));
        }
 done:
        memset(&ea, 0, sizeof(ea));
@@ -3078,11 +3076,11 @@ int qla24xx_async_gpsc(scsi_qla_host_t *vha, fc_port_t *fcport)
        if (rval != QLA_SUCCESS)
                goto done_free_sp;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async-%s %8phC hdl=%x loopid=%x portid=%02x%02x%02x.\n",
-               sp->name, fcport->port_name, sp->handle,
-               fcport->loop_id, fcport->d_id.b.domain,
-               fcport->d_id.b.area, fcport->d_id.b.al_pa);
+       ql_dbg(ql_dbg_disc, vha, 0x205e,
+           "Async-%s %8phC hdl=%x loopid=%x portid=%02x%02x%02x.\n",
+           sp->name, fcport->port_name, sp->handle,
+           fcport->loop_id, fcport->d_id.b.domain,
+           fcport->d_id.b.area, fcport->d_id.b.al_pa);
        return rval;
 
 done_free_sp:
@@ -3161,9 +3159,9 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
                }
        } else {
                /* create new fcport */
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post new sess\n",
-                          __func__, __LINE__, ea->port_name);
+               ql_dbg(ql_dbg_disc, vha, 0x2065,
+                   "%s %d %8phC post new sess\n",
+                   __func__, __LINE__, ea->port_name);
 
                qla24xx_post_newsess_work(vha, &ea->id, ea->port_name, NULL);
        }
@@ -3180,10 +3178,10 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res)
        struct event_arg ea;
        struct qla_work_evt *e;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async done-%s res %x ID %3phC. %8phC\n",
-               sp->name, res, ct_req->req.port_id.port_id,
-               ct_rsp->rsp.gpn_id.port_name);
+       ql_dbg(ql_dbg_disc, vha, 0x2066,
+           "Async done-%s res %x ID %3phC. %8phC\n",
+           sp->name, res, ct_req->req.port_id.port_id,
+           ct_rsp->rsp.gpn_id.port_name);
 
        memset(&ea, 0, sizeof(ea));
        memcpy(ea.port_name, ct_rsp->rsp.gpn_id.port_name, WWN_SIZE);
@@ -3245,8 +3243,8 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
                sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
                GFP_KERNEL);
        if (!sp->u.iocb_cmd.u.ctarg.req) {
-               ql_log(ql_log_warn, vha, 0xffff,
-                       "Failed to allocate ct_sns request.\n");
+               ql_log(ql_log_warn, vha, 0xd041,
+                   "Failed to allocate ct_sns request.\n");
                goto done_free_sp;
        }
 
@@ -3254,8 +3252,8 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
                sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
                GFP_KERNEL);
        if (!sp->u.iocb_cmd.u.ctarg.rsp) {
-               ql_log(ql_log_warn, vha, 0xffff,
-                       "Failed to allocate ct_sns request.\n");
+               ql_log(ql_log_warn, vha, 0xd042,
+                   "Failed to allocate ct_sns request.\n");
                goto done_free_sp;
        }
 
@@ -3282,9 +3280,9 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
        if (rval != QLA_SUCCESS)
                goto done_free_sp;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async-%s hdl=%x ID %3phC.\n", sp->name,
-               sp->handle, ct_req->req.port_id.port_id);
+       ql_dbg(ql_dbg_disc, vha, 0x2067,
+           "Async-%s hdl=%x ID %3phC.\n", sp->name,
+           sp->handle, ct_req->req.port_id.port_id);
        return rval;
 
 done_free_sp:
index 4ea4aa5bddaa19abb94d7abbf98cb96a8bbffe2f..c425d061cd8026f03eb4792a8c721750da806737 100644 (file)
@@ -141,7 +141,7 @@ qla2x00_async_login_sp_done(void *ptr, int res)
        struct srb_iocb *lio = &sp->u.iocb_cmd;
        struct event_arg ea;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20dd,
            "%s %8phC res %d \n", __func__, sp->fcport->port_name, res);
 
        sp->fcport->flags &= ~FCF_ASYNC_SENT;
@@ -334,31 +334,31 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
        if (ea->rc) { /* rval */
                if (fcport->login_retry == 0) {
                        fcport->login_retry = vha->hw->login_retry_count;
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                               "GNL failed Port login retry %8phN, retry cnt=%d.\n",
-                               fcport->port_name, fcport->login_retry);
+                       ql_dbg(ql_dbg_disc, vha, 0x20de,
+                           "GNL failed Port login retry %8phN, retry cnt=%d.\n",
+                           fcport->port_name, fcport->login_retry);
                }
                return;
        }
 
        if (fcport->last_rscn_gen != fcport->rscn_gen) {
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
+               ql_dbg(ql_dbg_disc, vha, 0x20df,
                    "%s %8phC rscn gen changed rscn %d|%d \n",
                    __func__, fcport->port_name,
                    fcport->last_rscn_gen, fcport->rscn_gen);
                qla24xx_post_gidpn_work(vha, fcport);
                return;
        } else if (fcport->last_login_gen != fcport->login_gen) {
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                       "%s %8phC login gen changed login %d|%d \n",
-                       __func__, fcport->port_name,
-                       fcport->last_login_gen, fcport->login_gen);
+               ql_dbg(ql_dbg_disc, vha, 0x20e0,
+                   "%s %8phC login gen changed login %d|%d\n",
+                   __func__, fcport->port_name,
+                   fcport->last_login_gen, fcport->login_gen);
                return;
        }
 
        n = ea->data[0] / sizeof(struct get_name_list_extended);
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20e1,
            "%s %d %8phC n %d %02x%02x%02x lid %d \n",
            __func__, __LINE__, fcport->port_name, n,
            fcport->d_id.b.domain, fcport->d_id.b.area,
@@ -380,20 +380,20 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
                loop_id = le16_to_cpu(e->nport_handle);
                loop_id = (loop_id & 0x7fff);
 
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                       "%s found %8phC CLS [%d|%d] ID[%02x%02x%02x|%02x%02x%02x] lid[%d|%d]\n",
-                          __func__, fcport->port_name,
-                       e->current_login_state, fcport->fw_login_state,
-                       id.b.domain, id.b.area, id.b.al_pa,
-                       fcport->d_id.b.domain, fcport->d_id.b.area,
-                       fcport->d_id.b.al_pa, loop_id, fcport->loop_id);
+               ql_dbg(ql_dbg_disc, vha, 0x20e2,
+                   "%s found %8phC CLS [%d|%d] ID[%02x%02x%02x|%02x%02x%02x] lid[%d|%d]\n",
+                   __func__, fcport->port_name,
+                   e->current_login_state, fcport->fw_login_state,
+                   id.b.domain, id.b.area, id.b.al_pa,
+                   fcport->d_id.b.domain, fcport->d_id.b.area,
+                   fcport->d_id.b.al_pa, loop_id, fcport->loop_id);
 
                if ((id.b24 != fcport->d_id.b24) ||
                    ((fcport->loop_id != FC_NO_LOOP_ID) &&
                        (fcport->loop_id != loop_id))) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post del sess\n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20e3,
+                           "%s %d %8phC post del sess\n",
+                           __func__, __LINE__, fcport->port_name);
                        qlt_schedule_sess_for_deletion(fcport, 1);
                        return;
                }
@@ -416,9 +416,9 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
 
                switch (e->current_login_state) {
                case DSC_LS_PRLI_COMP:
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post gpdb\n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20e4,
+                           "%s %d %8phC post gpdb\n",
+                           __func__, __LINE__, fcport->port_name);
                        opt = PDO_FORCE_ADISC;
                        qla24xx_post_gpdb_work(vha, fcport, opt);
                        break;
@@ -429,9 +429,9 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
                                qla2x00_find_new_loop_id(vha, fcport);
                                fcport->fw_login_state = DSC_LS_PORT_UNAVAIL;
                        }
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC \n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20e5,
+                           "%s %d %8phC\n",
+                           __func__, __LINE__, fcport->port_name);
                        qla24xx_fcport_handle_login(vha, fcport);
                        break;
                }
@@ -456,7 +456,7 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
                                            qla2x00_find_fcport_by_wwpn(vha,
                                                e->port_name, 0);
 
-                                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                                       ql_dbg(ql_dbg_disc, vha, 0x20e6,
                                            "%s %d %8phC post del sess\n",
                                            __func__, __LINE__,
                                            conflict_fcport->port_name);
@@ -487,7 +487,7 @@ qla24xx_async_gnl_sp_done(void *s, int res)
        u64 wwn;
        struct list_head h;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20e7,
            "Async done-%s res %x mb[1]=%x mb[2]=%x \n",
            sp->name, res, sp->u.iocb_cmd.u.mbx.in_mb[1],
            sp->u.iocb_cmd.u.mbx.in_mb[2]);
@@ -512,7 +512,7 @@ qla24xx_async_gnl_sp_done(void *s, int res)
                set_bit(loop_id, vha->hw->loop_id_map);
                wwn = wwn_to_u64(e->port_name);
 
-               ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0xffff,
+               ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20e8,
                    "%s %8phC %02x:%02x:%02x state %d/%d lid %x \n",
                    __func__, (void *)&wwn, e->port_id[2], e->port_id[1],
                    e->port_id[0], e->current_login_state, e->last_login_state,
@@ -551,7 +551,7 @@ int qla24xx_async_gnl(struct scsi_qla_host *vha, fc_port_t *fcport)
        if (!vha->flags.online)
                goto done;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20d9,
            "Async-gnlist WWPN %8phC \n", fcport->port_name);
 
        spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
@@ -598,9 +598,9 @@ int qla24xx_async_gnl(struct scsi_qla_host *vha, fc_port_t *fcport)
        if (rval != QLA_SUCCESS)
                goto done_free_sp;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async-%s - OUT WWPN %8phC hndl %x\n",
-               sp->name, fcport->port_name, sp->handle);
+       ql_dbg(ql_dbg_disc, vha, 0x20da,
+           "Async-%s - OUT WWPN %8phC hndl %x\n",
+           sp->name, fcport->port_name, sp->handle);
 
        return rval;
 
@@ -635,7 +635,7 @@ void qla24xx_async_gpdb_sp_done(void *s, int res)
        int rval = QLA_SUCCESS;
        struct event_arg ea;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20db,
            "Async done-%s res %x, WWPN %8phC mb[1]=%x mb[2]=%x \n",
            sp->name, res, fcport->port_name, mb[1], mb[2]);
 
@@ -701,8 +701,8 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)
 
        pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma);
        if (pd == NULL) {
-               ql_log(ql_log_warn, vha, 0xffff,
-                       "Failed to allocate port database structure.\n");
+               ql_log(ql_log_warn, vha, 0xd043,
+                   "Failed to allocate port database structure.\n");
                goto done_free_sp;
        }
        memset(pd, 0, max(PORT_DATABASE_SIZE, PORT_DATABASE_24XX_SIZE));
@@ -734,9 +734,9 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)
        if (rval != QLA_SUCCESS)
                goto done_free_sp;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async-%s %8phC hndl %x opt %x\n",
-               sp->name, fcport->port_name, sp->handle, opt);
+       ql_dbg(ql_dbg_disc, vha, 0x20dc,
+           "Async-%s %8phC hndl %x opt %x\n",
+           sp->name, fcport->port_name, sp->handle, opt);
 
        return rval;
 
@@ -760,27 +760,27 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
 
        fcport->flags &= ~FCF_ASYNC_SENT;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20d2,
            "%s %8phC DS %d LS %d rval %d\n", __func__, fcport->port_name,
            fcport->disc_state, fcport->fw_login_state, rval);
 
        if (ea->sp->gen2 != fcport->login_gen) {
                /* target side must have changed it. */
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
+               ql_dbg(ql_dbg_disc, vha, 0x20d3,
                    "%s %8phC generation changed rscn %d|%d login %d|%d \n",
                    __func__, fcport->port_name, fcport->last_rscn_gen,
                    fcport->rscn_gen, fcport->last_login_gen,
                    fcport->login_gen);
                return;
        } else if (ea->sp->gen1 != fcport->rscn_gen) {
-               ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %d %8phC post gidpn\n",
+               ql_dbg(ql_dbg_disc, vha, 0x20d4, "%s %d %8phC post gidpn\n",
                    __func__, __LINE__, fcport->port_name);
                qla24xx_post_gidpn_work(vha, fcport);
                return;
        }
 
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %d %8phC post del sess\n",
+               ql_dbg(ql_dbg_disc, vha, 0x20d5, "%s %d %8phC post del sess\n",
                    __func__, __LINE__, fcport->port_name);
                qlt_schedule_sess_for_deletion_lock(fcport);
                return;
@@ -797,14 +797,14 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
 
                if (!IS_IIDMA_CAPABLE(vha->hw) ||
                    !vha->hw->flags.gpsc_supported) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x20d6,
                            "%s %d %8phC post upd_fcport fcp_cnt %d\n",
                            __func__, __LINE__, fcport->port_name,
                            vha->fcport_count);
 
                        qla24xx_post_upd_fcport_work(vha, fcport);
                } else {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x20d7,
                            "%s %d %8phC post gpsc fcp_cnt %d\n",
                            __func__, __LINE__, fcport->port_name,
                            vha->fcport_count);
@@ -823,7 +823,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
        if (fcport->scan_state != QLA_FCPORT_FOUND)
                return 0;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
+       ql_dbg(ql_dbg_disc, vha, 0x20d8,
            "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d|%d retry %d lid %d\n",
            __func__, fcport->port_name, fcport->disc_state,
            fcport->fw_login_state, fcport->login_pause, fcport->flags,
@@ -854,14 +854,14 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
        switch (fcport->disc_state) {
        case DSC_DELETED:
                if (fcport->loop_id == FC_NO_LOOP_ID) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post gnl\n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20bd,
+                           "%s %d %8phC post gnl\n",
+                           __func__, __LINE__, fcport->port_name);
                        qla24xx_async_gnl(vha, fcport);
                } else {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post login\n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20bf,
+                           "%s %d %8phC post login\n",
+                           __func__, __LINE__, fcport->port_name);
                        fcport->disc_state = DSC_LOGIN_PEND;
                        qla2x00_post_async_login_work(vha, fcport, NULL);
                }
@@ -878,16 +878,16 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
                if (fcport->flags & FCF_FCP2_DEVICE) {
                        u8 opt = PDO_FORCE_ADISC;
 
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post gpdb\n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20c9,
+                           "%s %d %8phC post gpdb\n",
+                           __func__, __LINE__, fcport->port_name);
 
                        fcport->disc_state = DSC_GPDB;
                        qla24xx_post_gpdb_work(vha, fcport, opt);
                } else {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post login \n",
-                          __func__, __LINE__, fcport->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20cf,
+                           "%s %d %8phC post login\n",
+                           __func__, __LINE__, fcport->port_name);
                        fcport->disc_state = DSC_LOGIN_PEND;
                        qla2x00_post_async_login_work(vha, fcport, NULL);
                }
@@ -895,18 +895,18 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
                break;
 
        case DSC_LOGIN_FAILED:
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post gidpn \n",
-                          __func__, __LINE__, fcport->port_name);
+               ql_dbg(ql_dbg_disc, vha, 0x20d0,
+                   "%s %d %8phC post gidpn\n",
+                   __func__, __LINE__, fcport->port_name);
 
                qla24xx_post_gidpn_work(vha, fcport);
                break;
 
        case DSC_LOGIN_COMPLETE:
                /* recheck login state */
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post gpdb \n",
-                          __func__, __LINE__, fcport->port_name);
+               ql_dbg(ql_dbg_disc, vha, 0x20d1,
+                   "%s %d %8phC post gpdb\n",
+                   __func__, __LINE__, fcport->port_name);
 
                qla24xx_post_gpdb_work(vha, fcport, PDO_FORCE_ADISC);
                break;
@@ -923,10 +923,10 @@ void qla24xx_handle_rscn_event(fc_port_t *fcport, struct event_arg *ea)
 {
        fcport->rscn_gen++;
 
-       ql_dbg(ql_dbg_disc, fcport->vha, 0xffff,
-               "%s %8phC DS %d LS %d\n",
-               __func__, fcport->port_name, fcport->disc_state,
-               fcport->fw_login_state);
+       ql_dbg(ql_dbg_disc, fcport->vha, 0x210c,
+           "%s %8phC DS %d LS %d\n",
+           __func__, fcport->port_name, fcport->disc_state,
+           fcport->fw_login_state);
 
        if (fcport->flags & FCF_ASYNC_SENT)
                return;
@@ -993,14 +993,14 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha,
                return;
        }
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "%s %8phC DS %d LS %d P %d del %d cnfl %p rscn %d|%d login %d|%d fl %x\n",
-               __func__, fcport->port_name, fcport->disc_state,
-               fcport->fw_login_state, fcport->login_pause,
-               fcport->deleted, fcport->conflict,
-               fcport->last_rscn_gen, fcport->rscn_gen,
-               fcport->last_login_gen, fcport->login_gen,
-               fcport->flags);
+       ql_dbg(ql_dbg_disc, vha, 0x2102,
+           "%s %8phC DS %d LS %d P %d del %d cnfl %p rscn %d|%d login %d|%d fl %x\n",
+           __func__, fcport->port_name, fcport->disc_state,
+           fcport->fw_login_state, fcport->login_pause,
+           fcport->deleted, fcport->conflict,
+           fcport->last_rscn_gen, fcport->rscn_gen,
+           fcport->last_login_gen, fcport->login_gen,
+           fcport->flags);
 
        if ((fcport->fw_login_state == DSC_LS_PLOGI_PEND) ||
            (fcport->fw_login_state == DSC_LS_PRLI_PEND))
@@ -1023,7 +1023,7 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha,
        }
 
        if (fcport->last_rscn_gen != fcport->rscn_gen) {
-               ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %d %8phC post gidpn\n",
+               ql_dbg(ql_dbg_disc, vha, 0x20e9, "%s %d %8phC post gidpn\n",
                    __func__, __LINE__, fcport->port_name);
 
                qla24xx_async_gidpn(vha, fcport);
@@ -1070,10 +1070,10 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)
                                /* cable moved */
                                rc = qla24xx_post_gpnid_work(vha, &ea->id);
                                if (rc) {
-                                       ql_log(ql_log_warn, vha, 0xffff,
-                                               "RSCN GPNID work failed %02x%02x%02x\n",
-                                               ea->id.b.domain, ea->id.b.area,
-                                               ea->id.b.al_pa);
+                                       ql_log(ql_log_warn, vha, 0xd044,
+                                           "RSCN GPNID work failed %02x%02x%02x\n",
+                                           ea->id.b.domain, ea->id.b.area,
+                                           ea->id.b.al_pa);
                                }
                        } else {
                                ea->fcport = fcport;
@@ -1084,14 +1084,14 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)
                case RSCN_DOM_ADDR:
                        if (ea->id.b.rsvd_1 == RSCN_AREA_ADDR) {
                                mask = 0xffff00;
-                               ql_log(ql_dbg_async, vha, 0xffff,
-                                          "RSCN: Area 0x%06x was affected\n",
-                                          ea->id.b24);
+                               ql_dbg(ql_dbg_async, vha, 0x5044,
+                                   "RSCN: Area 0x%06x was affected\n",
+                                   ea->id.b24);
                        } else {
                                mask = 0xff0000;
-                               ql_log(ql_dbg_async, vha, 0xffff,
-                                          "RSCN: Domain 0x%06x was affected\n",
-                                          ea->id.b24);
+                               ql_dbg(ql_dbg_async, vha, 0x507a,
+                                   "RSCN: Domain 0x%06x was affected\n",
+                                   ea->id.b24);
                        }
 
                        rid = ea->id.b24 & mask;
@@ -1106,9 +1106,9 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)
                        break;
                case RSCN_FAB_ADDR:
                default:
-                       ql_log(ql_log_warn, vha, 0xffff,
-                               "RSCN: Fabric was affected. Addr format %d\n",
-                               ea->id.b.rsvd_1);
+                       ql_log(ql_log_warn, vha, 0xd045,
+                           "RSCN: Fabric was affected. Addr format %d\n",
+                           ea->id.b.rsvd_1);
                        qla2x00_mark_all_devices_lost(vha, 1);
                        set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
                        set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
@@ -1319,15 +1319,15 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
                 * force a relogin attempt via implicit LOGO, PLOGI, and PRLI
                 * requests.
                 */
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                          "%s %d %8phC post gpdb\n",
-                          __func__, __LINE__, ea->fcport->port_name);
+               ql_dbg(ql_dbg_disc, vha, 0x20ea,
+                   "%s %d %8phC post gpdb\n",
+                   __func__, __LINE__, ea->fcport->port_name);
                ea->fcport->chip_reset = vha->hw->chip_reset;
                ea->fcport->logout_on_delete = 1;
                qla24xx_post_gpdb_work(vha, ea->fcport, 0);
                break;
        case MBS_COMMAND_ERROR:
-               ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %d %8phC cmd error %x\n",
+               ql_dbg(ql_dbg_disc, vha, 0x20eb, "%s %d %8phC cmd error %x\n",
                    __func__, __LINE__, ea->fcport->port_name, ea->data[1]);
 
                ea->fcport->flags &= ~FCF_ASYNC_SENT;
@@ -1344,10 +1344,10 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
                cid.b.al_pa  = ea->iop[1] & 0xff;
                cid.b.rsvd_1 = 0;
 
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                       "%s %d %8phC LoopID 0x%x in use post gnl\n",
-                       __func__, __LINE__, ea->fcport->port_name,
-                       ea->fcport->loop_id);
+               ql_dbg(ql_dbg_disc, vha, 0x20ec,
+                   "%s %d %8phC LoopID 0x%x in use post gnl\n",
+                   __func__, __LINE__, ea->fcport->port_name,
+                   ea->fcport->loop_id);
 
                if (IS_SW_RESV_ADDR(cid)) {
                        set_bit(ea->fcport->loop_id, vha->hw->loop_id_map);
@@ -1358,11 +1358,11 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
                qla24xx_post_gnl_work(vha, ea->fcport);
                break;
        case MBS_PORT_ID_USED:
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                       "%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);
+               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);
 
                qla2x00_clear_loop_id(ea->fcport);
                qla24xx_post_gidpn_work(vha, ea->fcport);
@@ -2969,10 +2969,10 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)
                        ha->fw_options[2] &= ~BIT_11;
        }
 
-       ql_dbg(ql_dbg_init, vha, 0xffff,
-               "%s, add FW options 1-3 = 0x%04x 0x%04x 0x%04x mode %x\n",
-               __func__, ha->fw_options[1], ha->fw_options[2],
-               ha->fw_options[3], vha->host->active_mode);
+       ql_dbg(ql_dbg_init, vha, 0x00e8,
+           "%s, add FW options 1-3 = 0x%04x 0x%04x 0x%04x mode %x\n",
+           __func__, ha->fw_options[1], ha->fw_options[2],
+           ha->fw_options[3], vha->host->active_mode);
 
        if (ha->fw_options[1] || ha->fw_options[2] || ha->fw_options[3])
                qla2x00_set_fw_options(vha, ha->fw_options);
@@ -3053,7 +3053,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
                icb->rid = cpu_to_le16(rid);
                if (ha->flags.msix_enabled) {
                        msix = &ha->msix_entries[1];
-                       ql_dbg(ql_dbg_init, vha, 0x00fd,
+                       ql_dbg(ql_dbg_init, vha, 0x0019,
                            "Registering vector 0x%x for base que.\n",
                            msix->entry);
                        icb->msix = cpu_to_le16(msix->entry);
@@ -3183,7 +3183,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
                /* FA-WWPN Status */
                ha->flags.fawwpn_enabled =
                    (mid_init_cb->init_cb.firmware_options_1 & BIT_6) != 0;
-               ql_dbg(ql_dbg_init, vha, 0x0141, "FA-WWPN Support: %s.\n",
+               ql_dbg(ql_dbg_init, vha, 0x00bc, "FA-WWPN Support: %s.\n",
                    (ha->flags.fawwpn_enabled) ? "enabled" : "disabled");
        }
 
@@ -3857,10 +3857,10 @@ qla2x00_rport_del(void *data)
        fcport->drport = NULL;
        spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
        if (rport) {
-               ql_dbg(ql_dbg_disc, fcport->vha, 0xffff,
-                       "%s %8phN. rport %p roles %x \n",
-                       __func__, fcport->port_name, rport,
-                       rport->roles);
+               ql_dbg(ql_dbg_disc, fcport->vha, 0x210b,
+                   "%s %8phN. rport %p roles %x\n",
+                   __func__, fcport->port_name, rport,
+                   rport->roles);
 
                fc_remote_port_delete(rport);
        }
@@ -3900,7 +3900,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags)
        fcport->logout_on_delete = 1;
 
        if (!fcport->ct_desc.ct_sns) {
-               ql_log(ql_log_warn, vha, 0xffff,
+               ql_log(ql_log_warn, vha, 0xd049,
                    "Failed to allocate ct_sns request.\n");
                kfree(fcport);
                fcport = NULL;
@@ -4002,7 +4002,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
 
        if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {
                if (LOOP_TRANSITION(vha)) {
-                       ql_dbg(ql_dbg_disc, vha, 0x201e,
+                       ql_dbg(ql_dbg_disc, vha, 0x2099,
                            "Needs RSCN update and loop transition.\n");
                        rval = QLA_FUNCTION_FAILED;
                }
@@ -4102,7 +4102,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
        if (rval != QLA_SUCCESS)
                goto cleanup_allocation;
 
-       ql_dbg(ql_dbg_disc, vha, 0x2017,
+       ql_dbg(ql_dbg_disc, vha, 0x2011,
            "Entries in ID list (%d).\n", entries);
        ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2075,
            (uint8_t *)ha->gid_list,
@@ -4111,7 +4111,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
        /* Allocate temporary fcport for any new fcports discovered. */
        new_fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);
        if (new_fcport == NULL) {
-               ql_log(ql_log_warn, vha, 0x2018,
+               ql_log(ql_log_warn, vha, 0x2012,
                    "Memory allocation failed for fcport.\n");
                rval = QLA_MEMORY_ALLOC_FAILED;
                goto cleanup_allocation;
@@ -4126,7 +4126,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
                    fcport->port_type != FCT_BROADCAST &&
                    (fcport->flags & FCF_FABRIC_DEVICE) == 0) {
 
-                       ql_dbg(ql_dbg_disc, vha, 0x2019,
+                       ql_dbg(ql_dbg_disc, vha, 0x2096,
                            "Marking port lost loop_id=0x%04x.\n",
                            fcport->loop_id);
 
@@ -4171,11 +4171,11 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
 
                rval2 = qla2x00_get_port_database(vha, new_fcport, 0);
                if (rval2 != QLA_SUCCESS) {
-                       ql_dbg(ql_dbg_disc, vha, 0x201a,
+                       ql_dbg(ql_dbg_disc, vha, 0x2097,
                            "Failed to retrieve fcport information "
                            "-- get_port_database=%x, loop_id=0x%04x.\n",
                            rval2, new_fcport->loop_id);
-                       ql_dbg(ql_dbg_disc, vha, 0x201b,
+                       ql_dbg(ql_dbg_disc, vha, 0x2105,
                            "Scheduling resync.\n");
                        set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
                        continue;
@@ -4224,7 +4224,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
                        new_fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);
 
                        if (new_fcport == NULL) {
-                               ql_log(ql_log_warn, vha, 0x201c,
+                               ql_log(ql_log_warn, vha, 0xd031,
                                    "Failed to allocate memory for fcport.\n");
                                rval = QLA_MEMORY_ALLOC_FAILED;
                                goto cleanup_allocation;
@@ -4247,7 +4247,7 @@ cleanup_allocation:
        kfree(new_fcport);
 
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_disc, vha, 0x201d,
+               ql_dbg(ql_dbg_disc, vha, 0x2098,
                    "Configure local loop error exit: rval=%x.\n", rval);
        }
 
@@ -4317,10 +4317,10 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
        if (fcport->port_type == FCT_TARGET)
                rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "%s %8phN. rport %p is %s mode \n",
-               __func__, fcport->port_name, rport,
-               (fcport->port_type == FCT_TARGET) ? "tgt" : "ini");
+       ql_dbg(ql_dbg_disc, vha, 0x20ee,
+           "%s %8phN. rport %p is %s mode\n",
+           __func__, fcport->port_name, rport,
+           (fcport->port_type == FCT_TARGET) ? "tgt" : "ini");
 
        fc_remote_port_rolechg(rport, rport_ids.roles);
 }
@@ -4348,7 +4348,7 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
        if (IS_SW_RESV_ADDR(fcport->d_id))
                return;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %8phC \n",
+       ql_dbg(ql_dbg_disc, vha, 0x20ef, "%s %8phC\n",
            __func__, fcport->port_name);
 
        if (IS_QLAFX00(vha->hw)) {
@@ -4415,7 +4415,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                loop_id = SNS_FL_PORT;
        rval = qla2x00_get_port_name(vha, loop_id, vha->fabric_node_name, 1);
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_disc, vha, 0x201f,
+               ql_dbg(ql_dbg_disc, vha, 0x20a0,
                    "MBX_GET_PORT_NAME failed, No FL Port.\n");
 
                vha->device_flags &= ~SWITCH_FOUND;
@@ -4453,7 +4453,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                        return rval;
                }
                if (mb[0] != MBS_COMMAND_COMPLETE) {
-                       ql_dbg(ql_dbg_disc, vha, 0x2042,
+                       ql_dbg(ql_dbg_disc, vha, 0x20a1,
                            "Failed SNS login: loop_id=%x mb[0]=%x mb[1]=%x mb[2]=%x "
                            "mb[6]=%x mb[7]=%x.\n", loop_id, mb[0], mb[1],
                            mb[2], mb[6], mb[7]);
@@ -4463,7 +4463,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                if (test_and_clear_bit(REGISTER_FC4_NEEDED, &vha->dpc_flags)) {
                        if (qla2x00_rft_id(vha)) {
                                /* EMPTY */
-                               ql_dbg(ql_dbg_disc, vha, 0x2045,
+                               ql_dbg(ql_dbg_disc, vha, 0x20a2,
                                    "Register FC-4 TYPE failed.\n");
                                if (test_bit(LOOP_RESYNC_NEEDED,
                                    &vha->dpc_flags))
@@ -4471,7 +4471,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                        }
                        if (qla2x00_rff_id(vha)) {
                                /* EMPTY */
-                               ql_dbg(ql_dbg_disc, vha, 0x2049,
+                               ql_dbg(ql_dbg_disc, vha, 0x209a,
                                    "Register FC-4 Features failed.\n");
                                if (test_bit(LOOP_RESYNC_NEEDED,
                                    &vha->dpc_flags))
@@ -4479,14 +4479,14 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                        }
                        if (qla2x00_rnn_id(vha)) {
                                /* EMPTY */
-                               ql_dbg(ql_dbg_disc, vha, 0x204f,
+                               ql_dbg(ql_dbg_disc, vha, 0x2104,
                                    "Register Node Name failed.\n");
                                if (test_bit(LOOP_RESYNC_NEEDED,
                                    &vha->dpc_flags))
                                        break;
                        } else if (qla2x00_rsnn_nn(vha)) {
                                /* EMPTY */
-                               ql_dbg(ql_dbg_disc, vha, 0x2053,
+                               ql_dbg(ql_dbg_disc, vha, 0x209b,
                                    "Register Symobilic Node Name failed.\n");
                                if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
                                        break;
@@ -4555,7 +4555,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
        swl = ha->swl;
        if (!swl) {
                /*EMPTY*/
-               ql_dbg(ql_dbg_disc, vha, 0x2054,
+               ql_dbg(ql_dbg_disc, vha, 0x209c,
                    "GID_PT allocations failed, fallback on GA_NXT.\n");
        } else {
                memset(swl, 0, ha->max_fibre_devices * sizeof(sw_info_t));
@@ -4589,7 +4589,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
        /* Allocate temporary fcport for any new fcports discovered. */
        new_fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);
        if (new_fcport == NULL) {
-               ql_log(ql_log_warn, vha, 0x205e,
+               ql_log(ql_log_warn, vha, 0x209d,
                    "Failed to allocate memory for fcport.\n");
                return (QLA_MEMORY_ALLOC_FAILED);
        }
@@ -4636,7 +4636,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                        /* Send GA_NXT to the switch */
                        rval = qla2x00_ga_nxt(vha, new_fcport);
                        if (rval != QLA_SUCCESS) {
-                               ql_log(ql_log_warn, vha, 0x2064,
+                               ql_log(ql_log_warn, vha, 0x209e,
                                    "SNS scan failed -- assuming "
                                    "zero-entry result.\n");
                                rval = QLA_SUCCESS;
@@ -4649,7 +4649,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                        wrap.b24 = new_fcport->d_id.b24;
                        first_dev = 0;
                } else if (new_fcport->d_id.b24 == wrap.b24) {
-                       ql_dbg(ql_dbg_disc, vha, 0x2065,
+                       ql_dbg(ql_dbg_disc, vha, 0x209f,
                            "Device wrap (%02x%02x%02x).\n",
                            new_fcport->d_id.b.domain,
                            new_fcport->d_id.b.area,
@@ -4761,7 +4761,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                nxt_d_id.b24 = new_fcport->d_id.b24;
                new_fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);
                if (new_fcport == NULL) {
-                       ql_log(ql_log_warn, vha, 0x2066,
+                       ql_log(ql_log_warn, vha, 0xd032,
                            "Memory allocation failed for fcport.\n");
                        return (QLA_MEMORY_ALLOC_FAILED);
                }
@@ -4792,7 +4792,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                                    (fcport->flags & FCF_FCP2_DEVICE) == 0 &&
                                    fcport->port_type != FCT_INITIATOR &&
                                    fcport->port_type != FCT_BROADCAST) {
-                                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                                       ql_dbg(ql_dbg_disc, vha, 0x20f0,
                                            "%s %d %8phC post del sess\n",
                                            __func__, __LINE__,
                                            fcport->port_name);
@@ -7367,10 +7367,10 @@ qla81xx_update_fw_options(scsi_qla_host_t *vha)
                ha->fw_options[2] |= BIT_9;
        }
 
-       ql_dbg(ql_dbg_init, vha, 0xffff,
-               "%s, add FW options 1-3 = 0x%04x 0x%04x 0x%04x mode %x\n",
-               __func__, ha->fw_options[1], ha->fw_options[2],
-               ha->fw_options[3], vha->host->active_mode);
+       ql_dbg(ql_dbg_init, vha, 0x00e9,
+           "%s, add FW options 1-3 = 0x%04x 0x%04x 0x%04x mode %x\n",
+           __func__, ha->fw_options[1], ha->fw_options[2],
+           ha->fw_options[3], vha->host->active_mode);
 
        qla2x00_set_fw_options(vha, ha->fw_options);
 }
@@ -7599,7 +7599,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int v
                        if (msix->in_use)
                                continue;
                        qpair->msix = msix;
-                       ql_log(ql_dbg_multiq, vha, 0xc00f,
+                       ql_dbg(ql_dbg_multiq, vha, 0xc00f,
                            "Vector %x selected for qpair\n", msix->vector);
                        break;
                }
@@ -7642,7 +7642,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, int v
 
                qpair->srb_mempool = mempool_create_slab_pool(SRB_MIN_REQ, srb_cachep);
                if (!qpair->srb_mempool) {
-                       ql_log(ql_log_warn, vha, 0x0191,
+                       ql_log(ql_log_warn, vha, 0xd036,
                            "Failed to create srb mempool for qpair %d\n",
                            qpair->id);
                        goto fail_mempool;
index 1eb46eb450050e36ec23c98ac085b503fad178df..2984abcc29e7a5d639336c0dc8d8168116803f0f 100644 (file)
@@ -829,7 +829,7 @@ skip_rio:
                                        fc_host_port_name(vha->host) =
                                            wwn_to_u64(vha->port_name);
                                        ql_dbg(ql_dbg_init + ql_dbg_verbose,
-                                           vha, 0x0144, "LOOP DOWN detected,"
+                                           vha, 0x00d8, "LOOP DOWN detected,"
                                            "restore WWPN %016llx\n",
                                            wwn_to_u64(vha->port_name));
                                }
@@ -1718,7 +1718,7 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
        case LSC_SCODE_NOXCB:
                vha->hw->exch_starvation++;
                if (vha->hw->exch_starvation > 5) {
-                       ql_log(ql_log_warn, vha, 0xffff,
+                       ql_log(ql_log_warn, vha, 0xd046,
                            "Exchange starvation. Resetting RISC\n");
 
                        vha->hw->exch_starvation = 0;
@@ -2391,8 +2391,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                            ((unsigned)(scsi_bufflen(cp) - resid) <
                             cp->underflow)) {
                                ql_dbg(ql_dbg_io, fcport->vha, 0x301a,
-                                   "Mid-layer underflow "
-                                   "detected (0x%x of 0x%x bytes).\n",
+                                   "Mid-layer underflow detected (0x%x of 0x%x bytes).\n",
                                    resid, scsi_bufflen(cp));
 
                                res = DID_ERROR << 16;
@@ -2425,8 +2424,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                if (scsi_status & SS_RESIDUAL_UNDER) {
                        if (IS_FWI2_CAPABLE(ha) && fw_resid_len != resid_len) {
                                ql_dbg(ql_dbg_io, fcport->vha, 0x301d,
-                                   "Dropped frame(s) detected "
-                                   "(0x%x of 0x%x bytes).\n",
+                                   "Dropped frame(s) detected (0x%x of 0x%x bytes).\n",
                                    resid, scsi_bufflen(cp));
 
                                res = DID_ERROR << 16 | lscsi_status;
@@ -2437,8 +2435,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                            ((unsigned)(scsi_bufflen(cp) - resid) <
                            cp->underflow)) {
                                ql_dbg(ql_dbg_io, fcport->vha, 0x301e,
-                                   "Mid-layer underflow "
-                                   "detected (0x%x of 0x%x bytes).\n",
+                                   "Mid-layer underflow detected (0x%x of 0x%x bytes).\n",
                                    resid, scsi_bufflen(cp));
 
                                res = DID_ERROR << 16;
@@ -2452,9 +2449,8 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                         */
 
                        ql_dbg(ql_dbg_io, fcport->vha, 0x301f,
-                           "Dropped frame(s) detected (0x%x "
-                           "of 0x%x bytes).\n", resid,
-                           scsi_bufflen(cp));
+                           "Dropped frame(s) detected (0x%x of 0x%x bytes).\n",
+                           resid, scsi_bufflen(cp));
 
                        res = DID_ERROR << 16 | lscsi_status;
                        goto check_scsi_status;
index fffa1f7cd8d28e5d568438d3fd28ed35bb84431d..5e74600b99c2aed545682ed98fc4e88c52fe8276 100644 (file)
@@ -126,7 +126,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
        /* if PCI error, then avoid mbx processing.*/
        if (test_bit(PFLG_DISCONNECTED, &base_vha->dpc_flags) &&
            test_bit(UNLOADING, &base_vha->dpc_flags)) {
-               ql_log(ql_log_warn, vha, 0x1191,
+               ql_log(ql_log_warn, vha, 0xd04e,
                    "PCI error, exiting.\n");
                return QLA_FUNCTION_TIMEOUT;
        }
@@ -170,7 +170,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         */
        if (!wait_for_completion_timeout(&ha->mbx_cmd_comp, mcp->tov * HZ)) {
                /* Timeout occurred. Return error. */
-               ql_log(ql_log_warn, vha, 0x1005,
+               ql_log(ql_log_warn, vha, 0xd035,
                    "Cmd access timeout, cmd=0x%x, Exiting.\n",
                    mcp->mb[0]);
                return QLA_FUNCTION_TIMEOUT;
@@ -318,7 +318,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                        mcp->mb[0] = MBS_LINK_DOWN_ERROR;
                        ha->mcp = NULL;
                        rval = QLA_FUNCTION_FAILED;
-                       ql_log(ql_log_warn, vha, 0x1015,
+                       ql_log(ql_log_warn, vha, 0xd048,
                            "FW hung = %d.\n", ha->flags.isp82xx_fw_hung);
                        goto premature_exit;
                }
@@ -360,7 +360,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                        host_status = RD_REG_DWORD(&reg->isp24.host_status);
                        hccr = RD_REG_DWORD(&reg->isp24.hccr);
 
-                       ql_log(ql_log_warn, vha, 0x1119,
+                       ql_log(ql_log_warn, vha, 0xd04c,
                            "MBX Command timeout for cmd %x, iocontrol=%x jiffies=%lx "
                            "mb[0-3]=[0x%x 0x%x 0x%x 0x%x] mb7 0x%x host_status 0x%x hccr 0x%x\n",
                            command, ictrl, jiffies, mb[0], mb[1], mb[2], mb[3],
@@ -3212,7 +3212,7 @@ qla8044_write_serdes_word(scsi_qla_host_t *vha, uint32_t addr, uint32_t data)
        if (!IS_QLA8044(vha->hw))
                return QLA_FUNCTION_FAILED;
 
-       ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1186,
+       ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x11a0,
            "Entered %s.\n", __func__);
 
        mcp->mb[0] = MBC_SET_GET_ETH_SERDES_REG;
@@ -3228,7 +3228,7 @@ qla8044_write_serdes_word(scsi_qla_host_t *vha, uint32_t addr, uint32_t data)
        rval = qla2x00_mailbox_command(vha, mcp);
 
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_mbx, vha, 0x1187,
+               ql_dbg(ql_dbg_mbx, vha, 0x11a1,
                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
        } else {
                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1188,
@@ -3712,12 +3712,12 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
                set_bit(VP_DPC_NEEDED, &vha->dpc_flags);
                qla2xxx_wake_dpc(vha);
        } else if (rptid_entry->format == 2) {
-               ql_dbg(ql_dbg_async, vha, 0xffff,
+               ql_dbg(ql_dbg_async, vha, 0x505f,
                    "RIDA: format 2/N2N Primary port id %02x%02x%02x.\n",
                    rptid_entry->port_id[2], rptid_entry->port_id[1],
                    rptid_entry->port_id[0]);
 
-               ql_dbg(ql_dbg_async, vha, 0xffff,
+               ql_dbg(ql_dbg_async, vha, 0x5075,
                    "N2N: Remote WWPN %8phC.\n",
                    rptid_entry->u.f2.port_name);
 
@@ -5789,7 +5789,7 @@ qla26xx_dport_diagnostics(scsi_qla_host_t *vha,
        if (!IS_QLA83XX(vha->hw) && !IS_QLA27XX(vha->hw))
                return QLA_FUNCTION_FAILED;
 
-       ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1192,
+       ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x119f,
            "Entered %s.\n", __func__);
 
        dd_dma = dma_map_single(&vha->hw->pdev->dev,
@@ -5871,13 +5871,13 @@ int qla24xx_send_mb_cmd(struct scsi_qla_host *vha, mbx_cmd_t *mcp)
 
        rval = qla2x00_start_sp(sp);
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_mbx, vha, 0xffff,
+               ql_dbg(ql_dbg_mbx, vha, 0x1018,
                    "%s: %s Failed submission. %x.\n",
                    __func__, sp->name, rval);
                goto done_free_sp;
        }
 
-       ql_dbg(ql_dbg_mbx, vha, 0xffff, "MB:%s hndl %x submitted\n",
+       ql_dbg(ql_dbg_mbx, vha, 0x113f, "MB:%s hndl %x submitted\n",
            sp->name, sp->handle);
 
        wait_for_completion(&c->u.mbx.comp);
@@ -5886,16 +5886,16 @@ int qla24xx_send_mb_cmd(struct scsi_qla_host *vha, mbx_cmd_t *mcp)
        rval = c->u.mbx.rc;
        switch (rval) {
        case QLA_FUNCTION_TIMEOUT:
-               ql_dbg(ql_dbg_mbx, vha, 0xffff, "%s: %s Timeout. %x.\n",
+               ql_dbg(ql_dbg_mbx, vha, 0x1140, "%s: %s Timeout. %x.\n",
                    __func__, sp->name, rval);
                break;
        case  QLA_SUCCESS:
-               ql_dbg(ql_dbg_mbx, vha, 0xffff, "%s: %s done.\n",
+               ql_dbg(ql_dbg_mbx, vha, 0x119d, "%s: %s done.\n",
                    __func__, sp->name);
                sp->free(sp);
                break;
        default:
-               ql_dbg(ql_dbg_mbx, vha, 0xffff, "%s: %s Failed. %x.\n",
+               ql_dbg(ql_dbg_mbx, vha, 0x119e, "%s: %s Failed. %x.\n",
                    __func__, sp->name, rval);
                sp->free(sp);
                break;
@@ -5926,8 +5926,8 @@ int qla24xx_gpdb_wait(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)
 
        pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma);
        if (pd  == NULL) {
-               ql_log(ql_log_warn, vha, 0xffff,
-                       "Failed to allocate port database structure.\n");
+               ql_log(ql_log_warn, vha, 0xd047,
+                   "Failed to allocate port database structure.\n");
                goto done_free_sp;
        }
        memset(pd, 0, max(PORT_DATABASE_SIZE, PORT_DATABASE_24XX_SIZE));
@@ -5944,14 +5944,14 @@ int qla24xx_gpdb_wait(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)
 
        rval = qla24xx_send_mb_cmd(vha, &mc);
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_mbx, vha, 0xffff,
+               ql_dbg(ql_dbg_mbx, vha, 0x1193,
                    "%s: %8phC fail\n", __func__, fcport->port_name);
                goto done_free_sp;
        }
 
        rval = __qla24xx_parse_gpdb(vha, fcport, pd);
 
-       ql_dbg(ql_dbg_mbx, vha, 0xffff, "%s: %8phC done\n",
+       ql_dbg(ql_dbg_mbx, vha, 0x1197, "%s: %8phC done\n",
            __func__, fcport->port_name);
 
 done_free_sp:
@@ -5970,10 +5970,10 @@ int __qla24xx_parse_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport,
        /* Check for logged in state. */
        if (pd->current_login_state != PDS_PRLI_COMPLETE &&
                pd->last_login_state != PDS_PRLI_COMPLETE) {
-               ql_dbg(ql_dbg_mbx, vha, 0xffff,
-                          "Unable to verify login-state (%x/%x) for "
-                          "loop_id %x.\n", pd->current_login_state,
-                          pd->last_login_state, fcport->loop_id);
+               ql_dbg(ql_dbg_mbx, vha, 0x119a,
+                   "Unable to verify login-state (%x/%x) for loop_id %x.\n",
+                   pd->current_login_state, pd->last_login_state,
+                   fcport->loop_id);
                rval = QLA_FUNCTION_FAILED;
                goto gpd_error_out;
        }
@@ -6039,12 +6039,12 @@ int qla24xx_gidlist_wait(struct scsi_qla_host *vha,
 
        rval = qla24xx_send_mb_cmd(vha, &mc);
        if (rval != QLA_SUCCESS) {
-               ql_dbg(ql_dbg_mbx, vha, 0xffff,
-                       "%s:  fail\n", __func__);
+               ql_dbg(ql_dbg_mbx, vha, 0x119b,
+                   "%s:  fail\n", __func__);
        } else {
                *entries = mc.mb[1];
-               ql_dbg(ql_dbg_mbx, vha, 0xffff,
-                       "%s:  done\n", __func__);
+               ql_dbg(ql_dbg_mbx, vha, 0x119c,
+                   "%s:  done\n", __func__);
        }
 done:
        return rval;
index 79f050256c55c735c612c4553124ccf9e80fda0c..cca6acaed08705394991900b5e819fab0f7d4e78 100644 (file)
@@ -377,7 +377,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,
                }
                ha->base_qpair = kzalloc(sizeof(struct qla_qpair), GFP_KERNEL);
                if (ha->base_qpair == NULL) {
-                       ql_log(ql_log_warn, vha, 0x0182,
+                       ql_log(ql_log_warn, vha, 0x00e0,
                            "Failed to allocate base queue pair memory.\n");
                        goto fail_base_qpair;
                }
@@ -1062,9 +1062,9 @@ static inline int test_fcport_count(scsi_qla_host_t *vha)
        int res;
 
        spin_lock_irqsave(&ha->tgt.sess_lock, flags);
-       ql_dbg(ql_dbg_init, vha, 0xffff,
-               "tgt %p, fcport_count=%d\n",
-               vha, vha->fcport_count);
+       ql_dbg(ql_dbg_init, vha, 0x00ec,
+           "tgt %p, fcport_count=%d\n",
+           vha, vha->fcport_count);
        res = (vha->fcport_count == 0);
        spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
 
@@ -1975,7 +1975,7 @@ qla83xx_iospace_config(struct qla_hw_data *ha)
                        /* Queue pairs is the max value minus
                         * the base queue pair */
                        ha->max_qpairs = ha->max_req_queues - 1;
-                       ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0190,
+                       ql_dbg_pci(ql_dbg_init, ha->pdev, 0x00e3,
                            "Max no of queues pairs: %d.\n", ha->max_qpairs);
                }
                ql_log_pci(ql_log_info, ha->pdev, 0x011c,
@@ -3601,10 +3601,10 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,
        } else {
                int now;
                if (rport) {
-                       ql_dbg(ql_dbg_disc, fcport->vha, 0xffff,
-                               "%s %8phN. rport %p roles %x \n",
-                               __func__, fcport->port_name, rport,
-                               rport->roles);
+                       ql_dbg(ql_dbg_disc, fcport->vha, 0x2109,
+                           "%s %8phN. rport %p roles %x\n",
+                           __func__, fcport->port_name, rport,
+                           rport->roles);
                        fc_remote_port_delete(rport);
                }
                qlt_do_generation_tick(vha, &now);
@@ -3649,7 +3649,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport,
        if (fcport->login_retry == 0) {
                fcport->login_retry = vha->hw->login_retry_count;
 
-               ql_dbg(ql_dbg_disc, vha, 0x2067,
+               ql_dbg(ql_dbg_disc, vha, 0x20a3,
                    "Port login retry %8phN, lid 0x%04x retry cnt=%d.\n",
                    fcport->port_name, fcport->loop_id, fcport->login_retry);
        }
@@ -3673,8 +3673,8 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
 {
        fc_port_t *fcport;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                  "Mark all dev lost\n");
+       ql_dbg(ql_dbg_disc, vha, 0x20f1,
+           "Mark all dev lost\n");
 
        list_for_each_entry(fcport, &vha->vp_fcports, list) {
                fcport->scan_state = 0;
@@ -4016,7 +4016,7 @@ qla2x00_set_exlogins_buffer(scsi_qla_host_t *vha)
        /* Now configure the dma buffer */
        rval = qla_set_exlogin_mem_cfg(vha, ha->exlogin_buf_dma);
        if (rval) {
-               ql_log(ql_log_fatal, vha, 0x00cf,
+               ql_log(ql_log_fatal, vha, 0xd033,
                    "Setup extended login buffer  ****FAILED****.\n");
                qla2x00_free_exlogin_buffer(ha);
        }
@@ -4303,7 +4303,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
        vha->gnl.l = dma_alloc_coherent(&ha->pdev->dev,
            vha->gnl.size, &vha->gnl.ldma, GFP_KERNEL);
        if (!vha->gnl.l) {
-               ql_log(ql_log_fatal, vha, 0xffff,
+               ql_log(ql_log_fatal, vha, 0xd04a,
                    "Alloc failed for name list.\n");
                scsi_remove_host(vha->host);
                return NULL;
@@ -4620,7 +4620,7 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                    fcport->login_retry && !(fcport->flags & FCF_ASYNC_SENT)) {
                        fcport->login_retry--;
                        if (fcport->flags & FCF_FABRIC_DEVICE) {
-                               ql_dbg(ql_dbg_disc, fcport->vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, fcport->vha, 0x2108,
                                    "%s %8phC DS %d LS %d\n", __func__,
                                    fcport->port_name, fcport->disc_state,
                                    fcport->fw_login_state);
index a1f33b06019d3a1fdb0c52070d67f58d587e3ded..4ad09584d4a8fb805d445896495955e169bcab03 100644 (file)
@@ -200,8 +200,8 @@ struct scsi_qla_host *qlt_find_host_by_d_id(struct scsi_qla_host *vha,
 
        host = btree_lookup32(&vha->hw->tgt.host_map, key);
        if (!host)
-               ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
-                          "Unable to find host %06x\n", key);
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005,
+                   "Unable to find host %06x\n", key);
 
        return host;
 }
@@ -252,19 +252,15 @@ static void qlt_queue_unknown_atio(scsi_qla_host_t *vha,
        unsigned long flags;
 
        if (tgt->tgt_stop) {
-               ql_dbg(ql_dbg_async, vha, 0xffff,
-                          "qla_target(%d): dropping unknown ATIO_TYPE7, "
-                          "because tgt is being stopped", vha->vp_idx);
+               ql_dbg(ql_dbg_async, vha, 0x502c,
+                   "qla_target(%d): dropping unknown ATIO_TYPE7, because tgt is being stopped",
+                   vha->vp_idx);
                goto out_term;
        }
 
        u = kzalloc(sizeof(*u), GFP_ATOMIC);
-       if (u == NULL) {
-               ql_dbg(ql_dbg_async, vha, 0xffff,
-                   "Alloc of struct unknown_atio (size %zd) failed", sizeof(*u));
-               /* It should be harmless and on the next retry should work well */
+       if (u == NULL)
                goto out_term;
-       }
 
        u->vha = vha;
        memcpy(&u->atio, atio, sizeof(*atio));
@@ -295,8 +291,8 @@ static void qlt_try_to_dequeue_unknown_atios(struct scsi_qla_host *vha,
 
        list_for_each_entry_safe(u, t, &vha->unknown_atio_list, cmd_list) {
                if (u->aborted) {
-                       ql_dbg(ql_dbg_async, vha, 0xffff,
-                           "Freeing unknown %s %p, because of Abort",
+                       ql_dbg(ql_dbg_async, vha, 0x502e,
+                           "Freeing unknown %s %p, because of Abort\n",
                            "ATIO_TYPE7", u);
                        qlt_send_term_exchange(vha, NULL, &u->atio,
                            ha_locked, 0);
@@ -305,19 +301,18 @@ static void qlt_try_to_dequeue_unknown_atios(struct scsi_qla_host *vha,
 
                host = qlt_find_host_by_d_id(vha, u->atio.u.isp24.fcp_hdr.d_id);
                if (host != NULL) {
-                       ql_dbg(ql_dbg_async, vha, 0xffff,
-                               "Requeuing unknown ATIO_TYPE7 %p", u);
+                       ql_dbg(ql_dbg_async, vha, 0x502f,
+                           "Requeuing unknown ATIO_TYPE7 %p\n", u);
                        qlt_24xx_atio_pkt(host, &u->atio, ha_locked);
                } else if (tgt->tgt_stop) {
-                       ql_dbg(ql_dbg_async, vha, 0xffff,
-                               "Freeing unknown %s %p, because tgt is being stopped",
-                               "ATIO_TYPE7", u);
+                       ql_dbg(ql_dbg_async, vha, 0x503a,
+                           "Freeing unknown %s %p, because tgt is being stopped\n",
+                           "ATIO_TYPE7", u);
                        qlt_send_term_exchange(vha, NULL, &u->atio,
                            ha_locked, 0);
                } else {
-                       ql_dbg(ql_dbg_async, vha, 0xffff,
-                               "u %p, vha %p, host %p, sched again..", u,
-                               vha, host);
+                       ql_dbg(ql_dbg_async, vha, 0x503d,
+                           "Reschedule u %p, vha %p, host %p\n", u, vha, host);
                        if (!queued) {
                                queued = 1;
                                schedule_delayed_work(&vha->unknown_atio_work,
@@ -411,7 +406,7 @@ static bool qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
                unsigned long flags;
 
                if (unlikely(!host)) {
-                       ql_dbg(ql_dbg_tgt, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt, vha, 0xe00a,
                            "qla_target(%d): Response pkt (ABTS_RECV_24XX) "
                            "received, with unknown vp_index %d\n",
                            vha->vp_idx, entry->vp_index);
@@ -565,9 +560,9 @@ void qla2x00_async_nack_sp_done(void *s, int res)
        struct scsi_qla_host *vha = sp->vha;
        unsigned long flags;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async done-%s res %x %8phC  type %d\n",
-               sp->name, res, sp->fcport->port_name, sp->type);
+       ql_dbg(ql_dbg_disc, vha, 0x20f2,
+           "Async done-%s res %x %8phC  type %d\n",
+           sp->name, res, sp->fcport->port_name, sp->type);
 
        spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
        sp->fcport->flags &= ~FCF_ASYNC_SENT;
@@ -593,19 +588,19 @@ void qla2x00_async_nack_sp_done(void *s, int res)
 
                        if (!IS_IIDMA_CAPABLE(vha->hw) ||
                            !vha->hw->flags.gpsc_supported) {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                                       "%s %d %8phC post upd_fcport fcp_cnt %d\n",
-                                       __func__, __LINE__,
-                                       sp->fcport->port_name,
-                                       vha->fcport_count);
+                               ql_dbg(ql_dbg_disc, vha, 0x20f3,
+                                   "%s %d %8phC post upd_fcport fcp_cnt %d\n",
+                                   __func__, __LINE__,
+                                   sp->fcport->port_name,
+                                   vha->fcport_count);
 
                                qla24xx_post_upd_fcport_work(vha, sp->fcport);
                        } else {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                                       "%s %d %8phC post gpsc fcp_cnt %d\n",
-                                       __func__, __LINE__,
-                                       sp->fcport->port_name,
-                                       vha->fcport_count);
+                               ql_dbg(ql_dbg_disc, vha, 0x20f5,
+                                   "%s %d %8phC post gpsc fcp_cnt %d\n",
+                                   __func__, __LINE__,
+                                   sp->fcport->port_name,
+                                   vha->fcport_count);
 
                                qla24xx_post_gpsc_work(vha, sp->fcport);
                        }
@@ -664,9 +659,9 @@ int qla24xx_async_notify_ack(scsi_qla_host_t *vha, fc_port_t *fcport,
        if (rval != QLA_SUCCESS)
                goto done_free_sp;
 
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-               "Async-%s %8phC hndl %x %s\n",
-               sp->name, fcport->port_name, sp->handle, c);
+       ql_dbg(ql_dbg_disc, vha, 0x20f4,
+           "Async-%s %8phC hndl %x %s\n",
+           sp->name, fcport->port_name, sp->handle, c);
 
        return rval;
 
@@ -688,7 +683,7 @@ void qla24xx_do_nack_work(struct scsi_qla_host *vha, struct qla_work_evt *e)
                t = qlt_create_sess(vha, e->u.nack.fcport, 0);
                mutex_unlock(&vha->vha_tgt.tgt_mutex);
                if (t) {
-                       ql_log(ql_log_info, vha, 0xffff,
+                       ql_log(ql_log_info, vha, 0xd034,
                            "%s create sess success %p", __func__, t);
                        spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
                        /* create sess has an extra kref */
@@ -757,7 +752,7 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
                }
 
                if (!kref_get_unless_zero(&sess->sess_kref)) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x2107,
                            "%s: kref_get fail sess %8phC \n",
                            __func__, sess->port_name);
                        spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
@@ -1098,7 +1093,7 @@ void qlt_unreg_sess(struct fc_port *sess)
 {
        struct scsi_qla_host *vha = sess->vha;
 
-       ql_dbg(ql_dbg_disc, sess->vha, 0xffff,
+       ql_dbg(ql_dbg_disc, sess->vha, 0x210a,
            "%s sess %p for deletion %8phC\n",
            __func__, sess, sess->port_name);
 
@@ -1288,7 +1283,7 @@ static struct fc_port *qlt_create_sess(
 
        if (fcport->se_sess) {
                if (!kref_get_unless_zero(&sess->sess_kref)) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x20f6,
                            "%s: kref_get_unless_zero failed for %8phC\n",
                            __func__, sess->port_name);
                        return NULL;
@@ -1310,7 +1305,7 @@ static struct fc_port *qlt_create_sess(
 
        if (ha->tgt.tgt_ops->check_initiator_node_acl(vha,
            &fcport->port_name[0], sess) < 0) {
-               ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf015,
                    "(%d) %8phC check_initiator_node_acl failed\n",
                    vha->vp_idx, fcport->port_name);
                return NULL;
@@ -1321,7 +1316,7 @@ static struct fc_port *qlt_create_sess(
                 * fc_port access across ->tgt.sess_lock reaquire.
                 */
                if (!kref_get_unless_zero(&sess->sess_kref)) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x20f7,
                            "%s: kref_get_unless_zero failed for %8phC\n",
                            __func__, sess->port_name);
                        return NULL;
@@ -2139,7 +2134,7 @@ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)
                    ELS_PRLO ||
                    mcmd->orig_iocb.imm_ntfy.u.isp24.status_subcode ==
                    ELS_TPRLO) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x2106,
                            "TM response logo %phC status %#x state %#x",
                            mcmd->sess->port_name, mcmd->fc_tm_rsp,
                            mcmd->flags);
@@ -2497,35 +2492,35 @@ static void qlt_print_dif_err(struct qla_tgt_prm *prm)
                /* ASCQ */
                switch (prm->sense_buffer[13]) {
                case 1:
-                       ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_dif, vha, 0xe00b,
                            "BE detected Guard TAG ERR: lba[0x%llx|%lld] len[0x%x] "
                            "se_cmd=%p tag[%x]",
                            cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd,
                            cmd->atio.u.isp24.exchange_addr);
                        break;
                case 2:
-                       ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_dif, vha, 0xe00c,
                            "BE detected APP TAG ERR: lba[0x%llx|%lld] len[0x%x] "
                            "se_cmd=%p tag[%x]",
                            cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd,
                            cmd->atio.u.isp24.exchange_addr);
                        break;
                case 3:
-                       ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_dif, vha, 0xe00f,
                            "BE detected REF TAG ERR: lba[0x%llx|%lld] len[0x%x] "
                            "se_cmd=%p tag[%x]",
                            cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd,
                            cmd->atio.u.isp24.exchange_addr);
                        break;
                default:
-                       ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_dif, vha, 0xe010,
                            "BE detected Dif ERR: lba[%llx|%lld] len[%x] "
                            "se_cmd=%p tag[%x]",
                            cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd,
                            cmd->atio.u.isp24.exchange_addr);
                        break;
                }
-               ql_dump_buffer(ql_dbg_tgt_dif, vha, 0xffff, cmd->cdb, 16);
+               ql_dump_buffer(ql_dbg_tgt_dif, vha, 0xe011, cmd->cdb, 16);
        }
 }
 
@@ -3285,15 +3280,12 @@ qlt_handle_dif_error(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd,
 
        /* check appl tag */
        if (cmd->e_app_tag != cmd->a_app_tag) {
-               ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
-                       "App Tag ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] "
-                       "Ref[%x|%x], App[%x|%x], "
-                       "Guard [%x|%x] cmd=%p ox_id[%04x]",
-                       cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks,
-                       cmd->a_ref_tag, cmd->e_ref_tag,
-                       cmd->a_app_tag, cmd->e_app_tag,
-                       cmd->a_guard, cmd->e_guard,
-                       cmd, cmd->atio.u.isp24.fcp_hdr.ox_id);
+               ql_dbg(ql_dbg_tgt_dif, vha, 0xe00d,
+                   "App Tag ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] Ref[%x|%x], App[%x|%x], Guard [%x|%x] cmd=%p ox_id[%04x]",
+                   cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks,
+                   cmd->a_ref_tag, cmd->e_ref_tag, cmd->a_app_tag,
+                   cmd->e_app_tag, cmd->a_guard, cmd->e_guard, cmd,
+                   cmd->atio.u.isp24.fcp_hdr.ox_id);
 
                cmd->dif_err_code = DIF_ERR_APP;
                scsi_status = SAM_STAT_CHECK_CONDITION;
@@ -3304,15 +3296,12 @@ qlt_handle_dif_error(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd,
 
        /* check ref tag */
        if (cmd->e_ref_tag != cmd->a_ref_tag) {
-               ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
-                       "Ref Tag ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] "
-                       "Ref[%x|%x], App[%x|%x], "
-                       "Guard[%x|%x] cmd=%p ox_id[%04x] ",
-                       cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks,
-                       cmd->a_ref_tag, cmd->e_ref_tag,
-                       cmd->a_app_tag, cmd->e_app_tag,
-                       cmd->a_guard, cmd->e_guard,
-                       cmd, cmd->atio.u.isp24.fcp_hdr.ox_id);
+               ql_dbg(ql_dbg_tgt_dif, vha, 0xe00e,
+                   "Ref Tag ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] Ref[%x|%x], App[%x|%x], Guard[%x|%x] cmd=%p ox_id[%04x] ",
+                   cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks,
+                   cmd->a_ref_tag, cmd->e_ref_tag, cmd->a_app_tag,
+                   cmd->e_app_tag, cmd->a_guard, cmd->e_guard, cmd,
+                   cmd->atio.u.isp24.fcp_hdr.ox_id);
 
                cmd->dif_err_code = DIF_ERR_REF;
                scsi_status = SAM_STAT_CHECK_CONDITION;
@@ -3324,15 +3313,13 @@ qlt_handle_dif_error(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd,
 
        /* check guard */
        if (cmd->e_guard != cmd->a_guard) {
-               ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
-                       "Guard ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] "
-                       "Ref[%x|%x], App[%x|%x], "
-                       "Guard [%x|%x] cmd=%p ox_id[%04x]",
-                       cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks,
-                       cmd->a_ref_tag, cmd->e_ref_tag,
-                       cmd->a_app_tag, cmd->e_app_tag,
-                       cmd->a_guard, cmd->e_guard,
-                       cmd, cmd->atio.u.isp24.fcp_hdr.ox_id);
+               ql_dbg(ql_dbg_tgt_dif, vha, 0xe012,
+                   "Guard ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] Ref[%x|%x], App[%x|%x], Guard [%x|%x] cmd=%p ox_id[%04x]",
+                   cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks,
+                   cmd->a_ref_tag, cmd->e_ref_tag, cmd->a_app_tag,
+                   cmd->e_app_tag, cmd->a_guard, cmd->e_guard, cmd,
+                   cmd->atio.u.isp24.fcp_hdr.ox_id);
+
                cmd->dif_err_code = DIF_ERR_GRD;
                scsi_status = SAM_STAT_CHECK_CONDITION;
                sense_key = ABORTED_COMMAND;
@@ -3450,8 +3437,10 @@ done:
                spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
 }
 
-/* If hardware_lock held on entry, might drop it, then reaquire */
-/* This function sends the appropriate CTIO to ISP 2xxx or 24xx */
+/*
+ * If hardware_lock held on entry, might drop it, then reaquire
+ * This function sends the appropriate CTIO to ISP 2xxx or 24xx
+ */
 static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
        struct qla_tgt_cmd *cmd,
        struct atio_from_isp *atio)
@@ -3462,7 +3451,7 @@ static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
        int ret = 0;
        uint16_t temp;
 
-       ql_dbg(ql_dbg_tgt, vha, 0xe01c, "Sending TERM EXCH CTIO (ha=%p)\n", ha);
+       ql_dbg(ql_dbg_tgt, vha, 0xe009, "Sending TERM EXCH CTIO (ha=%p)\n", ha);
 
        pkt = (request_t *)qla2x00_alloc_iocbs_ready(vha, NULL);
        if (pkt == NULL) {
@@ -3615,10 +3604,10 @@ int qlt_abort_cmd(struct qla_tgt_cmd *cmd)
                 *  1) XFER Rdy completion + CMD_T_ABORT
                 *  2) TCM TMR - drain_state_list
                 */
-               ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
-                       "multiple abort. %p transport_state %x, t_state %x,"
-                       " se_cmd_flags %x \n", cmd, cmd->se_cmd.transport_state,
-                       cmd->se_cmd.t_state,cmd->se_cmd.se_cmd_flags);
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf016,
+                   "multiple abort. %p transport_state %x, t_state %x, "
+                   "se_cmd_flags %x\n", cmd, cmd->se_cmd.transport_state,
+                   cmd->se_cmd.t_state, cmd->se_cmd.se_cmd_flags);
                return EIO;
        }
        cmd->aborted = 1;
@@ -3670,7 +3659,7 @@ static int qlt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio,
        int term = 0;
 
        if (cmd->se_cmd.prot_op)
-               ql_dbg(ql_dbg_tgt_dif, vha, 0xffff,
+               ql_dbg(ql_dbg_tgt_dif, vha, 0xe013,
                    "Term DIF cmd: lba[0x%llx|%lld] len[0x%x] "
                    "se_cmd=%p tag[%x] op %#x/%s",
                     cmd->lba, cmd->lba,
@@ -3884,7 +3873,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
                                 */
                                cmd->sess->logout_on_delete = 0;
                                cmd->sess->send_els_logo = 1;
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x20f8,
                                    "%s %d %8phC post del sess\n",
                                    __func__, __LINE__, cmd->sess->port_name);
 
@@ -4227,7 +4216,7 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
        /* Another WWN used to have our s_id. Our PLOGI scheduled its
         * session deletion, but it's still in sess_del_work wq */
        if (sess->deleted) {
-               ql_dbg(ql_dbg_io, vha, 0x3061,
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf002,
                    "New command while old session %p is being deleted\n",
                    sess);
                return -EFAULT;
@@ -4237,7 +4226,7 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
         * Do kref_get() before returning + dropping qla_hw_data->hardware_lock.
         */
        if (!kref_get_unless_zero(&sess->sess_kref)) {
-               ql_dbg(ql_dbg_tgt, vha, 0xffff,
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
                    "%s: kref_get fail, %8phC oxid %x \n",
                    __func__, sess->port_name,
                     be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id));
@@ -4492,7 +4481,7 @@ qlt_find_sess_invalidate_other(scsi_qla_host_t *vha, uint64_t wwn,
                                 * Another wwn used to have our s_id/loop_id
                                 * kill the session, but don't free the loop_id
                                 */
-                               ql_dbg(ql_dbg_tgt_tmr, vha, 0xffff,
+                               ql_dbg(ql_dbg_tgt_tmr, vha, 0xf01b,
                                    "Invalidating sess %p loop_id %d wwn %llx.\n",
                                    other_sess, other_sess->loop_id, other_wwn);
 
@@ -4672,9 +4661,9 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                        sess->keep_nport_handle = ((sess->loop_id == loop_id) &&
                           (sess->d_id.b24 == port_id.b24));
 
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
-                                  "%s %d %8phC post del sess\n",
-                                  __func__, __LINE__, sess->port_name);
+                       ql_dbg(ql_dbg_disc, vha, 0x20f9,
+                           "%s %d %8phC post del sess\n",
+                           __func__, __LINE__, sess->port_name);
 
 
                        qlt_schedule_sess_for_deletion_lock(sess);
@@ -4744,7 +4733,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                /* Make session global (not used in fabric mode) */
                if (ha->current_topology != ISP_CFG_F) {
                        if (sess) {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x20fa,
                                    "%s %d %8phC post nack\n",
                                    __func__, __LINE__, sess->port_name);
                                qla24xx_post_nack_work(vha, sess, iocb,
@@ -4757,7 +4746,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                        }
                } else {
                        if (sess) {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x20fb,
                                    "%s %d %8phC post nack\n",
                                    __func__, __LINE__, sess->port_name);
                                qla24xx_post_nack_work(vha, sess, iocb,
@@ -4791,7 +4780,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
 
                res = qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS);
 
-               ql_dbg(ql_dbg_disc, vha, 0xffff,
+               ql_dbg(ql_dbg_disc, vha, 0x20fc,
                    "%s: logo %llx res %d sess %p ",
                    __func__, wwn, res, sess);
                if (res == 0) {
@@ -4823,7 +4812,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                sess = qla2x00_find_fcport_by_wwpn(vha,
                    iocb->u.isp24.port_name, 1);
                if (sess) {
-                       ql_dbg(ql_dbg_disc, vha, 0xffff,
+                       ql_dbg(ql_dbg_disc, vha, 0x20fd,
                                "sess %p lid %d|%d DS %d LS %d\n",
                                sess, sess->loop_id, loop_id,
                                sess->disc_state, sess->fw_login_state);
@@ -5597,17 +5586,17 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
                break;
 
        case MBA_REJECTED_FCP_CMD:
-               ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
-                       "qla_target(%d): Async event LS_REJECT occurred "
-                       "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx,
-                       le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
-                       le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf017,
+                   "qla_target(%d): Async event LS_REJECT occurred (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)",
+                   vha->vp_idx,
+                   le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
+                   le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
 
                if (le16_to_cpu(mailbox[3]) == 1) {
                        /* exchange starvation. */
                        vha->hw->exch_starvation++;
                        if (vha->hw->exch_starvation > 5) {
-                               ql_log(ql_log_warn, vha, 0xffff,
+                               ql_log(ql_log_warn, vha, 0xd03a,
                                    "Exchange starvation-. Resetting RISC\n");
 
                                vha->hw->exch_starvation = 0;
@@ -5707,12 +5696,12 @@ static fc_port_t *qlt_get_port_database(struct scsi_qla_host *vha,
        case MODE_DUAL:
                if (newfcport) {
                        if (!IS_IIDMA_CAPABLE(vha->hw) || !vha->hw->flags.gpsc_supported) {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x20fe,
                                   "%s %d %8phC post upd_fcport fcp_cnt %d\n",
                                   __func__, __LINE__, fcport->port_name, vha->fcport_count);
                                qla24xx_post_upd_fcport_work(vha, fcport);
                        } else {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
+                               ql_dbg(ql_dbg_disc, vha, 0x20ff,
                                   "%s %d %8phC post gpsc fcp_cnt %d\n",
                                   __func__, __LINE__, fcport->port_name, vha->fcport_count);
                                qla24xx_post_gpsc_work(vha, fcport);
@@ -5838,7 +5827,7 @@ static void qlt_abort_work(struct qla_tgt *tgt,
                }
 
                if (!kref_get_unless_zero(&sess->sess_kref)) {
-                       ql_dbg(ql_dbg_tgt_tmr, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_tmr, vha, 0xf01c,
                            "%s: kref_get fail %8phC \n",
                             __func__, sess->port_name);
                        sess = NULL;
@@ -5902,7 +5891,7 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
                }
 
                if (!kref_get_unless_zero(&sess->sess_kref)) {
-                       ql_dbg(ql_dbg_tgt_tmr, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_tmr, vha, 0xf020,
                            "%s: kref_get fail %8phC\n",
                             __func__, sess->port_name);
                        sess = NULL;
@@ -6251,7 +6240,7 @@ qlt_enable_vha(struct scsi_qla_host *vha)
                qla24xx_enable_vp(vha);
        } else {
                if (ha->msix_entries) {
-                       ql_dbg(ql_dbg_tgt, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt, vha, 0xe081,
                            "%s: host%ld : vector %d cpu %d\n",
                            __func__, vha->host_no,
                            ha->msix_entries[rspq_ent].vector,
@@ -6387,7 +6376,7 @@ qlt_24xx_process_atio_queue(struct scsi_qla_host *vha, uint8_t ha_locked)
                         * can not be trusted. There is no point in passing
                         * it further up.
                         */
-                       ql_log(ql_log_warn, vha, 0xffff,
+                       ql_log(ql_log_warn, vha, 0xd03c,
                            "corrupted fcp frame SID[%3phN] OXID[%04x] EXCG[%x] %64phN\n",
                            pkt->u.isp24.fcp_hdr.s_id,
                            be16_to_cpu(pkt->u.isp24.fcp_hdr.ox_id),
@@ -6744,7 +6733,7 @@ qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha)
 
        rc = btree_init32(&ha->tgt.host_map);
        if (rc)
-               ql_log(ql_log_info, base_vha, 0xffff,
+               ql_log(ql_log_info, base_vha, 0xd03d,
                    "Unable to initialize ha->host_map btree\n");
 
        qlt_update_vp_map(base_vha, SET_VP_IDX);
@@ -6872,25 +6861,25 @@ qlt_update_vp_map(struct scsi_qla_host *vha, int cmd)
        case SET_AL_PA:
                slot = btree_lookup32(&vha->hw->tgt.host_map, key);
                if (!slot) {
-                       ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
+                       ql_dbg(ql_dbg_tgt_mgt, vha, 0xf018,
                            "Save vha in host_map %p %06x\n", vha, key);
                        rc = btree_insert32(&vha->hw->tgt.host_map,
                                key, vha, GFP_ATOMIC);
                        if (rc)
-                               ql_log(ql_log_info, vha, 0xffff,
+                               ql_log(ql_log_info, vha, 0xd03e,
                                    "Unable to insert s_id into host_map: %06x\n",
                                    key);
                        return;
                }
-               ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
-                       "replace existing vha in host_map %p %06x\n", vha, key);
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf019,
+                   "replace existing vha in host_map %p %06x\n", vha, key);
                btree_update32(&vha->hw->tgt.host_map, key, vha);
                break;
        case RESET_VP_IDX:
                vha->hw->tgt.tgt_vp_map[vha->vp_idx].vha = NULL;
                break;
        case RESET_AL_PA:
-               ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff,
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01a,
                   "clear vha in host_map %p %06x\n", vha, key);
                slot = btree_lookup32(&vha->hw->tgt.host_map, key);
                if (slot)
@@ -6952,7 +6941,7 @@ int __init qlt_init(void)
            sizeof(struct qla_tgt_mgmt_cmd), __alignof__(struct
            qla_tgt_mgmt_cmd), 0, NULL);
        if (!qla_tgt_mgmt_cmd_cachep) {
-               ql_log(ql_log_fatal, NULL, 0xe06d,
+               ql_log(ql_log_fatal, NULL, 0xd04b,
                    "kmem_cache_create for qla_tgt_mgmt_cmd_cachep failed\n");
                return -ENOMEM;
        }