Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32350664 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Migrate to %px and %pf in kernel print calls 



In order to see real addresses, convert %p with %px for kernel addresses
and replace %p with %pf for functions.

While converting, standardize on "x%px" throughout (not %px or 0x%px).

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1df09449

drivers/scsi/lpfc/lpfc_bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
				if (!dmabuf) {

					lpfc_printf_log(phba, KERN_ERR,

						LOG_LIBDFC, "2616 No dmabuf "

						"found for iocbq 0x%p\n",

						"found for iocbq x%px\n",

						iocbq);

					kfree(evt_dat->data);

					kfree(evt_dat);

drivers/scsi/lpfc/lpfc_ct.c

+3 −2
Original line number Diff line number Diff line
@@ -1227,8 +1227,9 @@ lpfc_cmpl_ct_cmd_gft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
			if (fc4_data_1 &  LPFC_FC4_TYPE_BITMASK)

				ndlp->nlp_fc4_type |= NLP_FC4_NVME;

			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

					 "3064 Setting ndlp %p, DID x%06x with "

					 "FC4 x%08x, Data: x%08x x%08x %d\n",

					 "3064 Setting ndlp x%px, DID x%06x "

					 "with FC4 x%08x, Data: x%08x x%08x "

					 "%d\n",

					 ndlp, did, ndlp->nlp_fc4_type,

					 FC_TYPE_FCP, FC_TYPE_NVME,

					 ndlp->nlp_state);

drivers/scsi/lpfc/lpfc_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size) 
			phys = ((uint64_t)hbq_buf->dbuf.phys & 0xffffffff);

			if (phys == le32_to_cpu(hbqe->bde.addrLow)) {

				len +=  scnprintf(buf+len, size-len,

					"Buf%d: %p %06x\n", i,

					"Buf%d: x%px %06x\n", i,

					hbq_buf->dbuf.virt, hbq_buf->tag);

				found = 1;

				break;
@@ -2210,7 +2210,7 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file) 
		goto out;



	/* Round to page boundary */

	pr_err("9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%pD\n",

	pr_err("9060 BLKGRD: %s: _dump_buf_dif=x%px file=%pD\n",

			__func__, _dump_buf_dif, file);

	debug->buffer = _dump_buf_dif;

	if (!debug->buffer) {

drivers/scsi/lpfc/lpfc_els.c

+2 −2
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) 
		    !(vport->fc_flag & FC_OFFLINE_MODE)) {

			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

					 "4110 Issue PLOGI x%x deferred "

					 "on NPort x%x rpi x%x Data: %p\n",

					 "on NPort x%x rpi x%x Data: x%px\n",

					 ndlp->nlp_defer_did, ndlp->nlp_DID,

					 ndlp->nlp_rpi, ndlp);
@@ -4236,7 +4236,7 @@ lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	mempool_free(pmb, phba->mbox_mem_pool);

	if (ndlp) {

		lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,

				 "0006 rpi%x DID:%x flg:%x %d map:%x %p\n",

				 "0006 rpi%x DID:%x flg:%x %d map:%x x%px\n",

				 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,

				 kref_read(&ndlp->kref),

				 ndlp->nlp_usg_map, ndlp);

drivers/scsi/lpfc/lpfc_hbadisc.c

+40 −38
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) 
		ndlp->nlp_sid, ndlp->nlp_DID, ndlp->nlp_flag);



	lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,

			 "3181 dev_loss_callbk x%06x, rport %p flg x%x\n",

			 "3181 dev_loss_callbk x%06x, rport x%px flg x%x\n",

			 ndlp->nlp_DID, ndlp->rport, ndlp->nlp_flag);



	/* Don't defer this if we are in the process of deleting the vport
@@ -237,7 +237,7 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp) 
		ndlp->nlp_DID, ndlp->nlp_type, rport->scsi_target_id);



	lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,

			 "3182 dev_loss_tmo_handler x%06x, rport %p flg x%x\n",

			 "3182 dev_loss_tmo_handler x%06x, rport x%px flg x%x\n",

			 ndlp->nlp_DID, ndlp->rport, ndlp->nlp_flag);



	/*
@@ -3323,7 +3323,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la) 
out:

	lpfc_vport_set_state(vport, FC_VPORT_FAILED);

	lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,

			 "0263 Discovery Mailbox error: state: 0x%x : %p %p\n",

			 "0263 Discovery Mailbox error: state: 0x%x : x%px x%px\n",

			 vport->port_state, sparam_mbox, cfglink_mbox);

	lpfc_issue_clear_la(phba, vport);

	return;
@@ -3535,7 +3535,7 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	pmb->ctx_ndlp = NULL;



	lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,

			 "0002 rpi:%x DID:%x flg:%x %d map:%x %p\n",

			 "0002 rpi:%x DID:%x flg:%x %d map:%x x%px\n",

			 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,

			 kref_read(&ndlp->kref),

			 ndlp->nlp_usg_map, ndlp);
@@ -4047,7 +4047,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	ndlp->nlp_type |= NLP_FABRIC;

	lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);

	lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,

			 "0003 rpi:%x DID:%x flg:%x %d map%x %p\n",

			 "0003 rpi:%x DID:%x flg:%x %d map%x x%px\n",

			 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,

			 kref_read(&ndlp->kref),

			 ndlp->nlp_usg_map, ndlp);
@@ -4166,7 +4166,7 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
		fc_remote_port_rolechg(rport, rport_ids.roles);



	lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,

			 "3183 rport register x%06x, rport %p role x%x\n",

			 "3183 rport register x%06x, rport x%px role x%x\n",

			 ndlp->nlp_DID, rport, rport_ids.roles);



	if ((rport->scsi_target_id != -1) &&
@@ -4190,7 +4190,7 @@ lpfc_unregister_remote_port(struct lpfc_nodelist *ndlp) 
		ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);



	lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

			 "3184 rport unregister x%06x, rport %p\n",

			 "3184 rport unregister x%06x, rport x%px\n",

			 ndlp->nlp_DID, rport);



	fc_remote_port_delete(rport);
@@ -4509,9 +4509,9 @@ lpfc_enable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (NLP_CHK_FREE_REQ(ndlp)) {

		spin_unlock_irqrestore(&phba->ndlp_lock, flags);

		lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,

				"0277 lpfc_enable_node: ndlp:x%p "

				"0277 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

		goto free_rpi;

	}
@@ -4519,9 +4519,9 @@ lpfc_enable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (NLP_CHK_NODE_ACT(ndlp)) {

		spin_unlock_irqrestore(&phba->ndlp_lock, flags);

		lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,

				"0278 lpfc_enable_node: ndlp:x%p "

				"0278 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

		goto free_rpi;

	}
@@ -4551,7 +4551,7 @@ lpfc_enable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		ndlp->nlp_rpi = rpi;

		lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

				 "0008 rpi:%x DID:%x flg:%x refcnt:%d "

				 "map:%x %p\n", ndlp->nlp_rpi, ndlp->nlp_DID,

				 "map:%x x%px\n", ndlp->nlp_rpi, ndlp->nlp_DID,

				 ndlp->nlp_flag,

				 kref_read(&ndlp->kref),

				 ndlp->nlp_usg_map, ndlp);
@@ -4824,7 +4824,7 @@ lpfc_nlp_logo_unreg(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	    (ndlp->nlp_defer_did != NLP_EVT_NOTHING_PENDING)) {

		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

				 "1434 UNREG cmpl deferred logo x%x "

				 "on NPort x%x Data: x%x %p\n",

				 "on NPort x%x Data: x%x x%px\n",

				 ndlp->nlp_rpi, ndlp->nlp_DID,

				 ndlp->nlp_defer_did, ndlp);
@@ -4874,7 +4874,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

					 "1436 unreg_rpi SKIP UNREG x%x on "

					 "NPort x%x deferred x%x  flg x%x "

					 "Data: %p\n",

					 "Data: x%px\n",

					 ndlp->nlp_rpi, ndlp->nlp_DID,

					 ndlp->nlp_defer_did,

					 ndlp->nlp_flag, ndlp);
@@ -4924,7 +4924,8 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 


			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

					 "1433 unreg_rpi UNREG x%x on "

					 "NPort x%x deferred flg x%x Data:%p\n",

					 "NPort x%x deferred flg x%x "

					 "Data:x%px\n",

					 ndlp->nlp_rpi, ndlp->nlp_DID,

					 ndlp->nlp_flag, ndlp);
@@ -5065,16 +5066,16 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
			 ndlp->nlp_state, ndlp->nlp_rpi);

	if (NLP_CHK_FREE_REQ(ndlp)) {

		lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,

				"0280 lpfc_cleanup_node: ndlp:x%p "

				"0280 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

		lpfc_dequeue_node(vport, ndlp);

	} else {

		lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,

				"0281 lpfc_cleanup_node: ndlp:x%p "

				"0281 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

		lpfc_disable_node(vport, ndlp);

	}
@@ -5165,7 +5166,7 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
		 * allocated by the firmware.

		 */

		lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

				 "0005 rpi:%x DID:%x flg:%x %d map:%x %p\n",

				 "0005 rpi:%x DID:%x flg:%x %d map:%x x%px\n",

				 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,

				 kref_read(&ndlp->kref),

				 ndlp->nlp_usg_map, ndlp);
@@ -5201,8 +5202,8 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
		 * for registered rport so need to cleanup rport

		 */

		lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,

				"0940 removed node x%p DID x%x "

				" rport not null %p\n",

				"0940 removed node x%px DID x%x "

				" rport not null x%px\n",

				ndlp, ndlp->nlp_DID, ndlp->rport);

		rport = ndlp->rport;

		rdata = rport->dd_data;
@@ -5329,7 +5330,7 @@ lpfc_findnode_mapped(struct lpfc_vport *vport) 
			spin_unlock_irqrestore(shost->host_lock, iflags);

			lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

					 "2025 FIND node DID "

					 "Data: x%p x%x x%x x%x %p\n",

					 "Data: x%px x%x x%x x%x x%px\n",

					 ndlp, ndlp->nlp_DID,

					 ndlp->nlp_flag, data1,

					 ndlp->active_rrqs_xri_bitmap);
@@ -5996,7 +5997,7 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	ndlp->nlp_type |= NLP_FABRIC;

	lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);

	lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,

			 "0004 rpi:%x DID:%x flg:%x %d map:%x %p\n",

			 "0004 rpi:%x DID:%x flg:%x %d map:%x x%px\n",

			 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,

			 kref_read(&ndlp->kref),

			 ndlp->nlp_usg_map, ndlp);
@@ -6050,8 +6051,8 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param) 
	list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {

		if (filter(ndlp, param)) {

			lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

					 "3185 FIND node filter %p DID "

					 "ndlp %p did x%x flg x%x st x%x "

					 "3185 FIND node filter %pf DID "

					 "ndlp x%px did x%x flg x%x st x%x "

					 "xri x%x type x%x rpi x%x\n",

					 filter, ndlp, ndlp->nlp_DID,

					 ndlp->nlp_flag, ndlp->nlp_state,
@@ -6061,7 +6062,7 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param) 
		}

	}

	lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

			 "3186 FIND node filter %p NOT FOUND.\n", filter);

			 "3186 FIND node filter %pf NOT FOUND.\n", filter);

	return NULL;

}
@@ -6186,7 +6187,7 @@ lpfc_nlp_init(struct lpfc_vport *vport, uint32_t did) 
		ndlp->nlp_rpi = rpi;

		lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,

				 "0007 rpi:%x DID:%x flg:%x refcnt:%d "

				 "map:%x %p\n", ndlp->nlp_rpi, ndlp->nlp_DID,

				 "map:%x x%px\n", ndlp->nlp_rpi, ndlp->nlp_DID,

				 ndlp->nlp_flag,

				 kref_read(&ndlp->kref),

				 ndlp->nlp_usg_map, ndlp);
@@ -6224,8 +6225,9 @@ lpfc_nlp_release(struct kref *kref) 
		ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);



	lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,

			"0279 lpfc_nlp_release: ndlp:x%p did %x "

			"0279 %s: ndlp:x%px did %x "

			"usgmap:x%x refcnt:%d rpi:%x\n",

			__func__,

			(void *)ndlp, ndlp->nlp_DID, ndlp->nlp_usg_map,

			kref_read(&ndlp->kref), ndlp->nlp_rpi);
@@ -6272,9 +6274,9 @@ lpfc_nlp_get(struct lpfc_nodelist *ndlp) 
		if (!NLP_CHK_NODE_ACT(ndlp) || NLP_CHK_FREE_ACK(ndlp)) {

			spin_unlock_irqrestore(&phba->ndlp_lock, flags);

			lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_NODE,

				"0276 lpfc_nlp_get: ndlp:x%p "

				"0276 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

			return NULL;

		} else
@@ -6312,9 +6314,9 @@ lpfc_nlp_put(struct lpfc_nodelist *ndlp) 
	if (NLP_CHK_FREE_ACK(ndlp)) {

		spin_unlock_irqrestore(&phba->ndlp_lock, flags);

		lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_NODE,

				"0274 lpfc_nlp_put: ndlp:x%p "

				"0274 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

		return 1;

	}
@@ -6325,9 +6327,9 @@ lpfc_nlp_put(struct lpfc_nodelist *ndlp) 
	if (NLP_CHK_IACT_REQ(ndlp)) {

		spin_unlock_irqrestore(&phba->ndlp_lock, flags);

		lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_NODE,

				"0275 lpfc_nlp_put: ndlp:x%p "

				"0275 %s: ndlp:x%px "

				"usgmap:x%x refcnt:%d\n",

				(void *)ndlp, ndlp->nlp_usg_map,

				__func__, (void *)ndlp, ndlp->nlp_usg_map,

				kref_read(&ndlp->kref));

		return 1;

	}