[SCSI] qla2xxx: Code changes to support new dynamic logging infrastructure.

The code is changed to support the new dynamic logging infrastructure.
Following are the levels added.
Default is 0 - no logging.  0x40000000 - Module Init & Probe.
0x20000000 - Mailbox Cmnds. 0x10000000 - Device Discovery.
0x08000000 - IO tracing.    0x04000000 - DPC Thread.
0x02000000 - Async events.  0x01000000 - Timer routines.
0x00800000 - User space.    0x00400000 - Task Management.
0x00200000 - AER/EEH.       0x00100000 - Multi Q.
0x00080000 - P3P Specific.  0x00040000 - Virtual Port.
0x00020000 - Buffer Dump.   0x00010000 - Misc.
0x7fffffff - For enabling all logs, can be too many logs.

Setting ql2xextended_error_logging module parameter to any of the above
value, will enable the debug for that particular level.
Do LOGICAL OR of the value to enable more than one level.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 97 insertions, 86 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 532313e0725e..7836eb01c7fc 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -42,8 +42,8 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
         int reading;
 
         if (IS_QLA82XX(ha)) {
-                DEBUG2(qla_printk(KERN_INFO, ha,
-                        "Firmware dump not supported for ISP82xx\n"));
+                ql_dbg(ql_dbg_user, vha, 0x705b,
+                    "Firmware dump not supported for ISP82xx\n");
                 return count;
         }
 
@@ -56,7 +56,7 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
                 if (!ha->fw_dump_reading)
                         break;
 
-                qla_printk(KERN_INFO, ha,
+                ql_log(ql_log_info, vha, 0x705d,
                     "Firmware dump cleared on (%ld).\n", vha->host_no);
 
                 ha->fw_dump_reading = 0;
@@ -66,7 +66,7 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
                 if (ha->fw_dumped && !ha->fw_dump_reading) {
                         ha->fw_dump_reading = 1;
 
-                        qla_printk(KERN_INFO, ha,
+                        ql_log(ql_log_info, vha, 0x705e,
                             "Raw firmware dump ready for read on (%ld).\n",
                             vha->host_no);
                 }
@@ -148,7 +148,7 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,
         }
 
         if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x705f,
                     "HBA not online, failing NVRAM update.\n");
                 return -EAGAIN;
         }
@@ -158,6 +158,8 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,
         ha->isp_ops->read_nvram(vha, (uint8_t *)ha->nvram, ha->nvram_base,
             count);
 
+        ql_dbg(ql_dbg_user, vha, 0x7060,
+            "Setting ISP_ABORT_NEEDED\n");
         /* NVRAM settings take effect immediately. */
         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
         qla2xxx_wake_dpc(vha);
@@ -255,9 +257,9 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
 
                 ha->optrom_state = QLA_SWAITING;
 
-                DEBUG2(qla_printk(KERN_INFO, ha,
+                ql_dbg(ql_dbg_user, vha, 0x7061,
                     "Freeing flash region allocation -- 0x%x bytes.\n",
-                    ha->optrom_region_size));
+                    ha->optrom_region_size);
 
                 vfree(ha->optrom_buffer);
                 ha->optrom_buffer = NULL;
@@ -273,7 +275,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 ha->optrom_state = QLA_SREADING;
                 ha->optrom_buffer = vmalloc(ha->optrom_region_size);
                 if (ha->optrom_buffer == NULL) {
-                        qla_printk(KERN_WARNING, ha,
+                        ql_log(ql_log_warn, vha, 0x7062,
                             "Unable to allocate memory for optrom retrieval "
                             "(%x).\n", ha->optrom_region_size);
 
@@ -282,14 +284,14 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 }
 
                 if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
-                        qla_printk(KERN_WARNING, ha,
-                                "HBA not online, failing NVRAM update.\n");
+                        ql_log(ql_log_warn, vha, 0x7063,
+                            "HBA not online, failing NVRAM update.\n");
                         return -EAGAIN;
                 }
 
-                DEBUG2(qla_printk(KERN_INFO, ha,
+                ql_dbg(ql_dbg_user, vha, 0x7064,
                     "Reading flash region -- 0x%x/0x%x.\n",
-                    ha->optrom_region_start, ha->optrom_region_size));
+                    ha->optrom_region_start, ha->optrom_region_size);
 
                 memset(ha->optrom_buffer, 0, ha->optrom_region_size);
                 ha->isp_ops->read_optrom(vha, ha->optrom_buffer,
@@ -328,7 +330,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 else if (IS_QLA25XX(ha) || IS_QLA8XXX_TYPE(ha))
                         valid = 1;
                 if (!valid) {
-                        qla_printk(KERN_WARNING, ha,
+                        ql_log(ql_log_warn, vha, 0x7065,
                             "Invalid start region 0x%x/0x%x.\n", start, size);
                         return -EINVAL;
                 }
@@ -340,17 +342,17 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                 ha->optrom_state = QLA_SWRITING;
                 ha->optrom_buffer = vmalloc(ha->optrom_region_size);
                 if (ha->optrom_buffer == NULL) {
-                        qla_printk(KERN_WARNING, ha,
+                        ql_log(ql_log_warn, vha, 0x7066,
                             "Unable to allocate memory for optrom update "
-                            "(%x).\n", ha->optrom_region_size);
+                            "(%x)\n", ha->optrom_region_size);
 
                         ha->optrom_state = QLA_SWAITING;
                         return count;
                 }
 
-                DEBUG2(qla_printk(KERN_INFO, ha,
+                ql_dbg(ql_dbg_user, vha, 0x7067,
                     "Staging flash region write -- 0x%x/0x%x.\n",
-                    ha->optrom_region_start, ha->optrom_region_size));
+                    ha->optrom_region_start, ha->optrom_region_size);
 
                 memset(ha->optrom_buffer, 0, ha->optrom_region_size);
                 break;
@@ -359,14 +361,14 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
                         break;
 
                 if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
-                        qla_printk(KERN_WARNING, ha,
+                        ql_log(ql_log_warn, vha, 0x7068,
                             "HBA not online, failing flash update.\n");
                         return -EAGAIN;
                 }
 
-                DEBUG2(qla_printk(KERN_INFO, ha,
+                ql_dbg(ql_dbg_user, vha, 0x7069,
                     "Writing flash region -- 0x%x/0x%x.\n",
-                    ha->optrom_region_start, ha->optrom_region_size));
+                    ha->optrom_region_start, ha->optrom_region_size);
 
                 ha->isp_ops->write_optrom(vha, ha->optrom_buffer,
                     ha->optrom_region_start, ha->optrom_region_size);
@@ -425,7 +427,7 @@ qla2x00_sysfs_write_vpd(struct file *filp, struct kobject *kobj,
                 return 0;
 
         if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x706a,
                     "HBA not online, failing VPD update.\n");
                 return -EAGAIN;
         }
@@ -440,7 +442,7 @@ qla2x00_sysfs_write_vpd(struct file *filp, struct kobject *kobj,
 
         tmp_data = vmalloc(256);
         if (!tmp_data) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x706b,
                     "Unable to allocate memory for VPD information update.\n");
                 goto done;
         }
@@ -480,7 +482,7 @@ qla2x00_sysfs_read_sfp(struct file *filp, struct kobject *kobj,
         ha->sfp_data = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
             &ha->sfp_data_dma);
         if (!ha->sfp_data) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x706c,
                     "Unable to allocate memory for SFP read-data.\n");
                 return 0;
         }
@@ -499,9 +501,10 @@ do_read:
                 rval = qla2x00_read_sfp(vha, ha->sfp_data_dma, ha->sfp_data,
                     addr, offset, SFP_BLOCK_SIZE, 0);
                 if (rval != QLA_SUCCESS) {
-                        qla_printk(KERN_WARNING, ha,
+                        ql_log(ql_log_warn, vha, 0x706d,
                             "Unable to read SFP data (%x/%x/%x).\n", rval,
                             addr, offset);
+
                         count = 0;
                         break;
                 }
@@ -538,8 +541,8 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
         type = simple_strtol(buf, NULL, 10);
         switch (type) {
         case 0x2025c:
-                qla_printk(KERN_INFO, ha,
-                    "Issuing ISP reset on (%ld).\n", vha->host_no);
+                ql_log(ql_log_info, vha, 0x706e,
+                    "Issuing ISP reset.\n");
 
                 scsi_block_requests(vha->host);
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -551,8 +554,8 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 if (!IS_QLA81XX(ha))
                         break;
 
-                qla_printk(KERN_INFO, ha,
-                    "Issuing MPI reset on (%ld).\n", vha->host_no);
+                ql_log(ql_log_info, vha, 0x706f,
+                    "Issuing MPI reset.\n");
 
                 /* Make sure FC side is not in reset */
                 qla2x00_wait_for_hba_online(vha);
@@ -560,20 +563,19 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 /* Issue MPI reset */
                 scsi_block_requests(vha->host);
                 if (qla81xx_restart_mpi_firmware(vha) != QLA_SUCCESS)
-                        qla_printk(KERN_WARNING, ha,
-                            "MPI reset failed on (%ld).\n", vha->host_no);
+                        ql_log(ql_log_warn, vha, 0x7070,
+                            "MPI reset failed.\n");
                 scsi_unblock_requests(vha->host);
                 break;
         case 0x2025e:
                 if (!IS_QLA82XX(ha) || vha != base_vha) {
-                        qla_printk(KERN_INFO, ha,
-                            "FCoE ctx reset not supported for host%ld.\n",
-                            vha->host_no);
+                        ql_log(ql_log_info, vha, 0x7071,
+                            "FCoE ctx reset no supported.\n");
                         return count;
                 }
 
-                qla_printk(KERN_INFO, ha,
-                    "Issuing FCoE CTX reset on host%ld.\n", vha->host_no);
+                ql_log(ql_log_info, vha, 0x7072,
+                    "Issuing FCoE ctx reset.\n");
                 set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
                 qla2xxx_wake_dpc(vha);
                 qla2x00_wait_for_fcoe_ctx_reset(vha);
@@ -611,8 +613,8 @@ qla2x00_sysfs_write_edc(struct file *filp, struct kobject *kobj,
                 ha->edc_data = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
                     &ha->edc_data_dma);
                 if (!ha->edc_data) {
-                        DEBUG2(qla_printk(KERN_INFO, ha,
-                            "Unable to allocate memory for EDC write.\n"));
+                        ql_log(ql_log_warn, vha, 0x7073,
+                            "Unable to allocate memory for EDC write.\n");
                         return 0;
                 }
         }
@@ -631,9 +633,9 @@ qla2x00_sysfs_write_edc(struct file *filp, struct kobject *kobj,
         rval = qla2x00_write_sfp(vha, ha->edc_data_dma, ha->edc_data,
             dev, adr, len, opt);
         if (rval != QLA_SUCCESS) {
-                DEBUG2(qla_printk(KERN_INFO, ha,
-                    "Unable to write EDC (%x) %02x:%02x:%04x:%02x:%02x.\n",
-                    rval, dev, adr, opt, len, buf[8]));
+                ql_log(ql_log_warn, vha, 0x7074,
+                    "Unable to write EDC (%x) %02x:%04x:%02x:%02x\n",
+                    rval, dev, adr, opt, len, buf[8]);
                 return 0;
         }
 
@@ -669,8 +671,8 @@ qla2x00_sysfs_write_edc_status(struct file *filp, struct kobject *kobj,
                 ha->edc_data = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
                     &ha->edc_data_dma);
                 if (!ha->edc_data) {
-                        DEBUG2(qla_printk(KERN_INFO, ha,
-                            "Unable to allocate memory for EDC status.\n"));
+                        ql_log(ql_log_warn, vha, 0x708c,
+                            "Unable to allocate memory for EDC status.\n");
                         return 0;
                 }
         }
@@ -688,9 +690,9 @@ qla2x00_sysfs_write_edc_status(struct file *filp, struct kobject *kobj,
         rval = qla2x00_read_sfp(vha, ha->edc_data_dma, ha->edc_data,
                         dev, adr, len, opt);
         if (rval != QLA_SUCCESS) {
-                DEBUG2(qla_printk(KERN_INFO, ha,
-                    "Unable to write EDC status (%x) %02x:%02x:%04x:%02x.\n",
-                    rval, dev, adr, opt, len));
+                ql_log(ql_log_info, vha, 0x7075,
+                    "Unable to write EDC status (%x) %02x:%04x:%02x.\n",
+                    rval, dev, adr, opt, len);
                 return 0;
         }
 
@@ -749,7 +751,7 @@ qla2x00_sysfs_read_xgmac_stats(struct file *filp, struct kobject *kobj,
         ha->xgmac_data = dma_alloc_coherent(&ha->pdev->dev, XGMAC_DATA_SIZE,
             &ha->xgmac_data_dma, GFP_KERNEL);
         if (!ha->xgmac_data) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x7076,
                     "Unable to allocate memory for XGMAC read-data.\n");
                 return 0;
         }
@@ -761,7 +763,7 @@ do_read:
         rval = qla2x00_get_xgmac_stats(vha, ha->xgmac_data_dma,
             XGMAC_DATA_SIZE, &actual_size);
         if (rval != QLA_SUCCESS) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x7077,
                     "Unable to read XGMAC data (%x).\n", rval);
                 count = 0;
         }
@@ -801,7 +803,7 @@ qla2x00_sysfs_read_dcbx_tlv(struct file *filp, struct kobject *kobj,
         ha->dcbx_tlv = dma_alloc_coherent(&ha->pdev->dev, DCBX_TLV_DATA_SIZE,
             &ha->dcbx_tlv_dma, GFP_KERNEL);
         if (!ha->dcbx_tlv) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x7078,
                     "Unable to allocate memory for DCBX TLV read-data.\n");
                 return 0;
         }
@@ -813,8 +815,8 @@ do_read:
         rval = qla2x00_get_dcbx_params(vha, ha->dcbx_tlv_dma,
             DCBX_TLV_DATA_SIZE);
         if (rval != QLA_SUCCESS) {
-                qla_printk(KERN_WARNING, ha,
-                    "Unable to read DCBX TLV data (%x).\n", rval);
+                ql_log(ql_log_warn, vha, 0x7079,
+                    "Unable to read DCBX TLV (%x).\n", rval);
                 count = 0;
         }
 
@@ -869,9 +871,13 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *vha)
                 ret = sysfs_create_bin_file(&host->shost_gendev.kobj,
                     iter->attr);
                 if (ret)
-                        qla_printk(KERN_INFO, vha->hw,
-                            "Unable to create sysfs %s binary attribute "
-                            "(%d).\n", iter->name, ret);
+                        ql_log(ql_log_warn, vha, 0x00f3,
+                            "Unable to create sysfs %s binary attribute (%d).\n",
+                            iter->name, ret);
+                else
+                        ql_dbg(ql_dbg_init, vha, 0x00f4,
+                            "Successfully created sysfs %s binary attribure.\n",
+                            iter->name);
         }
 }
 
@@ -1126,7 +1132,7 @@ qla2x00_beacon_store(struct device *dev, struct device_attribute *attr,
                 return -EPERM;
 
         if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags)) {
-                qla_printk(KERN_WARNING, ha,
+                ql_log(ql_log_warn, vha, 0x707a,
                     "Abort ISP active -- ignoring beacon request.\n");
                 return -EBUSY;
         }
@@ -1322,9 +1328,8 @@ qla2x00_thermal_temp_show(struct device *dev,
         temp = frac = 0;
         if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
             test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
-                DEBUG2_3_11(printk(KERN_WARNING
-                    "%s(%ld): isp reset in progress.\n",
-                    __func__, vha->host_no));
+                ql_log(ql_log_warn, vha, 0x707b,
+                    "ISP reset active.\n");
         else if (!vha->hw->flags.eeh_busy)
                 rval = qla2x00_get_thermal_temp(vha, &temp, &frac);
         if (rval != QLA_SUCCESS)
@@ -1343,8 +1348,8 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
 
         if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
                 test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
-                DEBUG2_3_11(printk("%s(%ld): isp reset in progress.\n",
-                        __func__, vha->host_no));
+                ql_log(ql_log_warn, vha, 0x707c,
+                    "ISP reset active.\n");
         else if (!vha->hw->flags.eeh_busy)
                 rval = qla2x00_get_firmware_state(vha, state);
         if (rval != QLA_SUCCESS)
@@ -1645,8 +1650,8 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
 
         stats = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &stats_dma);
         if (stats == NULL) {
-                DEBUG2_3_11(printk("%s(%ld): Failed to allocate memory.\n",
-                    __func__, base_vha->host_no));
+                ql_log(ql_log_warn, vha, 0x707d,
+                    "Failed to allocate memory for stats.\n");
                 goto done;
         }
         memset(stats, 0, DMA_POOL_SIZE);
@@ -1746,15 +1751,14 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
         ret = qla24xx_vport_create_req_sanity_check(fc_vport);
         if (ret) {
-                DEBUG15(printk("qla24xx_vport_create_req_sanity_check failed, "
-                    "status %x\n", ret));
+                ql_log(ql_log_warn, vha, 0x707e,
+                    "Vport sanity check failed, status %x\n", ret);
                 return (ret);
         }
 
         vha = qla24xx_create_vhost(fc_vport);
         if (vha == NULL) {
-                DEBUG15(printk ("qla24xx_create_vhost failed, vha = %p\n",
-                    vha));
+                ql_log(ql_log_warn, vha, 0x707f, "Vport create host failed.\n");
                 return FC_VPORT_FAILED;
         }
         if (disable) {
@@ -1764,8 +1768,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                 atomic_set(&vha->vp_state, VP_FAILED);
 
         /* ready to create vport */
-        qla_printk(KERN_INFO, vha->hw, "VP entry id %d assigned.\n",
-                                                        vha->vp_idx);
+        ql_log(ql_log_info, vha, 0x7080,
+            "VP entry id %d assigned.\n", vha->vp_idx);
 
         /* initialized vport states */
         atomic_set(&vha->loop_state, LOOP_DOWN);
@@ -1775,8 +1779,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
         if (atomic_read(&base_vha->loop_state) == LOOP_DOWN ||
             atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
                 /* Don't retry or attempt login of this virtual port */
-                DEBUG15(printk ("scsi(%ld): pport loop_state is not UP.\n",
-                    base_vha->host_no));
+                ql_dbg(ql_dbg_user, vha, 0x7081,
+                    "Vport loop state is not UP.\n");
                 atomic_set(&vha->loop_state, LOOP_DEAD);
                 if (!disable)
                         fc_vport_set_state(fc_vport, FC_VPORT_LINKDOWN);
@@ -1785,9 +1789,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
         if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && ql2xenabledif) {
                 if (ha->fw_attributes & BIT_4) {
                         vha->flags.difdix_supported = 1;
-                        DEBUG18(qla_printk(KERN_INFO, ha,
-                            "Registering for DIF/DIX type 1 and 3"
-                            " protection.\n"));
+                        ql_dbg(ql_dbg_user, vha, 0x7082,
+                            "Registered for DIF/DIX type 1 and 3 protection.\n");
                         scsi_host_set_prot(vha->host,
                             SHOST_DIF_TYPE1_PROTECTION
                             | SHOST_DIF_TYPE2_PROTECTION
@@ -1802,8 +1805,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
         if (scsi_add_host_with_dma(vha->host, &fc_vport->dev,
                                    &ha->pdev->dev)) {
-                DEBUG15(printk("scsi(%ld): scsi_add_host failure for VP[%d].\n",
-                        vha->host_no, vha->vp_idx));
+                ql_dbg(ql_dbg_user, vha, 0x7083,
+                    "scsi_add_host failure for VP[%d].\n", vha->vp_idx);
                 goto vport_create_failed_2;
         }
 
@@ -1820,6 +1823,10 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
         if (ha->flags.cpu_affinity_enabled) {
                 req = ha->req_q_map[1];
+                ql_dbg(ql_dbg_multiq, vha, 0xc000,
+                    "Request queue %p attached with "
+                    "VP[%d], cpu affinity =%d\n",
+                    req, vha->vp_idx, ha->flags.cpu_affinity_enabled);
                 goto vport_queue;
         } else if (ql2xmaxqueues == 1 || !ha->npiv_info)
                 goto vport_queue;
@@ -1836,13 +1843,16 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                 ret = qla25xx_create_req_que(ha, options, vha->vp_idx, 0, 0,
                         qos);
                 if (!ret)
-                        qla_printk(KERN_WARNING, ha,
-                        "Can't create request queue for vp_idx:%d\n",
-                        vha->vp_idx);
+                        ql_log(ql_log_warn, vha, 0x7084,
+                            "Can't create request queue for VP[%d]\n",
+                            vha->vp_idx);
                 else {
-                        DEBUG2(qla_printk(KERN_INFO, ha,
-                        "Request Que:%d (QoS: %d) created for vp_idx:%d\n",
-                        ret, qos, vha->vp_idx));
+                        ql_dbg(ql_dbg_multiq, vha, 0xc001,
+                            "Request Que:%d Q0s: %d) created for VP[%d]\n",
+                            ret, qos, vha->vp_idx);
+                        ql_dbg(ql_dbg_user, vha, 0x7085,
+                            "Request Que:%d Q0s: %d) created for VP[%d]\n",
+                            ret, qos, vha->vp_idx);
                         req = ha->req_q_map[ret];
                 }
         }
@@ -1882,12 +1892,13 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
 
         if (vha->timer_active) {
                 qla2x00_vp_stop_timer(vha);
-                DEBUG15(printk(KERN_INFO "scsi(%ld): timer for the vport[%d]"
-                " = %p has stopped\n", vha->host_no, vha->vp_idx, vha));
+                ql_dbg(ql_dbg_user, vha, 0x7086,
+                    "Timer for the VP[%d] has stopped\n", vha->vp_idx);
         }
 
         /* No pending activities shall be there on the vha now */
-        DEBUG(msleep(random32()%10));  /* Just to see if something falls on
+        if (ql2xextended_error_logging & ql_dbg_user)
+                msleep(random32()%10);  /* Just to see if something falls on
                                         * the net we have placed below */
 
         BUG_ON(atomic_read(&vha->vref_count));
@@ -1901,12 +1912,12 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
 
         if (vha->req->id && !ha->flags.cpu_affinity_enabled) {
                 if (qla25xx_delete_req_que(vha, vha->req) != QLA_SUCCESS)
-                        qla_printk(KERN_WARNING, ha,
-                                "Queue delete failed.\n");
+                        ql_log(ql_log_warn, vha, 0x7087,
+                            "Queue delete failed.\n");
         }
 
         scsi_host_put(vha->host);
-        qla_printk(KERN_INFO, ha, "vport %d deleted\n", id);
+        ql_log(ql_log_info, vha, 0x7088, "VP[%d] deleted.\n", id);
         return 0;
 }