[SCSI] lpfc 8.2.2 : Rework the lpfc_printf_log() macro (e8b62011) · Commits · 戴 / test

drivers/scsi/lpfc/lpfc.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -349,6 +349,7 @@ struct lpfc_vport {
		uint32_t cfg_use_adisc;
		uint32_t cfg_fdmi_on;
		uint32_t cfg_discovery_threads;
		uint32_t cfg_log_verbose;
		uint32_t cfg_max_luns;

		uint32_t dev_loss_tmo_changed;
		@@ -446,8 +447,6 @@ struct lpfc_hba {
		uint64_t cfg_soft_wwpn;
		uint32_t cfg_hba_queue_depth;

		/* Config paramters that should be in the vport */
		uint32_t cfg_log_verbose;

		lpfc_vpd_t vpd; /* vital product data */

drivers/scsi/lpfc/lpfc_attr.c

+49 −61

Original line number	Diff line number	Diff line
		@@ -319,9 +319,8 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)
		if (cnt++ > 3000) {
		lpfc_printf_log(phba,
		KERN_WARNING, LOG_INIT,
		"%d:0466 Outstanding IO when "
		"bringing Adapter offline\n",
		phba->brd_no);
		"0466 Outstanding IO when "
		"bringing Adapter offline\n");
		break;
		}
		}
		@@ -694,9 +693,8 @@ lpfc_##attr##_init(struct lpfc_hba *phba, int val) \
		return 0;\
		}\
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT, \
		"%d:0449 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", \
		phba->brd_no, val); \
		"0449 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", val); \
		phba->cfg_##attr = default;\
		return -EINVAL;\
		}
		@@ -710,9 +708,8 @@ lpfc_##attr##_set(struct lpfc_hba *phba, int val) \
		return 0;\
		}\
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT, \
		"%d:0450 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", \
		phba->brd_no, val); \
		"0450 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", val); \
		return -EINVAL;\
		}

		@@ -764,10 +761,9 @@ lpfc_##attr##_init(struct lpfc_vport *vport, int val) \
		vport->cfg_##attr = val;\
		return 0;\
		}\
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT, \
		"%d:0449 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", \
		vport->phba->brd_no, val); \
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \
		"0449 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", val); \
		vport->cfg_##attr = default;\
		return -EINVAL;\
		}
		@@ -780,10 +776,9 @@ lpfc_##attr##_set(struct lpfc_vport *vport, int val) \
		vport->cfg_##attr = val;\
		return 0;\
		}\
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT, \
		"%d:0450 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", \
		vport->phba->brd_no, val); \
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \
		"0450 lpfc_"#attr" attribute cannot be set to %d, "\
		"allowed range is ["#minval", "#maxval"]\n", val); \
		return -EINVAL;\
		}

		@@ -1023,17 +1018,15 @@ lpfc_soft_wwpn_store(struct class_device cdev, const char buf, size_t count)
		stat1 = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);
		if (stat1)
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0463 lpfc_soft_wwpn attribute set failed to reinit "
		"adapter - %d\n", phba->brd_no, stat1);

		"0463 lpfc_soft_wwpn attribute set failed to "
		"reinit adapter - %d\n", stat1);
		init_completion(&online_compl);
		lpfc_workq_post_event(phba, &stat2, &online_compl, LPFC_EVT_ONLINE);
		wait_for_completion(&online_compl);
		if (stat2)
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0464 lpfc_soft_wwpn attribute set failed to reinit "
		"adapter - %d\n", phba->brd_no, stat2);

		"0464 lpfc_soft_wwpn attribute set failed to "
		"reinit adapter - %d\n", stat2);
		return (stat1 \|\| stat2) ? -EIO : count;
		}
		static CLASS_DEVICE_ATTR(lpfc_soft_wwpn, S_IRUGO \| S_IWUSR,\
		@@ -1145,11 +1138,10 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)
		if (vport->cfg_devloss_tmo != LPFC_DEF_DEVLOSS_TMO) {
		vport->cfg_nodev_tmo = vport->cfg_devloss_tmo;
		if (val != LPFC_DEF_DEVLOSS_TMO)
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d (%d):0402 Ignoring nodev_tmo module"
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0402 Ignoring nodev_tmo module "
		"parameter because devloss_tmo is "
		" set.\n",
		vport->phba->brd_no, vport->vpi);
		"set.\n");
		return 0;
		}

		@@ -1158,11 +1150,10 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)
		vport->cfg_devloss_tmo = val;
		return 0;
		}
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d (%d):0400 lpfc_nodev_tmo attribute cannot be set to"
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0400 lpfc_nodev_tmo attribute cannot be set to"
		" %d, allowed range is [%d, %d]\n",
		vport->phba->brd_no, vport->vpi, val,
		LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO);
		val, LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO);
		vport->cfg_nodev_tmo = LPFC_DEF_DEVLOSS_TMO;
		return -EINVAL;
		}
		@@ -1195,10 +1186,9 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
		{
		if (vport->dev_loss_tmo_changed \|\|
		(lpfc_devloss_tmo != LPFC_DEF_DEVLOSS_TMO)) {
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d (%d):0401 Ignoring change to nodev_tmo "
		"because devloss_tmo is set.\n",
		vport->phba->brd_no, vport->vpi);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0401 Ignoring change to nodev_tmo "
		"because devloss_tmo is set.\n");
		return 0;
		}
		if (val >= LPFC_MIN_DEVLOSS_TMO && val <= LPFC_MAX_DEVLOSS_TMO) {
		@@ -1207,11 +1197,10 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
		lpfc_update_rport_devloss_tmo(vport);
		return 0;
		}
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d (%d):0403 lpfc_nodev_tmo attribute cannot be set to"
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0403 lpfc_nodev_tmo attribute cannot be set to"
		"%d, allowed range is [%d, %d]\n",
		vport->phba->brd_no, vport->vpi, val,
		LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO);
		val, LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO);
		return -EINVAL;
		}

		@@ -1243,11 +1232,10 @@ lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val)
		return 0;
		}

		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d:0404 lpfc_devloss_tmo attribute cannot be set to"
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0404 lpfc_devloss_tmo attribute cannot be set to"
		" %d, allowed range is [%d, %d]\n",
		vport->phba->brd_no, val, LPFC_MIN_DEVLOSS_TMO,
		LPFC_MAX_DEVLOSS_TMO);
		val, LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO);
		return -EINVAL;
		}

		@@ -1273,7 +1261,8 @@ static CLASS_DEVICE_ATTR(lpfc_devloss_tmo, S_IRUGO \| S_IWUSR,
		# LOG_LIBDFC 0x2000 LIBDFC events
		# LOG_ALL_MSG 0xffff LOG all messages
		*/
		LPFC_ATTR_HEX_RW(log_verbose, 0x0, 0x0, 0xffff, "Verbose logging bit-mask");
		LPFC_VPORT_ATTR_HEX_RW(log_verbose, 0x0, 0x0, 0xffff,
		"Verbose logging bit-mask");

		/*
		# lun_queue_depth: This parameter is used to limit the number of outstanding
		@@ -1326,10 +1315,10 @@ static int
		lpfc_restrict_login_init(struct lpfc_vport *vport, int val)
		{
		if (val < 0 \|\| val > 1) {
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d:0449 lpfc_restrict_login attribute cannot "
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0449 lpfc_restrict_login attribute cannot "
		"be set to %d, allowed range is [0, 1]\n",
		vport->phba->brd_no, val);
		val);
		vport->cfg_restrict_login = 1;
		return -EINVAL;
		}
		@@ -1345,18 +1334,17 @@ static int
		lpfc_restrict_login_set(struct lpfc_vport *vport, int val)
		{
		if (val < 0 \|\| val > 1) {
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d:0450 lpfc_restrict_login attribute cannot "
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0450 lpfc_restrict_login attribute cannot "
		"be set to %d, allowed range is [0, 1]\n",
		vport->phba->brd_no, val);
		val);
		vport->cfg_restrict_login = 1;
		return -EINVAL;
		}
		if (vport->port_type == LPFC_PHYSICAL_PORT && val != 0) {
		lpfc_printf_log(vport->phba, KERN_ERR, LOG_INIT,
		"%d:0468 lpfc_restrict_login must be 0 for "
		"Physical ports.\n",
		vport->phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0468 lpfc_restrict_login must be 0 for "
		"Physical ports.\n");
		vport->cfg_restrict_login = 0;
		return 0;
		}
		@@ -2435,7 +2423,6 @@ struct fc_function_template lpfc_vport_transport_functions = {
		void
		lpfc_get_cfgparam(struct lpfc_hba *phba)
		{
		lpfc_log_verbose_init(phba, lpfc_log_verbose);
		lpfc_cr_delay_init(phba, lpfc_cr_delay);
		lpfc_cr_count_init(phba, lpfc_cr_count);
		lpfc_multi_ring_support_init(phba, lpfc_multi_ring_support);
		@@ -2469,6 +2456,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
		void
		lpfc_get_vport_cfgparam(struct lpfc_vport *vport)
		{
		lpfc_log_verbose_init(vport, lpfc_log_verbose);
		lpfc_lun_queue_depth_init(vport, lpfc_lun_queue_depth);
		lpfc_devloss_tmo_init(vport, lpfc_devloss_tmo);
		lpfc_nodev_tmo_init(vport, lpfc_nodev_tmo);

drivers/scsi/lpfc/lpfc_ct.c

+85 −105

Original line number	Diff line number	Diff line
		@@ -341,9 +341,9 @@ lpfc_gen_req(struct lpfc_vport vport, struct lpfc_dmabuf bmp,
		}

		/* Issue GEN REQ IOCB for NPORT <did> */
		lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
		"%d (%d):0119 Issue GEN REQ IOCB to NPORT x%x "
		"Data: x%x x%x\n", phba->brd_no, vport->vpi,
		lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
		"0119 Issue GEN REQ IOCB to NPORT x%x "
		"Data: x%x x%x\n",
		ndlp->nlp_DID, icmd->ulpIoTag,
		vport->port_state);
		geniocb->iocb_cmpl = cmpl;
		@@ -464,14 +464,13 @@ lpfc_ns_rsp(struct lpfc_vport vport, struct lpfc_dmabuf mp, uint32_t Size)
		Did, ndlp->nlp_flag,
		vport->fc_flag);

		lpfc_printf_log(phba, KERN_INFO,
		lpfc_printf_vlog(vport,
		KERN_INFO,
		LOG_DISCOVERY,
		"%d (%d):0238 Process "
		"0238 Process "
		"x%x NameServer Rsp"
		"Data: x%x x%x x%x\n",
		phba->brd_no,
		vport->vpi, Did,
		ndlp->nlp_flag,
		Did, ndlp->nlp_flag,
		vport->fc_flag,
		vport->fc_rscn_id_cnt);
		} else {
		@@ -482,14 +481,13 @@ lpfc_ns_rsp(struct lpfc_vport vport, struct lpfc_dmabuf mp, uint32_t Size)
		Did, vport->fc_flag,
		vport->fc_rscn_id_cnt);

		lpfc_printf_log(phba, KERN_INFO,
		lpfc_printf_vlog(vport,
		KERN_INFO,
		LOG_DISCOVERY,
		"%d (%d):0239 Skip x%x "
		"0239 Skip x%x "
		"NameServer Rsp Data: "
		"x%x x%x\n",
		phba->brd_no,
		vport->vpi, Did,
		vport->fc_flag,
		Did, vport->fc_flag,
		vport->fc_rscn_id_cnt);
		}

		@@ -516,14 +514,13 @@ lpfc_ns_rsp(struct lpfc_vport vport, struct lpfc_dmabuf mp, uint32_t Size)
		Did, vport->fc_flag,
		vport->fc_rscn_id_cnt);

		lpfc_printf_log(phba, KERN_INFO,
		lpfc_printf_vlog(vport,
		KERN_INFO,
		LOG_DISCOVERY,
		"%d (%d):0245 Skip x%x "
		"0245 Skip x%x "
		"NameServer Rsp Data: "
		"x%x x%x\n",
		phba->brd_no,
		vport->vpi, Did,
		vport->fc_flag,
		Did, vport->fc_flag,
		vport->fc_rscn_id_cnt);
		}
		}
		@@ -570,9 +567,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,


		if (lpfc_els_chk_latt(vport) \|\| lpfc_error_lost_link(irsp)) {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0216 Link event during NS query\n",
		phba->brd_no, vport->vpi);
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0216 Link event during NS query\n");
		lpfc_vport_set_state(vport, FC_VPORT_FAILED);
		goto out;
		}
		@@ -590,19 +586,16 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		goto out;
		}
		lpfc_vport_set_state(vport, FC_VPORT_FAILED);
		lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
		"%d (%d):0257 GID_FT Query error: 0x%x 0x%x\n",
		phba->brd_no, vport->vpi, irsp->ulpStatus,
		vport->fc_ns_retry);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
		"0257 GID_FT Query error: 0x%x 0x%x\n",
		irsp->ulpStatus, vport->fc_ns_retry);
		} else {
		/* Good status, continue checking */
		CTrsp = (struct lpfc_sli_ct_request *) outp->virt;
		if (CTrsp->CommandResponse.bits.CmdRsp ==
		be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0208 NameServer Rsp "
		"Data: x%x\n",
		phba->brd_no, vport->vpi,
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0208 NameServer Rsp Data: x%x\n",
		vport->fc_flag);
		lpfc_ns_rsp(vport, outp,
		(uint32_t) (irsp->un.genreq64.bdl.bdeSize));
		@@ -611,10 +604,10 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		/* NameServer Rsp Error */
		if ((CTrsp->ReasonCode == SLI_CT_UNABLE_TO_PERFORM_REQ)
		&& (CTrsp->Explanation == SLI_CT_NO_FC4_TYPES)) {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0269 No NameServer Entries "
		lpfc_printf_vlog(vport, KERN_INFO,
		LOG_DISCOVERY,
		"0269 No NameServer Entries "
		"Data: x%x x%x x%x x%x\n",
		phba->brd_no, vport->vpi,
		CTrsp->CommandResponse.bits.CmdRsp,
		(uint32_t) CTrsp->ReasonCode,
		(uint32_t) CTrsp->Explanation,
		@@ -625,12 +618,11 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		(uint32_t)CTrsp->CommandResponse.bits.CmdRsp,
		(uint32_t) CTrsp->ReasonCode,
		(uint32_t) CTrsp->Explanation);
		}
		else {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0240 NameServer Rsp Error "
		} else {
		lpfc_printf_vlog(vport, KERN_INFO,
		LOG_DISCOVERY,
		"0240 NameServer Rsp Error "
		"Data: x%x x%x x%x x%x\n",
		phba->brd_no, vport->vpi,
		CTrsp->CommandResponse.bits.CmdRsp,
		(uint32_t) CTrsp->ReasonCode,
		(uint32_t) CTrsp->Explanation,
		@@ -646,10 +638,9 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,

		} else {
		/* NameServer Rsp Error */
		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
		"%d (%d):0241 NameServer Rsp Error "
		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
		"0241 NameServer Rsp Error "
		"Data: x%x x%x x%x x%x\n",
		phba->brd_no, vport->vpi,
		CTrsp->CommandResponse.bits.CmdRsp,
		(uint32_t) CTrsp->ReasonCode,
		(uint32_t) CTrsp->Explanation,
		@@ -717,39 +708,36 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {
		if ((fbits & FC4_FEATURE_INIT) &&
		!(fbits & FC4_FEATURE_TARGET)) {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0270 Skip x%x GFF "
		lpfc_printf_vlog(vport, KERN_INFO,
		LOG_DISCOVERY,
		"0270 Skip x%x GFF "
		"NameServer Rsp Data: (init) "
		"x%x x%x\n", phba->brd_no,
		vport->vpi, did, fbits,
		"x%x x%x\n", did, fbits,
		vport->fc_rscn_id_cnt);
		goto out;
		}
		}
		}
		else {
		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
		"%d (%d):0267 NameServer GFF Rsp"
		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
		"0267 NameServer GFF Rsp "
		"x%x Error (%d %d) Data: x%x x%x\n",
		phba->brd_no, vport->vpi, did,
		irsp->ulpStatus, irsp->un.ulpWord[4],
		did, irsp->ulpStatus, irsp->un.ulpWord[4],
		vport->fc_flag, vport->fc_rscn_id_cnt)
		}

		/* This is a target port, unregistered port, or the GFF_ID failed */
		ndlp = lpfc_setup_disc_node(vport, did);
		if (ndlp) {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0242 Process x%x GFF "
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0242 Process x%x GFF "
		"NameServer Rsp Data: x%x x%x x%x\n",
		phba->brd_no, vport->vpi,
		did, ndlp->nlp_flag, vport->fc_flag,
		vport->fc_rscn_id_cnt);
		} else {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0243 Skip x%x GFF "
		"NameServer Rsp Data: x%x x%x\n",
		phba->brd_no, vport->vpi, did,
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0243 Skip x%x GFF "
		"NameServer Rsp Data: x%x x%x\n", did,
		vport->fc_flag, vport->fc_rscn_id_cnt);
		}
		out:
		@@ -806,10 +794,10 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		latt = lpfc_els_chk_latt(vport);

		/* RFT request completes status <ulpStatus> CmdRsp <CmdRsp> */
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0209 RFT request completes, latt %d, "
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0209 RFT request completes, latt %d, "
		"ulpStatus x%x CmdRsp x%x, Context x%x, Tag x%x\n",
		phba->brd_no, vport->vpi, latt, irsp->ulpStatus,
		latt, irsp->ulpStatus,
		CTrsp->CommandResponse.bits.CmdRsp,
		cmdiocb->iocb.ulpContext, cmdiocb->iocb.ulpIoTag);

		@@ -818,10 +806,9 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		irsp->ulpStatus, irsp->un.ulpWord[4], cmdcode);

		if (irsp->ulpStatus) {
		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
		"%d (%d):0268 NS cmd %x Error (%d %d)\n",
		phba->brd_no, vport->vpi, cmdcode,
		irsp->ulpStatus, irsp->un.ulpWord[4]);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
		"0268 NS cmd %x Error (%d %d)\n",
		cmdcode, irsp->ulpStatus, irsp->un.ulpWord[4]);

		if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
		((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,
		goto out;

		retry++;
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0216 Retrying NS cmd %x\n",
		phba->brd_no, vport->vpi, cmdcode);
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0216 Retrying NS cmd %x\n", cmdcode);
		rc = lpfc_ns_cmd(vport, cmdcode, retry, 0);
		if (rc == 0)
		goto out;
		@@ -979,10 +965,9 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
		}

		/* NameServer Req */
		lpfc_printf_log(phba, KERN_INFO ,LOG_DISCOVERY,
		"%d (%d):0236 NameServer Req Data: x%x x%x x%x\n",
		phba->brd_no, vport->vpi, cmdcode, vport->fc_flag,
		vport->fc_rscn_id_cnt);
		lpfc_printf_vlog(vport, KERN_INFO ,LOG_DISCOVERY,
		"0236 NameServer Req Data: x%x x%x x%x\n",
		cmdcode, vport->fc_flag, vport->fc_rscn_id_cnt);

		bpl = (struct ulp_bde64 *) bmp->virt;
		memset(bpl, 0, sizeof(struct ulp_bde64));
		@@ -1099,10 +1084,9 @@ ns_cmd_free_mpvirt:
		ns_cmd_free_mp:
		kfree(mp);
		ns_cmd_exit:
		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
		"%d (%d):0266 Issue NameServer Req x%x err %d Data: x%x x%x\n",
		phba->brd_no, vport->vpi, cmdcode, rc, vport->fc_flag,
		vport->fc_rscn_id_cnt);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
		"0266 Issue NameServer Req x%x err %d Data: x%x x%x\n",
		cmdcode, rc, vport->fc_flag, vport->fc_rscn_id_cnt);
		return 1;
		}

		@@ -1128,10 +1112,9 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		irsp->ulpStatus, irsp->un.ulpWord[4], latt);

		if (latt \|\| irsp->ulpStatus) {
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0229 FDMI cmd %04x failed, latt = %d "
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0229 FDMI cmd %04x failed, latt = %d "
		"ulpStatus: x%x, rid x%x\n",
		phba->brd_no, vport->vpi,
		be16_to_cpu(fdmi_cmd), latt, irsp->ulpStatus,
		irsp->un.ulpWord[4]);
		lpfc_ct_free_iocb(phba, cmdiocb);
		@@ -1141,9 +1124,8 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		ndlp = lpfc_findnode_did(vport, FDMI_DID);
		if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) {
		/* FDMI rsp failed */
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0220 FDMI rsp failed Data: x%x\n",
		phba->brd_no, vport->vpi,
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0220 FDMI rsp failed Data: x%x\n",
		be16_to_cpu(fdmi_cmd));
		}

		@@ -1207,11 +1189,9 @@ lpfc_fdmi_cmd(struct lpfc_vport vport, struct lpfc_nodelist ndlp, int cmdcode)
		INIT_LIST_HEAD(&bmp->list);

		/* FDMI request */
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0218 FDMI Request Data: x%x x%x x%x\n",
		phba->brd_no, vport->vpi, vport->fc_flag,
		vport->port_state, cmdcode);

		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0218 FDMI Request Data: x%x x%x x%x\n",
		vport->fc_flag, vport->port_state, cmdcode);
		CtReq = (struct lpfc_sli_ct_request *) mp->virt;

		memset(CtReq, 0, sizeof(struct lpfc_sli_ct_request));
		@@ -1534,9 +1514,9 @@ fdmi_cmd_free_mp:
		kfree(mp);
		fdmi_cmd_exit:
		/* Issue FDMI request failed */
		lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
		"%d (%d):0244 Issue FDMI request failed Data: x%x\n",
		phba->brd_no, vport->vpi, cmdcode);
		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
		"0244 Issue FDMI request failed Data: x%x\n",
		cmdcode);
		return 1;
		}

drivers/scsi/lpfc/lpfc_debugfs.c

+26 −36

Original line number	Diff line number	Diff line
		@@ -642,13 +642,11 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		lpfc_debugfs_root = debugfs_create_dir("lpfc", NULL);
		atomic_set(&lpfc_debugfs_hba_count, 0);
		if (!lpfc_debugfs_root) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs root (lpfc)",
		phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs root\n");
		goto debug_failed;
		}
		}

		if (!lpfc_debugfs_start_time)
		lpfc_debugfs_start_time = jiffies;

		@@ -658,9 +656,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		phba->hba_debugfs_root =
		debugfs_create_dir(name, lpfc_debugfs_root);
		if (!phba->hba_debugfs_root) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs hba (lpfc%d)",
		phba->brd_no, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs hba\n");
		goto debug_failed;
		}
		atomic_inc(&lpfc_debugfs_hba_count);
		@@ -673,9 +670,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		phba->hba_debugfs_root,
		phba, &lpfc_debugfs_op_dumpslim);
		if (!phba->debug_dumpslim) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs dumpslim (lpfc%d)",
		phba->brd_no, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs dumpslim\n");
		goto debug_failed;
		}

		@@ -692,8 +688,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		}
		lpfc_debugfs_max_slow_ring_trc = (1 << i);
		printk(KERN_ERR
		"lpfc_debugfs_max_slow_ring_trc change to %d\n",
		lpfc_debugfs_max_slow_ring_trc);
		"lpfc_debugfs_max_disc_trc changed to "
		"%d\n", lpfc_debugfs_max_disc_trc);
		}
		}

		@@ -704,10 +700,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		phba->hba_debugfs_root,
		phba, &lpfc_debugfs_op_slow_ring_trc);
		if (!phba->debug_slow_ring_trc) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs "
		"slow_ring_trace (lpfc%d)",
		phba->brd_no, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs "
		"slow_ring_trace\n");
		goto debug_failed;
		}
		if (!phba->slow_ring_trc) {
		@@ -716,10 +711,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		lpfc_debugfs_max_slow_ring_trc),
		GFP_KERNEL);
		if (!phba->slow_ring_trc) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs "
		"slow_ring buffer (lpfc%d)",
		phba->brd_no, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs "
		"slow_ring buffer\n");
		goto debug_failed;
		}
		atomic_set(&phba->slow_ring_trc_cnt, 0);
		@@ -734,9 +728,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		vport->vport_debugfs_root =
		debugfs_create_dir(name, phba->hba_debugfs_root);
		if (!vport->vport_debugfs_root) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cant create debugfs vport%d (lpfc%d)",
		phba->brd_no, vport->vpi, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cant create debugfs");
		goto debug_failed;
		}
		atomic_inc(&phba->debugfs_vport_count);
		@@ -764,10 +757,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		GFP_KERNEL);

		if (!vport->disc_trc) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs "
		"vport%d disc trace buffer (lpfc%d)",
		phba->brd_no, vport->vpi, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs disc trace "
		"buffer\n");
		goto debug_failed;
		}
		atomic_set(&vport->disc_trc_cnt, 0);
		@@ -780,10 +772,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		vport->vport_debugfs_root,
		vport, &lpfc_debugfs_op_disc_trc);
		if (!vport->debug_disc_trc) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cannot create debugfs "
		"vport%d discovery_trace (lpfc%d)",
		phba->brd_no, vport->vpi, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cannot create debugfs "
		"discovery_trace\n");
		goto debug_failed;
		}
		snprintf(name, sizeof(name), "nodelist");
		@@ -792,9 +783,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
		vport->vport_debugfs_root,
		vport, &lpfc_debugfs_op_nodelist);
		if (!vport->debug_nodelist) {
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		"%d:0409 Cant create debugfs vport%d nodelist (lpfc%d)",
		phba->brd_no, vport->vpi, phba->brd_no);
		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
		"0409 Cant create debugfs nodelist");
		goto debug_failed;
		}
		debug_failed:

drivers/scsi/lpfc/lpfc_els.c

+221 −312

File changed.

Preview size limit exceeded, changes collapsed.

Admin message