diff options
| author | James Smart <james.smart@emulex.com> | 2012-05-09 21:18:30 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-17 06:07:27 -0400 |
| commit | cc459f19e32bdc783f9f0ce5c872c1ff399e3e82 (patch) | |
| tree | d34fc936b01cdf9eb85ba492796799b74049c301 | |
| parent | 5a0d80fc0dd3c134d42df34e66e0f5fc91261b53 (diff) | |
[SCSI] lpfc 8.3.31: Fix log message for Mailbox command when no error is detected
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index d693f67ee074..b035e5badd52 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
| @@ -7207,14 +7207,19 @@ lpfc_sli_issue_mbox_s4(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, | |||
| 7207 | if (rc != MBX_SUCCESS) | 7207 | if (rc != MBX_SUCCESS) |
| 7208 | lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX | LOG_SLI, | 7208 | lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX | LOG_SLI, |
| 7209 | "(%d):2541 Mailbox command x%x " | 7209 | "(%d):2541 Mailbox command x%x " |
| 7210 | "(x%x/x%x) cannot issue Data: " | 7210 | "(x%x/x%x) failure: " |
| 7211 | "x%x x%x\n", | 7211 | "mqe_sta: x%x mcqe_sta: x%x/x%x " |
| 7212 | "Data: x%x x%x\n,", | ||
| 7212 | mboxq->vport ? mboxq->vport->vpi : 0, | 7213 | mboxq->vport ? mboxq->vport->vpi : 0, |
| 7213 | mboxq->u.mb.mbxCommand, | 7214 | mboxq->u.mb.mbxCommand, |
| 7214 | lpfc_sli_config_mbox_subsys_get(phba, | 7215 | lpfc_sli_config_mbox_subsys_get(phba, |
| 7215 | mboxq), | 7216 | mboxq), |
| 7216 | lpfc_sli_config_mbox_opcode_get(phba, | 7217 | lpfc_sli_config_mbox_opcode_get(phba, |
| 7217 | mboxq), | 7218 | mboxq), |
| 7219 | bf_get(lpfc_mqe_status, &mboxq->u.mqe), | ||
| 7220 | bf_get(lpfc_mcqe_status, &mboxq->mcqe), | ||
| 7221 | bf_get(lpfc_mcqe_ext_status, | ||
| 7222 | &mboxq->mcqe), | ||
| 7218 | psli->sli_flag, flag); | 7223 | psli->sli_flag, flag); |
| 7219 | return rc; | 7224 | return rc; |
| 7220 | } else if (flag == MBX_POLL) { | 7225 | } else if (flag == MBX_POLL) { |
| @@ -7233,18 +7238,22 @@ lpfc_sli_issue_mbox_s4(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, | |||
| 7233 | /* Successfully blocked, now issue sync mbox cmd */ | 7238 | /* Successfully blocked, now issue sync mbox cmd */ |
| 7234 | rc = lpfc_sli4_post_sync_mbox(phba, mboxq); | 7239 | rc = lpfc_sli4_post_sync_mbox(phba, mboxq); |
| 7235 | if (rc != MBX_SUCCESS) | 7240 | if (rc != MBX_SUCCESS) |
| 7236 | lpfc_printf_log(phba, KERN_ERR, | 7241 | lpfc_printf_log(phba, KERN_WARNING, |
| 7237 | LOG_MBOX | LOG_SLI, | 7242 | LOG_MBOX | LOG_SLI, |
| 7238 | "(%d):2597 Mailbox command " | 7243 | "(%d):2597 Sync Mailbox command " |
| 7239 | "x%x (x%x/x%x) cannot issue " | 7244 | "x%x (x%x/x%x) failure: " |
| 7240 | "Data: x%x x%x\n", | 7245 | "mqe_sta: x%x mcqe_sta: x%x/x%x " |
| 7241 | mboxq->vport ? | 7246 | "Data: x%x x%x\n,", |
| 7242 | mboxq->vport->vpi : 0, | 7247 | mboxq->vport ? mboxq->vport->vpi : 0, |
| 7243 | mboxq->u.mb.mbxCommand, | 7248 | mboxq->u.mb.mbxCommand, |
| 7244 | lpfc_sli_config_mbox_subsys_get(phba, | 7249 | lpfc_sli_config_mbox_subsys_get(phba, |
| 7245 | mboxq), | 7250 | mboxq), |
| 7246 | lpfc_sli_config_mbox_opcode_get(phba, | 7251 | lpfc_sli_config_mbox_opcode_get(phba, |
| 7247 | mboxq), | 7252 | mboxq), |
| 7253 | bf_get(lpfc_mqe_status, &mboxq->u.mqe), | ||
| 7254 | bf_get(lpfc_mcqe_status, &mboxq->mcqe), | ||
| 7255 | bf_get(lpfc_mcqe_ext_status, | ||
| 7256 | &mboxq->mcqe), | ||
| 7248 | psli->sli_flag, flag); | 7257 | psli->sli_flag, flag); |
| 7249 | /* Unblock the async mailbox posting afterward */ | 7258 | /* Unblock the async mailbox posting afterward */ |
| 7250 | lpfc_sli4_async_mbox_unblock(phba); | 7259 | lpfc_sli4_async_mbox_unblock(phba); |