[SCSI] lpfc 8.3.30: Fix handling of REG_VFI and cable pull.

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>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 24e4c0206482..b507536dc5b5 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -2843,7 +2843,14 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
         struct lpfc_vport *vport = mboxq->vport;
         struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
 
-        if (mboxq->u.mb.mbxStatus) {
+        /*
+         * VFI not supported for interface type 0, so ignore any mailbox
+         * error (except VFI in use) and continue with the discovery.
+         */
+        if (mboxq->u.mb.mbxStatus &&
+            (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) !=
+                        LPFC_SLI_INTF_IF_TYPE_0) &&
+            mboxq->u.mb.mbxStatus != MBX_VFI_IN_USE) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
                          "2018 REG_VFI mbxStatus error x%x "
                          "HBA state x%x\n",