aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2008-12-04 22:39:23 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-29 12:24:26 -0500
commit8f34f4cea3234ae347c4b0ffa302ffb85f140838 (patch)
treeb8e1393bc13d0f42770c807c5cdea4de9039bc93 /drivers/scsi
parent97207482fcdd120a60a44e9eb6bbad8da6f81c9d (diff)
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/lpfc/lpfc_mbox.c11
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c3
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index dcdb7c939520..5bb376baba62 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1198,16 +1198,11 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
1198 sizeof(*phba->host_gp)); 1198 sizeof(*phba->host_gp));
1199 } 1199 }
1200 1200
1201 /* Setup Port Group ring pointer */ 1201 /* Setup Port Group offset */
1202 if (phba->sli3_options & LPFC_SLI3_INB_ENABLED) { 1202 if (phba->sli_rev == 3)
1203 pgp_offset = offsetof(struct lpfc_sli2_slim,
1204 mbx.us.s3_inb_pgp.port);
1205 phba->hbq_get = phba->mbox->us.s3_inb_pgp.hbq_get;
1206 } else if (phba->sli_rev == 3) {
1207 pgp_offset = offsetof(struct lpfc_sli2_slim, 1203 pgp_offset = offsetof(struct lpfc_sli2_slim,
1208 mbx.us.s3_pgp.port); 1204 mbx.us.s3_pgp.port);
1209 phba->hbq_get = phba->mbox->us.s3_pgp.hbq_get; 1205 else
1210 } else
1211 pgp_offset = offsetof(struct lpfc_sli2_slim, mbx.us.s2.port); 1206 pgp_offset = offsetof(struct lpfc_sli2_slim, mbx.us.s2.port);
1212 pdma_addr = phba->slim2p.phys + pgp_offset; 1207 pdma_addr = phba->slim2p.phys + pgp_offset;
1213 phba->pcb->pgpAddrHigh = putPaddrHigh(pdma_addr); 1208 phba->pcb->pgpAddrHigh = putPaddrHigh(pdma_addr);
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 215f9a56f824..14f933676ce5 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -3144,17 +3144,20 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode)
3144 phba->sli3_options |= LPFC_SLI3_CRP_ENABLED; 3144 phba->sli3_options |= LPFC_SLI3_CRP_ENABLED;
3145 if (pmb->mb.un.varCfgPort.ginb) { 3145 if (pmb->mb.un.varCfgPort.ginb) {
3146 phba->sli3_options |= LPFC_SLI3_INB_ENABLED; 3146 phba->sli3_options |= LPFC_SLI3_INB_ENABLED;
3147 phba->hbq_get = phba->mbox->us.s3_inb_pgp.hbq_get;
3147 phba->port_gp = phba->mbox->us.s3_inb_pgp.port; 3148 phba->port_gp = phba->mbox->us.s3_inb_pgp.port;
3148 phba->inb_ha_copy = &phba->mbox->us.s3_inb_pgp.ha_copy; 3149 phba->inb_ha_copy = &phba->mbox->us.s3_inb_pgp.ha_copy;
3149 phba->inb_counter = &phba->mbox->us.s3_inb_pgp.counter; 3150 phba->inb_counter = &phba->mbox->us.s3_inb_pgp.counter;
3150 phba->inb_last_counter = 3151 phba->inb_last_counter =
3151 phba->mbox->us.s3_inb_pgp.counter; 3152 phba->mbox->us.s3_inb_pgp.counter;
3152 } else { 3153 } else {
3154 phba->hbq_get = phba->mbox->us.s3_pgp.hbq_get;
3153 phba->port_gp = phba->mbox->us.s3_pgp.port; 3155 phba->port_gp = phba->mbox->us.s3_pgp.port;
3154 phba->inb_ha_copy = NULL; 3156 phba->inb_ha_copy = NULL;
3155 phba->inb_counter = NULL; 3157 phba->inb_counter = NULL;
3156 } 3158 }
3157 } else { 3159 } else {
3160 phba->hbq_get = NULL;
3158 phba->port_gp = phba->mbox->us.s2.port; 3161 phba->port_gp = phba->mbox->us.s2.port;
3159 phba->inb_ha_copy = NULL; 3162 phba->inb_ha_copy = NULL;
3160 phba->inb_counter = NULL; 3163 phba->inb_counter = NULL;