Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f2ecf1 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.30: Fix RPI registered multiple times after HBA reset 



Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 5c1db2ac

drivers/scsi/lpfc/lpfc_init.c

+1 −3
Original line number Diff line number Diff line
@@ -5230,8 +5230,7 @@ lpfc_sli4_create_rpi_hdr(struct lpfc_hba *phba) 
	 * rpi is normalized to a zero base because the physical rpi is

	 * port based.

	 */

	curr_rpi_range = phba->sli4_hba.next_rpi -

		phba->sli4_hba.max_cfg_param.rpi_base;

	curr_rpi_range = phba->sli4_hba.next_rpi;

	spin_unlock_irq(&phba->hbalock);



	/*
@@ -6146,7 +6145,6 @@ lpfc_sli4_read_config(struct lpfc_hba *phba) 
		phba->sli4_hba.next_xri = phba->sli4_hba.max_cfg_param.xri_base;

		phba->vpi_base = phba->sli4_hba.max_cfg_param.vpi_base;

		phba->vfi_base = phba->sli4_hba.max_cfg_param.vfi_base;

		phba->sli4_hba.next_rpi = phba->sli4_hba.max_cfg_param.rpi_base;

		phba->max_vpi = (phba->sli4_hba.max_cfg_param.max_vpi > 0) ?

				(phba->sli4_hba.max_cfg_param.max_vpi - 1) : 0;

		phba->max_vports = phba->max_vpi;

drivers/scsi/lpfc/lpfc_sli.c

+1 −2
Original line number Diff line number Diff line
@@ -5578,8 +5578,6 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba) 
		for (i = 0; i < count; i++)

			phba->sli4_hba.rpi_ids[i] = base + i;



		lpfc_sli4_node_prep(phba);



		/* VPIs. */

		count = phba->sli4_hba.max_cfg_param.max_vpi;

		base = phba->sli4_hba.max_cfg_param.vpi_base;
@@ -6149,6 +6147,7 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) 
		rc = -ENODEV;

		goto out_free_mbox;

	}

	lpfc_sli4_node_prep(phba);



	/* Create all the SLI4 queues */

	rc = lpfc_sli4_queue_create(phba);