1 files changed, 260 insertions, 46 deletions

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 8041c3f06f7b..8f42fbfdd29e 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -82,6 +82,22 @@ lpfc_read_nv(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 }
 
 /**********************************************/
+/*  lpfc_heart_beat  Issue a HEART_BEAT       */
+/*                mailbox command             */
+/**********************************************/
+void
+lpfc_heart_beat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
+{
+        MAILBOX_t *mb;
+
+        mb = &pmb->mb;
+        memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
+        mb->mbxCommand = MBX_HEARTBEAT;
+        mb->mbxOwner = OWN_HOST;
+        return;
+}
+
+/**********************************************/
 /*  lpfc_read_la  Issue a READ LA             */
 /*                mailbox command             */
 /**********************************************/
@@ -134,6 +150,7 @@ lpfc_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 void
 lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
+        struct lpfc_vport  *vport = phba->pport;
         MAILBOX_t *mb = &pmb->mb;
         memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
 
@@ -147,7 +164,7 @@ lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
                 mb->un.varCfgLnk.cr_count = phba->cfg_cr_count;
         }
 
-        mb->un.varCfgLnk.myId = phba->fc_myDID;
+        mb->un.varCfgLnk.myId = vport->fc_myDID;
         mb->un.varCfgLnk.edtov = phba->fc_edtov;
         mb->un.varCfgLnk.arbtov = phba->fc_arbtov;
         mb->un.varCfgLnk.ratov = phba->fc_ratov;
@@ -239,7 +256,7 @@ lpfc_init_link(struct lpfc_hba * phba,
 /*                    mailbox command         */
 /**********************************************/
 int
-lpfc_read_sparam(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
+lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi)
 {
         struct lpfc_dmabuf *mp;
         MAILBOX_t *mb;
@@ -270,6 +287,7 @@ lpfc_read_sparam(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         mb->un.varRdSparm.un.sp64.tus.f.bdeSize = sizeof (struct serv_parm);
         mb->un.varRdSparm.un.sp64.addrHigh = putPaddrHigh(mp->phys);
         mb->un.varRdSparm.un.sp64.addrLow = putPaddrLow(mp->phys);
+        mb->un.varRdSparm.vpi = vpi;
 
         /* save address for completion */
         pmb->context1 = mp;
@@ -282,7 +300,8 @@ lpfc_read_sparam(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 /*                  mailbox command         */
 /********************************************/
 void
-lpfc_unreg_did(struct lpfc_hba * phba, uint32_t did, LPFC_MBOXQ_t * pmb)
+lpfc_unreg_did(struct lpfc_hba * phba, uint16_t vpi, uint32_t did,
+               LPFC_MBOXQ_t * pmb)
 {
         MAILBOX_t *mb;
 
@@ -290,6 +309,7 @@ lpfc_unreg_did(struct lpfc_hba * phba, uint32_t did, LPFC_MBOXQ_t * pmb)
         memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
 
         mb->un.varUnregDID.did = did;
+        mb->un.varUnregDID.vpi = vpi;
 
         mb->mbxCommand = MBX_UNREG_D_ID;
         mb->mbxOwner = OWN_HOST;
@@ -335,19 +355,17 @@ lpfc_read_lnk_stat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 /*                  mailbox command         */
 /********************************************/
 int
-lpfc_reg_login(struct lpfc_hba * phba,
-               uint32_t did, uint8_t * param, LPFC_MBOXQ_t * pmb, uint32_t flag)
+lpfc_reg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t did,
+               uint8_t *param, LPFC_MBOXQ_t *pmb, uint32_t flag)
 {
+        MAILBOX_t *mb = &pmb->mb;
         uint8_t *sparam;
         struct lpfc_dmabuf *mp;
-        MAILBOX_t *mb;
-        struct lpfc_sli *psli;
 
-        psli = &phba->sli;
-        mb = &pmb->mb;
         memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
 
         mb->un.varRegLogin.rpi = 0;
+        mb->un.varRegLogin.vpi = vpi;
         mb->un.varRegLogin.did = did;
         mb->un.varWords[30] = flag;     /* Set flag to issue action on cmpl */
 
@@ -359,12 +377,10 @@ lpfc_reg_login(struct lpfc_hba * phba,
                 kfree(mp);
                 mb->mbxCommand = MBX_REG_LOGIN64;
                 /* REG_LOGIN: no buffers */
-                lpfc_printf_log(phba,
-                               KERN_WARNING,
-                               LOG_MBOX,
-                               "%d:0302 REG_LOGIN: no buffers Data x%x x%x\n",
-                               phba->brd_no,
-                               (uint32_t) did, (uint32_t) flag);
+                lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX,
+                                "%d (%d):0302 REG_LOGIN: no buffers, DID x%x, "
+                                "flag x%x\n",
+                                phba->brd_no, vpi, did, flag);
                 return (1);
         }
         INIT_LIST_HEAD(&mp->list);
@@ -389,7 +405,8 @@ lpfc_reg_login(struct lpfc_hba * phba,
 /*                    mailbox command         */
 /**********************************************/
 void
-lpfc_unreg_login(struct lpfc_hba * phba, uint32_t rpi, LPFC_MBOXQ_t * pmb)
+lpfc_unreg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t rpi,
+                 LPFC_MBOXQ_t * pmb)
 {
         MAILBOX_t *mb;
 
@@ -398,12 +415,52 @@ lpfc_unreg_login(struct lpfc_hba * phba, uint32_t rpi, LPFC_MBOXQ_t * pmb)
 
         mb->un.varUnregLogin.rpi = (uint16_t) rpi;
         mb->un.varUnregLogin.rsvd1 = 0;
+        mb->un.varUnregLogin.vpi = vpi;
 
         mb->mbxCommand = MBX_UNREG_LOGIN;
         mb->mbxOwner = OWN_HOST;
         return;
 }
 
+/**************************************************/
+/*  lpfc_reg_vpi   Issue a REG_VPI                */
+/*                    mailbox command             */
+/**************************************************/
+void
+lpfc_reg_vpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t sid,
+             LPFC_MBOXQ_t *pmb)
+{
+        MAILBOX_t *mb = &pmb->mb;
+
+        memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
+
+        mb->un.varRegVpi.vpi = vpi;
+        mb->un.varRegVpi.sid = sid;
+
+        mb->mbxCommand = MBX_REG_VPI;
+        mb->mbxOwner = OWN_HOST;
+        return;
+
+}
+
+/**************************************************/
+/*  lpfc_unreg_vpi   Issue a UNREG_VNPI           */
+/*                    mailbox command             */
+/**************************************************/
+void
+lpfc_unreg_vpi(struct lpfc_hba *phba, uint16_t vpi, LPFC_MBOXQ_t *pmb)
+{
+        MAILBOX_t *mb = &pmb->mb;
+        memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
+
+        mb->un.varUnregVpi.vpi = vpi;
+
+        mb->mbxCommand = MBX_UNREG_VPI;
+        mb->mbxOwner = OWN_HOST;
+        return;
+
+}
+
 static void
 lpfc_config_pcb_setup(struct lpfc_hba * phba)
 {
@@ -412,14 +469,18 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)
         PCB_t *pcbp = &phba->slim2p->pcb;
         dma_addr_t pdma_addr;
         uint32_t offset;
-        uint32_t iocbCnt;
+        uint32_t iocbCnt = 0;
         int i;
 
         pcbp->maxRing = (psli->num_rings - 1);
 
-        iocbCnt = 0;
         for (i = 0; i < psli->num_rings; i++) {
                 pring = &psli->ring[i];
+
+                pring->sizeCiocb = phba->sli_rev == 3 ? SLI3_IOCB_CMD_SIZE:
+                                                        SLI2_IOCB_CMD_SIZE;
+                pring->sizeRiocb = phba->sli_rev == 3 ? SLI3_IOCB_RSP_SIZE:
+                                                        SLI2_IOCB_RSP_SIZE;
                 /* A ring MUST have both cmd and rsp entries defined to be
                    valid */
                 if ((pring->numCiocb == 0) || (pring->numRiocb == 0)) {
@@ -434,20 +495,18 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)
                         continue;
                 }
                 /* Command ring setup for ring */
-                pring->cmdringaddr =
-                    (void *)&phba->slim2p->IOCBs[iocbCnt];
+                pring->cmdringaddr = (void *) &phba->slim2p->IOCBs[iocbCnt];
                 pcbp->rdsc[i].cmdEntries = pring->numCiocb;
 
-                offset = (uint8_t *)&phba->slim2p->IOCBs[iocbCnt] -
-                         (uint8_t *)phba->slim2p;
+                offset = (uint8_t *) &phba->slim2p->IOCBs[iocbCnt] -
+                         (uint8_t *) phba->slim2p;
                 pdma_addr = phba->slim2p_mapping + offset;
                 pcbp->rdsc[i].cmdAddrHigh = putPaddrHigh(pdma_addr);
                 pcbp->rdsc[i].cmdAddrLow = putPaddrLow(pdma_addr);
                 iocbCnt += pring->numCiocb;
 
                 /* Response ring setup for ring */
-                pring->rspringaddr =
-                    (void *)&phba->slim2p->IOCBs[iocbCnt];
+                pring->rspringaddr = (void *) &phba->slim2p->IOCBs[iocbCnt];
 
                 pcbp->rdsc[i].rspEntries = pring->numRiocb;
                 offset = (uint8_t *)&phba->slim2p->IOCBs[iocbCnt] -
@@ -462,16 +521,108 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)
 void
 lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
-        MAILBOX_t *mb;
-
-        mb = &pmb->mb;
+        MAILBOX_t *mb = &pmb->mb;
         memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
         mb->un.varRdRev.cv = 1;
+        mb->un.varRdRev.v3req = 1; /* Request SLI3 info */
         mb->mbxCommand = MBX_READ_REV;
         mb->mbxOwner = OWN_HOST;
         return;
 }
 
+static void
+lpfc_build_hbq_profile2(struct config_hbq_var *hbqmb,
+                        struct lpfc_hbq_init  *hbq_desc)
+{
+        hbqmb->profiles.profile2.seqlenbcnt = hbq_desc->seqlenbcnt;
+        hbqmb->profiles.profile2.maxlen     = hbq_desc->maxlen;
+        hbqmb->profiles.profile2.seqlenoff  = hbq_desc->seqlenoff;
+}
+
+static void
+lpfc_build_hbq_profile3(struct config_hbq_var *hbqmb,
+                        struct lpfc_hbq_init  *hbq_desc)
+{
+        hbqmb->profiles.profile3.seqlenbcnt = hbq_desc->seqlenbcnt;
+        hbqmb->profiles.profile3.maxlen     = hbq_desc->maxlen;
+        hbqmb->profiles.profile3.cmdcodeoff = hbq_desc->cmdcodeoff;
+        hbqmb->profiles.profile3.seqlenoff  = hbq_desc->seqlenoff;
+        memcpy(&hbqmb->profiles.profile3.cmdmatch, hbq_desc->cmdmatch,
+               sizeof(hbqmb->profiles.profile3.cmdmatch));
+}
+
+static void
+lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb,
+                        struct lpfc_hbq_init  *hbq_desc)
+{
+        hbqmb->profiles.profile5.seqlenbcnt = hbq_desc->seqlenbcnt;
+        hbqmb->profiles.profile5.maxlen     = hbq_desc->maxlen;
+        hbqmb->profiles.profile5.cmdcodeoff = hbq_desc->cmdcodeoff;
+        hbqmb->profiles.profile5.seqlenoff  = hbq_desc->seqlenoff;
+        memcpy(&hbqmb->profiles.profile5.cmdmatch, hbq_desc->cmdmatch,
+               sizeof(hbqmb->profiles.profile5.cmdmatch));
+}
+
+void
+lpfc_config_hbq(struct lpfc_hba *phba, struct lpfc_hbq_init *hbq_desc,
+                uint32_t hbq_entry_index, LPFC_MBOXQ_t *pmb)
+{
+        int i;
+        MAILBOX_t *mb = &pmb->mb;
+        struct config_hbq_var *hbqmb = &mb->un.varCfgHbq;
+
+        memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
+        hbqmb->entry_count = hbq_desc->entry_count;   /* # entries in HBQ */
+        hbqmb->recvNotify = hbq_desc->rn;             /* Receive
+                                                       * Notification */
+        hbqmb->numMask    = hbq_desc->mask_count;     /* # R_CTL/TYPE masks
+                                                       * # in words 0-19 */
+        hbqmb->profile    = hbq_desc->profile;        /* Selection profile:
+                                                       * 0 = all,
+                                                       * 7 = logentry */
+        hbqmb->ringMask   = hbq_desc->ring_mask;      /* Binds HBQ to a ring
+                                                       * e.g. Ring0=b0001,
+                                                       * ring2=b0100 */
+        hbqmb->headerLen  = hbq_desc->headerLen;      /* 0 if not profile 4
+                                                       * or 5 */
+        hbqmb->logEntry   = hbq_desc->logEntry;       /* Set to 1 if this
+                                                       * HBQ will be used
+                                                       * for LogEntry
+                                                       * buffers */
+        hbqmb->hbqaddrLow = putPaddrLow(phba->hbqslimp.phys) +
+                hbq_entry_index * sizeof(struct lpfc_hbq_entry);
+        hbqmb->hbqaddrHigh = putPaddrHigh(phba->hbqslimp.phys);
+
+        mb->mbxCommand = MBX_CONFIG_HBQ;
+        mb->mbxOwner = OWN_HOST;
+
+                                /* Copy info for profiles 2,3,5. Other
+                                 * profiles this area is reserved
+                                 */
+        if (hbq_desc->profile == 2)
+                lpfc_build_hbq_profile2(hbqmb, hbq_desc);
+        else if (hbq_desc->profile == 3)
+                lpfc_build_hbq_profile3(hbqmb, hbq_desc);
+        else if (hbq_desc->profile == 5)
+                lpfc_build_hbq_profile5(hbqmb, hbq_desc);
+
+        /* Return if no rctl / type masks for this HBQ */
+        if (!hbq_desc->mask_count)
+                return;
+
+        /* Otherwise we setup specific rctl / type masks for this HBQ */
+        for (i = 0; i < hbq_desc->mask_count; i++) {
+                hbqmb->hbqMasks[i].tmatch = hbq_desc->hbqMasks[i].tmatch;
+                hbqmb->hbqMasks[i].tmask  = hbq_desc->hbqMasks[i].tmask;
+                hbqmb->hbqMasks[i].rctlmatch = hbq_desc->hbqMasks[i].rctlmatch;
+                hbqmb->hbqMasks[i].rctlmask  = hbq_desc->hbqMasks[i].rctlmask;
+        }
+
+        return;
+}
+
+
+
 void
 lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb)
 {
@@ -514,15 +665,16 @@ lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb)
 }
 
 void
-lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
+lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
+        MAILBOX_t __iomem *mb_slim = (MAILBOX_t __iomem *) phba->MBslimaddr;
         MAILBOX_t *mb = &pmb->mb;
         dma_addr_t pdma_addr;
         uint32_t bar_low, bar_high;
         size_t offset;
         struct lpfc_hgp hgp;
-        void __iomem *to_slim;
         int i;
+        uint32_t pgp_offset;
 
         memset(pmb, 0, sizeof(LPFC_MBOXQ_t));
         mb->mbxCommand = MBX_CONFIG_PORT;
@@ -535,12 +687,29 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         mb->un.varCfgPort.pcbLow = putPaddrLow(pdma_addr);
         mb->un.varCfgPort.pcbHigh = putPaddrHigh(pdma_addr);
 
+        /* If HBA supports SLI=3 ask for it */
+
+        if (phba->sli_rev == 3 && phba->vpd.sli3Feat.cerbm) {
+                mb->un.varCfgPort.cerbm = 1; /* Request HBQs */
+                mb->un.varCfgPort.max_hbq = 1; /* Requesting 2 HBQs */
+                if (phba->max_vpi && phba->cfg_npiv_enable &&
+                    phba->vpd.sli3Feat.cmv) {
+                        mb->un.varCfgPort.max_vpi = phba->max_vpi;
+                        mb->un.varCfgPort.cmv = 1;
+                        phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
+                } else
+                        mb->un.varCfgPort.max_vpi = phba->max_vpi = 0;
+        } else
+                phba->sli_rev = 2;
+        mb->un.varCfgPort.sli_mode = phba->sli_rev;
+
         /* Now setup pcb */
         phba->slim2p->pcb.type = TYPE_NATIVE_SLI2;
         phba->slim2p->pcb.feature = FEATURE_INITIAL_SLI2;
 
         /* Setup Mailbox pointers */
-        phba->slim2p->pcb.mailBoxSize = sizeof(MAILBOX_t);
+        phba->slim2p->pcb.mailBoxSize = offsetof(MAILBOX_t, us) +
+                sizeof(struct sli2_desc);
         offset = (uint8_t *)&phba->slim2p->mbx - (uint8_t *)phba->slim2p;
         pdma_addr = phba->slim2p_mapping + offset;
         phba->slim2p->pcb.mbAddrHigh = putPaddrHigh(pdma_addr);
@@ -568,29 +737,70 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         pci_read_config_dword(phba->pcidev, PCI_BASE_ADDRESS_0, &bar_low);
         pci_read_config_dword(phba->pcidev, PCI_BASE_ADDRESS_1, &bar_high);
 
+        /*
+         * Set up HGP - Port Memory
+         *
+         * The port expects the host get/put pointers to reside in memory
+         * following the "non-diagnostic" mode mailbox (32 words, 0x80 bytes)
+         * area of SLIM.  In SLI-2 mode, there's an additional 16 reserved
+         * words (0x40 bytes).  This area is not reserved if HBQs are
+         * configured in SLI-3.
+         *
+         * CR0Put    - SLI2(no HBQs) = 0xc0, With HBQs = 0x80
+         * RR0Get                      0xc4              0x84
+         * CR1Put                      0xc8              0x88
+         * RR1Get                      0xcc              0x8c
+         * CR2Put                      0xd0              0x90
+         * RR2Get                      0xd4              0x94
+         * CR3Put                      0xd8              0x98
+         * RR3Get                      0xdc              0x9c
+         *
+         * Reserved                    0xa0-0xbf
+         *    If HBQs configured:
+         *                         HBQ 0 Put ptr  0xc0
+         *                         HBQ 1 Put ptr  0xc4
+         *                         HBQ 2 Put ptr  0xc8
+         *                         ......
+         *                         HBQ(M-1)Put Pointer 0xc0+(M-1)*4
+         *
+         */
+
+        if (phba->sli_rev == 3) {
+                phba->host_gp = &mb_slim->us.s3.host[0];
+                phba->hbq_put = &mb_slim->us.s3.hbq_put[0];
+        } else {
+                phba->host_gp = &mb_slim->us.s2.host[0];
+                phba->hbq_put = NULL;
+        }
 
         /* mask off BAR0's flag bits 0 - 3 */
         phba->slim2p->pcb.hgpAddrLow = (bar_low & PCI_BASE_ADDRESS_MEM_MASK) +
-                                        (SLIMOFF*sizeof(uint32_t));
+                (void __iomem *) phba->host_gp -
+                (void __iomem *)phba->MBslimaddr;
         if (bar_low & PCI_BASE_ADDRESS_MEM_TYPE_64)
                 phba->slim2p->pcb.hgpAddrHigh = bar_high;
         else
                 phba->slim2p->pcb.hgpAddrHigh = 0;
         /* 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));
 
         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);
+                lpfc_memcpy_to_slim(phba->host_gp + i, &hgp,
+                                    sizeof(*phba->host_gp));
         }
 
         /* Setup Port Group ring pointer */
-        offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port -
-                 (uint8_t *)phba->slim2p;
-        pdma_addr = phba->slim2p_mapping + offset;
+        if (phba->sli_rev == 3)
+                pgp_offset = (uint8_t *)&phba->slim2p->mbx.us.s3_pgp.port -
+                        (uint8_t *)phba->slim2p;
+        else
+                pgp_offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port -
+                        (uint8_t *)phba->slim2p;
+
+        pdma_addr = phba->slim2p_mapping + pgp_offset;
         phba->slim2p->pcb.pgpAddrHigh = putPaddrHigh(pdma_addr);
         phba->slim2p->pcb.pgpAddrLow = putPaddrLow(pdma_addr);
+        phba->hbq_get = &phba->slim2p->mbx.us.s3_pgp.hbq_get[0];
 
         /* Use callback routine to setp rings in the pcb */
         lpfc_config_pcb_setup(phba);
@@ -606,11 +816,7 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         /* Swap PCB if needed */
         lpfc_sli_pcimem_bcopy(&phba->slim2p->pcb, &phba->slim2p->pcb,
-                                                                sizeof (PCB_t));
-
-        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
-                        "%d:0405 Service Level Interface (SLI) 2 selected\n",
-                        phba->brd_no);
+                              sizeof(PCB_t));
 }
 
 void
@@ -644,15 +850,23 @@ lpfc_mbox_get(struct lpfc_hba * phba)
         LPFC_MBOXQ_t *mbq = NULL;
         struct lpfc_sli *psli = &phba->sli;
 
-        list_remove_head((&psli->mboxq), mbq, LPFC_MBOXQ_t,
-                         list);
-        if (mbq) {
+        list_remove_head((&psli->mboxq), mbq, LPFC_MBOXQ_t, list);
+        if (mbq)
                 psli->mboxq_cnt--;
-        }
 
         return mbq;
 }
 
+void
+lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)
+{
+        /* This function expects to be called from interupt context */
+        spin_lock(&phba->hbalock);
+        list_add_tail(&mbq->list, &phba->sli.mboxq_cmpl);
+        spin_unlock(&phba->hbalock);
+        return;
+}
+
 int
 lpfc_mbox_tmo_val(struct lpfc_hba *phba, int cmd)
 {