Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -1198,16 +1198,11 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) ...@@ -1198,16 +1198,11 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
sizeof(*phba->host_gp)); sizeof(*phba->host_gp));
} }
/* Setup Port Group ring pointer */ /* Setup Port Group offset */
if (phba->sli3_options & LPFC_SLI3_INB_ENABLED) { if (phba->sli_rev == 3)
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) {
pgp_offset = offsetof(struct lpfc_sli2_slim, pgp_offset = offsetof(struct lpfc_sli2_slim,
mbx.us.s3_pgp.port); 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); pgp_offset = offsetof(struct lpfc_sli2_slim, mbx.us.s2.port);
pdma_addr = phba->slim2p.phys + pgp_offset; pdma_addr = phba->slim2p.phys + pgp_offset;
phba->pcb->pgpAddrHigh = putPaddrHigh(pdma_addr); phba->pcb->pgpAddrHigh = putPaddrHigh(pdma_addr);
......
...@@ -3144,17 +3144,20 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode) ...@@ -3144,17 +3144,20 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode)
phba->sli3_options |= LPFC_SLI3_CRP_ENABLED; phba->sli3_options |= LPFC_SLI3_CRP_ENABLED;
if (pmb->mb.un.varCfgPort.ginb) { if (pmb->mb.un.varCfgPort.ginb) {
phba->sli3_options |= LPFC_SLI3_INB_ENABLED; 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->port_gp = phba->mbox->us.s3_inb_pgp.port;
phba->inb_ha_copy = &phba->mbox->us.s3_inb_pgp.ha_copy; phba->inb_ha_copy = &phba->mbox->us.s3_inb_pgp.ha_copy;
phba->inb_counter = &phba->mbox->us.s3_inb_pgp.counter; phba->inb_counter = &phba->mbox->us.s3_inb_pgp.counter;
phba->inb_last_counter = phba->inb_last_counter =
phba->mbox->us.s3_inb_pgp.counter; phba->mbox->us.s3_inb_pgp.counter;
} else { } else {
phba->hbq_get = phba->mbox->us.s3_pgp.hbq_get;
phba->port_gp = phba->mbox->us.s3_pgp.port; phba->port_gp = phba->mbox->us.s3_pgp.port;
phba->inb_ha_copy = NULL; phba->inb_ha_copy = NULL;
phba->inb_counter = NULL; phba->inb_counter = NULL;
} }
} else { } else {
phba->hbq_get = NULL;
phba->port_gp = phba->mbox->us.s2.port; phba->port_gp = phba->mbox->us.s2.port;
phba->inb_ha_copy = NULL; phba->inb_ha_copy = NULL;
phba->inb_counter = NULL; phba->inb_counter = NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment