aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/scsi/qla2xxx/qla_dbg.c9
-rw-r--r--drivers/scsi/qla2xxx/qla_dbg.h5
-rw-r--r--drivers/scsi/qla2xxx/qla_mbx.c495
-rw-r--r--drivers/scsi/qla2xxx/qla_mid.c8
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c5
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c13
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 @@
12 * | Level | Last Value Used | Holes | 12 * | Level | Last Value Used | Holes |
13 * ---------------------------------------------------------------------- 13 * ----------------------------------------------------------------------
14 * | Module Init and Probe | 0x0120 | 0x4b,0xba,0xfa | 14 * | Module Init and Probe | 0x0120 | 0x4b,0xba,0xfa |
15 * | Mailbox commands | 0x113e | 0x112c-0x112e | 15 * | Mailbox commands | 0x113e | 0x111a-0x111b |
16 * | | | 0x112c-0x112e |
16 * | | | 0x113a | 17 * | | | 0x113a |
17 * | Device Discovery | 0x2086 | 0x2020-0x2022 | 18 * | Device Discovery | 0x2086 | 0x2020-0x2022 |
18 * | Queue Command and IO tracing | 0x3030 | 0x3006,0x3008 | 19 * | Queue Command and IO tracing | 0x3030 | 0x3006,0x3008 |
19 * | | | 0x302d-0x302e | 20 * | | | 0x302d-0x302e |
20 * | DPC Thread | 0x401c | | 21 * | DPC Thread | 0x401c | 0x4002,0x4013 |
21 * | Async Events | 0x505d | 0x502b-0x502f | 22 * | Async Events | 0x505d | 0x502b-0x502f |
22 * | | | 0x5047,0x5052 | 23 * | | | 0x5047,0x5052 |
23 * | Timer Routines | 0x6011 | | 24 * | Timer Routines | 0x6011 | |
@@ -27,9 +28,9 @@
27 * | | | 0x708c | 28 * | | | 0x708c |
28 * | Task Management | 0x803c | 0x8025-0x8026 | 29 * | Task Management | 0x803c | 0x8025-0x8026 |
29 * | | | 0x800b,0x8039 | 30 * | | | 0x800b,0x8039 |
30 * | AER/EEH | 0x900f | | 31 * | AER/EEH | 0x9011 | |
31 * | Virtual Port | 0xa007 | | 32 * | Virtual Port | 0xa007 | |
32 * | ISP82XX Specific | 0xb054 | 0xb053 | 33 * | ISP82XX Specific | 0xb054 | 0xb024 |
33 * | MultiQ | 0xc00c | | 34 * | MultiQ | 0xc00c | |
34 * | Misc | 0xd010 | | 35 * | Misc | 0xd010 | |
35 * ---------------------------------------------------------------------- 36 * ----------------------------------------------------------------------
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, ...);
339#define ql_dbg_misc 0x00010000 /* For dumping everything that is not 339#define ql_dbg_misc 0x00010000 /* For dumping everything that is not
340 * not covered by upper categories 340 * not covered by upper categories
341 */ 341 */
342#define ql_dbg_verbose 0x00008000 /* More verbosity for each level
343 * This is to be used with other levels where
344 * more verbosity is required. It might not
345 * be applicable to all the levels.
346 */
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)
270 ictrl = RD_REG_WORD(&reg->isp.ictrl); 270 ictrl = RD_REG_WORD(&reg->isp.ictrl);
271 } 271 }
272 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1119, 272 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1119,
273 "MBX Command timeout for cmd %x.\n", command); 273 "MBX Command timeout for cmd %x, iocontrol=%x jiffies=%lx "
274 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111a, 274 "mb[0]=0x%x\n", command, ictrl, jiffies, mb0);
275 "iocontrol=%x jiffies=%lx.\n", ictrl, jiffies);
276 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111b,
277 "mb[0] = 0x%x.\n", mb0);
278 ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1019); 275 ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1019);
279 276
280 /* 277 /*
@@ -390,7 +387,8 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
390 mbx_cmd_t mc; 387 mbx_cmd_t mc;
391 mbx_cmd_t *mcp = &mc; 388 mbx_cmd_t *mcp = &mc;
392 389
393 ql_dbg(ql_dbg_mbx, vha, 0x1022, "Entered %s.\n", __func__); 390 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1022,
391 "Entered %s.\n", __func__);
394 392
395 if (MSW(risc_addr) || IS_FWI2_CAPABLE(ha)) { 393 if (MSW(risc_addr) || IS_FWI2_CAPABLE(ha)) {
396 mcp->mb[0] = MBC_LOAD_RISC_RAM_EXTENDED; 394 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,
424 ql_dbg(ql_dbg_mbx, vha, 0x1023, 422 ql_dbg(ql_dbg_mbx, vha, 0x1023,
425 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 423 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
426 } else { 424 } else {
427 ql_dbg(ql_dbg_mbx, vha, 0x1024, "Done %s.\n", __func__); 425 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1024,
426 "Done %s.\n", __func__);
428 } 427 }
429 428
430 return rval; 429 return rval;
@@ -454,7 +453,8 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
454 mbx_cmd_t mc; 453 mbx_cmd_t mc;
455 mbx_cmd_t *mcp = &mc; 454 mbx_cmd_t *mcp = &mc;
456 455
457 ql_dbg(ql_dbg_mbx, vha, 0x1025, "Entered %s.\n", __func__); 456 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1025,
457 "Entered %s.\n", __func__);
458 458
459 mcp->mb[0] = MBC_EXECUTE_FIRMWARE; 459 mcp->mb[0] = MBC_EXECUTE_FIRMWARE;
460 mcp->out_mb = MBX_0; 460 mcp->out_mb = MBX_0;
@@ -489,10 +489,11 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
489 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 489 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
490 } else { 490 } else {
491 if (IS_FWI2_CAPABLE(ha)) { 491 if (IS_FWI2_CAPABLE(ha)) {
492 ql_dbg(ql_dbg_mbx, vha, 0x1027, 492 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1027,
493 "Done exchanges=%x.\n", mcp->mb[1]); 493 "Done exchanges=%x.\n", mcp->mb[1]);
494 } else { 494 } else {
495 ql_dbg(ql_dbg_mbx, vha, 0x1028, "Done %s.\n", __func__); 495 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1028,
496 "Done %s.\n", __func__);
496 } 497 }
497 } 498 }
498 499
@@ -523,7 +524,8 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
523 mbx_cmd_t *mcp = &mc; 524 mbx_cmd_t *mcp = &mc;
524 struct qla_hw_data *ha = vha->hw; 525 struct qla_hw_data *ha = vha->hw;
525 526
526 ql_dbg(ql_dbg_mbx, vha, 0x1029, "Entered %s.\n", __func__); 527 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1029,
528 "Entered %s.\n", __func__);
527 529
528 mcp->mb[0] = MBC_GET_FIRMWARE_VERSION; 530 mcp->mb[0] = MBC_GET_FIRMWARE_VERSION;
529 mcp->out_mb = MBX_0; 531 mcp->out_mb = MBX_0;
@@ -561,11 +563,11 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
561 ha->fw_attributes_h = mcp->mb[15]; 563 ha->fw_attributes_h = mcp->mb[15];
562 ha->fw_attributes_ext[0] = mcp->mb[16]; 564 ha->fw_attributes_ext[0] = mcp->mb[16];
563 ha->fw_attributes_ext[1] = mcp->mb[17]; 565 ha->fw_attributes_ext[1] = mcp->mb[17];
564 ql_dbg(ql_dbg_mbx, vha, 0x1139, 566 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1139,
565 "%s: FW_attributes Upper: 0x%x, Lower: 0x%x.\n", 567 "%s: FW_attributes Upper: 0x%x, Lower: 0x%x.\n",
566 __func__, mcp->mb[15], mcp->mb[6]); 568 __func__, mcp->mb[15], mcp->mb[6]);
567 } else 569 } else
568 ql_dbg(ql_dbg_mbx, vha, 0x112f, 570 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x112f,
569 "%s: FwAttributes [Upper] invalid, MB6:%04x\n", 571 "%s: FwAttributes [Upper] invalid, MB6:%04x\n",
570 __func__, mcp->mb[6]); 572 __func__, mcp->mb[6]);
571 } 573 }
@@ -576,7 +578,8 @@ failed:
576 ql_dbg(ql_dbg_mbx, vha, 0x102a, "Failed=%x.\n", rval); 578 ql_dbg(ql_dbg_mbx, vha, 0x102a, "Failed=%x.\n", rval);
577 } else { 579 } else {
578 /*EMPTY*/ 580 /*EMPTY*/
579 ql_dbg(ql_dbg_mbx, vha, 0x102b, "Done %s.\n", __func__); 581 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102b,
582 "Done %s.\n", __func__);
580 } 583 }
581 return rval; 584 return rval;
582} 585}
@@ -602,7 +605,8 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
602 mbx_cmd_t mc; 605 mbx_cmd_t mc;
603 mbx_cmd_t *mcp = &mc; 606 mbx_cmd_t *mcp = &mc;
604 607
605 ql_dbg(ql_dbg_mbx, vha, 0x102c, "Entered %s.\n", __func__); 608 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102c,
609 "Entered %s.\n", __func__);
606 610
607 mcp->mb[0] = MBC_GET_FIRMWARE_OPTION; 611 mcp->mb[0] = MBC_GET_FIRMWARE_OPTION;
608 mcp->out_mb = MBX_0; 612 mcp->out_mb = MBX_0;
@@ -620,7 +624,8 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
620 fwopts[2] = mcp->mb[2]; 624 fwopts[2] = mcp->mb[2];
621 fwopts[3] = mcp->mb[3]; 625 fwopts[3] = mcp->mb[3];
622 626
623 ql_dbg(ql_dbg_mbx, vha, 0x102e, "Done %s.\n", __func__); 627 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102e,
628 "Done %s.\n", __func__);
624 } 629 }
625 630
626 return rval; 631 return rval;
@@ -648,7 +653,8 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
648 mbx_cmd_t mc; 653 mbx_cmd_t mc;
649 mbx_cmd_t *mcp = &mc; 654 mbx_cmd_t *mcp = &mc;
650 655
651 ql_dbg(ql_dbg_mbx, vha, 0x102f, "Entered %s.\n", __func__); 656 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102f,
657 "Entered %s.\n", __func__);
652 658
653 mcp->mb[0] = MBC_SET_FIRMWARE_OPTION; 659 mcp->mb[0] = MBC_SET_FIRMWARE_OPTION;
654 mcp->mb[1] = fwopts[1]; 660 mcp->mb[1] = fwopts[1];
@@ -676,7 +682,8 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
676 "Failed=%x (%x/%x).\n", rval, mcp->mb[0], mcp->mb[1]); 682 "Failed=%x (%x/%x).\n", rval, mcp->mb[0], mcp->mb[1]);
677 } else { 683 } else {
678 /*EMPTY*/ 684 /*EMPTY*/
679 ql_dbg(ql_dbg_mbx, vha, 0x1031, "Done %s.\n", __func__); 685 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1031,
686 "Done %s.\n", __func__);
680 } 687 }
681 688
682 return rval; 689 return rval;
@@ -704,7 +711,8 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
704 mbx_cmd_t mc; 711 mbx_cmd_t mc;
705 mbx_cmd_t *mcp = &mc; 712 mbx_cmd_t *mcp = &mc;
706 713
707 ql_dbg(ql_dbg_mbx, vha, 0x1032, "Entered %s.\n", __func__); 714 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1032,
715 "Entered %s.\n", __func__);
708 716
709 mcp->mb[0] = MBC_MAILBOX_REGISTER_TEST; 717 mcp->mb[0] = MBC_MAILBOX_REGISTER_TEST;
710 mcp->mb[1] = 0xAAAA; 718 mcp->mb[1] = 0xAAAA;
@@ -734,7 +742,8 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
734 ql_dbg(ql_dbg_mbx, vha, 0x1033, "Failed=%x.\n", rval); 742 ql_dbg(ql_dbg_mbx, vha, 0x1033, "Failed=%x.\n", rval);
735 } else { 743 } else {
736 /*EMPTY*/ 744 /*EMPTY*/
737 ql_dbg(ql_dbg_mbx, vha, 0x1034, "Done %s.\n", __func__); 745 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1034,
746 "Done %s.\n", __func__);
738 } 747 }
739 748
740 return rval; 749 return rval;
@@ -762,7 +771,8 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
762 mbx_cmd_t mc; 771 mbx_cmd_t mc;
763 mbx_cmd_t *mcp = &mc; 772 mbx_cmd_t *mcp = &mc;
764 773
765 ql_dbg(ql_dbg_mbx, vha, 0x1035, "Entered %s.\n", __func__); 774 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1035,
775 "Entered %s.\n", __func__);
766 776
767 mcp->mb[0] = MBC_VERIFY_CHECKSUM; 777 mcp->mb[0] = MBC_VERIFY_CHECKSUM;
768 mcp->out_mb = MBX_0; 778 mcp->out_mb = MBX_0;
@@ -787,7 +797,8 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
787 "Failed=%x chm sum=%x.\n", rval, IS_FWI2_CAPABLE(vha->hw) ? 797 "Failed=%x chm sum=%x.\n", rval, IS_FWI2_CAPABLE(vha->hw) ?
788 (mcp->mb[2] << 16) | mcp->mb[1] : mcp->mb[1]); 798 (mcp->mb[2] << 16) | mcp->mb[1] : mcp->mb[1]);
789 } else { 799 } else {
790 ql_dbg(ql_dbg_mbx, vha, 0x1037, "Done %s.\n", __func__); 800 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1037,
801 "Done %s.\n", __func__);
791 } 802 }
792 803
793 return rval; 804 return rval;
@@ -819,7 +830,8 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
819 mbx_cmd_t mc; 830 mbx_cmd_t mc;
820 mbx_cmd_t *mcp = &mc; 831 mbx_cmd_t *mcp = &mc;
821 832
822 ql_dbg(ql_dbg_mbx, vha, 0x1038, "Entered %s.\n", __func__); 833 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1038,
834 "Entered %s.\n", __func__);
823 835
824 mcp->mb[0] = MBC_IOCB_COMMAND_A64; 836 mcp->mb[0] = MBC_IOCB_COMMAND_A64;
825 mcp->mb[1] = 0; 837 mcp->mb[1] = 0;
@@ -842,7 +854,8 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
842 /* Mask reserved bits. */ 854 /* Mask reserved bits. */
843 sts_entry->entry_status &= 855 sts_entry->entry_status &=
844 IS_FWI2_CAPABLE(vha->hw) ? RF_MASK_24XX : RF_MASK; 856 IS_FWI2_CAPABLE(vha->hw) ? RF_MASK_24XX : RF_MASK;
845 ql_dbg(ql_dbg_mbx, vha, 0x103a, "Done %s.\n", __func__); 857 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103a,
858 "Done %s.\n", __func__);
846 } 859 }
847 860
848 return rval; 861 return rval;
@@ -884,7 +897,8 @@ qla2x00_abort_command(srb_t *sp)
884 struct req_que *req = vha->req; 897 struct req_que *req = vha->req;
885 struct scsi_cmnd *cmd = GET_CMD_SP(sp); 898 struct scsi_cmnd *cmd = GET_CMD_SP(sp);
886 899
887 ql_dbg(ql_dbg_mbx, vha, 0x103b, "Entered %s.\n", __func__); 900 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103b,
901 "Entered %s.\n", __func__);
888 902
889 spin_lock_irqsave(&ha->hardware_lock, flags); 903 spin_lock_irqsave(&ha->hardware_lock, flags);
890 for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) { 904 for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -915,7 +929,8 @@ qla2x00_abort_command(srb_t *sp)
915 if (rval != QLA_SUCCESS) { 929 if (rval != QLA_SUCCESS) {
916 ql_dbg(ql_dbg_mbx, vha, 0x103c, "Failed=%x.\n", rval); 930 ql_dbg(ql_dbg_mbx, vha, 0x103c, "Failed=%x.\n", rval);
917 } else { 931 } else {
918 ql_dbg(ql_dbg_mbx, vha, 0x103d, "Done %s.\n", __func__); 932 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103d,
933 "Done %s.\n", __func__);
919 } 934 }
920 935
921 return rval; 936 return rval;
@@ -934,7 +949,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
934 l = l; 949 l = l;
935 vha = fcport->vha; 950 vha = fcport->vha;
936 951
937 ql_dbg(ql_dbg_mbx, vha, 0x103e, "Entered %s.\n", __func__); 952 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103e,
953 "Entered %s.\n", __func__);
938 954
939 req = vha->hw->req_q_map[0]; 955 req = vha->hw->req_q_map[0];
940 rsp = req->rsp; 956 rsp = req->rsp;
@@ -955,7 +971,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
955 mcp->flags = 0; 971 mcp->flags = 0;
956 rval = qla2x00_mailbox_command(vha, mcp); 972 rval = qla2x00_mailbox_command(vha, mcp);
957 if (rval != QLA_SUCCESS) { 973 if (rval != QLA_SUCCESS) {
958 ql_dbg(ql_dbg_mbx, vha, 0x103f, "Failed=%x.\n", rval); 974 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103f,
975 "Failed=%x.\n", rval);
959 } 976 }
960 977
961 /* Issue marker IOCB. */ 978 /* Issue marker IOCB. */
@@ -965,7 +982,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
965 ql_dbg(ql_dbg_mbx, vha, 0x1040, 982 ql_dbg(ql_dbg_mbx, vha, 0x1040,
966 "Failed to issue marker IOCB (%x).\n", rval2); 983 "Failed to issue marker IOCB (%x).\n", rval2);
967 } else { 984 } else {
968 ql_dbg(ql_dbg_mbx, vha, 0x1041, "Done %s.\n", __func__); 985 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1041,
986 "Done %s.\n", __func__);
969 } 987 }
970 988
971 return rval; 989 return rval;
@@ -983,7 +1001,8 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
983 1001
984 vha = fcport->vha; 1002 vha = fcport->vha;
985 1003
986 ql_dbg(ql_dbg_mbx, vha, 0x1042, "Entered %s.\n", __func__); 1004 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1042,
1005 "Entered %s.\n", __func__);
987 1006
988 req = vha->hw->req_q_map[0]; 1007 req = vha->hw->req_q_map[0];
989 rsp = req->rsp; 1008 rsp = req->rsp;
@@ -1012,7 +1031,8 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
1012 ql_dbg(ql_dbg_mbx, vha, 0x1044, 1031 ql_dbg(ql_dbg_mbx, vha, 0x1044,
1013 "Failed to issue marker IOCB (%x).\n", rval2); 1032 "Failed to issue marker IOCB (%x).\n", rval2);
1014 } else { 1033 } else {
1015 ql_dbg(ql_dbg_mbx, vha, 0x1045, "Done %s.\n", __func__); 1034 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1045,
1035 "Done %s.\n", __func__);
1016 } 1036 }
1017 1037
1018 return rval; 1038 return rval;
@@ -1046,7 +1066,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
1046 mbx_cmd_t mc; 1066 mbx_cmd_t mc;
1047 mbx_cmd_t *mcp = &mc; 1067 mbx_cmd_t *mcp = &mc;
1048 1068
1049 ql_dbg(ql_dbg_mbx, vha, 0x1046, "Entered %s.\n", __func__); 1069 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1046,
1070 "Entered %s.\n", __func__);
1050 1071
1051 mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID; 1072 mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID;
1052 mcp->mb[9] = vha->vp_idx; 1073 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,
1074 /*EMPTY*/ 1095 /*EMPTY*/
1075 ql_dbg(ql_dbg_mbx, vha, 0x1047, "Failed=%x.\n", rval); 1096 ql_dbg(ql_dbg_mbx, vha, 0x1047, "Failed=%x.\n", rval);
1076 } else { 1097 } else {
1077 ql_dbg(ql_dbg_mbx, vha, 0x1048, "Done %s.\n", __func__); 1098 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1048,
1099 "Done %s.\n", __func__);
1078 1100
1079 if (IS_CNA_CAPABLE(vha->hw)) { 1101 if (IS_CNA_CAPABLE(vha->hw)) {
1080 vha->fcoe_vlan_id = mcp->mb[9] & 0xfff; 1102 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,
1115 mbx_cmd_t mc; 1137 mbx_cmd_t mc;
1116 mbx_cmd_t *mcp = &mc; 1138 mbx_cmd_t *mcp = &mc;
1117 1139
1118 ql_dbg(ql_dbg_mbx, vha, 0x1049, "Entered %s.\n", __func__); 1140 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1049,
1141 "Entered %s.\n", __func__);
1119 1142
1120 mcp->mb[0] = MBC_GET_RETRY_COUNT; 1143 mcp->mb[0] = MBC_GET_RETRY_COUNT;
1121 mcp->out_mb = MBX_0; 1144 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,
1138 *tov = ratov; 1161 *tov = ratov;
1139 } 1162 }
1140 1163
1141 ql_dbg(ql_dbg_mbx, vha, 0x104b, 1164 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104b,
1142 "Done %s mb3=%d ratov=%d.\n", __func__, mcp->mb[3], ratov); 1165 "Done %s mb3=%d ratov=%d.\n", __func__, mcp->mb[3], ratov);
1143 } 1166 }
1144 1167
@@ -1170,7 +1193,8 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
1170 mbx_cmd_t *mcp = &mc; 1193 mbx_cmd_t *mcp = &mc;
1171 struct qla_hw_data *ha = vha->hw; 1194 struct qla_hw_data *ha = vha->hw;
1172 1195
1173 ql_dbg(ql_dbg_mbx, vha, 0x104c, "Entered %s.\n", __func__); 1196 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104c,
1197 "Entered %s.\n", __func__);
1174 1198
1175 if (IS_QLA82XX(ha) && ql2xdbwr) 1199 if (IS_QLA82XX(ha) && ql2xdbwr)
1176 qla82xx_wr_32(ha, ha->nxdb_wr_ptr, 1200 qla82xx_wr_32(ha, ha->nxdb_wr_ptr,
@@ -1213,7 +1237,8 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
1213 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3]); 1237 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3]);
1214 } else { 1238 } else {
1215 /*EMPTY*/ 1239 /*EMPTY*/
1216 ql_dbg(ql_dbg_mbx, vha, 0x104e, "Done %s.\n", __func__); 1240 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104e,
1241 "Done %s.\n", __func__);
1217 } 1242 }
1218 1243
1219 return rval; 1244 return rval;
@@ -1246,7 +1271,8 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
1246 dma_addr_t pd_dma; 1271 dma_addr_t pd_dma;
1247 struct qla_hw_data *ha = vha->hw; 1272 struct qla_hw_data *ha = vha->hw;
1248 1273
1249 ql_dbg(ql_dbg_mbx, vha, 0x104f, "Entered %s.\n", __func__); 1274 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104f,
1275 "Entered %s.\n", __func__);
1250 1276
1251 pd24 = NULL; 1277 pd24 = NULL;
1252 pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma); 1278 pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma);
@@ -1378,7 +1404,8 @@ gpd_error_out:
1378 "Failed=%x mb[0]=%x mb[1]=%x.\n", rval, 1404 "Failed=%x mb[0]=%x mb[1]=%x.\n", rval,
1379 mcp->mb[0], mcp->mb[1]); 1405 mcp->mb[0], mcp->mb[1]);
1380 } else { 1406 } else {
1381 ql_dbg(ql_dbg_mbx, vha, 0x1053, "Done %s.\n", __func__); 1407 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1053,
1408 "Done %s.\n", __func__);
1382 } 1409 }
1383 1410
1384 return rval; 1411 return rval;
@@ -1407,7 +1434,8 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
1407 mbx_cmd_t mc; 1434 mbx_cmd_t mc;
1408 mbx_cmd_t *mcp = &mc; 1435 mbx_cmd_t *mcp = &mc;
1409 1436
1410 ql_dbg(ql_dbg_mbx, vha, 0x1054, "Entered %s.\n", __func__); 1437 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1054,
1438 "Entered %s.\n", __func__);
1411 1439
1412 mcp->mb[0] = MBC_GET_FIRMWARE_STATE; 1440 mcp->mb[0] = MBC_GET_FIRMWARE_STATE;
1413 mcp->out_mb = MBX_0; 1441 mcp->out_mb = MBX_0;
@@ -1433,7 +1461,8 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
1433 ql_dbg(ql_dbg_mbx, vha, 0x1055, "Failed=%x.\n", rval); 1461 ql_dbg(ql_dbg_mbx, vha, 0x1055, "Failed=%x.\n", rval);
1434 } else { 1462 } else {
1435 /*EMPTY*/ 1463 /*EMPTY*/
1436 ql_dbg(ql_dbg_mbx, vha, 0x1056, "Done %s.\n", __func__); 1464 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1056,
1465 "Done %s.\n", __func__);
1437 } 1466 }
1438 1467
1439 return rval; 1468 return rval;
@@ -1465,7 +1494,8 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
1465 mbx_cmd_t mc; 1494 mbx_cmd_t mc;
1466 mbx_cmd_t *mcp = &mc; 1495 mbx_cmd_t *mcp = &mc;
1467 1496
1468 ql_dbg(ql_dbg_mbx, vha, 0x1057, "Entered %s.\n", __func__); 1497 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1057,
1498 "Entered %s.\n", __func__);
1469 1499
1470 mcp->mb[0] = MBC_GET_PORT_NAME; 1500 mcp->mb[0] = MBC_GET_PORT_NAME;
1471 mcp->mb[9] = vha->vp_idx; 1501 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,
1499 name[7] = LSB(mcp->mb[7]); 1529 name[7] = LSB(mcp->mb[7]);
1500 } 1530 }
1501 1531
1502 ql_dbg(ql_dbg_mbx, vha, 0x1059, "Done %s.\n", __func__); 1532 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1059,
1533 "Done %s.\n", __func__);
1503 } 1534 }
1504 1535
1505 return rval; 1536 return rval;
@@ -1527,7 +1558,8 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
1527 mbx_cmd_t mc; 1558 mbx_cmd_t mc;
1528 mbx_cmd_t *mcp = &mc; 1559 mbx_cmd_t *mcp = &mc;
1529 1560
1530 ql_dbg(ql_dbg_mbx, vha, 0x105a, "Entered %s.\n", __func__); 1561 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105a,
1562 "Entered %s.\n", __func__);
1531 1563
1532 if (IS_CNA_CAPABLE(vha->hw)) { 1564 if (IS_CNA_CAPABLE(vha->hw)) {
1533 /* Logout across all FCFs. */ 1565 /* Logout across all FCFs. */
@@ -1564,7 +1596,8 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
1564 ql_dbg(ql_dbg_mbx, vha, 0x105b, "Failed=%x.\n", rval); 1596 ql_dbg(ql_dbg_mbx, vha, 0x105b, "Failed=%x.\n", rval);
1565 } else { 1597 } else {
1566 /*EMPTY*/ 1598 /*EMPTY*/
1567 ql_dbg(ql_dbg_mbx, vha, 0x105c, "Done %s.\n", __func__); 1599 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105c,
1600 "Done %s.\n", __func__);
1568 } 1601 }
1569 1602
1570 return rval; 1603 return rval;
@@ -1596,9 +1629,10 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
1596 mbx_cmd_t mc; 1629 mbx_cmd_t mc;
1597 mbx_cmd_t *mcp = &mc; 1630 mbx_cmd_t *mcp = &mc;
1598 1631
1599 ql_dbg(ql_dbg_mbx, vha, 0x105d, "Entered %s.\n", __func__); 1632 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105d,
1633 "Entered %s.\n", __func__);
1600 1634
1601 ql_dbg(ql_dbg_mbx, vha, 0x105e, 1635 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105e,
1602 "Retry cnt=%d ratov=%d total tov=%d.\n", 1636 "Retry cnt=%d ratov=%d total tov=%d.\n",
1603 vha->hw->retry_count, vha->hw->login_timeout, mcp->tov); 1637 vha->hw->retry_count, vha->hw->login_timeout, mcp->tov);
1604 1638
@@ -1622,7 +1656,8 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
1622 rval, mcp->mb[0], mcp->mb[1]); 1656 rval, mcp->mb[0], mcp->mb[1]);
1623 } else { 1657 } else {
1624 /*EMPTY*/ 1658 /*EMPTY*/
1625 ql_dbg(ql_dbg_mbx, vha, 0x1060, "Done %s.\n", __func__); 1659 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1060,
1660 "Done %s.\n", __func__);
1626 } 1661 }
1627 1662
1628 return rval; 1663 return rval;
@@ -1641,7 +1676,8 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
1641 struct req_que *req; 1676 struct req_que *req;
1642 struct rsp_que *rsp; 1677 struct rsp_que *rsp;
1643 1678
1644 ql_dbg(ql_dbg_mbx, vha, 0x1061, "Entered %s.\n", __func__); 1679 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1061,
1680 "Entered %s.\n", __func__);
1645 1681
1646 if (ha->flags.cpu_affinity_enabled) 1682 if (ha->flags.cpu_affinity_enabled)
1647 req = ha->req_q_map[0]; 1683 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,
1715 break; 1751 break;
1716 } 1752 }
1717 } else { 1753 } else {
1718 ql_dbg(ql_dbg_mbx, vha, 0x1066, "Done %s.\n", __func__); 1754 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1066,
1755 "Done %s.\n", __func__);
1719 1756
1720 iop[0] = le32_to_cpu(lg->io_parameter[0]); 1757 iop[0] = le32_to_cpu(lg->io_parameter[0]);
1721 1758
@@ -1770,7 +1807,8 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
1770 mbx_cmd_t *mcp = &mc; 1807 mbx_cmd_t *mcp = &mc;
1771 struct qla_hw_data *ha = vha->hw; 1808 struct qla_hw_data *ha = vha->hw;
1772 1809
1773 ql_dbg(ql_dbg_mbx, vha, 0x1067, "Entered %s.\n", __func__); 1810 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1067,
1811 "Entered %s.\n", __func__);
1774 1812
1775 mcp->mb[0] = MBC_LOGIN_FABRIC_PORT; 1813 mcp->mb[0] = MBC_LOGIN_FABRIC_PORT;
1776 mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; 1814 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,
1818 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]); 1856 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
1819 } else { 1857 } else {
1820 /*EMPTY*/ 1858 /*EMPTY*/
1821 ql_dbg(ql_dbg_mbx, vha, 0x1069, "Done %s.\n", __func__); 1859 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1069,
1860 "Done %s.\n", __func__);
1822 } 1861 }
1823 1862
1824 return rval; 1863 return rval;
@@ -1849,7 +1888,8 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
1849 mbx_cmd_t *mcp = &mc; 1888 mbx_cmd_t *mcp = &mc;
1850 struct qla_hw_data *ha = vha->hw; 1889 struct qla_hw_data *ha = vha->hw;
1851 1890
1852 ql_dbg(ql_dbg_mbx, vha, 0x106a, "Entered %s.\n", __func__); 1891 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106a,
1892 "Entered %s.\n", __func__);
1853 1893
1854 if (IS_FWI2_CAPABLE(ha)) 1894 if (IS_FWI2_CAPABLE(ha))
1855 return qla24xx_login_fabric(vha, fcport->loop_id, 1895 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,
1891 rval, mcp->mb[0], mcp->mb[1], mcp->mb[6], mcp->mb[7]); 1931 rval, mcp->mb[0], mcp->mb[1], mcp->mb[6], mcp->mb[7]);
1892 } else { 1932 } else {
1893 /*EMPTY*/ 1933 /*EMPTY*/
1894 ql_dbg(ql_dbg_mbx, vha, 0x106c, "Done %s.\n", __func__); 1934 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106c,
1935 "Done %s.\n", __func__);
1895 } 1936 }
1896 1937
1897 return (rval); 1938 return (rval);
@@ -1908,7 +1949,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
1908 struct req_que *req; 1949 struct req_que *req;
1909 struct rsp_que *rsp; 1950 struct rsp_que *rsp;
1910 1951
1911 ql_dbg(ql_dbg_mbx, vha, 0x106d, "Entered %s.\n", __func__); 1952 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106d,
1953 "Entered %s.\n", __func__);
1912 1954
1913 lg = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &lg_dma); 1955 lg = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &lg_dma);
1914 if (lg == NULL) { 1956 if (lg == NULL) {
@@ -1952,7 +1994,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
1952 le32_to_cpu(lg->io_parameter[1])); 1994 le32_to_cpu(lg->io_parameter[1]));
1953 } else { 1995 } else {
1954 /*EMPTY*/ 1996 /*EMPTY*/
1955 ql_dbg(ql_dbg_mbx, vha, 0x1072, "Done %s.\n", __func__); 1997 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1072,
1998 "Done %s.\n", __func__);
1956 } 1999 }
1957 2000
1958 dma_pool_free(ha->s_dma_pool, lg, lg_dma); 2001 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,
1984 mbx_cmd_t mc; 2027 mbx_cmd_t mc;
1985 mbx_cmd_t *mcp = &mc; 2028 mbx_cmd_t *mcp = &mc;
1986 2029
1987 ql_dbg(ql_dbg_mbx, vha, 0x1073, "Entered %s.\n", __func__); 2030 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1073,
2031 "Entered %s.\n", __func__);
1988 2032
1989 mcp->mb[0] = MBC_LOGOUT_FABRIC_PORT; 2033 mcp->mb[0] = MBC_LOGOUT_FABRIC_PORT;
1990 mcp->out_mb = MBX_1|MBX_0; 2034 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,
2007 "Failed=%x mb[1]=%x.\n", rval, mcp->mb[1]); 2051 "Failed=%x mb[1]=%x.\n", rval, mcp->mb[1]);
2008 } else { 2052 } else {
2009 /*EMPTY*/ 2053 /*EMPTY*/
2010 ql_dbg(ql_dbg_mbx, vha, 0x1075, "Done %s.\n", __func__); 2054 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1075,
2055 "Done %s.\n", __func__);
2011 } 2056 }
2012 2057
2013 return rval; 2058 return rval;
@@ -2035,7 +2080,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
2035 mbx_cmd_t mc; 2080 mbx_cmd_t mc;
2036 mbx_cmd_t *mcp = &mc; 2081 mbx_cmd_t *mcp = &mc;
2037 2082
2038 ql_dbg(ql_dbg_mbx, vha, 0x1076, "Entered %s.\n", __func__); 2083 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1076,
2084 "Entered %s.\n", __func__);
2039 2085
2040 mcp->mb[0] = MBC_LIP_FULL_LOGIN; 2086 mcp->mb[0] = MBC_LIP_FULL_LOGIN;
2041 mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0; 2087 mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0;
@@ -2052,7 +2098,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
2052 ql_dbg(ql_dbg_mbx, vha, 0x1077, "Failed=%x.\n", rval); 2098 ql_dbg(ql_dbg_mbx, vha, 0x1077, "Failed=%x.\n", rval);
2053 } else { 2099 } else {
2054 /*EMPTY*/ 2100 /*EMPTY*/
2055 ql_dbg(ql_dbg_mbx, vha, 0x1078, "Done %s.\n", __func__); 2101 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1078,
2102 "Done %s.\n", __func__);
2056 } 2103 }
2057 2104
2058 return rval; 2105 return rval;
@@ -2078,7 +2125,8 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
2078 mbx_cmd_t mc; 2125 mbx_cmd_t mc;
2079 mbx_cmd_t *mcp = &mc; 2126 mbx_cmd_t *mcp = &mc;
2080 2127
2081 ql_dbg(ql_dbg_mbx, vha, 0x1079, "Entered %s.\n", __func__); 2128 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1079,
2129 "Entered %s.\n", __func__);
2082 2130
2083 if (id_list == NULL) 2131 if (id_list == NULL)
2084 return QLA_FUNCTION_FAILED; 2132 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,
2110 ql_dbg(ql_dbg_mbx, vha, 0x107a, "Failed=%x.\n", rval); 2158 ql_dbg(ql_dbg_mbx, vha, 0x107a, "Failed=%x.\n", rval);
2111 } else { 2159 } else {
2112 *entries = mcp->mb[1]; 2160 *entries = mcp->mb[1];
2113 ql_dbg(ql_dbg_mbx, vha, 0x107b, "Done %s.\n", __func__); 2161 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107b,
2162 "Done %s.\n", __func__);
2114 } 2163 }
2115 2164
2116 return rval; 2165 return rval;
@@ -2138,7 +2187,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
2138 mbx_cmd_t mc; 2187 mbx_cmd_t mc;
2139 mbx_cmd_t *mcp = &mc; 2188 mbx_cmd_t *mcp = &mc;
2140 2189
2141 ql_dbg(ql_dbg_mbx, vha, 0x107c, "Entered %s.\n", __func__); 2190 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107c,
2191 "Entered %s.\n", __func__);
2142 2192
2143 mcp->mb[0] = MBC_GET_RESOURCE_COUNTS; 2193 mcp->mb[0] = MBC_GET_RESOURCE_COUNTS;
2144 mcp->out_mb = MBX_0; 2194 mcp->out_mb = MBX_0;
@@ -2154,7 +2204,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
2154 ql_dbg(ql_dbg_mbx, vha, 0x107d, 2204 ql_dbg(ql_dbg_mbx, vha, 0x107d,
2155 "Failed mb[0]=%x.\n", mcp->mb[0]); 2205 "Failed mb[0]=%x.\n", mcp->mb[0]);
2156 } else { 2206 } else {
2157 ql_dbg(ql_dbg_mbx, vha, 0x107e, 2207 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107e,
2158 "Done %s mb1=%x mb2=%x mb3=%x mb6=%x mb7=%x mb10=%x " 2208 "Done %s mb1=%x mb2=%x mb3=%x mb6=%x mb7=%x mb10=%x "
2159 "mb11=%x mb12=%x.\n", __func__, mcp->mb[1], mcp->mb[2], 2209 "mb11=%x mb12=%x.\n", __func__, mcp->mb[1], mcp->mb[2],
2160 mcp->mb[3], mcp->mb[6], mcp->mb[7], mcp->mb[10], 2210 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)
2201 dma_addr_t pmap_dma; 2251 dma_addr_t pmap_dma;
2202 struct qla_hw_data *ha = vha->hw; 2252 struct qla_hw_data *ha = vha->hw;
2203 2253
2204 ql_dbg(ql_dbg_mbx, vha, 0x107f, "Entered %s.\n", __func__); 2254 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107f,
2255 "Entered %s.\n", __func__);
2205 2256
2206 pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma); 2257 pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma);
2207 if (pmap == NULL) { 2258 if (pmap == NULL) {
@@ -2224,7 +2275,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
2224 rval = qla2x00_mailbox_command(vha, mcp); 2275 rval = qla2x00_mailbox_command(vha, mcp);
2225 2276
2226 if (rval == QLA_SUCCESS) { 2277 if (rval == QLA_SUCCESS) {
2227 ql_dbg(ql_dbg_mbx, vha, 0x1081, 2278 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1081,
2228 "mb0/mb1=%x/%X FC/AL position map size (%x).\n", 2279 "mb0/mb1=%x/%X FC/AL position map size (%x).\n",
2229 mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]); 2280 mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]);
2230 ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111d, 2281 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)
2238 if (rval != QLA_SUCCESS) { 2289 if (rval != QLA_SUCCESS) {
2239 ql_dbg(ql_dbg_mbx, vha, 0x1082, "Failed=%x.\n", rval); 2290 ql_dbg(ql_dbg_mbx, vha, 0x1082, "Failed=%x.\n", rval);
2240 } else { 2291 } else {
2241 ql_dbg(ql_dbg_mbx, vha, 0x1083, "Done %s.\n", __func__); 2292 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1083,
2293 "Done %s.\n", __func__);
2242 } 2294 }
2243 2295
2244 return rval; 2296 return rval;
@@ -2267,7 +2319,8 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
2267 uint32_t *siter, *diter, dwords; 2319 uint32_t *siter, *diter, dwords;
2268 struct qla_hw_data *ha = vha->hw; 2320 struct qla_hw_data *ha = vha->hw;
2269 2321
2270 ql_dbg(ql_dbg_mbx, vha, 0x1084, "Entered %s.\n", __func__); 2322 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1084,
2323 "Entered %s.\n", __func__);
2271 2324
2272 mcp->mb[0] = MBC_GET_LINK_STATUS; 2325 mcp->mb[0] = MBC_GET_LINK_STATUS;
2273 mcp->mb[2] = MSW(stats_dma); 2326 mcp->mb[2] = MSW(stats_dma);
@@ -2301,7 +2354,8 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
2301 rval = QLA_FUNCTION_FAILED; 2354 rval = QLA_FUNCTION_FAILED;
2302 } else { 2355 } else {
2303 /* Copy over data -- firmware data is LE. */ 2356 /* Copy over data -- firmware data is LE. */
2304 ql_dbg(ql_dbg_mbx, vha, 0x1086, "Done %s.\n", __func__); 2357 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1086,
2358 "Done %s.\n", __func__);
2305 dwords = offsetof(struct link_statistics, unused1) / 4; 2359 dwords = offsetof(struct link_statistics, unused1) / 4;
2306 siter = diter = &stats->link_fail_cnt; 2360 siter = diter = &stats->link_fail_cnt;
2307 while (dwords--) 2361 while (dwords--)
@@ -2324,7 +2378,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
2324 mbx_cmd_t *mcp = &mc; 2378 mbx_cmd_t *mcp = &mc;
2325 uint32_t *siter, *diter, dwords; 2379 uint32_t *siter, *diter, dwords;
2326 2380
2327 ql_dbg(ql_dbg_mbx, vha, 0x1088, "Entered %s.\n", __func__); 2381 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
2382 "Entered %s.\n", __func__);
2328 2383
2329 mcp->mb[0] = MBC_GET_LINK_PRIV_STATS; 2384 mcp->mb[0] = MBC_GET_LINK_PRIV_STATS;
2330 mcp->mb[2] = MSW(stats_dma); 2385 mcp->mb[2] = MSW(stats_dma);
@@ -2346,7 +2401,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
2346 "Failed mb[0]=%x.\n", mcp->mb[0]); 2401 "Failed mb[0]=%x.\n", mcp->mb[0]);
2347 rval = QLA_FUNCTION_FAILED; 2402 rval = QLA_FUNCTION_FAILED;
2348 } else { 2403 } else {
2349 ql_dbg(ql_dbg_mbx, vha, 0x108a, "Done %s.\n", __func__); 2404 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108a,
2405 "Done %s.\n", __func__);
2350 /* Copy over data -- firmware data is LE. */ 2406 /* Copy over data -- firmware data is LE. */
2351 dwords = sizeof(struct link_statistics) / 4; 2407 dwords = sizeof(struct link_statistics) / 4;
2352 siter = diter = &stats->link_fail_cnt; 2408 siter = diter = &stats->link_fail_cnt;
@@ -2375,7 +2431,8 @@ qla24xx_abort_command(srb_t *sp)
2375 struct qla_hw_data *ha = vha->hw; 2431 struct qla_hw_data *ha = vha->hw;
2376 struct req_que *req = vha->req; 2432 struct req_que *req = vha->req;
2377 2433
2378 ql_dbg(ql_dbg_mbx, vha, 0x108c, "Entered %s.\n", __func__); 2434 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108c,
2435 "Entered %s.\n", __func__);
2379 2436
2380 spin_lock_irqsave(&ha->hardware_lock, flags); 2437 spin_lock_irqsave(&ha->hardware_lock, flags);
2381 for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) { 2438 for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -2423,7 +2480,8 @@ qla24xx_abort_command(srb_t *sp)
2423 le16_to_cpu(abt->nport_handle)); 2480 le16_to_cpu(abt->nport_handle));
2424 rval = QLA_FUNCTION_FAILED; 2481 rval = QLA_FUNCTION_FAILED;
2425 } else { 2482 } else {
2426 ql_dbg(ql_dbg_mbx, vha, 0x1091, "Done %s.\n", __func__); 2483 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1091,
2484 "Done %s.\n", __func__);
2427 } 2485 }
2428 2486
2429 dma_pool_free(ha->s_dma_pool, abt, abt_dma); 2487 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,
2455 ha = vha->hw; 2513 ha = vha->hw;
2456 req = vha->req; 2514 req = vha->req;
2457 2515
2458 ql_dbg(ql_dbg_mbx, vha, 0x1092, "Entered %s.\n", __func__); 2516 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1092,
2517 "Entered %s.\n", __func__);
2459 2518
2460 if (ha->flags.cpu_affinity_enabled) 2519 if (ha->flags.cpu_affinity_enabled)
2461 rsp = ha->rsp_q_map[tag + 1]; 2520 rsp = ha->rsp_q_map[tag + 1];
@@ -2504,7 +2563,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
2504 } else if (le16_to_cpu(sts->scsi_status) & 2563 } else if (le16_to_cpu(sts->scsi_status) &
2505 SS_RESPONSE_INFO_LEN_VALID) { 2564 SS_RESPONSE_INFO_LEN_VALID) {
2506 if (le32_to_cpu(sts->rsp_data_len) < 4) { 2565 if (le32_to_cpu(sts->rsp_data_len) < 4) {
2507 ql_dbg(ql_dbg_mbx, vha, 0x1097, 2566 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1097,
2508 "Ignoring inconsistent data length -- not enough " 2567 "Ignoring inconsistent data length -- not enough "
2509 "response info (%d).\n", 2568 "response info (%d).\n",
2510 le32_to_cpu(sts->rsp_data_len)); 2569 le32_to_cpu(sts->rsp_data_len));
@@ -2523,7 +2582,8 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
2523 ql_dbg(ql_dbg_mbx, vha, 0x1099, 2582 ql_dbg(ql_dbg_mbx, vha, 0x1099,
2524 "Failed to issue marker IOCB (%x).\n", rval2); 2583 "Failed to issue marker IOCB (%x).\n", rval2);
2525 } else { 2584 } else {
2526 ql_dbg(ql_dbg_mbx, vha, 0x109a, "Done %s.\n", __func__); 2585 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109a,
2586 "Done %s.\n", __func__);
2527 } 2587 }
2528 2588
2529 dma_pool_free(ha->s_dma_pool, tsk, tsk_dma); 2589 dma_pool_free(ha->s_dma_pool, tsk, tsk_dma);
@@ -2564,7 +2624,8 @@ qla2x00_system_error(scsi_qla_host_t *vha)
2564 if (!IS_QLA23XX(ha) && !IS_FWI2_CAPABLE(ha)) 2624 if (!IS_QLA23XX(ha) && !IS_FWI2_CAPABLE(ha))
2565 return QLA_FUNCTION_FAILED; 2625 return QLA_FUNCTION_FAILED;
2566 2626
2567 ql_dbg(ql_dbg_mbx, vha, 0x109b, "Entered %s.\n", __func__); 2627 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109b,
2628 "Entered %s.\n", __func__);
2568 2629
2569 mcp->mb[0] = MBC_GEN_SYSTEM_ERROR; 2630 mcp->mb[0] = MBC_GEN_SYSTEM_ERROR;
2570 mcp->out_mb = MBX_0; 2631 mcp->out_mb = MBX_0;
@@ -2576,7 +2637,8 @@ qla2x00_system_error(scsi_qla_host_t *vha)
2576 if (rval != QLA_SUCCESS) { 2637 if (rval != QLA_SUCCESS) {
2577 ql_dbg(ql_dbg_mbx, vha, 0x109c, "Failed=%x.\n", rval); 2638 ql_dbg(ql_dbg_mbx, vha, 0x109c, "Failed=%x.\n", rval);
2578 } else { 2639 } else {
2579 ql_dbg(ql_dbg_mbx, vha, 0x109d, "Done %s.\n", __func__); 2640 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109d,
2641 "Done %s.\n", __func__);
2580 } 2642 }
2581 2643
2582 return rval; 2644 return rval;
@@ -2596,7 +2658,8 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
2596 mbx_cmd_t mc; 2658 mbx_cmd_t mc;
2597 mbx_cmd_t *mcp = &mc; 2659 mbx_cmd_t *mcp = &mc;
2598 2660
2599 ql_dbg(ql_dbg_mbx, vha, 0x109e, "Entered %s.\n", __func__); 2661 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109e,
2662 "Entered %s.\n", __func__);
2600 2663
2601 mcp->mb[0] = MBC_SERDES_PARAMS; 2664 mcp->mb[0] = MBC_SERDES_PARAMS;
2602 mcp->mb[1] = BIT_0; 2665 mcp->mb[1] = BIT_0;
@@ -2615,7 +2678,8 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
2615 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 2678 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
2616 } else { 2679 } else {
2617 /*EMPTY*/ 2680 /*EMPTY*/
2618 ql_dbg(ql_dbg_mbx, vha, 0x10a0, "Done %s.\n", __func__); 2681 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a0,
2682 "Done %s.\n", __func__);
2619 } 2683 }
2620 2684
2621 return rval; 2685 return rval;
@@ -2631,7 +2695,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
2631 if (!IS_FWI2_CAPABLE(vha->hw)) 2695 if (!IS_FWI2_CAPABLE(vha->hw))
2632 return QLA_FUNCTION_FAILED; 2696 return QLA_FUNCTION_FAILED;
2633 2697
2634 ql_dbg(ql_dbg_mbx, vha, 0x10a1, "Entered %s.\n", __func__); 2698 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a1,
2699 "Entered %s.\n", __func__);
2635 2700
2636 mcp->mb[0] = MBC_STOP_FIRMWARE; 2701 mcp->mb[0] = MBC_STOP_FIRMWARE;
2637 mcp->mb[1] = 0; 2702 mcp->mb[1] = 0;
@@ -2646,7 +2711,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
2646 if (mcp->mb[0] == MBS_INVALID_COMMAND) 2711 if (mcp->mb[0] == MBS_INVALID_COMMAND)
2647 rval = QLA_INVALID_COMMAND; 2712 rval = QLA_INVALID_COMMAND;
2648 } else { 2713 } else {
2649 ql_dbg(ql_dbg_mbx, vha, 0x10a3, "Done %s.\n", __func__); 2714 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a3,
2715 "Done %s.\n", __func__);
2650 } 2716 }
2651 2717
2652 return rval; 2718 return rval;
@@ -2660,7 +2726,8 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
2660 mbx_cmd_t mc; 2726 mbx_cmd_t mc;
2661 mbx_cmd_t *mcp = &mc; 2727 mbx_cmd_t *mcp = &mc;
2662 2728
2663 ql_dbg(ql_dbg_mbx, vha, 0x10a4, "Entered %s.\n", __func__); 2729 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a4,
2730 "Entered %s.\n", __func__);
2664 2731
2665 if (!IS_FWI2_CAPABLE(vha->hw)) 2732 if (!IS_FWI2_CAPABLE(vha->hw))
2666 return QLA_FUNCTION_FAILED; 2733 return QLA_FUNCTION_FAILED;
@@ -2686,7 +2753,8 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
2686 "Failed=%x mb[0]=%x mb[1]=%x.\n", 2753 "Failed=%x mb[0]=%x mb[1]=%x.\n",
2687 rval, mcp->mb[0], mcp->mb[1]); 2754 rval, mcp->mb[0], mcp->mb[1]);
2688 } else { 2755 } else {
2689 ql_dbg(ql_dbg_mbx, vha, 0x10a6, "Done %s.\n", __func__); 2756 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a6,
2757 "Done %s.\n", __func__);
2690 } 2758 }
2691 2759
2692 return rval; 2760 return rval;
@@ -2699,7 +2767,8 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
2699 mbx_cmd_t mc; 2767 mbx_cmd_t mc;
2700 mbx_cmd_t *mcp = &mc; 2768 mbx_cmd_t *mcp = &mc;
2701 2769
2702 ql_dbg(ql_dbg_mbx, vha, 0x10a7, "Entered %s.\n", __func__); 2770 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a7,
2771 "Entered %s.\n", __func__);
2703 2772
2704 if (!IS_FWI2_CAPABLE(vha->hw)) 2773 if (!IS_FWI2_CAPABLE(vha->hw))
2705 return QLA_FUNCTION_FAILED; 2774 return QLA_FUNCTION_FAILED;
@@ -2719,7 +2788,8 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
2719 "Failed=%x mb[0]=%x mb[1]=%x.\n", 2788 "Failed=%x mb[0]=%x mb[1]=%x.\n",
2720 rval, mcp->mb[0], mcp->mb[1]); 2789 rval, mcp->mb[0], mcp->mb[1]);
2721 } else { 2790 } else {
2722 ql_dbg(ql_dbg_mbx, vha, 0x10a9, "Done %s.\n", __func__); 2791 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a9,
2792 "Done %s.\n", __func__);
2723 } 2793 }
2724 2794
2725 return rval; 2795 return rval;
@@ -2733,7 +2803,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
2733 mbx_cmd_t mc; 2803 mbx_cmd_t mc;
2734 mbx_cmd_t *mcp = &mc; 2804 mbx_cmd_t *mcp = &mc;
2735 2805
2736 ql_dbg(ql_dbg_mbx, vha, 0x10aa, "Entered %s.\n", __func__); 2806 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10aa,
2807 "Entered %s.\n", __func__);
2737 2808
2738 if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw) && 2809 if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw) &&
2739 !IS_QLA83XX(vha->hw)) 2810 !IS_QLA83XX(vha->hw))
@@ -2764,7 +2835,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
2764 "Failed=%x mb[0]=%x mb[1]=%x.\n", 2835 "Failed=%x mb[0]=%x mb[1]=%x.\n",
2765 rval, mcp->mb[0], mcp->mb[1]); 2836 rval, mcp->mb[0], mcp->mb[1]);
2766 } else { 2837 } else {
2767 ql_dbg(ql_dbg_mbx, vha, 0x10ac, "Done %s.\n", __func__); 2838 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ac,
2839 "Done %s.\n", __func__);
2768 2840
2769 if (mb) 2841 if (mb)
2770 memcpy(mb, mcp->mb, 8 * sizeof(*mb)); 2842 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)
2782 mbx_cmd_t mc; 2854 mbx_cmd_t mc;
2783 mbx_cmd_t *mcp = &mc; 2855 mbx_cmd_t *mcp = &mc;
2784 2856
2785 ql_dbg(ql_dbg_mbx, vha, 0x10ad, "Entered %s.\n", __func__); 2857 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ad,
2858 "Entered %s.\n", __func__);
2786 2859
2787 if (!IS_FWI2_CAPABLE(vha->hw)) 2860 if (!IS_FWI2_CAPABLE(vha->hw))
2788 return QLA_FUNCTION_FAILED; 2861 return QLA_FUNCTION_FAILED;
@@ -2804,7 +2877,8 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
2804 "Failed=%x mb[0]=%x mb[1]=%x.\n", 2877 "Failed=%x mb[0]=%x mb[1]=%x.\n",
2805 rval, mcp->mb[0], mcp->mb[1]); 2878 rval, mcp->mb[0], mcp->mb[1]);
2806 } else { 2879 } else {
2807 ql_dbg(ql_dbg_mbx, vha, 0x10af, "Done %s.\n", __func__); 2880 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10af,
2881 "Done %s.\n", __func__);
2808 2882
2809 if (wr) 2883 if (wr)
2810 *wr = (uint64_t) mcp->mb[5] << 48 | 2884 *wr = (uint64_t) mcp->mb[5] << 48 |
@@ -2829,7 +2903,8 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
2829 mbx_cmd_t mc; 2903 mbx_cmd_t mc;
2830 mbx_cmd_t *mcp = &mc; 2904 mbx_cmd_t *mcp = &mc;
2831 2905
2832 ql_dbg(ql_dbg_mbx, vha, 0x10b0, "Entered %s.\n", __func__); 2906 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b0,
2907 "Entered %s.\n", __func__);
2833 2908
2834 if (!IS_IIDMA_CAPABLE(vha->hw)) 2909 if (!IS_IIDMA_CAPABLE(vha->hw))
2835 return QLA_FUNCTION_FAILED; 2910 return QLA_FUNCTION_FAILED;
@@ -2854,7 +2929,8 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
2854 if (rval != QLA_SUCCESS) { 2929 if (rval != QLA_SUCCESS) {
2855 ql_dbg(ql_dbg_mbx, vha, 0x10b1, "Failed=%x.\n", rval); 2930 ql_dbg(ql_dbg_mbx, vha, 0x10b1, "Failed=%x.\n", rval);
2856 } else { 2931 } else {
2857 ql_dbg(ql_dbg_mbx, vha, 0x10b2, "Done %s.\n", __func__); 2932 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b2,
2933 "Done %s.\n", __func__);
2858 if (port_speed) 2934 if (port_speed)
2859 *port_speed = mcp->mb[3]; 2935 *port_speed = mcp->mb[3];
2860 } 2936 }
@@ -2870,7 +2946,8 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
2870 mbx_cmd_t mc; 2946 mbx_cmd_t mc;
2871 mbx_cmd_t *mcp = &mc; 2947 mbx_cmd_t *mcp = &mc;
2872 2948
2873 ql_dbg(ql_dbg_mbx, vha, 0x10b3, "Entered %s.\n", __func__); 2949 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b3,
2950 "Entered %s.\n", __func__);
2874 2951
2875 if (!IS_IIDMA_CAPABLE(vha->hw)) 2952 if (!IS_IIDMA_CAPABLE(vha->hw))
2876 return QLA_FUNCTION_FAILED; 2953 return QLA_FUNCTION_FAILED;
@@ -2897,9 +2974,11 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
2897 } 2974 }
2898 2975
2899 if (rval != QLA_SUCCESS) { 2976 if (rval != QLA_SUCCESS) {
2900 ql_dbg(ql_dbg_mbx, vha, 0x10b4, "Failed=%x.\n", rval); 2977 ql_dbg(ql_dbg_mbx, vha, 0x10b4,
2978 "Failed=%x.\n", rval);
2901 } else { 2979 } else {
2902 ql_dbg(ql_dbg_mbx, vha, 0x10b5, "Done %s.\n", __func__); 2980 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b5,
2981 "Done %s.\n", __func__);
2903 } 2982 }
2904 2983
2905 return rval; 2984 return rval;
@@ -2915,24 +2994,25 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
2915 scsi_qla_host_t *vp; 2994 scsi_qla_host_t *vp;
2916 unsigned long flags; 2995 unsigned long flags;
2917 2996
2918 ql_dbg(ql_dbg_mbx, vha, 0x10b6, "Entered %s.\n", __func__); 2997 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b6,
2998 "Entered %s.\n", __func__);
2919 2999
2920 if (rptid_entry->entry_status != 0) 3000 if (rptid_entry->entry_status != 0)
2921 return; 3001 return;
2922 3002
2923 if (rptid_entry->format == 0) { 3003 if (rptid_entry->format == 0) {
2924 ql_dbg(ql_dbg_mbx, vha, 0x10b7, 3004 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b7,
2925 "Format 0 : Number of VPs setup %d, number of " 3005 "Format 0 : Number of VPs setup %d, number of "
2926 "VPs acquired %d.\n", 3006 "VPs acquired %d.\n",
2927 MSB(le16_to_cpu(rptid_entry->vp_count)), 3007 MSB(le16_to_cpu(rptid_entry->vp_count)),
2928 LSB(le16_to_cpu(rptid_entry->vp_count))); 3008 LSB(le16_to_cpu(rptid_entry->vp_count)));
2929 ql_dbg(ql_dbg_mbx, vha, 0x10b8, 3009 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b8,
2930 "Primary port id %02x%02x%02x.\n", 3010 "Primary port id %02x%02x%02x.\n",
2931 rptid_entry->port_id[2], rptid_entry->port_id[1], 3011 rptid_entry->port_id[2], rptid_entry->port_id[1],
2932 rptid_entry->port_id[0]); 3012 rptid_entry->port_id[0]);
2933 } else if (rptid_entry->format == 1) { 3013 } else if (rptid_entry->format == 1) {
2934 vp_idx = LSB(stat); 3014 vp_idx = LSB(stat);
2935 ql_dbg(ql_dbg_mbx, vha, 0x10b9, 3015 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b9,
2936 "Format 1: VP[%d] enabled - status %d - with " 3016 "Format 1: VP[%d] enabled - status %d - with "
2937 "port id %02x%02x%02x.\n", vp_idx, MSB(stat), 3017 "port id %02x%02x%02x.\n", vp_idx, MSB(stat),
2938 rptid_entry->port_id[2], rptid_entry->port_id[1], 3018 rptid_entry->port_id[2], rptid_entry->port_id[1],
@@ -2999,7 +3079,8 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
2999 3079
3000 /* This can be called by the parent */ 3080 /* This can be called by the parent */
3001 3081
3002 ql_dbg(ql_dbg_mbx, vha, 0x10bb, "Entered %s.\n", __func__); 3082 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10bb,
3083 "Entered %s.\n", __func__);
3003 3084
3004 vpmod = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &vpmod_dma); 3085 vpmod = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &vpmod_dma);
3005 if (!vpmod) { 3086 if (!vpmod) {
@@ -3035,7 +3116,8 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
3035 rval = QLA_FUNCTION_FAILED; 3116 rval = QLA_FUNCTION_FAILED;
3036 } else { 3117 } else {
3037 /* EMPTY */ 3118 /* EMPTY */
3038 ql_dbg(ql_dbg_mbx, vha, 0x10c0, "Done %s.\n", __func__); 3119 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c0,
3120 "Done %s.\n", __func__);
3039 fc_vport_set_state(vha->fc_vport, FC_VPORT_INITIALIZING); 3121 fc_vport_set_state(vha->fc_vport, FC_VPORT_INITIALIZING);
3040 } 3122 }
3041 dma_pool_free(ha->s_dma_pool, vpmod, vpmod_dma); 3123 dma_pool_free(ha->s_dma_pool, vpmod, vpmod_dma);
@@ -3069,7 +3151,7 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
3069 int vp_index = vha->vp_idx; 3151 int vp_index = vha->vp_idx;
3070 struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev); 3152 struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
3071 3153
3072 ql_dbg(ql_dbg_mbx, vha, 0x10c1, 3154 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c1,
3073 "Entered %s enabling index %d.\n", __func__, vp_index); 3155 "Entered %s enabling index %d.\n", __func__, vp_index);
3074 3156
3075 if (vp_index == 0 || vp_index >= ha->max_npiv_vports) 3157 if (vp_index == 0 || vp_index >= ha->max_npiv_vports)
@@ -3112,7 +3194,8 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
3112 le16_to_cpu(vce->comp_status)); 3194 le16_to_cpu(vce->comp_status));
3113 rval = QLA_FUNCTION_FAILED; 3195 rval = QLA_FUNCTION_FAILED;
3114 } else { 3196 } else {
3115 ql_dbg(ql_dbg_mbx, vha, 0x10c6, "Done %s.\n", __func__); 3197 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c6,
3198 "Done %s.\n", __func__);
3116 } 3199 }
3117 3200
3118 dma_pool_free(ha->s_dma_pool, vce, vce_dma); 3201 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,
3149 mbx_cmd_t mc; 3232 mbx_cmd_t mc;
3150 mbx_cmd_t *mcp = &mc; 3233 mbx_cmd_t *mcp = &mc;
3151 3234
3152 ql_dbg(ql_dbg_mbx, vha, 0x10c7, "Entered %s.\n", __func__); 3235 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c7,
3236 "Entered %s.\n", __func__);
3153 3237
3154 /* 3238 /*
3155 * This command is implicitly executed by firmware during login for the 3239 * 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,
3185 mbx_cmd_t mc; 3269 mbx_cmd_t mc;
3186 mbx_cmd_t *mcp = &mc; 3270 mbx_cmd_t *mcp = &mc;
3187 3271
3188 ql_dbg(ql_dbg_mbx, vha, 0x1009, "Entered %s.\n", __func__); 3272 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1009,
3273 "Entered %s.\n", __func__);
3189 3274
3190 if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) { 3275 if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) {
3191 mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED; 3276 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,
3219 ql_dbg(ql_dbg_mbx, vha, 0x1008, 3304 ql_dbg(ql_dbg_mbx, vha, 0x1008,
3220 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3305 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3221 } else { 3306 } else {
3222 ql_dbg(ql_dbg_mbx, vha, 0x1007, "Done %s.\n", __func__); 3307 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1007,
3308 "Done %s.\n", __func__);
3223 } 3309 }
3224 3310
3225 return rval; 3311 return rval;
@@ -3244,7 +3330,8 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
3244 unsigned long flags; 3330 unsigned long flags;
3245 struct qla_hw_data *ha = vha->hw; 3331 struct qla_hw_data *ha = vha->hw;
3246 3332
3247 ql_dbg(ql_dbg_mbx, vha, 0x10c8, "Entered %s.\n", __func__); 3333 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c8,
3334 "Entered %s.\n", __func__);
3248 3335
3249 mn = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &mn_dma); 3336 mn = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &mn_dma);
3250 if (mn == NULL) { 3337 if (mn == NULL) {
@@ -3285,7 +3372,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
3285 status[0] = le16_to_cpu(mn->p.rsp.comp_status); 3372 status[0] = le16_to_cpu(mn->p.rsp.comp_status);
3286 status[1] = status[0] == CS_VCS_CHIP_FAILURE ? 3373 status[1] = status[0] == CS_VCS_CHIP_FAILURE ?
3287 le16_to_cpu(mn->p.rsp.failure_code) : 0; 3374 le16_to_cpu(mn->p.rsp.failure_code) : 0;
3288 ql_dbg(ql_dbg_mbx, vha, 0x10ce, 3375 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ce,
3289 "cs=%x fc=%x.\n", status[0], status[1]); 3376 "cs=%x fc=%x.\n", status[0], status[1]);
3290 3377
3291 if (status[0] != CS_COMPLETE) { 3378 if (status[0] != CS_COMPLETE) {
@@ -3299,7 +3386,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
3299 retry = 1; 3386 retry = 1;
3300 } 3387 }
3301 } else { 3388 } else {
3302 ql_dbg(ql_dbg_mbx, vha, 0x10d0, 3389 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d0,
3303 "Firmware updated to %x.\n", 3390 "Firmware updated to %x.\n",
3304 le32_to_cpu(mn->p.rsp.fw_ver)); 3391 le32_to_cpu(mn->p.rsp.fw_ver));
3305 3392
@@ -3316,9 +3403,11 @@ verify_done:
3316 dma_pool_free(ha->s_dma_pool, mn, mn_dma); 3403 dma_pool_free(ha->s_dma_pool, mn, mn_dma);
3317 3404
3318 if (rval != QLA_SUCCESS) { 3405 if (rval != QLA_SUCCESS) {
3319 ql_dbg(ql_dbg_mbx, vha, 0x10d1, "Failed=%x.\n", rval); 3406 ql_dbg(ql_dbg_mbx, vha, 0x10d1,
3407 "Failed=%x.\n", rval);
3320 } else { 3408 } else {
3321 ql_dbg(ql_dbg_mbx, vha, 0x10d2, "Done %s.\n", __func__); 3409 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d2,
3410 "Done %s.\n", __func__);
3322 } 3411 }
3323 3412
3324 return rval; 3413 return rval;
@@ -3334,7 +3423,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
3334 struct device_reg_25xxmq __iomem *reg; 3423 struct device_reg_25xxmq __iomem *reg;
3335 struct qla_hw_data *ha = vha->hw; 3424 struct qla_hw_data *ha = vha->hw;
3336 3425
3337 ql_dbg(ql_dbg_mbx, vha, 0x10d3, "Entered %s.\n", __func__); 3426 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d3,
3427 "Entered %s.\n", __func__);
3338 3428
3339 mcp->mb[0] = MBC_INITIALIZE_MULTIQ; 3429 mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
3340 mcp->mb[1] = req->options; 3430 mcp->mb[1] = req->options;
@@ -3388,7 +3478,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
3388 ql_dbg(ql_dbg_mbx, vha, 0x10d4, 3478 ql_dbg(ql_dbg_mbx, vha, 0x10d4,
3389 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3479 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3390 } else { 3480 } else {
3391 ql_dbg(ql_dbg_mbx, vha, 0x10d5, "Done %s.\n", __func__); 3481 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d5,
3482 "Done %s.\n", __func__);
3392 } 3483 }
3393 3484
3394 return rval; 3485 return rval;
@@ -3404,7 +3495,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
3404 struct device_reg_25xxmq __iomem *reg; 3495 struct device_reg_25xxmq __iomem *reg;
3405 struct qla_hw_data *ha = vha->hw; 3496 struct qla_hw_data *ha = vha->hw;
3406 3497
3407 ql_dbg(ql_dbg_mbx, vha, 0x10d6, "Entered %s.\n", __func__); 3498 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d6,
3499 "Entered %s.\n", __func__);
3408 3500
3409 mcp->mb[0] = MBC_INITIALIZE_MULTIQ; 3501 mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
3410 mcp->mb[1] = rsp->options; 3502 mcp->mb[1] = rsp->options;
@@ -3456,7 +3548,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
3456 ql_dbg(ql_dbg_mbx, vha, 0x10d7, 3548 ql_dbg(ql_dbg_mbx, vha, 0x10d7,
3457 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3549 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3458 } else { 3550 } else {
3459 ql_dbg(ql_dbg_mbx, vha, 0x10d8, "Done %s.\n", __func__); 3551 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d8,
3552 "Done %s.\n", __func__);
3460 } 3553 }
3461 3554
3462 return rval; 3555 return rval;
@@ -3469,7 +3562,8 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
3469 mbx_cmd_t mc; 3562 mbx_cmd_t mc;
3470 mbx_cmd_t *mcp = &mc; 3563 mbx_cmd_t *mcp = &mc;
3471 3564
3472 ql_dbg(ql_dbg_mbx, vha, 0x10d9, "Entered %s.\n", __func__); 3565 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d9,
3566 "Entered %s.\n", __func__);
3473 3567
3474 mcp->mb[0] = MBC_IDC_ACK; 3568 mcp->mb[0] = MBC_IDC_ACK;
3475 memcpy(&mcp->mb[1], mb, QLA_IDC_ACK_REGS * sizeof(uint16_t)); 3569 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)
3483 ql_dbg(ql_dbg_mbx, vha, 0x10da, 3577 ql_dbg(ql_dbg_mbx, vha, 0x10da,
3484 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3578 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3485 } else { 3579 } else {
3486 ql_dbg(ql_dbg_mbx, vha, 0x10db, "Done %s.\n", __func__); 3580 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10db,
3581 "Done %s.\n", __func__);
3487 } 3582 }
3488 3583
3489 return rval; 3584 return rval;
@@ -3496,7 +3591,8 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
3496 mbx_cmd_t mc; 3591 mbx_cmd_t mc;
3497 mbx_cmd_t *mcp = &mc; 3592 mbx_cmd_t *mcp = &mc;
3498 3593
3499 ql_dbg(ql_dbg_mbx, vha, 0x10dc, "Entered %s.\n", __func__); 3594 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10dc,
3595 "Entered %s.\n", __func__);
3500 3596
3501 if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw)) 3597 if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
3502 return QLA_FUNCTION_FAILED; 3598 return QLA_FUNCTION_FAILED;
@@ -3514,7 +3610,8 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
3514 "Failed=%x mb[0]=%x mb[1]=%x.\n", 3610 "Failed=%x mb[0]=%x mb[1]=%x.\n",
3515 rval, mcp->mb[0], mcp->mb[1]); 3611 rval, mcp->mb[0], mcp->mb[1]);
3516 } else { 3612 } else {
3517 ql_dbg(ql_dbg_mbx, vha, 0x10de, "Done %s.\n", __func__); 3613 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10de,
3614 "Done %s.\n", __func__);
3518 *sector_size = mcp->mb[1]; 3615 *sector_size = mcp->mb[1];
3519 } 3616 }
3520 3617
@@ -3531,7 +3628,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
3531 if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw)) 3628 if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
3532 return QLA_FUNCTION_FAILED; 3629 return QLA_FUNCTION_FAILED;
3533 3630
3534 ql_dbg(ql_dbg_mbx, vha, 0x10df, "Entered %s.\n", __func__); 3631 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10df,
3632 "Entered %s.\n", __func__);
3535 3633
3536 mcp->mb[0] = MBC_FLASH_ACCESS_CTRL; 3634 mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
3537 mcp->mb[1] = enable ? FAC_OPT_CMD_WRITE_ENABLE : 3635 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)
3547 "Failed=%x mb[0]=%x mb[1]=%x.\n", 3645 "Failed=%x mb[0]=%x mb[1]=%x.\n",
3548 rval, mcp->mb[0], mcp->mb[1]); 3646 rval, mcp->mb[0], mcp->mb[1]);
3549 } else { 3647 } else {
3550 ql_dbg(ql_dbg_mbx, vha, 0x10e1, "Done %s.\n", __func__); 3648 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e1,
3649 "Done %s.\n", __func__);
3551 } 3650 }
3552 3651
3553 return rval; 3652 return rval;
@@ -3563,7 +3662,8 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
3563 if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw)) 3662 if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
3564 return QLA_FUNCTION_FAILED; 3663 return QLA_FUNCTION_FAILED;
3565 3664
3566 ql_dbg(ql_dbg_mbx, vha, 0x10e2, "Entered %s.\n", __func__); 3665 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,
3666 "Entered %s.\n", __func__);
3567 3667
3568 mcp->mb[0] = MBC_FLASH_ACCESS_CTRL; 3668 mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
3569 mcp->mb[1] = FAC_OPT_CMD_ERASE_SECTOR; 3669 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)
3582 "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n", 3682 "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
3583 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]); 3683 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
3584 } else { 3684 } else {
3585 ql_dbg(ql_dbg_mbx, vha, 0x10e4, "Done %s.\n", __func__); 3685 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e4,
3686 "Done %s.\n", __func__);
3586 } 3687 }
3587 3688
3588 return rval; 3689 return rval;
@@ -3595,7 +3696,8 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
3595 mbx_cmd_t mc; 3696 mbx_cmd_t mc;
3596 mbx_cmd_t *mcp = &mc; 3697 mbx_cmd_t *mcp = &mc;
3597 3698
3598 ql_dbg(ql_dbg_mbx, vha, 0x10e5, "Entered %s.\n", __func__); 3699 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e5,
3700 "Entered %s.\n", __func__);
3599 3701
3600 mcp->mb[0] = MBC_RESTART_MPI_FW; 3702 mcp->mb[0] = MBC_RESTART_MPI_FW;
3601 mcp->out_mb = MBX_0; 3703 mcp->out_mb = MBX_0;
@@ -3609,7 +3711,8 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
3609 "Failed=%x mb[0]=%x mb[1]=%x.\n", 3711 "Failed=%x mb[0]=%x mb[1]=%x.\n",
3610 rval, mcp->mb[0], mcp->mb[1]); 3712 rval, mcp->mb[0], mcp->mb[1]);
3611 } else { 3713 } else {
3612 ql_dbg(ql_dbg_mbx, vha, 0x10e7, "Done %s.\n", __func__); 3714 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e7,
3715 "Done %s.\n", __func__);
3613 } 3716 }
3614 3717
3615 return rval; 3718 return rval;
@@ -3624,7 +3727,8 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
3624 mbx_cmd_t *mcp = &mc; 3727 mbx_cmd_t *mcp = &mc;
3625 struct qla_hw_data *ha = vha->hw; 3728 struct qla_hw_data *ha = vha->hw;
3626 3729
3627 ql_dbg(ql_dbg_mbx, vha, 0x10e8, "Entered %s.\n", __func__); 3730 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,
3731 "Entered %s.\n", __func__);
3628 3732
3629 if (!IS_FWI2_CAPABLE(ha)) 3733 if (!IS_FWI2_CAPABLE(ha))
3630 return QLA_FUNCTION_FAILED; 3734 return QLA_FUNCTION_FAILED;
@@ -3654,7 +3758,8 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
3654 ql_dbg(ql_dbg_mbx, vha, 0x10e9, 3758 ql_dbg(ql_dbg_mbx, vha, 0x10e9,
3655 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3759 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3656 } else { 3760 } else {
3657 ql_dbg(ql_dbg_mbx, vha, 0x10ea, "Done %s.\n", __func__); 3761 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,
3762 "Done %s.\n", __func__);
3658 } 3763 }
3659 3764
3660 return rval; 3765 return rval;
@@ -3669,7 +3774,8 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
3669 mbx_cmd_t *mcp = &mc; 3774 mbx_cmd_t *mcp = &mc;
3670 struct qla_hw_data *ha = vha->hw; 3775 struct qla_hw_data *ha = vha->hw;
3671 3776
3672 ql_dbg(ql_dbg_mbx, vha, 0x10eb, "Entered %s.\n", __func__); 3777 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10eb,
3778 "Entered %s.\n", __func__);
3673 3779
3674 if (!IS_FWI2_CAPABLE(ha)) 3780 if (!IS_FWI2_CAPABLE(ha))
3675 return QLA_FUNCTION_FAILED; 3781 return QLA_FUNCTION_FAILED;
@@ -3699,7 +3805,8 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
3699 ql_dbg(ql_dbg_mbx, vha, 0x10ec, 3805 ql_dbg(ql_dbg_mbx, vha, 0x10ec,
3700 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3806 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3701 } else { 3807 } else {
3702 ql_dbg(ql_dbg_mbx, vha, 0x10ed, "Done %s.\n", __func__); 3808 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ed,
3809 "Done %s.\n", __func__);
3703 } 3810 }
3704 3811
3705 return rval; 3812 return rval;
@@ -3713,7 +3820,8 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
3713 mbx_cmd_t mc; 3820 mbx_cmd_t mc;
3714 mbx_cmd_t *mcp = &mc; 3821 mbx_cmd_t *mcp = &mc;
3715 3822
3716 ql_dbg(ql_dbg_mbx, vha, 0x10ee, "Entered %s.\n", __func__); 3823 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ee,
3824 "Entered %s.\n", __func__);
3717 3825
3718 if (!IS_CNA_CAPABLE(vha->hw)) 3826 if (!IS_CNA_CAPABLE(vha->hw))
3719 return QLA_FUNCTION_FAILED; 3827 return QLA_FUNCTION_FAILED;
@@ -3735,7 +3843,8 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
3735 "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n", 3843 "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
3736 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]); 3844 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
3737 } else { 3845 } else {
3738 ql_dbg(ql_dbg_mbx, vha, 0x10f0, "Done %s.\n", __func__); 3846 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f0,
3847 "Done %s.\n", __func__);
3739 3848
3740 3849
3741 *actual_size = mcp->mb[2] << 2; 3850 *actual_size = mcp->mb[2] << 2;
@@ -3752,7 +3861,8 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
3752 mbx_cmd_t mc; 3861 mbx_cmd_t mc;
3753 mbx_cmd_t *mcp = &mc; 3862 mbx_cmd_t *mcp = &mc;
3754 3863
3755 ql_dbg(ql_dbg_mbx, vha, 0x10f1, "Entered %s.\n", __func__); 3864 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f1,
3865 "Entered %s.\n", __func__);
3756 3866
3757 if (!IS_CNA_CAPABLE(vha->hw)) 3867 if (!IS_CNA_CAPABLE(vha->hw))
3758 return QLA_FUNCTION_FAILED; 3868 return QLA_FUNCTION_FAILED;
@@ -3775,7 +3885,8 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
3775 "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n", 3885 "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
3776 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]); 3886 rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
3777 } else { 3887 } else {
3778 ql_dbg(ql_dbg_mbx, vha, 0x10f3, "Done %s.\n", __func__); 3888 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f3,
3889 "Done %s.\n", __func__);
3779 } 3890 }
3780 3891
3781 return rval; 3892 return rval;
@@ -3788,7 +3899,8 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
3788 mbx_cmd_t mc; 3899 mbx_cmd_t mc;
3789 mbx_cmd_t *mcp = &mc; 3900 mbx_cmd_t *mcp = &mc;
3790 3901
3791 ql_dbg(ql_dbg_mbx, vha, 0x10f4, "Entered %s.\n", __func__); 3902 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f4,
3903 "Entered %s.\n", __func__);
3792 3904
3793 if (!IS_FWI2_CAPABLE(vha->hw)) 3905 if (!IS_FWI2_CAPABLE(vha->hw))
3794 return QLA_FUNCTION_FAILED; 3906 return QLA_FUNCTION_FAILED;
@@ -3805,7 +3917,8 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
3805 ql_dbg(ql_dbg_mbx, vha, 0x10f5, 3917 ql_dbg(ql_dbg_mbx, vha, 0x10f5,
3806 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 3918 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3807 } else { 3919 } else {
3808 ql_dbg(ql_dbg_mbx, vha, 0x10f6, "Done %s.\n", __func__); 3920 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f6,
3921 "Done %s.\n", __func__);
3809 *data = mcp->mb[3] << 16 | mcp->mb[2]; 3922 *data = mcp->mb[3] << 16 | mcp->mb[2];
3810 } 3923 }
3811 3924
@@ -3821,7 +3934,8 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
3821 mbx_cmd_t *mcp = &mc; 3934 mbx_cmd_t *mcp = &mc;
3822 uint32_t iter_cnt = 0x1; 3935 uint32_t iter_cnt = 0x1;
3823 3936
3824 ql_dbg(ql_dbg_mbx, vha, 0x10f7, "Entered %s.\n", __func__); 3937 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f7,
3938 "Entered %s.\n", __func__);
3825 3939
3826 memset(mcp->mb, 0 , sizeof(mcp->mb)); 3940 memset(mcp->mb, 0 , sizeof(mcp->mb));
3827 mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK; 3941 mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK;
@@ -3865,7 +3979,8 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
3865 "mb[19]=%x.\n", rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], 3979 "mb[19]=%x.\n", rval, mcp->mb[0], mcp->mb[1], mcp->mb[2],
3866 mcp->mb[3], mcp->mb[18], mcp->mb[19]); 3980 mcp->mb[3], mcp->mb[18], mcp->mb[19]);
3867 } else { 3981 } else {
3868 ql_dbg(ql_dbg_mbx, vha, 0x10f9, "Done %s.\n", __func__); 3982 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f9,
3983 "Done %s.\n", __func__);
3869 } 3984 }
3870 3985
3871 /* Copy mailbox information */ 3986 /* Copy mailbox information */
@@ -3882,7 +3997,8 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
3882 mbx_cmd_t *mcp = &mc; 3997 mbx_cmd_t *mcp = &mc;
3883 struct qla_hw_data *ha = vha->hw; 3998 struct qla_hw_data *ha = vha->hw;
3884 3999
3885 ql_dbg(ql_dbg_mbx, vha, 0x10fa, "Entered %s.\n", __func__); 4000 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fa,
4001 "Entered %s.\n", __func__);
3886 4002
3887 memset(mcp->mb, 0 , sizeof(mcp->mb)); 4003 memset(mcp->mb, 0 , sizeof(mcp->mb));
3888 mcp->mb[0] = MBC_DIAGNOSTIC_ECHO; 4004 mcp->mb[0] = MBC_DIAGNOSTIC_ECHO;
@@ -3926,7 +4042,8 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
3926 "Failed=%x mb[0]=%x mb[1]=%x.\n", 4042 "Failed=%x mb[0]=%x mb[1]=%x.\n",
3927 rval, mcp->mb[0], mcp->mb[1]); 4043 rval, mcp->mb[0], mcp->mb[1]);
3928 } else { 4044 } else {
3929 ql_dbg(ql_dbg_mbx, vha, 0x10fc, "Done %s.\n", __func__); 4045 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fc,
4046 "Done %s.\n", __func__);
3930 } 4047 }
3931 4048
3932 /* Copy mailbox information */ 4049 /* Copy mailbox information */
@@ -3941,7 +4058,7 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
3941 mbx_cmd_t mc; 4058 mbx_cmd_t mc;
3942 mbx_cmd_t *mcp = &mc; 4059 mbx_cmd_t *mcp = &mc;
3943 4060
3944 ql_dbg(ql_dbg_mbx, vha, 0x10fd, 4061 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fd,
3945 "Entered %s enable_diag=%d.\n", __func__, enable_diagnostic); 4062 "Entered %s enable_diag=%d.\n", __func__, enable_diagnostic);
3946 4063
3947 mcp->mb[0] = MBC_ISP84XX_RESET; 4064 mcp->mb[0] = MBC_ISP84XX_RESET;
@@ -3955,7 +4072,8 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
3955 if (rval != QLA_SUCCESS) 4072 if (rval != QLA_SUCCESS)
3956 ql_dbg(ql_dbg_mbx, vha, 0x10fe, "Failed=%x.\n", rval); 4073 ql_dbg(ql_dbg_mbx, vha, 0x10fe, "Failed=%x.\n", rval);
3957 else 4074 else
3958 ql_dbg(ql_dbg_mbx, vha, 0x10ff, "Done %s.\n", __func__); 4075 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ff,
4076 "Done %s.\n", __func__);
3959 4077
3960 return rval; 4078 return rval;
3961} 4079}
@@ -3967,7 +4085,8 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
3967 mbx_cmd_t mc; 4085 mbx_cmd_t mc;
3968 mbx_cmd_t *mcp = &mc; 4086 mbx_cmd_t *mcp = &mc;
3969 4087
3970 ql_dbg(ql_dbg_mbx, vha, 0x1100, "Entered %s.\n", __func__); 4088 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1100,
4089 "Entered %s.\n", __func__);
3971 4090
3972 if (!IS_FWI2_CAPABLE(vha->hw)) 4091 if (!IS_FWI2_CAPABLE(vha->hw))
3973 return QLA_FUNCTION_FAILED; 4092 return QLA_FUNCTION_FAILED;
@@ -3986,7 +4105,8 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
3986 ql_dbg(ql_dbg_mbx, vha, 0x1101, 4105 ql_dbg(ql_dbg_mbx, vha, 0x1101,
3987 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4106 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
3988 } else { 4107 } else {
3989 ql_dbg(ql_dbg_mbx, vha, 0x1102, "Done %s.\n", __func__); 4108 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1102,
4109 "Done %s.\n", __func__);
3990 } 4110 }
3991 4111
3992 return rval; 4112 return rval;
@@ -4003,7 +4123,8 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
4003 4123
4004 rval = QLA_SUCCESS; 4124 rval = QLA_SUCCESS;
4005 4125
4006 ql_dbg(ql_dbg_mbx, vha, 0x1103, "Entered %s.\n", __func__); 4126 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1103,
4127 "Entered %s.\n", __func__);
4007 4128
4008 clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags); 4129 clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
4009 4130
@@ -4046,7 +4167,8 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
4046 ql_dbg(ql_dbg_mbx, vha, 0x1104, 4167 ql_dbg(ql_dbg_mbx, vha, 0x1104,
4047 "Failed=%x mb[0]=%x.\n", rval, mb[0]); 4168 "Failed=%x mb[0]=%x.\n", rval, mb[0]);
4048 } else { 4169 } else {
4049 ql_dbg(ql_dbg_mbx, vha, 0x1105, "Done %s.\n", __func__); 4170 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1105,
4171 "Done %s.\n", __func__);
4050 } 4172 }
4051 4173
4052 return rval; 4174 return rval;
@@ -4060,7 +4182,8 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
4060 mbx_cmd_t *mcp = &mc; 4182 mbx_cmd_t *mcp = &mc;
4061 struct qla_hw_data *ha = vha->hw; 4183 struct qla_hw_data *ha = vha->hw;
4062 4184
4063 ql_dbg(ql_dbg_mbx, vha, 0x1106, "Entered %s.\n", __func__); 4185 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1106,
4186 "Entered %s.\n", __func__);
4064 4187
4065 if (!IS_FWI2_CAPABLE(ha)) 4188 if (!IS_FWI2_CAPABLE(ha))
4066 return QLA_FUNCTION_FAILED; 4189 return QLA_FUNCTION_FAILED;
@@ -4078,7 +4201,8 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
4078 ql_dbg(ql_dbg_mbx, vha, 0x1107, 4201 ql_dbg(ql_dbg_mbx, vha, 0x1107,
4079 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4202 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4080 } else { 4203 } else {
4081 ql_dbg(ql_dbg_mbx, vha, 0x1108, "Done %s.\n", __func__); 4204 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1108,
4205 "Done %s.\n", __func__);
4082 if (mcp->mb[1] != 0x7) 4206 if (mcp->mb[1] != 0x7)
4083 ha->link_data_rate = mcp->mb[1]; 4207 ha->link_data_rate = mcp->mb[1];
4084 } 4208 }
@@ -4094,7 +4218,8 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
4094 mbx_cmd_t *mcp = &mc; 4218 mbx_cmd_t *mcp = &mc;
4095 struct qla_hw_data *ha = vha->hw; 4219 struct qla_hw_data *ha = vha->hw;
4096 4220
4097 ql_dbg(ql_dbg_mbx, vha, 0x1109, "Entered %s.\n", __func__); 4221 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1109,
4222 "Entered %s.\n", __func__);
4098 4223
4099 if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha)) 4224 if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
4100 return QLA_FUNCTION_FAILED; 4225 return QLA_FUNCTION_FAILED;
@@ -4113,7 +4238,8 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
4113 /* Copy all bits to preserve original value */ 4238 /* Copy all bits to preserve original value */
4114 memcpy(mb, &mcp->mb[1], sizeof(uint16_t) * 4); 4239 memcpy(mb, &mcp->mb[1], sizeof(uint16_t) * 4);
4115 4240
4116 ql_dbg(ql_dbg_mbx, vha, 0x110b, "Done %s.\n", __func__); 4241 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110b,
4242 "Done %s.\n", __func__);
4117 } 4243 }
4118 return rval; 4244 return rval;
4119} 4245}
@@ -4125,7 +4251,8 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
4125 mbx_cmd_t mc; 4251 mbx_cmd_t mc;
4126 mbx_cmd_t *mcp = &mc; 4252 mbx_cmd_t *mcp = &mc;
4127 4253
4128 ql_dbg(ql_dbg_mbx, vha, 0x110c, "Entered %s.\n", __func__); 4254 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110c,
4255 "Entered %s.\n", __func__);
4129 4256
4130 mcp->mb[0] = MBC_SET_PORT_CONFIG; 4257 mcp->mb[0] = MBC_SET_PORT_CONFIG;
4131 /* Copy all bits to preserve original setting */ 4258 /* Copy all bits to preserve original setting */
@@ -4140,7 +4267,8 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
4140 ql_dbg(ql_dbg_mbx, vha, 0x110d, 4267 ql_dbg(ql_dbg_mbx, vha, 0x110d,
4141 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4268 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4142 } else 4269 } else
4143 ql_dbg(ql_dbg_mbx, vha, 0x110e, "Done %s.\n", __func__); 4270 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110e,
4271 "Done %s.\n", __func__);
4144 4272
4145 return rval; 4273 return rval;
4146} 4274}
@@ -4155,7 +4283,8 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
4155 mbx_cmd_t *mcp = &mc; 4283 mbx_cmd_t *mcp = &mc;
4156 struct qla_hw_data *ha = vha->hw; 4284 struct qla_hw_data *ha = vha->hw;
4157 4285
4158 ql_dbg(ql_dbg_mbx, vha, 0x110f, "Entered %s.\n", __func__); 4286 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110f,
4287 "Entered %s.\n", __func__);
4159 4288
4160 if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha)) 4289 if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
4161 return QLA_FUNCTION_FAILED; 4290 return QLA_FUNCTION_FAILED;
@@ -4183,7 +4312,8 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
4183 if (rval != QLA_SUCCESS) { 4312 if (rval != QLA_SUCCESS) {
4184 ql_dbg(ql_dbg_mbx, vha, 0x10cd, "Failed=%x.\n", rval); 4313 ql_dbg(ql_dbg_mbx, vha, 0x10cd, "Failed=%x.\n", rval);
4185 } else { 4314 } else {
4186 ql_dbg(ql_dbg_mbx, vha, 0x10cc, "Done %s.\n", __func__); 4315 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10cc,
4316 "Done %s.\n", __func__);
4187 } 4317 }
4188 4318
4189 return rval; 4319 return rval;
@@ -4196,7 +4326,8 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
4196 uint8_t byte; 4326 uint8_t byte;
4197 struct qla_hw_data *ha = vha->hw; 4327 struct qla_hw_data *ha = vha->hw;
4198 4328
4199 ql_dbg(ql_dbg_mbx, vha, 0x10ca, "Entered %s.\n", __func__); 4329 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ca,
4330 "Entered %s.\n", __func__);
4200 4331
4201 /* Integer part */ 4332 /* Integer part */
4202 rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x01, 1, BIT_13|BIT_0); 4333 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)
4216 } 4347 }
4217 *frac = (byte >> 6) * 25; 4348 *frac = (byte >> 6) * 25;
4218 4349
4219 ql_dbg(ql_dbg_mbx, vha, 0x1018, "Done %s.\n", __func__); 4350 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1018,
4351 "Done %s.\n", __func__);
4220fail: 4352fail:
4221 return rval; 4353 return rval;
4222} 4354}
@@ -4229,7 +4361,8 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
4229 mbx_cmd_t mc; 4361 mbx_cmd_t mc;
4230 mbx_cmd_t *mcp = &mc; 4362 mbx_cmd_t *mcp = &mc;
4231 4363
4232 ql_dbg(ql_dbg_mbx, vha, 0x1017, "Entered %s.\n", __func__); 4364 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1017,
4365 "Entered %s.\n", __func__);
4233 4366
4234 if (!IS_FWI2_CAPABLE(ha)) 4367 if (!IS_FWI2_CAPABLE(ha))
4235 return QLA_FUNCTION_FAILED; 4368 return QLA_FUNCTION_FAILED;
@@ -4248,7 +4381,8 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
4248 ql_dbg(ql_dbg_mbx, vha, 0x1016, 4381 ql_dbg(ql_dbg_mbx, vha, 0x1016,
4249 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4382 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4250 } else { 4383 } else {
4251 ql_dbg(ql_dbg_mbx, vha, 0x100e, "Done %s.\n", __func__); 4384 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100e,
4385 "Done %s.\n", __func__);
4252 } 4386 }
4253 4387
4254 return rval; 4388 return rval;
@@ -4262,7 +4396,8 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
4262 mbx_cmd_t mc; 4396 mbx_cmd_t mc;
4263 mbx_cmd_t *mcp = &mc; 4397 mbx_cmd_t *mcp = &mc;
4264 4398
4265 ql_dbg(ql_dbg_mbx, vha, 0x100d, "Entered %s.\n", __func__); 4399 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100d,
4400 "Entered %s.\n", __func__);
4266 4401
4267 if (!IS_QLA82XX(ha)) 4402 if (!IS_QLA82XX(ha))
4268 return QLA_FUNCTION_FAILED; 4403 return QLA_FUNCTION_FAILED;
@@ -4281,7 +4416,8 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
4281 ql_dbg(ql_dbg_mbx, vha, 0x100c, 4416 ql_dbg(ql_dbg_mbx, vha, 0x100c,
4282 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4417 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4283 } else { 4418 } else {
4284 ql_dbg(ql_dbg_mbx, vha, 0x100b, "Done %s.\n", __func__); 4419 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100b,
4420 "Done %s.\n", __func__);
4285 } 4421 }
4286 4422
4287 return rval; 4423 return rval;
@@ -4295,7 +4431,8 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
4295 mbx_cmd_t *mcp = &mc; 4431 mbx_cmd_t *mcp = &mc;
4296 int rval = QLA_FUNCTION_FAILED; 4432 int rval = QLA_FUNCTION_FAILED;
4297 4433
4298 ql_dbg(ql_dbg_mbx, vha, 0x111f, "Entered %s.\n", __func__); 4434 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111f,
4435 "Entered %s.\n", __func__);
4299 4436
4300 memset(mcp->mb, 0 , sizeof(mcp->mb)); 4437 memset(mcp->mb, 0 , sizeof(mcp->mb));
4301 mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE); 4438 mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
@@ -4318,7 +4455,8 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
4318 (mcp->mb[1] << 16) | mcp->mb[0], 4455 (mcp->mb[1] << 16) | mcp->mb[0],
4319 (mcp->mb[3] << 16) | mcp->mb[2]); 4456 (mcp->mb[3] << 16) | mcp->mb[2]);
4320 } else { 4457 } else {
4321 ql_dbg(ql_dbg_mbx, vha, 0x1121, "Done %s.\n", __func__); 4458 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1121,
4459 "Done %s.\n", __func__);
4322 ha->md_template_size = ((mcp->mb[3] << 16) | mcp->mb[2]); 4460 ha->md_template_size = ((mcp->mb[3] << 16) | mcp->mb[2]);
4323 if (!ha->md_template_size) { 4461 if (!ha->md_template_size) {
4324 ql_dbg(ql_dbg_mbx, vha, 0x1122, 4462 ql_dbg(ql_dbg_mbx, vha, 0x1122,
@@ -4337,7 +4475,8 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
4337 mbx_cmd_t *mcp = &mc; 4475 mbx_cmd_t *mcp = &mc;
4338 int rval = QLA_FUNCTION_FAILED; 4476 int rval = QLA_FUNCTION_FAILED;
4339 4477
4340 ql_dbg(ql_dbg_mbx, vha, 0x1123, "Entered %s.\n", __func__); 4478 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1123,
4479 "Entered %s.\n", __func__);
4341 4480
4342 ha->md_tmplt_hdr = dma_alloc_coherent(&ha->pdev->dev, 4481 ha->md_tmplt_hdr = dma_alloc_coherent(&ha->pdev->dev,
4343 ha->md_template_size, &ha->md_tmplt_hdr_dma, GFP_KERNEL); 4482 ha->md_template_size, &ha->md_tmplt_hdr_dma, GFP_KERNEL);
@@ -4372,7 +4511,8 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
4372 ((mcp->mb[1] << 16) | mcp->mb[0]), 4511 ((mcp->mb[1] << 16) | mcp->mb[0]),
4373 ((mcp->mb[3] << 16) | mcp->mb[2])); 4512 ((mcp->mb[3] << 16) | mcp->mb[2]));
4374 } else 4513 } else
4375 ql_dbg(ql_dbg_mbx, vha, 0x1126, "Done %s.\n", __func__); 4514 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1126,
4515 "Done %s.\n", __func__);
4376 return rval; 4516 return rval;
4377} 4517}
4378 4518
@@ -4387,7 +4527,8 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
4387 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha)) 4527 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
4388 return QLA_FUNCTION_FAILED; 4528 return QLA_FUNCTION_FAILED;
4389 4529
4390 ql_dbg(ql_dbg_mbx, vha, 0x1133, "Entered %s.\n", __func__); 4530 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1133,
4531 "Entered %s.\n", __func__);
4391 4532
4392 memset(mcp, 0, sizeof(mbx_cmd_t)); 4533 memset(mcp, 0, sizeof(mbx_cmd_t));
4393 mcp->mb[0] = MBC_SET_LED_CONFIG; 4534 mcp->mb[0] = MBC_SET_LED_CONFIG;
@@ -4412,7 +4553,8 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
4412 ql_dbg(ql_dbg_mbx, vha, 0x1134, 4553 ql_dbg(ql_dbg_mbx, vha, 0x1134,
4413 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4554 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4414 } else { 4555 } else {
4415 ql_dbg(ql_dbg_mbx, vha, 0x1135, "Done %s.\n", __func__); 4556 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1135,
4557 "Done %s.\n", __func__);
4416 } 4558 }
4417 4559
4418 return rval; 4560 return rval;
@@ -4429,7 +4571,8 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
4429 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha)) 4571 if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
4430 return QLA_FUNCTION_FAILED; 4572 return QLA_FUNCTION_FAILED;
4431 4573
4432 ql_dbg(ql_dbg_mbx, vha, 0x1136, "Entered %s.\n", __func__); 4574 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1136,
4575 "Entered %s.\n", __func__);
4433 4576
4434 memset(mcp, 0, sizeof(mbx_cmd_t)); 4577 memset(mcp, 0, sizeof(mbx_cmd_t));
4435 mcp->mb[0] = MBC_GET_LED_CONFIG; 4578 mcp->mb[0] = MBC_GET_LED_CONFIG;
@@ -4454,7 +4597,8 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
4454 led_cfg[4] = mcp->mb[5]; 4597 led_cfg[4] = mcp->mb[5];
4455 led_cfg[5] = mcp->mb[6]; 4598 led_cfg[5] = mcp->mb[6];
4456 } 4599 }
4457 ql_dbg(ql_dbg_mbx, vha, 0x1138, "Done %s.\n", __func__); 4600 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1138,
4601 "Done %s.\n", __func__);
4458 } 4602 }
4459 4603
4460 return rval; 4604 return rval;
@@ -4471,7 +4615,7 @@ qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
4471 if (!IS_QLA82XX(ha)) 4615 if (!IS_QLA82XX(ha))
4472 return QLA_FUNCTION_FAILED; 4616 return QLA_FUNCTION_FAILED;
4473 4617
4474 ql_dbg(ql_dbg_mbx, vha, 0x1127, 4618 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1127,
4475 "Entered %s.\n", __func__); 4619 "Entered %s.\n", __func__);
4476 4620
4477 memset(mcp, 0, sizeof(mbx_cmd_t)); 4621 memset(mcp, 0, sizeof(mbx_cmd_t));
@@ -4491,7 +4635,7 @@ qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
4491 ql_dbg(ql_dbg_mbx, vha, 0x1128, 4635 ql_dbg(ql_dbg_mbx, vha, 0x1128,
4492 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4636 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4493 } else { 4637 } else {
4494 ql_dbg(ql_dbg_mbx, vha, 0x1129, 4638 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1129,
4495 "Done %s.\n", __func__); 4639 "Done %s.\n", __func__);
4496 } 4640 }
4497 4641
@@ -4509,7 +4653,8 @@ qla83xx_write_remote_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
4509 if (!IS_QLA83XX(ha)) 4653 if (!IS_QLA83XX(ha))
4510 return QLA_FUNCTION_FAILED; 4654 return QLA_FUNCTION_FAILED;
4511 4655
4512 ql_dbg(ql_dbg_mbx, vha, 0x1130, "Entered %s.\n", __func__); 4656 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1130,
4657 "Entered %s.\n", __func__);
4513 4658
4514 mcp->mb[0] = MBC_WRITE_REMOTE_REG; 4659 mcp->mb[0] = MBC_WRITE_REMOTE_REG;
4515 mcp->mb[1] = LSW(reg); 4660 mcp->mb[1] = LSW(reg);
@@ -4527,7 +4672,7 @@ qla83xx_write_remote_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
4527 ql_dbg(ql_dbg_mbx, vha, 0x1131, 4672 ql_dbg(ql_dbg_mbx, vha, 0x1131,
4528 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4673 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4529 } else { 4674 } else {
4530 ql_dbg(ql_dbg_mbx, vha, 0x1132, 4675 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1132,
4531 "Done %s.\n", __func__); 4676 "Done %s.\n", __func__);
4532 } 4677 }
4533 4678
@@ -4543,13 +4688,14 @@ qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
4543 mbx_cmd_t *mcp = &mc; 4688 mbx_cmd_t *mcp = &mc;
4544 4689
4545 if (IS_QLA2100(ha) || IS_QLA2200(ha)) { 4690 if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
4546 ql_dbg(ql_dbg_mbx, vha, 0x113b, 4691 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113b,
4547 "Implicit LOGO Unsupported.\n"); 4692 "Implicit LOGO Unsupported.\n");
4548 return QLA_FUNCTION_FAILED; 4693 return QLA_FUNCTION_FAILED;
4549 } 4694 }
4550 4695
4551 4696
4552 ql_dbg(ql_dbg_mbx, vha, 0x113c, "Entering %s.\n", __func__); 4697 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113c,
4698 "Entering %s.\n", __func__);
4553 4699
4554 /* Perform Implicit LOGO. */ 4700 /* Perform Implicit LOGO. */
4555 mcp->mb[0] = MBC_PORT_LOGOUT; 4701 mcp->mb[0] = MBC_PORT_LOGOUT;
@@ -4564,7 +4710,8 @@ qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
4564 ql_dbg(ql_dbg_mbx, vha, 0x113d, 4710 ql_dbg(ql_dbg_mbx, vha, 0x113d,
4565 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); 4711 "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
4566 else 4712 else
4567 ql_dbg(ql_dbg_mbx, vha, 0x113e, "Done %s.\n", __func__); 4713 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113e,
4714 "Done %s.\n", __func__);
4568 4715
4569 return rval; 4716 return rval;
4570} 4717}
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)
295static int 295static int
296qla2x00_do_dpc_vp(scsi_qla_host_t *vha) 296qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
297{ 297{
298 ql_dbg(ql_dbg_dpc, vha, 0x4012, 298 ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x4012,
299 "Entering %s.\n", __func__); 299 "Entering %s vp_flags: 0x%lx.\n", __func__, vha->vp_flags);
300 ql_dbg(ql_dbg_dpc, vha, 0x4013,
301 "vp_flags: 0x%lx.\n", vha->vp_flags);
302 300
303 qla2x00_do_work(vha); 301 qla2x00_do_work(vha);
304 302
@@ -348,7 +346,7 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
348 } 346 }
349 } 347 }
350 348
351 ql_dbg(ql_dbg_dpc, vha, 0x401c, 349 ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x401c,
352 "Exiting %s.\n", __func__); 350 "Exiting %s.\n", __func__);
353 return 0; 351 return 0;
354} 352}
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)
2960 * changing the state to DEV_READY 2960 * changing the state to DEV_READY
2961 */ 2961 */
2962 ql_log(ql_log_info, vha, 0xb023, 2962 ql_log(ql_log_info, vha, 0xb023,
2963 "%s : QUIESCENT TIMEOUT.\n", QLA2XXX_DRIVER_NAME); 2963 "%s : QUIESCENT TIMEOUT DRV_ACTIVE:%d "
2964 ql_log(ql_log_info, vha, 0xb024, 2964 "DRV_STATE:%d.\n", QLA2XXX_DRIVER_NAME,
2965 "DRV_ACTIVE:%d DRV_STATE:%d.\n",
2966 drv_active, drv_state); 2965 drv_active, drv_state);
2967 qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, 2966 qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
2968 QLA82XX_DEV_READY); 2967 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)
649 649
650 if (ha->flags.eeh_busy) { 650 if (ha->flags.eeh_busy) {
651 if (ha->flags.pci_channel_io_perm_failure) { 651 if (ha->flags.pci_channel_io_perm_failure) {
652 ql_dbg(ql_dbg_io, vha, 0x3001, 652 ql_dbg(ql_dbg_aer, vha, 0x9010,
653 "PCI Channel IO permanent failure, exiting " 653 "PCI Channel IO permanent failure, exiting "
654 "cmd=%p.\n", cmd); 654 "cmd=%p.\n", cmd);
655 cmd->result = DID_NO_CONNECT << 16; 655 cmd->result = DID_NO_CONNECT << 16;
656 } else { 656 } else {
657 ql_dbg(ql_dbg_io, vha, 0x3002, 657 ql_dbg(ql_dbg_aer, vha, 0x9011,
658 "EEH_Busy, Requeuing the cmd=%p.\n", cmd); 658 "EEH_Busy, Requeuing the cmd=%p.\n", cmd);
659 cmd->result = DID_REQUEUE << 16; 659 cmd->result = DID_REQUEUE << 16;
660 } 660 }
@@ -664,7 +664,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
664 rval = fc_remote_port_chkready(rport); 664 rval = fc_remote_port_chkready(rport);
665 if (rval) { 665 if (rval) {
666 cmd->result = rval; 666 cmd->result = rval;
667 ql_dbg(ql_dbg_io, vha, 0x3003, 667 ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3003,
668 "fc_remote_port_chkready failed for cmd=%p, rval=0x%x.\n", 668 "fc_remote_port_chkready failed for cmd=%p, rval=0x%x.\n",
669 cmd, rval); 669 cmd, rval);
670 goto qc24_fail_command; 670 goto qc24_fail_command;
@@ -3689,10 +3689,9 @@ qla2x00_do_dpc(void *data)
3689 3689
3690 ha->dpc_active = 1; 3690 ha->dpc_active = 1;
3691 3691
3692 ql_dbg(ql_dbg_dpc, base_vha, 0x4001, 3692 ql_dbg(ql_dbg_dpc + ql_dbg_verbose, base_vha, 0x4001,
3693 "DPC handler waking up.\n"); 3693 "DPC handler waking up, dpc_flags=0x%lx.\n",
3694 ql_dbg(ql_dbg_dpc, base_vha, 0x4002, 3694 base_vha->dpc_flags);
3695 "dpc_flags=0x%lx.\n", base_vha->dpc_flags);
3696 3695
3697 qla2x00_do_work(base_vha); 3696 qla2x00_do_work(base_vha);
3698 3697
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-11 12:27:09 -0500