4 files changed, 12 insertions, 6 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index ba4573912c02..e591611f98e2 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1429,6 +1429,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         if (!phba->slim2p)
                 goto out_iounmap;
 
+        memset(phba->slim2p, 0, SLI2_SLIM_SIZE);
 
         /* Initialize the SLI Layer to run with lpfc HBAs. */
         lpfc_sli_setup(phba);
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 73eb89f91593..31c20cc00609 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -531,6 +531,7 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         size_t offset;
         struct lpfc_hgp hgp;
         void __iomem *to_slim;
+        int i;
 
         memset(pmb, 0, sizeof(LPFC_MBOXQ_t));
         mb->mbxCommand = MBX_CONFIG_PORT;
@@ -587,7 +588,11 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         /* write HGP data to SLIM at the required longword offset */
         memset(&hgp, 0, sizeof(struct lpfc_hgp));
         to_slim = phba->MBslimaddr + (SLIMOFF*sizeof (uint32_t));
-        lpfc_memcpy_to_slim(to_slim, &hgp, sizeof(struct lpfc_hgp));
+
+        for (i=0; i < phba->sli.num_rings; i++) {
+                lpfc_memcpy_to_slim(to_slim, &hgp, sizeof(struct lpfc_hgp));
+                to_slim += sizeof (struct lpfc_hgp);
+        }
 
         /* Setup Port Group ring pointer */
         offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port -
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index e74e224fd77c..71ff2b6a642f 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -335,7 +335,7 @@ lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
          * driver will put a command into.
          */
         pring->cmdidx = pring->next_cmdidx;
-        writeb(pring->cmdidx, phba->MBslimaddr
+        writel(pring->cmdidx, phba->MBslimaddr
                + (SLIMOFF + (pring->ringno * 2)) * 4);
 }
 
@@ -1033,7 +1033,7 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
 
                 to_slim = phba->MBslimaddr +
                         (SLIMOFF + (pring->ringno * 2) + 1) * 4;
-                writeb(pring->rspidx, to_slim);
+                writel(pring->rspidx, to_slim);
 
                 if (pring->rspidx == portRspPut)
                         portRspPut = le32_to_cpu(pgp->rspPutInx);
@@ -1147,7 +1147,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba * phba,
 
                 to_slim = phba->MBslimaddr + (SLIMOFF + (pring->ringno * 2)
                                               + 1) * 4;
-                writeb(pring->rspidx, to_slim);
+                writel(pring->rspidx, to_slim);
 
                 if (list_empty(&(pring->iocb_continueq))) {
                         list_add(&rspiocbp->list, &(pring->iocb_continueq));
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h
index 6c74f3c85ff7..2d5b0670415c 100644
--- a/drivers/scsi/lpfc/lpfc_sli.h
+++ b/drivers/scsi/lpfc/lpfc_sli.h
@@ -125,10 +125,10 @@ struct lpfc_sli_ring {
 
         uint32_t local_getidx;   /* last available cmd index (from cmdGetInx) */
         uint32_t next_cmdidx;    /* next_cmd index */
+        uint32_t rspidx;        /* current index in response ring */
+        uint32_t cmdidx;        /* current index in command ring */
         uint8_t rsvd;
         uint8_t ringno;         /* ring number */
-        uint8_t rspidx;         /* current index in response ring */
-        uint8_t cmdidx;         /* current index in command ring */
         uint16_t numCiocb;      /* number of command iocb's per ring */
         uint16_t numRiocb;      /* number of rsp iocb's per ring */