mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-29 04:09:39 +00:00
Code Issues Releases Wiki Activity

[SCSI] lpfc 8.1.7 : ID String and Message fixes

Browse source 
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: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Smart 2006-08-01 07:34:08 -04:00 committed by James Bottomley
parent 8f6d98d2e0
commit dca9479be8
6 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/scsi/lpfc/lpfc_ct.c
View file

@ -482,7 +482,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
if (CTrsp->CommandResponse.bits.CmdRsp == if (CTrsp->CommandResponse.bits.CmdRsp ==
be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) { be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {
lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
"%d:0239 NameServer Rsp " "%d:0208 NameServer Rsp "
"Data: x%x\n", "Data: x%x\n",
phba->brd_no, phba->brd_no,
phba->fc_flag); 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); lpfc_decode_firmware_rev(phba, fwrev, 0);
if (phba->Port[0]) { sprintf(symbp, "Emulex %s FV%s DV%s", phba->ModelName,
sprintf(symbp, "Emulex %s Port %s FV%s DV%s", phba->ModelName, fwrev, lpfc_release_version);
phba->Port, fwrev, lpfc_release_version); return;
} else {
sprintf(symbp, "Emulex %s FV%s DV%s", phba->ModelName,
fwrev, lpfc_release_version);
}
} }
/* /*

6
drivers/scsi/lpfc/lpfc_els.c
View file

@ -2839,7 +2839,7 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
/* Xmit ELS RPS ACC response tag <ulpIoTag> */ /* Xmit ELS RPS ACC response tag <ulpIoTag> */
lpfc_printf_log(phba, KERN_INFO, LOG_ELS, 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", "Data: x%x x%x x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
elsiocb->iocb.ulpIoTag, 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> */ /* Xmit ELS RPL ACC response tag <ulpIoTag> */
lpfc_printf_log(phba, KERN_INFO, LOG_ELS, 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", "Data: x%x x%x x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
elsiocb->iocb.ulpIoTag, 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; struct lpfc_nodelist *ndlp, *next_ndlp;
/* FAN received */ /* 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); phba->brd_no);
icmd = &cmdiocb->iocb; icmd = &cmdiocb->iocb;

12
drivers/scsi/lpfc/lpfc_hbadisc.c
View file

@ -1782,7 +1782,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did)
/* LOG change to REGLOGIN */ /* LOG change to REGLOGIN */
/* FIND node DID reglogin */ /* FIND node DID reglogin */
lpfc_printf_log(phba, KERN_INFO, LOG_NODE, 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", " Data: x%p x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
ndlp, ndlp->nlp_DID, 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 */ /* LOG change to PRLI */
/* FIND node DID prli */ /* FIND node DID prli */
lpfc_printf_log(phba, KERN_INFO, LOG_NODE, 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", "Data: x%p x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
ndlp, ndlp->nlp_DID, 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 */ /* LOG change to NPR */
/* FIND node DID npr */ /* FIND node DID npr */
lpfc_printf_log(phba, KERN_INFO, LOG_NODE, 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", "Data: x%p x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
ndlp, ndlp->nlp_DID, 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 */ /* LOG change to UNUSED */
/* FIND node DID unused */ /* FIND node DID unused */
lpfc_printf_log(phba, KERN_INFO, LOG_NODE, 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", "Data: x%p x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
ndlp, ndlp->nlp_DID, 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); initlinkmbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
if (!initlinkmbox) { if (!initlinkmbox) {
lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
"%d:0226 Device Discovery " "%d:0206 Device Discovery "
"completion error\n", "completion error\n",
phba->brd_no); phba->brd_no);
phba->hba_state = LPFC_HBA_ERROR; phba->hba_state = LPFC_HBA_ERROR;
@ -2365,7 +2365,7 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba)
if (!clearlambox) { if (!clearlambox) {
clrlaerr = 1; clrlaerr = 1;
lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
"%d:0226 Device Discovery " "%d:0207 Device Discovery "
"completion error\n", "completion error\n",
phba->brd_no); phba->brd_no);
phba->hba_state = LPFC_HBA_ERROR; phba->hba_state = LPFC_HBA_ERROR;

2
drivers/scsi/lpfc/lpfc_nportdisc.c
View file

@ -179,7 +179,7 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
/* Abort outstanding I/O on NPort <nlp_DID> */ /* Abort outstanding I/O on NPort <nlp_DID> */
lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, 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", "Data: x%x x%x x%x\n",
phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag, phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag,
ndlp->nlp_state, ndlp->nlp_rpi); ndlp->nlp_state, ndlp->nlp_rpi);

2
drivers/scsi/lpfc/lpfc_scsi.c
View file

@ -1104,7 +1104,7 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
ndlp->rport->dd_data); ndlp->rport->dd_data);
if (ret != SUCCESS) { if (ret != SUCCESS) {
lpfc_printf_log(phba, KERN_ERR, LOG_FCP, 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); phba->brd_no, i);
err_count++; err_count++;
} }

28
drivers/scsi/lpfc/lpfc_sli.c
View file

@ -970,9 +970,11 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba * phba)
* resources need to be recovered. * resources need to be recovered.
*/ */
if (unlikely(irsp->ulpCommand == CMD_XRI_ABORTED_CX)) { if (unlikely(irsp->ulpCommand == CMD_XRI_ABORTED_CX)) {
printk(KERN_INFO "%s: IOCB cmd 0x%x processed." lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
" Skipping completion\n", __FUNCTION__, "%d:0314 IOCB cmd 0x%x"
irsp->ulpCommand); " processed. Skipping"
" completion", phba->brd_no,
irsp->ulpCommand);
break; break;
} }
@ -1105,7 +1107,7 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
if (unlikely(irsp->ulpStatus)) { if (unlikely(irsp->ulpStatus)) {
/* Rsp ring <ringno> error: IOCB */ /* Rsp ring <ringno> error: IOCB */
lpfc_printf_log(phba, KERN_WARNING, LOG_SLI, lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
"%d:0326 Rsp Ring %d error: IOCB Data: " "%d:0336 Rsp Ring %d error: IOCB Data: "
"x%x x%x x%x x%x x%x x%x x%x x%x\n", "x%x x%x x%x x%x x%x x%x x%x x%x\n",
phba->brd_no, pring->ringno, phba->brd_no, pring->ringno,
irsp->un.ulpWord[0], irsp->un.ulpWord[1], irsp->un.ulpWord[0], irsp->un.ulpWord[1],
@ -1123,9 +1125,11 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
* resources need to be recovered. * resources need to be recovered.
*/ */
if (unlikely(irsp->ulpCommand == CMD_XRI_ABORTED_CX)) { if (unlikely(irsp->ulpCommand == CMD_XRI_ABORTED_CX)) {
printk(KERN_INFO "%s: IOCB cmd 0x%x processed. " lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
"Skipping completion\n", __FUNCTION__, "%d:0333 IOCB cmd 0x%x"
irsp->ulpCommand); " processed. Skipping"
" completion\n", phba->brd_no,
irsp->ulpCommand);
break; break;
} }
@ -1156,7 +1160,7 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
} else { } else {
/* Unknown IOCB command */ /* Unknown IOCB command */
lpfc_printf_log(phba, KERN_ERR, LOG_SLI, lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"%d:0321 Unknown IOCB command " "%d:0334 Unknown IOCB command "
"Data: x%x, x%x x%x x%x x%x\n", "Data: x%x, x%x x%x x%x x%x\n",
phba->brd_no, type, irsp->ulpCommand, phba->brd_no, type, irsp->ulpCommand,
irsp->ulpStatus, irsp->ulpIoTag, irsp->ulpStatus, irsp->ulpIoTag,
@ -1239,7 +1243,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba * phba,
lpfc_printf_log(phba, lpfc_printf_log(phba,
KERN_ERR, KERN_ERR,
LOG_SLI, LOG_SLI,
"%d:0312 Ring %d handler: portRspPut %d " "%d:0303 Ring %d handler: portRspPut %d "
"is bigger then rsp ring %d\n", "is bigger then rsp ring %d\n",
phba->brd_no, phba->brd_no,
pring->ringno, portRspPut, portRspMax); pring->ringno, portRspPut, portRspMax);
@ -1384,7 +1388,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba * phba,
lpfc_printf_log(phba, lpfc_printf_log(phba,
KERN_ERR, KERN_ERR,
LOG_SLI, LOG_SLI,
"%d:0321 Unknown IOCB command " "%d:0335 Unknown IOCB command "
"Data: x%x x%x x%x x%x\n", "Data: x%x x%x x%x x%x\n",
phba->brd_no, phba->brd_no,
irsp->ulpCommand, irsp->ulpCommand,
@ -1759,7 +1763,7 @@ lpfc_sli_brdrestart(struct lpfc_hba * phba)
/* Restart HBA */ /* Restart HBA */
lpfc_printf_log(phba, KERN_INFO, LOG_SLI, lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
"%d:0328 Restart HBA Data: x%x x%x\n", phba->brd_no, "%d:0337 Restart HBA Data: x%x x%x\n", phba->brd_no,
phba->hba_state, psli->sli_flag); phba->hba_state, psli->sli_flag);
word0 = 0; word0 = 0;
@ -3016,7 +3020,7 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba * phba,
if (timeleft == 0) { if (timeleft == 0) {
lpfc_printf_log(phba, KERN_ERR, LOG_SLI, lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"%d:0329 IOCB wait timeout error - no " "%d:0338 IOCB wait timeout error - no "
"wake response Data x%x\n", "wake response Data x%x\n",
phba->brd_no, timeout); phba->brd_no, timeout);
retval = IOCB_TIMEDOUT; retval = IOCB_TIMEDOUT;