From: James Smart <james.smart@broadcom.com>
Date: Wed, 6 Jul 2016 19:36:01 +0000 (-0700)
Subject: lpfc: Fix SLI mode 2 config failure
X-Git-Tag: v4.1.12-92~2^2~103
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ba669c0856ab46b9a63ef776d3728a49a1875eb9;p=users%2Fjedix%2Flinux-maple.git

lpfc: Fix SLI mode 2 config failure

Orabug: 25486030

Fix SLI mode 2 config failure

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 4597663fabf16645e2af8f02b9d7ba66110588b6)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 70bfb8873f647..280d86f8b47c6 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4667,6 +4667,8 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
 				"Not supported by adapter.\n");
 	if (rc && mode != 2)
 		rc = lpfc_sli_config_port(phba, 2);
+	else if (rc && mode == 2)
+		rc = lpfc_sli_config_port(phba, 3);
 	if (rc)
 		goto lpfc_sli_hba_setup_error;