1 files changed, 152 insertions, 247 deletions

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index b5ad1871d34b..c34d3cf4f19c 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -50,12 +50,13 @@
  * and the BPL BDE is setup in the IOCB.
  */
 static struct lpfc_scsi_buf *
-lpfc_get_scsi_buf(struct lpfc_hba * phba)
+lpfc_new_scsi_buf(struct lpfc_hba * phba)
 {
         struct lpfc_scsi_buf *psb;
         struct ulp_bde64 *bpl;
         IOCB_t *iocb;
         dma_addr_t pdma_phys;
+        uint16_t iotag;
 
         psb = kmalloc(sizeof(struct lpfc_scsi_buf), GFP_KERNEL);
         if (!psb)
@@ -79,6 +80,16 @@ lpfc_get_scsi_buf(struct lpfc_hba * phba)
         /* Initialize virtual ptrs to dma_buf region. */
         memset(psb->data, 0, phba->cfg_sg_dma_buf_size);
 
+        /* Allocate iotag for psb->cur_iocbq. */
+        iotag = lpfc_sli_next_iotag(phba, &psb->cur_iocbq);
+        if (iotag == 0) {
+                pci_pool_free(phba->lpfc_scsi_dma_buf_pool,
+                              psb->data, psb->dma_handle);
+                kfree (psb);
+                return NULL;
+        }
+        psb->cur_iocbq.iocb_flag |= LPFC_IO_FCP;
+
         psb->fcp_cmnd = psb->data;
         psb->fcp_rsp = psb->data + sizeof(struct fcp_cmnd);
         psb->fcp_bpl = psb->data + sizeof(struct fcp_cmnd) +
@@ -125,11 +136,19 @@ lpfc_get_scsi_buf(struct lpfc_hba * phba)
         return psb;
 }
 
-static void
-lpfc_free_scsi_buf(struct lpfc_scsi_buf * psb)
+struct  lpfc_scsi_buf*
+lpfc_sli_get_scsi_buf(struct lpfc_hba * phba)
 {
-        struct lpfc_hba *phba = psb->scsi_hba;
+        struct  lpfc_scsi_buf * lpfc_cmd = NULL;
+        struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list;
+
+        list_remove_head(scsi_buf_list, lpfc_cmd, struct lpfc_scsi_buf, list);
+        return  lpfc_cmd;
+}
 
+static void
+lpfc_release_scsi_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * psb)
+{
         /*
          * There are only two special cases to consider.  (1) the scsi command
          * requested scatter-gather usage or (2) the scsi command allocated
@@ -147,6 +166,7 @@ lpfc_free_scsi_buf(struct lpfc_scsi_buf * psb)
                  }
         }
 
+        psb->pCmd = NULL;
         list_add_tail(&psb->list, &phba->lpfc_scsi_buf_list);
 }
 
@@ -403,14 +423,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                         break;
                 }
 
-                if (pnode) {
-                        if (pnode->nlp_state != NLP_STE_MAPPED_NODE)
-                                cmd->result = ScsiResult(DID_BUS_BUSY,
-                                        SAM_STAT_BUSY);
-                }
-                else {
-                        cmd->result = ScsiResult(DID_NO_CONNECT, 0);
-                }
+                if ((pnode == NULL )
+                    || (pnode->nlp_state != NLP_STE_MAPPED_NODE))
+                        cmd->result = ScsiResult(DID_BUS_BUSY, SAM_STAT_BUSY);
         } else {
                 cmd->result = ScsiResult(DID_OK, 0);
         }
@@ -426,12 +441,11 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                                 *lp, *(lp + 3), cmd->retries, cmd->resid);
         }
 
+        cmd->scsi_done(cmd);
+
         spin_lock_irqsave(phba->host->host_lock, iflag);
-        lpfc_free_scsi_buf(lpfc_cmd);
-        cmd->host_scribble = NULL;
+        lpfc_release_scsi_buf(phba, lpfc_cmd);
         spin_unlock_irqrestore(phba->host->host_lock, iflag);
-
-        cmd->scsi_done(cmd);
 }
 
 static void
@@ -539,7 +553,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,
         struct lpfc_rport_data *rdata = scsi_dev->hostdata;
         struct lpfc_nodelist *ndlp = rdata->pnode;
 
-        if ((ndlp == 0) || (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
+        if ((ndlp == NULL) || (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
                 return 0;
         }
 
@@ -618,8 +632,7 @@ static int
 lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba)
 {
         struct lpfc_iocbq *iocbq;
-        struct lpfc_iocbq *iocbqrsp = NULL;
-        struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
+        struct lpfc_iocbq *iocbqrsp;
         int ret;
 
         ret = lpfc_scsi_prep_task_mgmt_cmd(phba, lpfc_cmd, FCP_TARGET_RESET);
@@ -628,17 +641,14 @@ lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba)
 
         lpfc_cmd->scsi_hba = phba;
         iocbq = &lpfc_cmd->cur_iocbq;
-        list_remove_head(lpfc_iocb_list, iocbqrsp, struct lpfc_iocbq, list);
+        iocbqrsp = lpfc_sli_get_iocbq(phba);
+
         if (!iocbqrsp)
                 return FAILED;
-        memset(iocbqrsp, 0, sizeof (struct lpfc_iocbq));
-
-        iocbq->iocb_flag |= LPFC_IO_POLL;
-        ret = lpfc_sli_issue_iocb_wait_high_priority(phba,
-                     &phba->sli.ring[phba->sli.fcp_ring],
-                     iocbq, SLI_IOCB_HIGH_PRIORITY,
-                     iocbqrsp,
-                     lpfc_cmd->timeout);
+
+        ret = lpfc_sli_issue_iocb_wait(phba,
+                                       &phba->sli.ring[phba->sli.fcp_ring],
+                                       iocbq, iocbqrsp, lpfc_cmd->timeout);
         if (ret != IOCB_SUCCESS) {
                 lpfc_cmd->status = IOSTAT_DRIVER_REJECT;
                 ret = FAILED;
@@ -651,45 +661,10 @@ lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba)
                                 lpfc_cmd->status = IOSTAT_DRIVER_REJECT;
         }
 
-        /*
-         * All outstanding txcmplq I/Os should have been aborted by the target.
-         * Unfortunately, some targets do not abide by this forcing the driver
-         * to double check.
-         */
-        lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring],
-                            lpfc_cmd->pCmd->device->id,
-                            lpfc_cmd->pCmd->device->lun, 0, LPFC_CTX_TGT);
-
-        /* Return response IOCB to free list. */
-        list_add_tail(&iocbqrsp->list, lpfc_iocb_list);
+        lpfc_sli_release_iocbq(phba, iocbqrsp);
         return ret;
 }
 
-static void
-lpfc_scsi_cmd_iocb_cleanup (struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
-                            struct lpfc_iocbq *pIocbOut)
-{
-        unsigned long iflag;
-        struct lpfc_scsi_buf *lpfc_cmd =
-                (struct lpfc_scsi_buf *) pIocbIn->context1;
-
-        spin_lock_irqsave(phba->host->host_lock, iflag);
-        lpfc_free_scsi_buf(lpfc_cmd);
-        spin_unlock_irqrestore(phba->host->host_lock, iflag);
-}
-
-static void
-lpfc_scsi_cmd_iocb_cmpl_aborted(struct lpfc_hba *phba,
-                                struct lpfc_iocbq *pIocbIn,
-                                struct lpfc_iocbq *pIocbOut)
-{
-        struct scsi_cmnd *ml_cmd =
-                ((struct lpfc_scsi_buf *) pIocbIn->context1)->pCmd;
-
-        lpfc_scsi_cmd_iocb_cleanup (phba, pIocbIn, pIocbOut);
-        ml_cmd->host_scribble = NULL;
-}
-
 const char *
 lpfc_info(struct Scsi_Host *host)
 {
@@ -726,43 +701,25 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
         struct lpfc_sli *psli = &phba->sli;
         struct lpfc_rport_data *rdata = cmnd->device->hostdata;
         struct lpfc_nodelist *ndlp = rdata->pnode;
-        struct lpfc_scsi_buf *lpfc_cmd = NULL;
-        struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list;
-        int err = 0;
+        struct lpfc_scsi_buf *lpfc_cmd;
+        struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
+        int err;
 
-        /*
-         * The target pointer is guaranteed not to be NULL because the driver
-         * only clears the device->hostdata field in lpfc_slave_destroy.  This
-         * approach guarantees no further IO calls on this target.
-         */
-        if (!ndlp) {
-                cmnd->result = ScsiResult(DID_NO_CONNECT, 0);
+        err = fc_remote_port_chkready(rport);
+        if (err) {
+                cmnd->result = err;
                 goto out_fail_command;
         }
 
         /*
-         * A Fibre Channel target is present and functioning only when the node
-         * state is MAPPED.  Any other state is a failure.
+         * Catch race where our node has transitioned, but the
+         * transport is still transitioning.
          */
-        if (ndlp->nlp_state != NLP_STE_MAPPED_NODE) {
-                if ((ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) ||
-                    (ndlp->nlp_state == NLP_STE_UNUSED_NODE)) {
-                        cmnd->result = ScsiResult(DID_NO_CONNECT, 0);
-                        goto out_fail_command;
-                }
-                else if (ndlp->nlp_state == NLP_STE_NPR_NODE) {
-                        cmnd->result = ScsiResult(DID_BUS_BUSY, 0);
-                        goto out_fail_command;
-                }
-                /*
-                 * The device is most likely recovered and the driver
-                 * needs a bit more time to finish.  Ask the midlayer
-                 * to retry.
-                 */
-                goto out_host_busy;
+        if (!ndlp) {
+                cmnd->result = ScsiResult(DID_BUS_BUSY, 0);
+                goto out_fail_command;
         }
-
-        list_remove_head(scsi_buf_list, lpfc_cmd, struct lpfc_scsi_buf, list);
+        lpfc_cmd = lpfc_sli_get_scsi_buf (phba);
         if (lpfc_cmd == NULL) {
                 printk(KERN_WARNING "%s: No buffer available - list empty, "
                        "total count %d\n", __FUNCTION__, phba->total_scsi_bufs);
@@ -792,7 +749,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
         return 0;
 
  out_host_busy_free_buf:
-        lpfc_free_scsi_buf(lpfc_cmd);
+        lpfc_release_scsi_buf(phba, lpfc_cmd);
         cmnd->host_scribble = NULL;
  out_host_busy:
         return SCSI_MLQUEUE_HOST_BUSY;
@@ -808,119 +765,92 @@ __lpfc_abort_handler(struct scsi_cmnd *cmnd)
         struct lpfc_hba *phba =
                         (struct lpfc_hba *)cmnd->device->host->hostdata[0];
         struct lpfc_sli_ring *pring = &phba->sli.ring[phba->sli.fcp_ring];
-        struct lpfc_iocbq *iocb, *next_iocb;
-        struct lpfc_iocbq *abtsiocb = NULL;
+        struct lpfc_iocbq *iocb;
+        struct lpfc_iocbq *abtsiocb;
         struct lpfc_scsi_buf *lpfc_cmd;
-        struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
         IOCB_t *cmd, *icmd;
-        unsigned long snum;
-        unsigned int id, lun;
         unsigned int loop_count = 0;
-        int ret = IOCB_SUCCESS;
+        int ret = SUCCESS;
 
-        /*
-         * If the host_scribble data area is NULL, then the driver has already
-         * completed this command, but the midlayer did not see the completion
-         * before the eh fired.  Just return SUCCESS.
-         */
-        lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble;
-        if (!lpfc_cmd)
-                return SUCCESS;
 
-        /* save these now since lpfc_cmd can be freed */
-        id   = lpfc_cmd->pCmd->device->id;
-        lun  = lpfc_cmd->pCmd->device->lun;
-        snum = lpfc_cmd->pCmd->serial_number;
+        lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble;
+        BUG_ON(!lpfc_cmd);
 
-        list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
-                cmd = &iocb->iocb;
-                if (iocb->context1 != lpfc_cmd)
-                        continue;
+        /*
+         * If pCmd field of the corresponding lpfc_scsi_buf structure
+         * points to a different SCSI command, then the driver has
+         * already completed this command, but the midlayer did not
+         * see the completion before the eh fired.  Just return
+         * SUCCESS.
+         */
+        iocb = &lpfc_cmd->cur_iocbq;
+        if (lpfc_cmd->pCmd != cmnd)
+                goto out;
 
-                list_del_init(&iocb->list);
-                pring->txq_cnt--;
-                if (!iocb->iocb_cmpl) {
-                        list_add_tail(&iocb->list, lpfc_iocb_list);
-                }
-                else {
-                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                        cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                        lpfc_scsi_cmd_iocb_cmpl_aborted(phba, iocb, iocb);
-                }
+        BUG_ON(iocb->context1 != lpfc_cmd);
 
+        abtsiocb = lpfc_sli_get_iocbq(phba);
+        if (abtsiocb == NULL) {
+                ret = FAILED;
                 goto out;
         }
 
-        list_remove_head(lpfc_iocb_list, abtsiocb, struct lpfc_iocbq, list);
-        if (abtsiocb == NULL)
-                return FAILED;
-
-        memset(abtsiocb, 0, sizeof (struct lpfc_iocbq));
-
         /*
-         * The scsi command was not in the txq.  Check the txcmplq and if it is
-         * found, send an abort to the FW.
+         * The scsi command can not be in txq and it is in flight because the
+         * pCmd is still pointig at the SCSI command we have to abort. There
+         * is no need to search the txcmplq. Just send an abort to the FW.
          */
-        list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list) {
-                if (iocb->context1 != lpfc_cmd)
-                        continue;
 
-                iocb->iocb_cmpl = lpfc_scsi_cmd_iocb_cmpl_aborted;
-                cmd = &iocb->iocb;
-                icmd = &abtsiocb->iocb;
-                icmd->un.acxri.abortType = ABORT_TYPE_ABTS;
-                icmd->un.acxri.abortContextTag = cmd->ulpContext;
-                icmd->un.acxri.abortIoTag = cmd->ulpIoTag;
-
-                icmd->ulpLe = 1;
-                icmd->ulpClass = cmd->ulpClass;
-                if (phba->hba_state >= LPFC_LINK_UP)
-                        icmd->ulpCommand = CMD_ABORT_XRI_CN;
-                else
-                        icmd->ulpCommand = CMD_CLOSE_XRI_CN;
+        cmd = &iocb->iocb;
+        icmd = &abtsiocb->iocb;
+        icmd->un.acxri.abortType = ABORT_TYPE_ABTS;
+        icmd->un.acxri.abortContextTag = cmd->ulpContext;
+        icmd->un.acxri.abortIoTag = cmd->ulpIoTag;
 
-                abtsiocb->iocb_cmpl = lpfc_sli_abort_fcp_cmpl;
-                if (lpfc_sli_issue_iocb(phba, pring, abtsiocb, 0) ==
-                                                                IOCB_ERROR) {
-                        list_add_tail(&abtsiocb->list, lpfc_iocb_list);
-                        ret = IOCB_ERROR;
-                        break;
-                }
+        icmd->ulpLe = 1;
+        icmd->ulpClass = cmd->ulpClass;
+        if (phba->hba_state >= LPFC_LINK_UP)
+                icmd->ulpCommand = CMD_ABORT_XRI_CN;
+        else
+                icmd->ulpCommand = CMD_CLOSE_XRI_CN;
 
-                /* Wait for abort to complete */
-                while (cmnd->host_scribble)
-                {
-                        spin_unlock_irq(phba->host->host_lock);
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(LPFC_ABORT_WAIT*HZ);
-                        spin_lock_irq(phba->host->host_lock);
-                        if (++loop_count
-                            > (2 * phba->cfg_nodev_tmo)/LPFC_ABORT_WAIT)
-                                break;
-                }
+        abtsiocb->iocb_cmpl = lpfc_sli_abort_fcp_cmpl;
+        if (lpfc_sli_issue_iocb(phba, pring, abtsiocb, 0) == IOCB_ERROR) {
+                lpfc_sli_release_iocbq(phba, abtsiocb);
+                ret = FAILED;
+                goto out;
+        }
 
-                if(cmnd->host_scribble) {
-                        lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
-                                        "%d:0748 abort handler timed "
-                                        "out waiting for abort to "
-                                        "complete. Data: "
-                                        "x%x x%x x%x x%lx\n",
-                                        phba->brd_no, ret, id, lun, snum);
-                        cmnd->host_scribble = NULL;
-                        iocb->iocb_cmpl = lpfc_scsi_cmd_iocb_cleanup;
-                        ret = IOCB_ERROR;
-                }
+        /* Wait for abort to complete */
+        while (lpfc_cmd->pCmd == cmnd)
+        {
+                spin_unlock_irq(phba->host->host_lock);
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(LPFC_ABORT_WAIT*HZ);
+                spin_lock_irq(phba->host->host_lock);
+                if (++loop_count
+                    > (2 * phba->cfg_nodev_tmo)/LPFC_ABORT_WAIT)
+                        break;
+        }
 
-                break;
+        if (lpfc_cmd->pCmd == cmnd) {
+                ret = FAILED;
+                lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
+                                "%d:0748 abort handler timed out waiting for "
+                                "abort to complete: ret %#x, ID %d, LUN %d, "
+                                "snum %#lx\n",
+                                phba->brd_no,  ret, cmnd->device->id,
+                                cmnd->device->lun, cmnd->serial_number);
         }
 
  out:
         lpfc_printf_log(phba, KERN_WARNING, LOG_FCP,
-                        "%d:0749 SCSI layer issued abort device "
-                        "Data: x%x x%x x%x x%lx\n",
-                        phba->brd_no, ret, id, lun, snum);
+                        "%d:0749 SCSI layer issued abort device: ret %#x, "
+                        "ID %d, LUN %d, snum %#lx\n",
+                        phba->brd_no, ret, cmnd->device->id,
+                        cmnd->device->lun, cmnd->serial_number);
 
-        return ret == IOCB_SUCCESS ? SUCCESS : FAILED;
+        return ret;
 }
 
 static int
@@ -938,11 +868,8 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
 {
         struct Scsi_Host *shost = cmnd->device->host;
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0];
-        struct lpfc_sli *psli = &phba->sli;
-        struct lpfc_scsi_buf *lpfc_cmd = NULL;
-        struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list;
-        struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
-        struct lpfc_iocbq *iocbq, *iocbqrsp = NULL;
+        struct lpfc_scsi_buf *lpfc_cmd;
+        struct lpfc_iocbq *iocbq, *iocbqrsp;
         struct lpfc_rport_data *rdata = cmnd->device->hostdata;
         struct lpfc_nodelist *pnode = rdata->pnode;
         int ret = FAILED;
@@ -966,7 +893,7 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
                         break;
         }
 
-        list_remove_head(scsi_buf_list, lpfc_cmd, struct lpfc_scsi_buf, list);
+        lpfc_cmd = lpfc_sli_get_scsi_buf (phba);
         if (lpfc_cmd == NULL)
                 goto out;
 
@@ -981,18 +908,13 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
         iocbq = &lpfc_cmd->cur_iocbq;
 
         /* get a buffer for this IOCB command response */
-        list_remove_head(lpfc_iocb_list, iocbqrsp, struct lpfc_iocbq, list);
+        iocbqrsp = lpfc_sli_get_iocbq(phba);
         if (iocbqrsp == NULL)
                 goto out_free_scsi_buf;
 
-        memset(iocbqrsp, 0, sizeof (struct lpfc_iocbq));
-
-        iocbq->iocb_flag |= LPFC_IO_POLL;
-        iocbq->iocb_cmpl = lpfc_sli_wake_iocb_high_priority;
-
-        ret = lpfc_sli_issue_iocb_wait_high_priority(phba,
-                     &phba->sli.ring[psli->fcp_ring],
-                     iocbq, 0, iocbqrsp, 60);
+        ret = lpfc_sli_issue_iocb_wait(phba,
+                                       &phba->sli.ring[phba->sli.fcp_ring],
+                                       iocbq, iocbqrsp, lpfc_cmd->timeout);
         if (ret == IOCB_SUCCESS)
                 ret = SUCCESS;
 
@@ -1027,12 +949,13 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
         }
 
         if (cnt) {
-                lpfc_printf_log(phba, KERN_INFO, LOG_FCP,
+                lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
                         "%d:0719 LUN Reset I/O flush failure: cnt x%x\n",
                         phba->brd_no, cnt);
+                ret = FAILED;
         }
 
-        list_add_tail(&iocbqrsp->list, lpfc_iocb_list);
+        lpfc_sli_release_iocbq(phba, iocbqrsp);
 
 out_free_scsi_buf:
         lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
@@ -1041,7 +964,7 @@ out_free_scsi_buf:
                         phba->brd_no, lpfc_cmd->pCmd->device->id,
                         lpfc_cmd->pCmd->device->lun, ret, lpfc_cmd->status,
                         lpfc_cmd->result);
-        lpfc_free_scsi_buf(lpfc_cmd);
+        lpfc_release_scsi_buf(phba, lpfc_cmd);
 out:
         return ret;
 }
@@ -1069,10 +992,9 @@ __lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
         int ret = FAILED, i, err_count = 0;
         int cnt, loopcnt;
         unsigned int midlayer_id = 0;
-        struct lpfc_scsi_buf * lpfc_cmd = NULL;
-        struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list;
+        struct lpfc_scsi_buf * lpfc_cmd;
 
-        list_remove_head(scsi_buf_list, lpfc_cmd, struct lpfc_scsi_buf, list);
+        lpfc_cmd = lpfc_sli_get_scsi_buf (phba);
         if (lpfc_cmd == NULL)
                 goto out;
 
@@ -1136,10 +1058,12 @@ __lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
                    phba->brd_no, cnt, i);
         }
 
-        if (!err_count)
+        if (cnt == 0)
                 ret = SUCCESS;
+        else
+                ret = FAILED;
 
-        lpfc_free_scsi_buf(lpfc_cmd);
+        lpfc_release_scsi_buf(phba, lpfc_cmd);
         lpfc_printf_log(phba,
                         KERN_ERR,
                         LOG_FCP,
@@ -1163,66 +1087,47 @@ static int
 lpfc_slave_alloc(struct scsi_device *sdev)
 {
         struct lpfc_hba *phba = (struct lpfc_hba *)sdev->host->hostdata[0];
-        struct lpfc_nodelist *ndlp = NULL;
-        int match = 0;
         struct lpfc_scsi_buf *scsi_buf = NULL;
+        struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
         uint32_t total = 0, i;
         uint32_t num_to_alloc = 0;
         unsigned long flags;
-        struct list_head *listp;
-        struct list_head *node_list[6];
-
-        /*
-         * Store the target pointer in the scsi_device hostdata pointer provided
-         * the driver has already discovered the target id.
-         */
-
-        /* Search the nlp lists other than unmap_list for this target ID */
-        node_list[0] = &phba->fc_npr_list;
-        node_list[1] = &phba->fc_nlpmap_list;
-        node_list[2] = &phba->fc_prli_list;
-        node_list[3] = &phba->fc_reglogin_list;
-        node_list[4] = &phba->fc_adisc_list;
-        node_list[5] = &phba->fc_plogi_list;
-
-        for (i = 0; i < 6 && !match; i++) {
-                listp = node_list[i];
-                if (list_empty(listp))
-                        continue;
-                list_for_each_entry(ndlp, listp, nlp_listp) {
-                        if ((sdev->id == ndlp->nlp_sid) && ndlp->rport) {
-                                match = 1;
-                                break;
-                        }
-                }
-        }
 
-        if (!match)
+        if (!rport || fc_remote_port_chkready(rport))
                 return -ENXIO;
 
-        sdev->hostdata = ndlp->rport->dd_data;
+        sdev->hostdata = rport->dd_data;
 
         /*
          * Populate the cmds_per_lun count scsi_bufs into this host's globally
          * available list of scsi buffers.  Don't allocate more than the
-         * HBA limit conveyed to the midlayer via the host structure.  Note
-         * that this list of scsi bufs exists for the lifetime of the driver.
+         * HBA limit conveyed to the midlayer via the host structure.  The
+         * formula accounts for the lun_queue_depth + error handlers + 1
+         * extra.  This list of scsi bufs exists for the lifetime of the driver.
          */
         total = phba->total_scsi_bufs;
-        num_to_alloc = LPFC_CMD_PER_LUN;
+        num_to_alloc = phba->cfg_lun_queue_depth + 2;
         if (total >= phba->cfg_hba_queue_depth) {
-                printk(KERN_WARNING "%s, At config limitation of "
-                       "%d allocated scsi_bufs\n", __FUNCTION__, total);
+                lpfc_printf_log(phba, KERN_WARNING, LOG_FCP,
+                                "%d:0704 At limitation of %d preallocated "
+                                "command buffers\n", phba->brd_no, total);
                 return 0;
         } else if (total + num_to_alloc > phba->cfg_hba_queue_depth) {
+                lpfc_printf_log(phba, KERN_WARNING, LOG_FCP,
+                                "%d:0705 Allocation request of %d command "
+                                "buffers will exceed max of %d.  Reducing "
+                                "allocation request to %d.\n", phba->brd_no,
+                                num_to_alloc, phba->cfg_hba_queue_depth,
+                                (phba->cfg_hba_queue_depth - total));
                 num_to_alloc = phba->cfg_hba_queue_depth - total;
         }
 
         for (i = 0; i < num_to_alloc; i++) {
-                scsi_buf = lpfc_get_scsi_buf(phba);
+                scsi_buf = lpfc_new_scsi_buf(phba);
                 if (!scsi_buf) {
-                        printk(KERN_ERR "%s, failed to allocate "
-                               "scsi_buf\n", __FUNCTION__);
+                        lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
+                                        "%d:0706 Failed to allocate command "
+                                        "buffer\n", phba->brd_no);
                         break;
                 }