diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_ct.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_ct.c | 190 |
1 files changed, 85 insertions, 105 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 8b7e90eac5c3..ad7f33a31567 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c | |||
@@ -341,11 +341,11 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp, | |||
341 | } | 341 | } |
342 | 342 | ||
343 | /* Issue GEN REQ IOCB for NPORT <did> */ | 343 | /* Issue GEN REQ IOCB for NPORT <did> */ |
344 | lpfc_printf_log(phba, KERN_INFO, LOG_ELS, | 344 | lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, |
345 | "%d (%d):0119 Issue GEN REQ IOCB to NPORT x%x " | 345 | "0119 Issue GEN REQ IOCB to NPORT x%x " |
346 | "Data: x%x x%x\n", phba->brd_no, vport->vpi, | 346 | "Data: x%x x%x\n", |
347 | ndlp->nlp_DID, icmd->ulpIoTag, | 347 | ndlp->nlp_DID, icmd->ulpIoTag, |
348 | vport->port_state); | 348 | vport->port_state); |
349 | geniocb->iocb_cmpl = cmpl; | 349 | geniocb->iocb_cmpl = cmpl; |
350 | geniocb->drvrTimeout = icmd->ulpTimeout + LPFC_DRVR_TIMEOUT; | 350 | geniocb->drvrTimeout = icmd->ulpTimeout + LPFC_DRVR_TIMEOUT; |
351 | geniocb->vport = vport; | 351 | geniocb->vport = vport; |
@@ -464,14 +464,13 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size) | |||
464 | Did, ndlp->nlp_flag, | 464 | Did, ndlp->nlp_flag, |
465 | vport->fc_flag); | 465 | vport->fc_flag); |
466 | 466 | ||
467 | lpfc_printf_log(phba, KERN_INFO, | 467 | lpfc_printf_vlog(vport, |
468 | KERN_INFO, | ||
468 | LOG_DISCOVERY, | 469 | LOG_DISCOVERY, |
469 | "%d (%d):0238 Process " | 470 | "0238 Process " |
470 | "x%x NameServer Rsp" | 471 | "x%x NameServer Rsp" |
471 | "Data: x%x x%x x%x\n", | 472 | "Data: x%x x%x x%x\n", |
472 | phba->brd_no, | 473 | Did, ndlp->nlp_flag, |
473 | vport->vpi, Did, | ||
474 | ndlp->nlp_flag, | ||
475 | vport->fc_flag, | 474 | vport->fc_flag, |
476 | vport->fc_rscn_id_cnt); | 475 | vport->fc_rscn_id_cnt); |
477 | } else { | 476 | } else { |
@@ -482,14 +481,13 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size) | |||
482 | Did, vport->fc_flag, | 481 | Did, vport->fc_flag, |
483 | vport->fc_rscn_id_cnt); | 482 | vport->fc_rscn_id_cnt); |
484 | 483 | ||
485 | lpfc_printf_log(phba, KERN_INFO, | 484 | lpfc_printf_vlog(vport, |
485 | KERN_INFO, | ||
486 | LOG_DISCOVERY, | 486 | LOG_DISCOVERY, |
487 | "%d (%d):0239 Skip x%x " | 487 | "0239 Skip x%x " |
488 | "NameServer Rsp Data: " | 488 | "NameServer Rsp Data: " |
489 | "x%x x%x\n", | 489 | "x%x x%x\n", |
490 | phba->brd_no, | 490 | Did, vport->fc_flag, |
491 | vport->vpi, Did, | ||
492 | vport->fc_flag, | ||
493 | vport->fc_rscn_id_cnt); | 491 | vport->fc_rscn_id_cnt); |
494 | } | 492 | } |
495 | 493 | ||
@@ -516,14 +514,13 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size) | |||
516 | Did, vport->fc_flag, | 514 | Did, vport->fc_flag, |
517 | vport->fc_rscn_id_cnt); | 515 | vport->fc_rscn_id_cnt); |
518 | 516 | ||
519 | lpfc_printf_log(phba, KERN_INFO, | 517 | lpfc_printf_vlog(vport, |
518 | KERN_INFO, | ||
520 | LOG_DISCOVERY, | 519 | LOG_DISCOVERY, |
521 | "%d (%d):0245 Skip x%x " | 520 | "0245 Skip x%x " |
522 | "NameServer Rsp Data: " | 521 | "NameServer Rsp Data: " |
523 | "x%x x%x\n", | 522 | "x%x x%x\n", |
524 | phba->brd_no, | 523 | Did, vport->fc_flag, |
525 | vport->vpi, Did, | ||
526 | vport->fc_flag, | ||
527 | vport->fc_rscn_id_cnt); | 524 | vport->fc_rscn_id_cnt); |
528 | } | 525 | } |
529 | } | 526 | } |
@@ -570,9 +567,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
570 | 567 | ||
571 | 568 | ||
572 | if (lpfc_els_chk_latt(vport) || lpfc_error_lost_link(irsp)) { | 569 | if (lpfc_els_chk_latt(vport) || lpfc_error_lost_link(irsp)) { |
573 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 570 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
574 | "%d (%d):0216 Link event during NS query\n", | 571 | "0216 Link event during NS query\n"); |
575 | phba->brd_no, vport->vpi); | ||
576 | lpfc_vport_set_state(vport, FC_VPORT_FAILED); | 572 | lpfc_vport_set_state(vport, FC_VPORT_FAILED); |
577 | goto out; | 573 | goto out; |
578 | } | 574 | } |
@@ -590,20 +586,17 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
590 | goto out; | 586 | goto out; |
591 | } | 587 | } |
592 | lpfc_vport_set_state(vport, FC_VPORT_FAILED); | 588 | lpfc_vport_set_state(vport, FC_VPORT_FAILED); |
593 | lpfc_printf_log(phba, KERN_ERR, LOG_ELS, | 589 | lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS, |
594 | "%d (%d):0257 GID_FT Query error: 0x%x 0x%x\n", | 590 | "0257 GID_FT Query error: 0x%x 0x%x\n", |
595 | phba->brd_no, vport->vpi, irsp->ulpStatus, | 591 | irsp->ulpStatus, vport->fc_ns_retry); |
596 | vport->fc_ns_retry); | ||
597 | } else { | 592 | } else { |
598 | /* Good status, continue checking */ | 593 | /* Good status, continue checking */ |
599 | CTrsp = (struct lpfc_sli_ct_request *) outp->virt; | 594 | CTrsp = (struct lpfc_sli_ct_request *) outp->virt; |
600 | if (CTrsp->CommandResponse.bits.CmdRsp == | 595 | if (CTrsp->CommandResponse.bits.CmdRsp == |
601 | be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) { | 596 | be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) { |
602 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 597 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
603 | "%d (%d):0208 NameServer Rsp " | 598 | "0208 NameServer Rsp Data: x%x\n", |
604 | "Data: x%x\n", | 599 | vport->fc_flag); |
605 | phba->brd_no, vport->vpi, | ||
606 | vport->fc_flag); | ||
607 | lpfc_ns_rsp(vport, outp, | 600 | lpfc_ns_rsp(vport, outp, |
608 | (uint32_t) (irsp->un.genreq64.bdl.bdeSize)); | 601 | (uint32_t) (irsp->un.genreq64.bdl.bdeSize)); |
609 | } else if (CTrsp->CommandResponse.bits.CmdRsp == | 602 | } else if (CTrsp->CommandResponse.bits.CmdRsp == |
@@ -611,10 +604,10 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
611 | /* NameServer Rsp Error */ | 604 | /* NameServer Rsp Error */ |
612 | if ((CTrsp->ReasonCode == SLI_CT_UNABLE_TO_PERFORM_REQ) | 605 | if ((CTrsp->ReasonCode == SLI_CT_UNABLE_TO_PERFORM_REQ) |
613 | && (CTrsp->Explanation == SLI_CT_NO_FC4_TYPES)) { | 606 | && (CTrsp->Explanation == SLI_CT_NO_FC4_TYPES)) { |
614 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 607 | lpfc_printf_vlog(vport, KERN_INFO, |
615 | "%d (%d):0269 No NameServer Entries " | 608 | LOG_DISCOVERY, |
609 | "0269 No NameServer Entries " | ||
616 | "Data: x%x x%x x%x x%x\n", | 610 | "Data: x%x x%x x%x x%x\n", |
617 | phba->brd_no, vport->vpi, | ||
618 | CTrsp->CommandResponse.bits.CmdRsp, | 611 | CTrsp->CommandResponse.bits.CmdRsp, |
619 | (uint32_t) CTrsp->ReasonCode, | 612 | (uint32_t) CTrsp->ReasonCode, |
620 | (uint32_t) CTrsp->Explanation, | 613 | (uint32_t) CTrsp->Explanation, |
@@ -625,12 +618,11 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
625 | (uint32_t)CTrsp->CommandResponse.bits.CmdRsp, | 618 | (uint32_t)CTrsp->CommandResponse.bits.CmdRsp, |
626 | (uint32_t) CTrsp->ReasonCode, | 619 | (uint32_t) CTrsp->ReasonCode, |
627 | (uint32_t) CTrsp->Explanation); | 620 | (uint32_t) CTrsp->Explanation); |
628 | } | 621 | } else { |
629 | else { | 622 | lpfc_printf_vlog(vport, KERN_INFO, |
630 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 623 | LOG_DISCOVERY, |
631 | "%d (%d):0240 NameServer Rsp Error " | 624 | "0240 NameServer Rsp Error " |
632 | "Data: x%x x%x x%x x%x\n", | 625 | "Data: x%x x%x x%x x%x\n", |
633 | phba->brd_no, vport->vpi, | ||
634 | CTrsp->CommandResponse.bits.CmdRsp, | 626 | CTrsp->CommandResponse.bits.CmdRsp, |
635 | (uint32_t) CTrsp->ReasonCode, | 627 | (uint32_t) CTrsp->ReasonCode, |
636 | (uint32_t) CTrsp->Explanation, | 628 | (uint32_t) CTrsp->Explanation, |
@@ -646,10 +638,9 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
646 | 638 | ||
647 | } else { | 639 | } else { |
648 | /* NameServer Rsp Error */ | 640 | /* NameServer Rsp Error */ |
649 | lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, | 641 | lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY, |
650 | "%d (%d):0241 NameServer Rsp Error " | 642 | "0241 NameServer Rsp Error " |
651 | "Data: x%x x%x x%x x%x\n", | 643 | "Data: x%x x%x x%x x%x\n", |
652 | phba->brd_no, vport->vpi, | ||
653 | CTrsp->CommandResponse.bits.CmdRsp, | 644 | CTrsp->CommandResponse.bits.CmdRsp, |
654 | (uint32_t) CTrsp->ReasonCode, | 645 | (uint32_t) CTrsp->ReasonCode, |
655 | (uint32_t) CTrsp->Explanation, | 646 | (uint32_t) CTrsp->Explanation, |
@@ -717,40 +708,37 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
717 | be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) { | 708 | be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) { |
718 | if ((fbits & FC4_FEATURE_INIT) && | 709 | if ((fbits & FC4_FEATURE_INIT) && |
719 | !(fbits & FC4_FEATURE_TARGET)) { | 710 | !(fbits & FC4_FEATURE_TARGET)) { |
720 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 711 | lpfc_printf_vlog(vport, KERN_INFO, |
721 | "%d (%d):0270 Skip x%x GFF " | 712 | LOG_DISCOVERY, |
722 | "NameServer Rsp Data: (init) " | 713 | "0270 Skip x%x GFF " |
723 | "x%x x%x\n", phba->brd_no, | 714 | "NameServer Rsp Data: (init) " |
724 | vport->vpi, did, fbits, | 715 | "x%x x%x\n", did, fbits, |
725 | vport->fc_rscn_id_cnt); | 716 | vport->fc_rscn_id_cnt); |
726 | goto out; | 717 | goto out; |
727 | } | 718 | } |
728 | } | 719 | } |
729 | } | 720 | } |
730 | else { | 721 | else { |
731 | lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, | 722 | lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY, |
732 | "%d (%d):0267 NameServer GFF Rsp" | 723 | "0267 NameServer GFF Rsp " |
733 | " x%x Error (%d %d) Data: x%x x%x\n", | 724 | "x%x Error (%d %d) Data: x%x x%x\n", |
734 | phba->brd_no, vport->vpi, did, | 725 | did, irsp->ulpStatus, irsp->un.ulpWord[4], |
735 | irsp->ulpStatus, irsp->un.ulpWord[4], | 726 | vport->fc_flag, vport->fc_rscn_id_cnt) |
736 | vport->fc_flag, vport->fc_rscn_id_cnt) | ||
737 | } | 727 | } |
738 | 728 | ||
739 | /* This is a target port, unregistered port, or the GFF_ID failed */ | 729 | /* This is a target port, unregistered port, or the GFF_ID failed */ |
740 | ndlp = lpfc_setup_disc_node(vport, did); | 730 | ndlp = lpfc_setup_disc_node(vport, did); |
741 | if (ndlp) { | 731 | if (ndlp) { |
742 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 732 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
743 | "%d (%d):0242 Process x%x GFF " | 733 | "0242 Process x%x GFF " |
744 | "NameServer Rsp Data: x%x x%x x%x\n", | 734 | "NameServer Rsp Data: x%x x%x x%x\n", |
745 | phba->brd_no, vport->vpi, | 735 | did, ndlp->nlp_flag, vport->fc_flag, |
746 | did, ndlp->nlp_flag, vport->fc_flag, | 736 | vport->fc_rscn_id_cnt); |
747 | vport->fc_rscn_id_cnt); | ||
748 | } else { | 737 | } else { |
749 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 738 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
750 | "%d (%d):0243 Skip x%x GFF " | 739 | "0243 Skip x%x GFF " |
751 | "NameServer Rsp Data: x%x x%x\n", | 740 | "NameServer Rsp Data: x%x x%x\n", did, |
752 | phba->brd_no, vport->vpi, did, | 741 | vport->fc_flag, vport->fc_rscn_id_cnt); |
753 | vport->fc_flag, vport->fc_rscn_id_cnt); | ||
754 | } | 742 | } |
755 | out: | 743 | out: |
756 | /* Link up / RSCN discovery */ | 744 | /* Link up / RSCN discovery */ |
@@ -806,22 +794,21 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
806 | latt = lpfc_els_chk_latt(vport); | 794 | latt = lpfc_els_chk_latt(vport); |
807 | 795 | ||
808 | /* RFT request completes status <ulpStatus> CmdRsp <CmdRsp> */ | 796 | /* RFT request completes status <ulpStatus> CmdRsp <CmdRsp> */ |
809 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 797 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
810 | "%d (%d):0209 RFT request completes, latt %d, " | 798 | "0209 RFT request completes, latt %d, " |
811 | "ulpStatus x%x CmdRsp x%x, Context x%x, Tag x%x\n", | 799 | "ulpStatus x%x CmdRsp x%x, Context x%x, Tag x%x\n", |
812 | phba->brd_no, vport->vpi, latt, irsp->ulpStatus, | 800 | latt, irsp->ulpStatus, |
813 | CTrsp->CommandResponse.bits.CmdRsp, | 801 | CTrsp->CommandResponse.bits.CmdRsp, |
814 | cmdiocb->iocb.ulpContext, cmdiocb->iocb.ulpIoTag); | 802 | cmdiocb->iocb.ulpContext, cmdiocb->iocb.ulpIoTag); |
815 | 803 | ||
816 | lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT, | 804 | lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT, |
817 | "CT cmd cmpl: status:x%x/x%x cmd:x%x", | 805 | "CT cmd cmpl: status:x%x/x%x cmd:x%x", |
818 | irsp->ulpStatus, irsp->un.ulpWord[4], cmdcode); | 806 | irsp->ulpStatus, irsp->un.ulpWord[4], cmdcode); |
819 | 807 | ||
820 | if (irsp->ulpStatus) { | 808 | if (irsp->ulpStatus) { |
821 | lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, | 809 | lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY, |
822 | "%d (%d):0268 NS cmd %x Error (%d %d)\n", | 810 | "0268 NS cmd %x Error (%d %d)\n", |
823 | phba->brd_no, vport->vpi, cmdcode, | 811 | cmdcode, irsp->ulpStatus, irsp->un.ulpWord[4]); |
824 | irsp->ulpStatus, irsp->un.ulpWord[4]); | ||
825 | 812 | ||
826 | if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) && | 813 | if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) && |
827 | ((irsp->un.ulpWord[4] == IOERR_SLI_DOWN) || | 814 | ((irsp->un.ulpWord[4] == IOERR_SLI_DOWN) || |
@@ -833,9 +820,8 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
833 | goto out; | 820 | goto out; |
834 | 821 | ||
835 | retry++; | 822 | retry++; |
836 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 823 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
837 | "%d (%d):0216 Retrying NS cmd %x\n", | 824 | "0216 Retrying NS cmd %x\n", cmdcode); |
838 | phba->brd_no, vport->vpi, cmdcode); | ||
839 | rc = lpfc_ns_cmd(vport, cmdcode, retry, 0); | 825 | rc = lpfc_ns_cmd(vport, cmdcode, retry, 0); |
840 | if (rc == 0) | 826 | if (rc == 0) |
841 | goto out; | 827 | goto out; |
@@ -979,10 +965,9 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, | |||
979 | } | 965 | } |
980 | 966 | ||
981 | /* NameServer Req */ | 967 | /* NameServer Req */ |
982 | lpfc_printf_log(phba, KERN_INFO ,LOG_DISCOVERY, | 968 | lpfc_printf_vlog(vport, KERN_INFO ,LOG_DISCOVERY, |
983 | "%d (%d):0236 NameServer Req Data: x%x x%x x%x\n", | 969 | "0236 NameServer Req Data: x%x x%x x%x\n", |
984 | phba->brd_no, vport->vpi, cmdcode, vport->fc_flag, | 970 | cmdcode, vport->fc_flag, vport->fc_rscn_id_cnt); |
985 | vport->fc_rscn_id_cnt); | ||
986 | 971 | ||
987 | bpl = (struct ulp_bde64 *) bmp->virt; | 972 | bpl = (struct ulp_bde64 *) bmp->virt; |
988 | memset(bpl, 0, sizeof(struct ulp_bde64)); | 973 | memset(bpl, 0, sizeof(struct ulp_bde64)); |
@@ -1099,10 +1084,9 @@ ns_cmd_free_mpvirt: | |||
1099 | ns_cmd_free_mp: | 1084 | ns_cmd_free_mp: |
1100 | kfree(mp); | 1085 | kfree(mp); |
1101 | ns_cmd_exit: | 1086 | ns_cmd_exit: |
1102 | lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, | 1087 | lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY, |
1103 | "%d (%d):0266 Issue NameServer Req x%x err %d Data: x%x x%x\n", | 1088 | "0266 Issue NameServer Req x%x err %d Data: x%x x%x\n", |
1104 | phba->brd_no, vport->vpi, cmdcode, rc, vport->fc_flag, | 1089 | cmdcode, rc, vport->fc_flag, vport->fc_rscn_id_cnt); |
1105 | vport->fc_rscn_id_cnt); | ||
1106 | return 1; | 1090 | return 1; |
1107 | } | 1091 | } |
1108 | 1092 | ||
@@ -1128,12 +1112,11 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
1128 | irsp->ulpStatus, irsp->un.ulpWord[4], latt); | 1112 | irsp->ulpStatus, irsp->un.ulpWord[4], latt); |
1129 | 1113 | ||
1130 | if (latt || irsp->ulpStatus) { | 1114 | if (latt || irsp->ulpStatus) { |
1131 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 1115 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
1132 | "%d (%d):0229 FDMI cmd %04x failed, latt = %d " | 1116 | "0229 FDMI cmd %04x failed, latt = %d " |
1133 | "ulpStatus: x%x, rid x%x\n", | 1117 | "ulpStatus: x%x, rid x%x\n", |
1134 | phba->brd_no, vport->vpi, | 1118 | be16_to_cpu(fdmi_cmd), latt, irsp->ulpStatus, |
1135 | be16_to_cpu(fdmi_cmd), latt, irsp->ulpStatus, | 1119 | irsp->un.ulpWord[4]); |
1136 | irsp->un.ulpWord[4]); | ||
1137 | lpfc_ct_free_iocb(phba, cmdiocb); | 1120 | lpfc_ct_free_iocb(phba, cmdiocb); |
1138 | return; | 1121 | return; |
1139 | } | 1122 | } |
@@ -1141,10 +1124,9 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
1141 | ndlp = lpfc_findnode_did(vport, FDMI_DID); | 1124 | ndlp = lpfc_findnode_did(vport, FDMI_DID); |
1142 | if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) { | 1125 | if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) { |
1143 | /* FDMI rsp failed */ | 1126 | /* FDMI rsp failed */ |
1144 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 1127 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
1145 | "%d (%d):0220 FDMI rsp failed Data: x%x\n", | 1128 | "0220 FDMI rsp failed Data: x%x\n", |
1146 | phba->brd_no, vport->vpi, | 1129 | be16_to_cpu(fdmi_cmd)); |
1147 | be16_to_cpu(fdmi_cmd)); | ||
1148 | } | 1130 | } |
1149 | 1131 | ||
1150 | switch (be16_to_cpu(fdmi_cmd)) { | 1132 | switch (be16_to_cpu(fdmi_cmd)) { |
@@ -1207,11 +1189,9 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) | |||
1207 | INIT_LIST_HEAD(&bmp->list); | 1189 | INIT_LIST_HEAD(&bmp->list); |
1208 | 1190 | ||
1209 | /* FDMI request */ | 1191 | /* FDMI request */ |
1210 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 1192 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
1211 | "%d (%d):0218 FDMI Request Data: x%x x%x x%x\n", | 1193 | "0218 FDMI Request Data: x%x x%x x%x\n", |
1212 | phba->brd_no, vport->vpi, vport->fc_flag, | 1194 | vport->fc_flag, vport->port_state, cmdcode); |
1213 | vport->port_state, cmdcode); | ||
1214 | |||
1215 | CtReq = (struct lpfc_sli_ct_request *) mp->virt; | 1195 | CtReq = (struct lpfc_sli_ct_request *) mp->virt; |
1216 | 1196 | ||
1217 | memset(CtReq, 0, sizeof(struct lpfc_sli_ct_request)); | 1197 | memset(CtReq, 0, sizeof(struct lpfc_sli_ct_request)); |
@@ -1534,9 +1514,9 @@ fdmi_cmd_free_mp: | |||
1534 | kfree(mp); | 1514 | kfree(mp); |
1535 | fdmi_cmd_exit: | 1515 | fdmi_cmd_exit: |
1536 | /* Issue FDMI request failed */ | 1516 | /* Issue FDMI request failed */ |
1537 | lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, | 1517 | lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY, |
1538 | "%d (%d):0244 Issue FDMI request failed Data: x%x\n", | 1518 | "0244 Issue FDMI request failed Data: x%x\n", |
1539 | phba->brd_no, vport->vpi, cmdcode); | 1519 | cmdcode); |
1540 | return 1; | 1520 | return 1; |
1541 | } | 1521 | } |
1542 | 1522 | ||