[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: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
97207482fc
commit
8f34f4cea3
2 changed files with 6 additions and 8 deletions
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Reference in a new issue