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

[SCSI] lpfc 8.1.12 : Improve diagnostic messages and change local loopback message to KERN_INFO 



Improve diagnostic messages and change local loopback message to KERN_INFO

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

drivers/scsi/lpfc/lpfc.h

+10 −0
Original line number Diff line number Diff line
@@ -247,6 +247,9 @@ struct lpfc_hba { 
#define FC_ABORT_DISCOVERY      0x8000	/* we want to abort discovery */

#define FC_NDISC_ACTIVE         0x10000	/* NPort discovery active */

#define FC_BYPASSED_MODE        0x20000	/* NPort is in bypassed mode */

#define FC_LOOPBACK_MODE        0x40000	/* NPort is in Loopback mode */

					/* This flag is set while issuing */

					/* INIT_LINK mailbox command */



	uint32_t fc_topology;	/* link topology, from LINK INIT */
@@ -388,6 +391,13 @@ struct lpfc_hba { 
	struct fc_host_statistics link_stats;

};



static inline void

lpfc_set_loopback_flag(struct lpfc_hba *phba) {

	if (phba->cfg_topology == FLAGS_LOCAL_LB)

		phba->fc_flag |= FC_LOOPBACK_MODE;

	else

		phba->fc_flag &= ~FC_LOOPBACK_MODE;

}



struct rnidrsp {

	void *buf;

drivers/scsi/lpfc/lpfc_attr.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ lpfc_issue_lip(struct Scsi_Host *host) 
						     phba->fc_ratov * 2);

	}



	lpfc_set_loopback_flag(phba);

	if (mbxstatus == MBX_TIMEOUT)

		pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

	else

drivers/scsi/lpfc/lpfc_els.c

+32 −34
Original line number Diff line number Diff line
@@ -2046,10 +2046,9 @@ lpfc_els_rsp_reject(struct lpfc_hba * phba, uint32_t rejectError, 


	/* Xmit ELS RJT <err> response tag <ulpIoTag> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"%d:0129 Xmit ELS RJT x%x response tag x%x "

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

			phba->brd_no,

			rejectError, elsiocb->iocb.ulpIoTag,

			"%d:0129 Xmit ELS RJT x%x response tag x%x xri x%x, "

			"did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",

			phba->brd_no, rejectError, elsiocb->iotag,

			elsiocb->iocb.ulpContext, ndlp->nlp_DID,

			ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
@@ -2088,18 +2087,18 @@ lpfc_els_rsp_adisc_acc(struct lpfc_hba * phba, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

	icmd->ulpContext = oldcmd->ulpContext;	/* Xri */



	/* Xmit ADISC ACC response tag <ulpIoTag> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"%d:0130 Xmit ADISC ACC response tag x%x "

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

			phba->brd_no,

			elsiocb->iocb.ulpIoTag,

			"%d:0130 Xmit ADISC ACC response iotag x%x xri: "

			"x%x, did x%x, nlp_flag x%x, nlp_state x%x rpi x%x\n",

			phba->brd_no, elsiocb->iotag,

			elsiocb->iocb.ulpContext, ndlp->nlp_DID,

			ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);



	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

	icmd->ulpContext = oldcmd->ulpContext;	/* Xri */

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -2124,8 +2123,8 @@ lpfc_els_rsp_adisc_acc(struct lpfc_hba * phba, 
}



int

lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,

		      struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)

lpfc_els_rsp_prli_acc(struct lpfc_hba *phba, struct lpfc_iocbq *oldiocb,

		      struct lpfc_nodelist *ndlp)

{

	PRLI *npr;

	lpfc_vpd_t *vpd;
@@ -2147,18 +2146,18 @@ lpfc_els_rsp_prli_acc(struct lpfc_hba * phba, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

	icmd->ulpContext = oldcmd->ulpContext;	/* Xri */



	/* Xmit PRLI ACC response tag <ulpIoTag> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"%d:0131 Xmit PRLI ACC response tag x%x "

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

			phba->brd_no,

			elsiocb->iocb.ulpIoTag,

			"%d:0131 Xmit PRLI ACC response tag x%x xri x%x, "

			"did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",

			phba->brd_no, elsiocb->iotag,

			elsiocb->iocb.ulpContext, ndlp->nlp_DID,

			ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);



	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

	icmd->ulpContext = oldcmd->ulpContext;	/* Xri */

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	*((uint32_t *) (pcmd)) = (ELS_CMD_ACC | (ELS_CMD_PRLI & ~ELS_RSP_MASK));
@@ -2228,17 +2227,17 @@ lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

	icmd->ulpContext = oldcmd->ulpContext;	/* Xri */



	/* Xmit RNID ACC response tag <ulpIoTag> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"%d:0132 Xmit RNID ACC response tag x%x "

			"Data: x%x\n",

			phba->brd_no,

			elsiocb->iocb.ulpIoTag,

			"xri x%x\n",

			phba->brd_no, elsiocb->iotag,

			elsiocb->iocb.ulpContext);



	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

	icmd->ulpContext = oldcmd->ulpContext;	/* Xri */

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -2701,6 +2700,7 @@ lpfc_els_rcv_flogi(struct lpfc_hba * phba, 
			mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

			rc = lpfc_sli_issue_mbox

				(phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB));

			lpfc_set_loopback_flag(phba);

			if (rc == MBX_NOT_FINISHED) {

				mempool_free( mbox, phba->mbox_mem_pool);

			}
@@ -2842,10 +2842,9 @@ 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: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,

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

			"did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",

			phba->brd_no, elsiocb->iotag,

			elsiocb->iocb.ulpContext, ndlp->nlp_DID,

			ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
@@ -2951,10 +2950,9 @@ 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: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,

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

			"did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",

			phba->brd_no, elsiocb->iotag,

			elsiocb->iocb.ulpContext, ndlp->nlp_DID,

			ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);

drivers/scsi/lpfc/lpfc_hbadisc.c

+11 −1
Original line number Diff line number Diff line
@@ -900,12 +900,21 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) 


	if (la->attType == AT_LINK_UP) {

		phba->fc_stat.LinkUp++;

		if (phba->fc_flag & FC_LOOPBACK_MODE) {

			lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,

				"%d:1306 Link Up Event in loop back mode "

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

				phba->brd_no, la->eventTag, phba->fc_eventTag,

				la->granted_AL_PA, la->UlnkSpeed,

				phba->alpa_map[0]);

		} else {

			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,

				"%d:1303 Link Up Event x%x received "

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

				phba->brd_no, la->eventTag, phba->fc_eventTag,

				la->granted_AL_PA, la->UlnkSpeed,

				phba->alpa_map[0]);

		}

		lpfc_mbx_process_link_up(phba, la);

	} else {

		phba->fc_stat.LinkDown++;
@@ -2251,6 +2260,7 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba) 
		initlinkmbox->mb.un.varInitLnk.lipsr_AL_PA = 0;

		rc = lpfc_sli_issue_mbox(phba, initlinkmbox,

					 (MBX_NOWAIT | MBX_STOP_IOCB));

		lpfc_set_loopback_flag(phba);

		if (rc == MBX_NOT_FINISHED)

			mempool_free(initlinkmbox, phba->mbox_mem_pool);

drivers/scsi/lpfc/lpfc_init.c

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ lpfc_config_port_post(struct lpfc_hba * phba) 
	lpfc_init_link(phba, pmb, phba->cfg_topology, phba->cfg_link_speed);

	pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

	rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);

	lpfc_set_loopback_flag(phba);

	if (rc != MBX_SUCCESS) {

		lpfc_printf_log(phba,

				KERN_ERR,