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

Commit dca9479b authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.1.7 : ID String and Message fixes 



ID String and Message fixes
 - Fix switch symbolic name registration to match cross-OS values
 - Replace printk's with more standard lpfc_printf_log calls
 - Make all lpfc_printf_log message numbers unique

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 8f6d98d2

drivers/scsi/lpfc/lpfc_ct.c

+4 −8
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb, 
		if (CTrsp->CommandResponse.bits.CmdRsp ==

		    be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {

			lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,

					"%d:0239 NameServer Rsp "

					"%d:0208 NameServer Rsp "

					"Data: x%x\n",

					phba->brd_no,

					phba->fc_flag);
@@ -589,13 +589,9 @@ lpfc_get_hba_sym_node_name(struct lpfc_hba * phba, uint8_t * symbp) 


	lpfc_decode_firmware_rev(phba, fwrev, 0);



	if (phba->Port[0]) {

		sprintf(symbp, "Emulex %s Port %s FV%s DV%s", phba->ModelName,

			phba->Port, fwrev, lpfc_release_version);

	} else {

	sprintf(symbp, "Emulex %s FV%s DV%s", phba->ModelName,

		fwrev, lpfc_release_version);

	}

	return;

}



/*

drivers/scsi/lpfc/lpfc_els.c

+3 −3
Original line number Diff line number Diff line
@@ -2839,7 +2839,7 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) 


	/* Xmit ELS RPS ACC response tag <ulpIoTag> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"%d:0128 Xmit ELS RPS ACC response tag x%x "

			"%d:0118 Xmit ELS RPS ACC response tag x%x "

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

			phba->brd_no,

			elsiocb->iocb.ulpIoTag,
@@ -2948,7 +2948,7 @@ lpfc_els_rsp_rpl_acc(struct lpfc_hba * phba, uint16_t cmdsize, 


	/* Xmit ELS RPL ACC response tag <ulpIoTag> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"%d:0128 Xmit ELS RPL ACC response tag x%x "

			"%d:0120 Xmit ELS RPL ACC response tag x%x "

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

			phba->brd_no,

			elsiocb->iocb.ulpIoTag,
@@ -3109,7 +3109,7 @@ lpfc_els_rcv_fan(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb, 
	struct lpfc_nodelist *ndlp, *next_ndlp;



	/* FAN received */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS, "%d:265 FAN received\n",

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS, "%d:0265 FAN received\n",

								phba->brd_no);



	icmd = &cmdiocb->iocb;

drivers/scsi/lpfc/lpfc_hbadisc.c

+6 −6
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did) 
				/* LOG change to REGLOGIN */

				/* FIND node DID reglogin */

				lpfc_printf_log(phba, KERN_INFO, LOG_NODE,

						"%d:0931 FIND node DID reglogin"

						"%d:0901 FIND node DID reglogin"

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

						phba->brd_no,

						ndlp, ndlp->nlp_DID,
@@ -1805,7 +1805,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did) 
				/* LOG change to PRLI */

				/* FIND node DID prli */

				lpfc_printf_log(phba, KERN_INFO, LOG_NODE,

						"%d:0931 FIND node DID prli "

						"%d:0902 FIND node DID prli "

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

						phba->brd_no,

						ndlp, ndlp->nlp_DID,
@@ -1828,7 +1828,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did) 
				/* LOG change to NPR */

				/* FIND node DID npr */

				lpfc_printf_log(phba, KERN_INFO, LOG_NODE,

						"%d:0931 FIND node DID npr "

						"%d:0903 FIND node DID npr "

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

						phba->brd_no,

						ndlp, ndlp->nlp_DID,
@@ -1851,7 +1851,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did) 
				/* LOG change to UNUSED */

				/* FIND node DID unused */

				lpfc_printf_log(phba, KERN_INFO, LOG_NODE,

						"%d:0931 FIND node DID unused "

						"%d:0905 FIND node DID unused "

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

						phba->brd_no,

						ndlp, ndlp->nlp_DID,
@@ -2335,7 +2335,7 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba) 
		initlinkmbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);

		if (!initlinkmbox) {

			lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,

					"%d:0226 Device Discovery "

					"%d:0206 Device Discovery "

					"completion error\n",

					phba->brd_no);

			phba->hba_state = LPFC_HBA_ERROR;
@@ -2365,7 +2365,7 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba) 
		if (!clearlambox) {

			clrlaerr = 1;

			lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,

					"%d:0226 Device Discovery "

					"%d:0207 Device Discovery "

					"completion error\n",

					phba->brd_no);

			phba->hba_state = LPFC_HBA_ERROR;

drivers/scsi/lpfc/lpfc_nportdisc.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, 


	/* Abort outstanding I/O on NPort <nlp_DID> */

	lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,

			"%d:0201 Abort outstanding I/O on NPort x%x "

			"%d:0205 Abort outstanding I/O on NPort x%x "

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

			phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag,

			ndlp->nlp_state, ndlp->nlp_rpi);

drivers/scsi/lpfc/lpfc_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd) 
					  ndlp->rport->dd_data);

		if (ret != SUCCESS) {

			lpfc_printf_log(phba, KERN_ERR, LOG_FCP,

				"%d:0713 Bus Reset on target %d failed\n",

				"%d:0700 Bus Reset on target %d failed\n",

				phba->brd_no, i);

			err_count++;

		}