diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_mbox.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_mbox.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c index 8712a80fe747..73213030c746 100644 --- a/drivers/scsi/lpfc/lpfc_mbox.c +++ b/drivers/scsi/lpfc/lpfc_mbox.c | |||
@@ -422,7 +422,6 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba) | |||
422 | uint32_t iocbCnt; | 422 | uint32_t iocbCnt; |
423 | int i; | 423 | int i; |
424 | 424 | ||
425 | psli->MBhostaddr = (uint32_t *)&phba->slim2p->mbx; | ||
426 | pcbp->maxRing = (psli->num_rings - 1); | 425 | pcbp->maxRing = (psli->num_rings - 1); |
427 | 426 | ||
428 | iocbCnt = 0; | 427 | iocbCnt = 0; |
@@ -528,7 +527,7 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
528 | dma_addr_t pdma_addr; | 527 | dma_addr_t pdma_addr; |
529 | uint32_t bar_low, bar_high; | 528 | uint32_t bar_low, bar_high; |
530 | size_t offset; | 529 | size_t offset; |
531 | HGP hgp; | 530 | struct lpfc_hgp hgp; |
532 | void __iomem *to_slim; | 531 | void __iomem *to_slim; |
533 | 532 | ||
534 | memset(pmb, 0, sizeof(LPFC_MBOXQ_t)); | 533 | memset(pmb, 0, sizeof(LPFC_MBOXQ_t)); |
@@ -584,9 +583,9 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
584 | else | 583 | else |
585 | phba->slim2p->pcb.hgpAddrHigh = 0; | 584 | phba->slim2p->pcb.hgpAddrHigh = 0; |
586 | /* write HGP data to SLIM at the required longword offset */ | 585 | /* write HGP data to SLIM at the required longword offset */ |
587 | memset(&hgp, 0, sizeof(HGP)); | 586 | memset(&hgp, 0, sizeof(struct lpfc_hgp)); |
588 | to_slim = phba->MBslimaddr + (SLIMOFF*sizeof (uint32_t)); | 587 | to_slim = phba->MBslimaddr + (SLIMOFF*sizeof (uint32_t)); |
589 | lpfc_memcpy_to_slim(to_slim, &hgp, sizeof (HGP)); | 588 | lpfc_memcpy_to_slim(to_slim, &hgp, sizeof(struct lpfc_hgp)); |
590 | 589 | ||
591 | /* Setup Port Group ring pointer */ | 590 | /* Setup Port Group ring pointer */ |
592 | offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port - | 591 | offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port - |