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

Commit 8f34f4ce authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.0 : Fix issue with assumed Interrupt Enable Block support 



The phba hbq_get address was setup before the HBA reported support for
Interrupt Enable Block (INB).  This caused loopback tests to fail
after all HBQs had been used once.  Moved setting of hba_get until
after config port mailbox command completes.

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 97207482

drivers/scsi/lpfc/lpfc_mbox.c

+3 −8
Original line number Diff line number Diff line
@@ -1198,16 +1198,11 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
				    sizeof(*phba->host_gp));

	}



	/* Setup Port Group ring pointer */

	if (phba->sli3_options & LPFC_SLI3_INB_ENABLED) {

		pgp_offset = offsetof(struct lpfc_sli2_slim,

				      mbx.us.s3_inb_pgp.port);

		phba->hbq_get = phba->mbox->us.s3_inb_pgp.hbq_get;

	} else if (phba->sli_rev == 3) {

	/* Setup Port Group offset */

	if (phba->sli_rev == 3)

		pgp_offset = offsetof(struct lpfc_sli2_slim,

				      mbx.us.s3_pgp.port);

		phba->hbq_get = phba->mbox->us.s3_pgp.hbq_get;

	} else

	else

		pgp_offset = offsetof(struct lpfc_sli2_slim, mbx.us.s2.port);

	pdma_addr = phba->slim2p.phys + pgp_offset;

	phba->pcb->pgpAddrHigh = putPaddrHigh(pdma_addr);

drivers/scsi/lpfc/lpfc_sli.c

+3 −0
Original line number Diff line number Diff line
@@ -3144,17 +3144,20 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode) 
			phba->sli3_options |= LPFC_SLI3_CRP_ENABLED;

		if (pmb->mb.un.varCfgPort.ginb) {

			phba->sli3_options |= LPFC_SLI3_INB_ENABLED;

			phba->hbq_get = phba->mbox->us.s3_inb_pgp.hbq_get;

			phba->port_gp = phba->mbox->us.s3_inb_pgp.port;

			phba->inb_ha_copy = &phba->mbox->us.s3_inb_pgp.ha_copy;

			phba->inb_counter = &phba->mbox->us.s3_inb_pgp.counter;

			phba->inb_last_counter =

					phba->mbox->us.s3_inb_pgp.counter;

		} else {

			phba->hbq_get = phba->mbox->us.s3_pgp.hbq_get;

			phba->port_gp = phba->mbox->us.s3_pgp.port;

			phba->inb_ha_copy = NULL;

			phba->inb_counter = NULL;

		}

	} else {

		phba->hbq_get = NULL;

		phba->port_gp = phba->mbox->us.s2.port;

		phba->inb_ha_copy = NULL;

		phba->inb_counter = NULL;