diff mbox

[03/11] Vport creation is failing with "Link Down" error

Message ID 20170616055651.9674-4-jsmart2021@gmail.com (mailing list archive)
State Accepted
Headers show

Commit Message

James Smart June 16, 2017, 5:56 a.m. UTC 
Vport creation fails for SLI-3 adapters.

Mailbox submission fails because mailbox interrupt is disabled. Mailbox
interrupt is disabled during port reset.

Do reset only for physical port.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
---
 drivers/scsi/lpfc/lpfc_init.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Comments

Hannes Reinecke June 16, 2017, 7:51 a.m. UTC | #1 
On 06/16/2017 07:56 AM, James Smart wrote:
> Vport creation fails for SLI-3 adapters.
> 
> Mailbox submission fails because mailbox interrupt is disabled. Mailbox
> interrupt is disabled during port reset.
> 
> Do reset only for physical port.
> 
> Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
> Signed-off-by: James Smart <james.smart@broadcom.com>
> ---
>  drivers/scsi/lpfc/lpfc_init.c | 21 ++++++++++++---------
>  1 file changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index 9d3a12636455..77283705eb8d 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -3691,14 +3691,6 @@ lpfc_get_wwpn(struct lpfc_hba *phba)
>  	LPFC_MBOXQ_t *mboxq;
>  	MAILBOX_t *mb;
>  
> -	if (phba->sli_rev < LPFC_SLI_REV4) {
> -		/* Reset the port first */
> -		lpfc_sli_brdrestart(phba);
> -		rc = lpfc_sli_chipset_init(phba);
> -		if (rc)
> -			return (uint64_t)-1;
> -	}
> -
>  	mboxq = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool,
>  						GFP_KERNEL);
>  	if (!mboxq)
> @@ -3852,8 +3844,19 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
>  	int i;
>  	uint64_t wwn;
>  	bool use_no_reset_hba = false;
> +	int rc;
>  
> -	wwn = lpfc_get_wwpn(phba);
> +	if (lpfc_no_hba_reset_cnt) {
> +		if (phba->sli_rev < LPFC_SLI_REV4 &&
> +		    dev == &phba->pcidev->dev) {
> +			/* Reset the port first */
> +			lpfc_sli_brdrestart(phba);
> +			rc = lpfc_sli_chipset_init(phba);
> +			if (rc)
> +				return NULL;
> +		}
> +		wwn = lpfc_get_wwpn(phba);
> +	}
>  
>  	for (i = 0; i < lpfc_no_hba_reset_cnt; i++) {
>  		if (wwn == lpfc_no_hba_reset[i]) {
> 
Reviewed-by: Hannes Reinecke <hare@suse.com>

Cheers,

Hannes
diff mbox

Patch

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 9d3a12636455..77283705eb8d 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -3691,14 +3691,6 @@  lpfc_get_wwpn(struct lpfc_hba *phba)
 	LPFC_MBOXQ_t *mboxq;
 	MAILBOX_t *mb;
 
-	if (phba->sli_rev < LPFC_SLI_REV4) {
-		/* Reset the port first */
-		lpfc_sli_brdrestart(phba);
-		rc = lpfc_sli_chipset_init(phba);
-		if (rc)
-			return (uint64_t)-1;
-	}
-
 	mboxq = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool,
 						GFP_KERNEL);
 	if (!mboxq)
@@ -3852,8 +3844,19 @@  lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
 	int i;
 	uint64_t wwn;
 	bool use_no_reset_hba = false;
+	int rc;
 
-	wwn = lpfc_get_wwpn(phba);
+	if (lpfc_no_hba_reset_cnt) {
+		if (phba->sli_rev < LPFC_SLI_REV4 &&
+		    dev == &phba->pcidev->dev) {
+			/* Reset the port first */
+			lpfc_sli_brdrestart(phba);
+			rc = lpfc_sli_chipset_init(phba);
+			if (rc)
+				return NULL;
+		}
+		wwn = lpfc_get_wwpn(phba);
+	}
 
 	for (i = 0; i < lpfc_no_hba_reset_cnt; i++) {
 		if (wwn == lpfc_no_hba_reset[i]) {