[SCSI] qla2xxx: Add ql_dbg_verbose logging level.

Add an extra layer of logging granularity for messages that are necessary in
some circumstances but may flood the kernel log buffer with too many messages
otherwise.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

6 files changed, 342 insertions, 193 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index ec1b925a19a8..8e39f8a08ac2 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -12,12 +12,13 @@
  * |             Level            |   Last Value Used  |     Holes      |
  * ----------------------------------------------------------------------
  * | Module Init and Probe        |       0x0120       | 0x4b,0xba,0xfa |
- * | Mailbox commands             |       0x113e       | 0x112c-0x112e  |
+ * | Mailbox commands             |       0x113e       | 0x111a-0x111b  |
+ * |                              |                    | 0x112c-0x112e  |
  * |                              |                    | 0x113a         |
  * | Device Discovery             |       0x2086       | 0x2020-0x2022  |
  * | Queue Command and IO tracing |       0x3030       | 0x3006,0x3008  |
  * |                              |                    | 0x302d-0x302e  |
- * | DPC Thread                   |       0x401c       |                |
+ * | DPC Thread                   |       0x401c       | 0x4002,0x4013  |
  * | Async Events                 |       0x505d       | 0x502b-0x502f  |
  * |                              |                    | 0x5047,0x5052  |
  * | Timer Routines               |       0x6011       |                |
@@ -27,9 +28,9 @@
  * |                              |                    | 0x708c         |
  * | Task Management              |       0x803c       | 0x8025-0x8026  |
  * |                              |                    | 0x800b,0x8039  |
- * | AER/EEH                      |       0x900f       |                |
+ * | AER/EEH                      |       0x9011       |                |
  * | Virtual Port                 |       0xa007       |                |
- * | ISP82XX Specific             |       0xb054       | 0xb053         |
+ * | ISP82XX Specific             |       0xb054       | 0xb024         |
  * | MultiQ                       |       0xc00c       |                |
  * | Misc                         |       0xd010       |                |
  * ----------------------------------------------------------------------
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 2157bdf1569a..3ba45a73c81f 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -339,3 +339,8 @@ ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);
 #define ql_dbg_misc     0x00010000 /* For dumping everything that is not
                                     * not covered by upper categories
                                     */
+#define ql_dbg_verbose  0x00008000 /* More verbosity for each level
+                                    * This is to be used with other levels where
+                                    * more verbosity is required. It might not
+                                    * be applicable to all the levels.
+                                    */
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 10244ba54d67..c7fcc30c9812 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -270,11 +270,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                         ictrl = RD_REG_WORD(&reg->isp.ictrl);
                 }
                 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1119,
-                    "MBX Command timeout for cmd %x.\n", command);
-                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111a,
-                    "iocontrol=%x jiffies=%lx.\n", ictrl, jiffies);
-                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111b,
-                    "mb[0] = 0x%x.\n", mb0);
+                    "MBX Command timeout for cmd %x, iocontrol=%x jiffies=%lx "
+                    "mb[0]=0x%x\n", command, ictrl, jiffies, mb0);
                 ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1019);
 
                 /*
@@ -390,7 +387,8 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1022, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1022,
+            "Entered %s.\n", __func__);
 
         if (MSW(risc_addr) || IS_FWI2_CAPABLE(ha)) {
                 mcp->mb[0] = MBC_LOAD_RISC_RAM_EXTENDED;
@@ -424,7 +422,8 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
                 ql_dbg(ql_dbg_mbx, vha, 0x1023,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1024, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1024,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -454,7 +453,8 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1025, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1025,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_EXECUTE_FIRMWARE;
         mcp->out_mb = MBX_0;
@@ -489,10 +489,11 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 if (IS_FWI2_CAPABLE(ha)) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1027,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1027,
                             "Done exchanges=%x.\n", mcp->mb[1]);
                 } else {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1028, "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1028,
+                            "Done %s.\n", __func__);
                 }
         }
 
@@ -523,7 +524,8 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
         mbx_cmd_t       *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1029, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1029,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_VERSION;
         mcp->out_mb = MBX_0;
@@ -561,11 +563,11 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
                         ha->fw_attributes_h = mcp->mb[15];
                         ha->fw_attributes_ext[0] = mcp->mb[16];
                         ha->fw_attributes_ext[1] = mcp->mb[17];
-                        ql_dbg(ql_dbg_mbx, vha, 0x1139,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1139,
                             "%s: FW_attributes Upper: 0x%x, Lower: 0x%x.\n",
                             __func__, mcp->mb[15], mcp->mb[6]);
                 } else
-                        ql_dbg(ql_dbg_mbx, vha, 0x112f,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x112f,
                             "%s: FwAttributes [Upper]  invalid, MB6:%04x\n",
                             __func__, mcp->mb[6]);
         }
@@ -576,7 +578,8 @@ failed:
                 ql_dbg(ql_dbg_mbx, vha, 0x102a, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x102b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102b,
+                    "Done %s.\n", __func__);
         }
         return rval;
 }
@@ -602,7 +605,8 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x102c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102c,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_OPTION;
         mcp->out_mb = MBX_0;
@@ -620,7 +624,8 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
                 fwopts[2] = mcp->mb[2];
                 fwopts[3] = mcp->mb[3];
 
-                ql_dbg(ql_dbg_mbx, vha, 0x102e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102e,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -648,7 +653,8 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x102f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102f,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SET_FIRMWARE_OPTION;
         mcp->mb[1] = fwopts[1];
@@ -676,7 +682,8 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
                     "Failed=%x (%x/%x).\n", rval, mcp->mb[0], mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1031, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1031,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -704,7 +711,8 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1032, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1032,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_MAILBOX_REGISTER_TEST;
         mcp->mb[1] = 0xAAAA;
@@ -734,7 +742,8 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1033, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1034, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1034,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -762,7 +771,8 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1035, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1035,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_VERIFY_CHECKSUM;
         mcp->out_mb = MBX_0;
@@ -787,7 +797,8 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
                     "Failed=%x chm sum=%x.\n", rval, IS_FWI2_CAPABLE(vha->hw) ?
                     (mcp->mb[2] << 16) | mcp->mb[1] : mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1037, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1037,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -819,7 +830,8 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
         mbx_cmd_t       mc;
         mbx_cmd_t       *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1038, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1038,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_IOCB_COMMAND_A64;
         mcp->mb[1] = 0;
@@ -842,7 +854,8 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
                 /* Mask reserved bits. */
                 sts_entry->entry_status &=
                     IS_FWI2_CAPABLE(vha->hw) ? RF_MASK_24XX : RF_MASK;
-                ql_dbg(ql_dbg_mbx, vha, 0x103a, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103a,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -884,7 +897,8 @@ qla2x00_abort_command(srb_t *sp)
         struct req_que *req = vha->req;
         struct scsi_cmnd *cmd = GET_CMD_SP(sp);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x103b, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103b,
+            "Entered %s.\n", __func__);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -915,7 +929,8 @@ qla2x00_abort_command(srb_t *sp)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x103c, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x103d, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103d,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -934,7 +949,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
         l = l;
         vha = fcport->vha;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x103e, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103e,
+            "Entered %s.\n", __func__);
 
         req = vha->hw->req_q_map[0];
         rsp = req->rsp;
@@ -955,7 +971,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(vha, mcp);
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x103f, "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103f,
+                    "Failed=%x.\n", rval);
         }
 
         /* Issue marker IOCB. */
@@ -965,7 +982,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
                 ql_dbg(ql_dbg_mbx, vha, 0x1040,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1041, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1041,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -983,7 +1001,8 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
 
         vha = fcport->vha;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1042, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1042,
+            "Entered %s.\n", __func__);
 
         req = vha->hw->req_q_map[0];
         rsp = req->rsp;
@@ -1012,7 +1031,8 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
                 ql_dbg(ql_dbg_mbx, vha, 0x1044,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1045, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1045,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1046,7 +1066,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1046, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1046,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID;
         mcp->mb[9] = vha->vp_idx;
@@ -1074,7 +1095,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
                 /*EMPTY*/
                 ql_dbg(ql_dbg_mbx, vha, 0x1047, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1048, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1048,
+                    "Done %s.\n", __func__);
 
                 if (IS_CNA_CAPABLE(vha->hw)) {
                         vha->fcoe_vlan_id = mcp->mb[9] & 0xfff;
@@ -1115,7 +1137,8 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *vha, uint8_t *retry_cnt, uint8_t *tov,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1049, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1049,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_RETRY_COUNT;
         mcp->out_mb = MBX_0;
@@ -1138,7 +1161,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *vha, uint8_t *retry_cnt, uint8_t *tov,
                         *tov = ratov;
                 }
 
-                ql_dbg(ql_dbg_mbx, vha, 0x104b,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104b,
                     "Done %s mb3=%d ratov=%d.\n", __func__, mcp->mb[3], ratov);
         }
 
@@ -1170,7 +1193,8 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x104c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104c,
+            "Entered %s.\n", __func__);
 
         if (IS_QLA82XX(ha) && ql2xdbwr)
                 qla82xx_wr_32(ha, ha->nxdb_wr_ptr,
@@ -1213,7 +1237,8 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x104e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104e,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1246,7 +1271,8 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
         dma_addr_t pd_dma;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x104f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104f,
+            "Entered %s.\n", __func__);
 
         pd24 = NULL;
         pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma);
@@ -1378,7 +1404,8 @@ gpd_error_out:
                     "Failed=%x mb[0]=%x mb[1]=%x.\n", rval,
                     mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1053, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1053,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1407,7 +1434,8 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1054, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1054,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_STATE;
         mcp->out_mb = MBX_0;
@@ -1433,7 +1461,8 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
                 ql_dbg(ql_dbg_mbx, vha, 0x1055, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1056, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1056,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1465,7 +1494,8 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1057, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1057,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_PORT_NAME;
         mcp->mb[9] = vha->vp_idx;
@@ -1499,7 +1529,8 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
                         name[7] = LSB(mcp->mb[7]);
                 }
 
-                ql_dbg(ql_dbg_mbx, vha, 0x1059, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1059,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1527,7 +1558,8 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x105a, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105a,
+            "Entered %s.\n", __func__);
 
         if (IS_CNA_CAPABLE(vha->hw)) {
                 /* Logout across all FCFs. */
@@ -1564,7 +1596,8 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x105b, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x105c, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105c,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1596,9 +1629,10 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x105d, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105d,
+            "Entered %s.\n", __func__);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x105e,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105e,
             "Retry cnt=%d ratov=%d total tov=%d.\n",
             vha->hw->retry_count, vha->hw->login_timeout, mcp->tov);
 
@@ -1622,7 +1656,8 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1060, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1060,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1641,7 +1676,8 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         struct req_que *req;
         struct rsp_que *rsp;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1061, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1061,
+            "Entered %s.\n", __func__);
 
         if (ha->flags.cpu_affinity_enabled)
                 req = ha->req_q_map[0];
@@ -1715,7 +1751,8 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                         break;
                 }
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1066, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1066,
+                    "Done %s.\n", __func__);
 
                 iop[0] = le32_to_cpu(lg->io_parameter[0]);
 
@@ -1770,7 +1807,8 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1067, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1067,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LOGIN_FABRIC_PORT;
         mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
@@ -1818,7 +1856,8 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1069, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1069,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1849,7 +1888,8 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x106a, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106a,
+            "Entered %s.\n", __func__);
 
         if (IS_FWI2_CAPABLE(ha))
                 return qla24xx_login_fabric(vha, fcport->loop_id,
@@ -1891,7 +1931,8 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[6], mcp->mb[7]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x106c, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106c,
+                    "Done %s.\n", __func__);
         }
 
         return (rval);
@@ -1908,7 +1949,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         struct req_que *req;
         struct rsp_que *rsp;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x106d, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106d,
+            "Entered %s.\n", __func__);
 
         lg = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &lg_dma);
         if (lg == NULL) {
@@ -1952,7 +1994,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     le32_to_cpu(lg->io_parameter[1]));
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1072, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1072,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -1984,7 +2027,8 @@ qla2x00_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1073, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1073,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LOGOUT_FABRIC_PORT;
         mcp->out_mb = MBX_1|MBX_0;
@@ -2007,7 +2051,8 @@ qla2x00_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     "Failed=%x mb[1]=%x.\n", rval, mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1075, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1075,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2035,7 +2080,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1076, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1076,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LIP_FULL_LOGIN;
         mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0;
@@ -2052,7 +2098,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1077, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1078, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1078,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2078,7 +2125,8 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1079, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1079,
+            "Entered %s.\n", __func__);
 
         if (id_list == NULL)
                 return QLA_FUNCTION_FAILED;
@@ -2110,7 +2158,8 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
                 ql_dbg(ql_dbg_mbx, vha, 0x107a, "Failed=%x.\n", rval);
         } else {
                 *entries = mcp->mb[1];
-                ql_dbg(ql_dbg_mbx, vha, 0x107b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107b,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2138,7 +2187,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x107c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107c,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_RESOURCE_COUNTS;
         mcp->out_mb = MBX_0;
@@ -2154,7 +2204,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
                 ql_dbg(ql_dbg_mbx, vha, 0x107d,
                     "Failed mb[0]=%x.\n", mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x107e,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107e,
                     "Done %s mb1=%x mb2=%x mb3=%x mb6=%x mb7=%x mb10=%x "
                     "mb11=%x mb12=%x.\n", __func__, mcp->mb[1], mcp->mb[2],
                     mcp->mb[3], mcp->mb[6], mcp->mb[7], mcp->mb[10],
@@ -2201,7 +2251,8 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         dma_addr_t pmap_dma;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x107f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107f,
+            "Entered %s.\n", __func__);
 
         pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma);
         if (pmap  == NULL) {
@@ -2224,7 +2275,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         rval = qla2x00_mailbox_command(vha, mcp);
 
         if (rval == QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1081,
+                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1081,
                     "mb0/mb1=%x/%X FC/AL position map size (%x).\n",
                     mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]);
                 ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111d,
@@ -2238,7 +2289,8 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x1082, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1083, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1083,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2267,7 +2319,8 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
         uint32_t *siter, *diter, dwords;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1084, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1084,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_LINK_STATUS;
         mcp->mb[2] = MSW(stats_dma);
@@ -2301,7 +2354,8 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
                         rval = QLA_FUNCTION_FAILED;
                 } else {
                         /* Copy over data -- firmware data is LE. */
-                        ql_dbg(ql_dbg_mbx, vha, 0x1086, "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1086,
+                            "Done %s.\n", __func__);
                         dwords = offsetof(struct link_statistics, unused1) / 4;
                         siter = diter = &stats->link_fail_cnt;
                         while (dwords--)
@@ -2324,7 +2378,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
         mbx_cmd_t *mcp = &mc;
         uint32_t *siter, *diter, dwords;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1088, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_LINK_PRIV_STATS;
         mcp->mb[2] = MSW(stats_dma);
@@ -2346,7 +2401,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
                             "Failed mb[0]=%x.\n", mcp->mb[0]);
                         rval = QLA_FUNCTION_FAILED;
                 } else {
-                        ql_dbg(ql_dbg_mbx, vha, 0x108a, "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108a,
+                            "Done %s.\n", __func__);
                         /* Copy over data -- firmware data is LE. */
                         dwords = sizeof(struct link_statistics) / 4;
                         siter = diter = &stats->link_fail_cnt;
@@ -2375,7 +2431,8 @@ qla24xx_abort_command(srb_t *sp)
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = vha->req;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x108c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108c,
+            "Entered %s.\n", __func__);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -2423,7 +2480,8 @@ qla24xx_abort_command(srb_t *sp)
                     le16_to_cpu(abt->nport_handle));
                 rval = QLA_FUNCTION_FAILED;
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1091, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1091,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, abt, abt_dma);
@@ -2455,7 +2513,8 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         ha = vha->hw;
         req = vha->req;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1092, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1092,
+            "Entered %s.\n", __func__);
 
         if (ha->flags.cpu_affinity_enabled)
                 rsp = ha->rsp_q_map[tag + 1];
@@ -2504,7 +2563,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         } else if (le16_to_cpu(sts->scsi_status) &
             SS_RESPONSE_INFO_LEN_VALID) {
                 if (le32_to_cpu(sts->rsp_data_len) < 4) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1097,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1097,
                             "Ignoring inconsistent data length -- not enough "
                             "response info (%d).\n",
                             le32_to_cpu(sts->rsp_data_len));
@@ -2523,7 +2582,8 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
                 ql_dbg(ql_dbg_mbx, vha, 0x1099,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x109a, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109a,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, tsk, tsk_dma);
@@ -2564,7 +2624,8 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         if (!IS_QLA23XX(ha) && !IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x109b, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109b,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GEN_SYSTEM_ERROR;
         mcp->out_mb = MBX_0;
@@ -2576,7 +2637,8 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x109c, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x109d, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109d,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2596,7 +2658,8 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x109e, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109e,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SERDES_PARAMS;
         mcp->mb[1] = BIT_0;
@@ -2615,7 +2678,8 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x10a0, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a0,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2631,7 +2695,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10a1, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a1,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_STOP_FIRMWARE;
         mcp->mb[1] = 0;
@@ -2646,7 +2711,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
                 if (mcp->mb[0] == MBS_INVALID_COMMAND)
                         rval = QLA_INVALID_COMMAND;
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10a3, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a3,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2660,7 +2726,8 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10a4, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a4,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2686,7 +2753,8 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10a6, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a6,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2699,7 +2767,8 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10a7, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a7,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2719,7 +2788,8 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10a9, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a9,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2733,7 +2803,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10aa, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10aa,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw) &&
             !IS_QLA83XX(vha->hw))
@@ -2764,7 +2835,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10ac, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ac,
+                    "Done %s.\n", __func__);
 
                 if (mb)
                         memcpy(mb, mcp->mb, 8 * sizeof(*mb));
@@ -2782,7 +2854,8 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10ad, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ad,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2804,7 +2877,8 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10af, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10af,
+                    "Done %s.\n", __func__);
 
                 if (wr)
                         *wr = (uint64_t) mcp->mb[5] << 48 |
@@ -2829,7 +2903,8 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10b0, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b0,
+            "Entered %s.\n", __func__);
 
         if (!IS_IIDMA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2854,7 +2929,8 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10b1, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b2, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b2,
+                    "Done %s.\n", __func__);
                 if (port_speed)
                         *port_speed = mcp->mb[3];
         }
@@ -2870,7 +2946,8 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10b3, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b3,
+            "Entered %s.\n", __func__);
 
         if (!IS_IIDMA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2897,9 +2974,11 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         }
 
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b4, "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x10b4,
+                    "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b5, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b5,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2915,24 +2994,25 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
         scsi_qla_host_t *vp;
         unsigned long   flags;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10b6, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b6,
+            "Entered %s.\n", __func__);
 
         if (rptid_entry->entry_status != 0)
                 return;
 
         if (rptid_entry->format == 0) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b7,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b7,
                     "Format 0 : Number of VPs setup %d, number of "
                     "VPs acquired %d.\n",
                     MSB(le16_to_cpu(rptid_entry->vp_count)),
                     LSB(le16_to_cpu(rptid_entry->vp_count)));
-                ql_dbg(ql_dbg_mbx, vha, 0x10b8,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b8,
                     "Primary port id %02x%02x%02x.\n",
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
                     rptid_entry->port_id[0]);
         } else if (rptid_entry->format == 1) {
                 vp_idx = LSB(stat);
-                ql_dbg(ql_dbg_mbx, vha, 0x10b9,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b9,
                     "Format 1: VP[%d] enabled - status %d - with "
                     "port id %02x%02x%02x.\n", vp_idx, MSB(stat),
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
@@ -2999,7 +3079,8 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
 
         /* This can be called by the parent */
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10bb, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10bb,
+            "Entered %s.\n", __func__);
 
         vpmod = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &vpmod_dma);
         if (!vpmod) {
@@ -3035,7 +3116,8 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
                 rval = QLA_FUNCTION_FAILED;
         } else {
                 /* EMPTY */
-                ql_dbg(ql_dbg_mbx, vha, 0x10c0, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c0,
+                    "Done %s.\n", __func__);
                 fc_vport_set_state(vha->fc_vport, FC_VPORT_INITIALIZING);
         }
         dma_pool_free(ha->s_dma_pool, vpmod, vpmod_dma);
@@ -3069,7 +3151,7 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
         int     vp_index = vha->vp_idx;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10c1,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c1,
             "Entered %s enabling index %d.\n", __func__, vp_index);
 
         if (vp_index == 0 || vp_index >= ha->max_npiv_vports)
@@ -3112,7 +3194,8 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
                     le16_to_cpu(vce->comp_status));
                 rval = QLA_FUNCTION_FAILED;
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10c6, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c6,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, vce, vce_dma);
@@ -3149,7 +3232,8 @@ qla2x00_send_change_request(scsi_qla_host_t *vha, uint16_t format,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10c7, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c7,
+            "Entered %s.\n", __func__);
 
         /*
          * This command is implicitly executed by firmware during login for the
@@ -3185,7 +3269,8 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1009, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1009,
+            "Entered %s.\n", __func__);
 
         if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) {
                 mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED;
@@ -3219,7 +3304,8 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
                 ql_dbg(ql_dbg_mbx, vha, 0x1008,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1007, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1007,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3244,7 +3330,8 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
         unsigned long flags;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10c8, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c8,
+            "Entered %s.\n", __func__);
 
         mn = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &mn_dma);
         if (mn == NULL) {
@@ -3285,7 +3372,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
                 status[0] = le16_to_cpu(mn->p.rsp.comp_status);
                 status[1] = status[0] == CS_VCS_CHIP_FAILURE ?
                     le16_to_cpu(mn->p.rsp.failure_code) : 0;
-                ql_dbg(ql_dbg_mbx, vha, 0x10ce,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ce,
                     "cs=%x fc=%x.\n", status[0], status[1]);
 
                 if (status[0] != CS_COMPLETE) {
@@ -3299,7 +3386,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
                                 retry = 1;
                         }
                 } else {
-                        ql_dbg(ql_dbg_mbx, vha, 0x10d0,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d0,
                             "Firmware updated to %x.\n",
                             le32_to_cpu(mn->p.rsp.fw_ver));
 
@@ -3316,9 +3403,11 @@ verify_done:
         dma_pool_free(ha->s_dma_pool, mn, mn_dma);
 
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d1, "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x10d1,
+                    "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d2, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d2,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3334,7 +3423,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
         struct device_reg_25xxmq __iomem *reg;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10d3, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d3,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
         mcp->mb[1] = req->options;
@@ -3388,7 +3478,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
                 ql_dbg(ql_dbg_mbx, vha, 0x10d4,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d5, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d5,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3404,7 +3495,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
         struct device_reg_25xxmq __iomem *reg;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10d6, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d6,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
         mcp->mb[1] = rsp->options;
@@ -3456,7 +3548,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
                 ql_dbg(ql_dbg_mbx, vha, 0x10d7,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d8, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d8,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3469,7 +3562,8 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10d9, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d9,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_IDC_ACK;
         memcpy(&mcp->mb[1], mb, QLA_IDC_ACK_REGS * sizeof(uint16_t));
@@ -3483,7 +3577,8 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x10da,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10db, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10db,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3496,7 +3591,8 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10dc, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10dc,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3514,7 +3610,8 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10de, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10de,
+                    "Done %s.\n", __func__);
                 *sector_size = mcp->mb[1];
         }
 
@@ -3531,7 +3628,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
         if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10df, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10df,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
         mcp->mb[1] = enable ? FAC_OPT_CMD_WRITE_ENABLE :
@@ -3547,7 +3645,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10e1, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e1,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3563,7 +3662,8 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
         if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10e2, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
         mcp->mb[1] = FAC_OPT_CMD_ERASE_SECTOR;
@@ -3582,7 +3682,8 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10e4, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e4,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3595,7 +3696,8 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10e5, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e5,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_RESTART_MPI_FW;
         mcp->out_mb = MBX_0;
@@ -3609,7 +3711,8 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10e7, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e7,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3624,7 +3727,8 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10e8, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -3654,7 +3758,8 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
                 ql_dbg(ql_dbg_mbx, vha, 0x10e9,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10ea, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3669,7 +3774,8 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10eb, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10eb,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -3699,7 +3805,8 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
                 ql_dbg(ql_dbg_mbx, vha, 0x10ec,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10ed, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ed,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3713,7 +3820,8 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10ee, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ee,
+            "Entered %s.\n", __func__);
 
         if (!IS_CNA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3735,7 +3843,8 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f0, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f0,
+                    "Done %s.\n", __func__);
 
 
                 *actual_size = mcp->mb[2] << 2;
@@ -3752,7 +3861,8 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10f1, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f1,
+            "Entered %s.\n", __func__);
 
         if (!IS_CNA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3775,7 +3885,8 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f3, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f3,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3788,7 +3899,8 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10f4, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f4,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3805,7 +3917,8 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
                 ql_dbg(ql_dbg_mbx, vha, 0x10f5,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f6, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f6,
+                    "Done %s.\n", __func__);
                 *data = mcp->mb[3] << 16 | mcp->mb[2];
         }
 
@@ -3821,7 +3934,8 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mbx_cmd_t *mcp = &mc;
         uint32_t iter_cnt = 0x1;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10f7, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f7,
+            "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK;
@@ -3865,7 +3979,8 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
                     "mb[19]=%x.\n", rval, mcp->mb[0], mcp->mb[1], mcp->mb[2],
                     mcp->mb[3], mcp->mb[18], mcp->mb[19]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f9, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f9,
+                    "Done %s.\n", __func__);
         }
 
         /* Copy mailbox information */
@@ -3882,7 +3997,8 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10fa, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fa,
+            "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = MBC_DIAGNOSTIC_ECHO;
@@ -3926,7 +4042,8 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10fc, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fc,
+                    "Done %s.\n", __func__);
         }
 
         /* Copy mailbox information */
@@ -3941,7 +4058,7 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10fd,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fd,
             "Entered %s enable_diag=%d.\n", __func__, enable_diagnostic);
 
         mcp->mb[0] = MBC_ISP84XX_RESET;
@@ -3955,7 +4072,8 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
         if (rval != QLA_SUCCESS)
                 ql_dbg(ql_dbg_mbx, vha, 0x10fe, "Failed=%x.\n", rval);
         else
-                ql_dbg(ql_dbg_mbx, vha, 0x10ff, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ff,
+                    "Done %s.\n", __func__);
 
         return rval;
 }
@@ -3967,7 +4085,8 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1100, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1100,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3986,7 +4105,8 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
                 ql_dbg(ql_dbg_mbx, vha, 0x1101,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1102, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1102,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4003,7 +4123,8 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
 
         rval = QLA_SUCCESS;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1103, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1103,
+            "Entered %s.\n", __func__);
 
         clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
@@ -4046,7 +4167,8 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x1104,
                     "Failed=%x mb[0]=%x.\n", rval, mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1105, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1105,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4060,7 +4182,8 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1106, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1106,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4078,7 +4201,8 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1107,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1108, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1108,
+                    "Done %s.\n", __func__);
                 if (mcp->mb[1] != 0x7)
                         ha->link_data_rate = mcp->mb[1];
         }
@@ -4094,7 +4218,8 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1109, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1109,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4113,7 +4238,8 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
                 /* Copy all bits to preserve original value */
                 memcpy(mb, &mcp->mb[1], sizeof(uint16_t) * 4);
 
-                ql_dbg(ql_dbg_mbx, vha, 0x110b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110b,
+                    "Done %s.\n", __func__);
         }
         return rval;
 }
@@ -4125,7 +4251,8 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x110c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110c,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SET_PORT_CONFIG;
         /* Copy all bits to preserve original setting */
@@ -4140,7 +4267,8 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x110d,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else
-                ql_dbg(ql_dbg_mbx, vha, 0x110e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110e,
+                    "Done %s.\n", __func__);
 
         return rval;
 }
@@ -4155,7 +4283,8 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x110f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110f,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4183,7 +4312,8 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10cd, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10cc, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10cc,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4196,7 +4326,8 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         uint8_t byte;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10ca, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ca,
+            "Entered %s.\n", __func__);
 
         /* Integer part */
         rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x01, 1, BIT_13|BIT_0);
@@ -4216,7 +4347,8 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         }
         *frac = (byte >> 6) * 25;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1018, "Done %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1018,
+            "Done %s.\n", __func__);
 fail:
         return rval;
 }
@@ -4229,7 +4361,8 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1017, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1017,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4248,7 +4381,8 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1016,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x100e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100e,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4262,7 +4396,8 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x100d, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100d,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA82XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4281,7 +4416,8 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x100c,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x100b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100b,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4295,7 +4431,8 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         int rval = QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x111f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111f,
+            "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
@@ -4318,7 +4455,8 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
                     (mcp->mb[1] << 16) | mcp->mb[0],
                     (mcp->mb[3] << 16) | mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1121, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1121,
+                    "Done %s.\n", __func__);
                 ha->md_template_size = ((mcp->mb[3] << 16) | mcp->mb[2]);
                 if (!ha->md_template_size) {
                         ql_dbg(ql_dbg_mbx, vha, 0x1122,
@@ -4337,7 +4475,8 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         int rval = QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1123, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1123,
+            "Entered %s.\n", __func__);
 
         ha->md_tmplt_hdr = dma_alloc_coherent(&ha->pdev->dev,
            ha->md_template_size, &ha->md_tmplt_hdr_dma, GFP_KERNEL);
@@ -4372,7 +4511,8 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
                     ((mcp->mb[1] << 16) | mcp->mb[0]),
                     ((mcp->mb[3] << 16) | mcp->mb[2]));
         } else
-                ql_dbg(ql_dbg_mbx, vha, 0x1126, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1126,
+                    "Done %s.\n", __func__);
         return rval;
 }
 
@@ -4387,7 +4527,8 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
         if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1133, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1133,
+            "Entered %s.\n", __func__);
 
         memset(mcp, 0, sizeof(mbx_cmd_t));
         mcp->mb[0] = MBC_SET_LED_CONFIG;
@@ -4412,7 +4553,8 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
                 ql_dbg(ql_dbg_mbx, vha, 0x1134,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1135, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1135,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4429,7 +4571,8 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
         if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1136, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1136,
+            "Entered %s.\n", __func__);
 
         memset(mcp, 0, sizeof(mbx_cmd_t));
         mcp->mb[0] = MBC_GET_LED_CONFIG;
@@ -4454,7 +4597,8 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
                         led_cfg[4] = mcp->mb[5];
                         led_cfg[5] = mcp->mb[6];
                 }
-                ql_dbg(ql_dbg_mbx, vha, 0x1138, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1138,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4471,7 +4615,7 @@ qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
         if (!IS_QLA82XX(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1127,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1127,
                 "Entered %s.\n", __func__);
 
         memset(mcp, 0, sizeof(mbx_cmd_t));
@@ -4491,7 +4635,7 @@ qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
                 ql_dbg(ql_dbg_mbx, vha, 0x1128,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1129,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1129,
                     "Done %s.\n", __func__);
         }
 
@@ -4509,7 +4653,8 @@ qla83xx_write_remote_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
         if (!IS_QLA83XX(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1130, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1130,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_WRITE_REMOTE_REG;
         mcp->mb[1] = LSW(reg);
@@ -4527,7 +4672,7 @@ qla83xx_write_remote_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
                 ql_dbg(ql_dbg_mbx, vha, 0x1131,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1132,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1132,
                     "Done %s.\n", __func__);
         }
 
@@ -4543,13 +4688,14 @@ qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
         mbx_cmd_t *mcp = &mc;
 
         if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
-                ql_dbg(ql_dbg_mbx, vha, 0x113b,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113b,
                     "Implicit LOGO Unsupported.\n");
                 return QLA_FUNCTION_FAILED;
         }
 
 
-        ql_dbg(ql_dbg_mbx, vha, 0x113c, "Entering %s.\n",  __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113c,
+            "Entering %s.\n",  __func__);
 
         /* Perform Implicit LOGO. */
         mcp->mb[0] = MBC_PORT_LOGOUT;
@@ -4564,7 +4710,8 @@ qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
                 ql_dbg(ql_dbg_mbx, vha, 0x113d,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         else
-                ql_dbg(ql_dbg_mbx, vha, 0x113e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113e,
+                    "Done %s.\n", __func__);
 
         return rval;
 }
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index aa062a1b0ca4..6230ba98addc 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -295,10 +295,8 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
 static int
 qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
 {
-        ql_dbg(ql_dbg_dpc, vha, 0x4012,
-            "Entering %s.\n", __func__);
-        ql_dbg(ql_dbg_dpc, vha, 0x4013,
-            "vp_flags: 0x%lx.\n", vha->vp_flags);
+        ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x4012,
+            "Entering %s vp_flags: 0x%lx.\n", __func__, vha->vp_flags);
 
         qla2x00_do_work(vha);
 
@@ -348,7 +346,7 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
                 }
         }
 
-        ql_dbg(ql_dbg_dpc, vha, 0x401c,
+        ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x401c,
             "Exiting %s.\n", __func__);
         return 0;
 }
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 954e2c211729..195528a708a7 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2960,9 +2960,8 @@ qla82xx_need_qsnt_handler(scsi_qla_host_t *vha)
                          * changing the state to DEV_READY
                          */
                         ql_log(ql_log_info, vha, 0xb023,
-                            "%s : QUIESCENT TIMEOUT.\n", QLA2XXX_DRIVER_NAME);
-                        ql_log(ql_log_info, vha, 0xb024,
-                            "DRV_ACTIVE:%d DRV_STATE:%d.\n",
+                            "%s : QUIESCENT TIMEOUT DRV_ACTIVE:%d "
+                            "DRV_STATE:%d.\n", QLA2XXX_DRIVER_NAME,
                             drv_active, drv_state);
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
                             QLA82XX_DEV_READY);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2e6dd88fbf50..00bebdff1576 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -649,12 +649,12 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 
         if (ha->flags.eeh_busy) {
                 if (ha->flags.pci_channel_io_perm_failure) {
-                        ql_dbg(ql_dbg_io, vha, 0x3001,
+                        ql_dbg(ql_dbg_aer, vha, 0x9010,
                             "PCI Channel IO permanent failure, exiting "
                             "cmd=%p.\n", cmd);
                         cmd->result = DID_NO_CONNECT << 16;
                 } else {
-                        ql_dbg(ql_dbg_io, vha, 0x3002,
+                        ql_dbg(ql_dbg_aer, vha, 0x9011,
                             "EEH_Busy, Requeuing the cmd=%p.\n", cmd);
                         cmd->result = DID_REQUEUE << 16;
                 }
@@ -664,7 +664,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         rval = fc_remote_port_chkready(rport);
         if (rval) {
                 cmd->result = rval;
-                ql_dbg(ql_dbg_io, vha, 0x3003,
+                ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3003,
                     "fc_remote_port_chkready failed for cmd=%p, rval=0x%x.\n",
                     cmd, rval);
                 goto qc24_fail_command;
@@ -3689,10 +3689,9 @@ qla2x00_do_dpc(void *data)
 
                 ha->dpc_active = 1;
 
-                ql_dbg(ql_dbg_dpc, base_vha, 0x4001,
-                    "DPC handler waking up.\n");
-                ql_dbg(ql_dbg_dpc, base_vha, 0x4002,
-                    "dpc_flags=0x%lx.\n", base_vha->dpc_flags);
+                ql_dbg(ql_dbg_dpc + ql_dbg_verbose, base_vha, 0x4001,
+                    "DPC handler waking up, dpc_flags=0x%lx.\n",
+                    base_vha->dpc_flags);
 
                 qla2x00_do_work(base_vha);