[SCSI] lpfc 8.3.14: SCSI and SLI API fixes

- Fixed accounting of allocated SCSI buffers when post sgl fails.
- Restrict scsi buffer allocation based on LUN count (sdev_cnt).
- Create __lpfc_sli_free_rpi that doesn't take out the hbalock.
- Modify lpfc_sli_free_rpi to call __lpfc_sli_free_rpi.
- Call __lpfc_sli_free_rpi in lpfc_cleanup_pending_mbox.
- Do not swap the strings returned in mailbox commands and do
  not swap byte aligned data in VPD.

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index fcfc495d1e0d7129d8db25729f5bc9c680745cc3..bb40fcbe17c5739f198f94813d54ecdbe8e79091 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -815,6 +815,7 @@ struct lpfc_hba {
 #define HBA_MENLO_SUPPORT      0x1 /* HBA supports menlo commands */
        uint32_t iocb_cnt;
        uint32_t iocb_max;
+       atomic_t sdev_cnt;
 };
 
 static inline struct Scsi_Host *

diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 361f4e7e23e4acbfe2e333a406c04d65a1d43fca..03f4ddc185723f94520e112df291cc266b8c45d3 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -191,6 +191,7 @@ irqreturn_t lpfc_sli4_sp_intr_handler(int, void *);
 irqreturn_t lpfc_sli4_fp_intr_handler(int, void *);
 
 void lpfc_read_rev(struct lpfc_hba *, LPFC_MBOXQ_t *);
+void lpfc_sli4_swap_str(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_config_ring(struct lpfc_hba *, int, LPFC_MBOXQ_t *);
 void lpfc_config_port(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_kill_board(struct lpfc_hba *, LPFC_MBOXQ_t *);

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 7cd5c47a66ea2ab925b563ef34f10cd76418cef2..9fcad20491ef467006d65e40a62b87622ca62f51 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -3845,6 +3845,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                                mempool_free(mbox, phba->mbox_mem_pool);
                }
                lpfc_no_rpi(phba, ndlp);
+
                ndlp->nlp_rpi = 0;
                ndlp->nlp_flag &= ~NLP_RPI_VALID;
                ndlp->nlp_flag &= ~NLP_NPR_ADISC;

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 08db674ec580a93c254297834f3c1e41c2127791..fb06933f8e6ccd00c294c7eca43011b7e361a452 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4919,6 +4919,7 @@ lpfc_create_shost(struct lpfc_hba *phba)
        phba->fc_altov = FF_DEF_ALTOV;
        phba->fc_arbtov = FF_DEF_ARBTOV;
 
+       atomic_set(&phba->sdev_cnt, 0);
        vport = lpfc_create_port(phba, phba->brd_no, &phba->pcidev->dev);
        if (!vport)
                return -ENODEV;

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 196371fae24271b1688e712c5ace28e74df06a2e..cb5d93b41b506f132769a306b897165c9c1cfd36 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -955,6 +955,26 @@ lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
 
+void
+lpfc_sli4_swap_str(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+       MAILBOX_t *mb = &pmb->u.mb;
+       struct lpfc_mqe *mqe;
+
+       switch (mb->mbxCommand) {
+       case  MBX_READ_REV:
+                mqe = &pmb->u.mqe;
+               lpfc_sli_pcimem_bcopy(mqe->un.read_rev.fw_name,
+                                mqe->un.read_rev.fw_name, 16);
+               lpfc_sli_pcimem_bcopy(mqe->un.read_rev.ulp_fw_name,
+                                mqe->un.read_rev.ulp_fw_name, 16);
+               break;
+       default:
+               break;
+       }
+       return;
+}
+
 /**
  * lpfc_build_hbq_profile2 - Set up the HBQ Selection Profile 2
  * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index f68753ea941fe905a14c6454029c3fff42601540..7b66b71a14fe084bfadfd2304d9c50ef1e9154e0 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -747,7 +747,6 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)
        int status = 0, index;
        int bcnt;
        int non_sequential_xri = 0;
-       int rc = 0;
        LIST_HEAD(sblist);
 
        for (bcnt = 0; bcnt < num_to_alloc; bcnt++) {
@@ -860,7 +859,6 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)
                        if (status) {
                                /* Put this back on the abort scsi list */
                                psb->exch_busy = 1;
-                               rc++;
                        } else {
                                psb->exch_busy = 0;
                                psb->status = IOSTAT_SUCCESS;
@@ -879,7 +877,6 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)
                        if (status) {
                                /* Put this back on the abort scsi list */
                                psb->exch_busy = 1;
-                               rc++;
                        } else {
                                psb->exch_busy = 0;
                                psb->status = IOSTAT_SUCCESS;
@@ -889,7 +886,7 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)
                }
        }
 
-       return bcnt + non_sequential_xri - rc;
+       return bcnt + non_sequential_xri;
 }
 
 /**
@@ -3572,11 +3569,13 @@ lpfc_slave_alloc(struct scsi_device *sdev)
        uint32_t total = 0;
        uint32_t num_to_alloc = 0;
        int num_allocated = 0;
+       uint32_t sdev_cnt;
 
        if (!rport || fc_remote_port_chkready(rport))
                return -ENXIO;
 
        sdev->hostdata = rport->dd_data;
+       sdev_cnt = atomic_inc_return(&phba->sdev_cnt);
 
        /*
         * Populate the cmds_per_lun count scsi_bufs into this host's globally
@@ -3588,6 +3587,10 @@ lpfc_slave_alloc(struct scsi_device *sdev)
        total = phba->total_scsi_bufs;
        num_to_alloc = vport->cfg_lun_queue_depth + 2;
 
+       /* If allocated buffers are enough do nothing */
+       if ((sdev_cnt * (vport->cfg_lun_queue_depth + 2)) < total)
+               return 0;
+
        /* Allow some exchanges to be available always to complete discovery */
        if (total >= phba->cfg_hba_queue_depth - LPFC_DISC_IOCB_BUFF_COUNT ) {
                lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP,
@@ -3669,6 +3672,9 @@ lpfc_slave_configure(struct scsi_device *sdev)
 static void
 lpfc_slave_destroy(struct scsi_device *sdev)
 {
+       struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+       atomic_dec(&phba->sdev_cnt);
        sdev->hostdata = NULL;
        return;
 }

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index f38c05dc5635f2e58de067618e53f7983acaba24..7ddf5268227126901fe4dcec627e3b32d9019be7 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4236,7 +4236,8 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
        if (mqe->un.read_rev.avail_vpd_len < *vpd_size)
                *vpd_size = mqe->un.read_rev.avail_vpd_len;
 
-       lpfc_sli_pcimem_bcopy(dmabuf->virt, vpd, *vpd_size);
+       memcpy(vpd, dmabuf->virt, *vpd_size);
+
        dma_free_coherent(&phba->pcidev->dev, dma_size,
                          dmabuf->virt, dmabuf->phys);
        kfree(dmabuf);
@@ -5305,7 +5306,8 @@ lpfc_sli4_post_sync_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
        if (mcqe_status != MB_CQE_STATUS_SUCCESS) {
                bf_set(lpfc_mqe_status, mb, LPFC_MBX_ERROR_RANGE | mcqe_status);
                rc = MBXERR_ERROR;
-       }
+       } else
+               lpfc_sli4_swap_str(phba, mboxq);
 
        lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
                        "(%d):0356 Mailbox cmd x%x (x%x) Status x%x "
@@ -7790,9 +7792,10 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                 * if LPFC_MBX_WAKE flag is set the mailbox is completed
                 * else do not free the resources.
                 */
-               if (pmboxq->mbox_flag & LPFC_MBX_WAKE)
+               if (pmboxq->mbox_flag & LPFC_MBX_WAKE) {
                        retval = MBX_SUCCESS;
-               else {
+                       lpfc_sli4_swap_str(phba, pmboxq);
+               } else {
                        retval = MBX_TIMEOUT;
                        pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                }
@@ -11967,6 +11970,22 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba)
        return rpi;
 }
 
+/**
+ * lpfc_sli4_free_rpi - Release an rpi for reuse.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to release an rpi to the pool of
+ * available rpis maintained by the driver.
+ **/
+void
+__lpfc_sli4_free_rpi(struct lpfc_hba *phba, int rpi)
+{
+       if (test_and_clear_bit(rpi, phba->sli4_hba.rpi_bmask)) {
+               phba->sli4_hba.rpi_count--;
+               phba->sli4_hba.max_cfg_param.rpi_used--;
+       }
+}
+
 /**
  * lpfc_sli4_free_rpi - Release an rpi for reuse.
  * @phba: pointer to lpfc hba data structure.
@@ -11978,9 +11997,7 @@ void
 lpfc_sli4_free_rpi(struct lpfc_hba *phba, int rpi)
 {
        spin_lock_irq(&phba->hbalock);
-       clear_bit(rpi, phba->sli4_hba.rpi_bmask);
-       phba->sli4_hba.rpi_count--;
-       phba->sli4_hba.max_cfg_param.rpi_used--;
+       __lpfc_sli4_free_rpi(phba, rpi);
        spin_unlock_irq(&phba->hbalock);
 }
 
@@ -12751,6 +12768,9 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport)
                        continue;
 
                if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) {
+                       if (phba->sli_rev == LPFC_SLI_REV4)
+                               __lpfc_sli4_free_rpi(phba,
+                                               mb->u.mb.un.varRegLogin.rpi);
                        mp = (struct lpfc_dmabuf *) (mb->context1);
                        if (mp) {
                                __lpfc_mbuf_free(phba, mp->virt, mp->phys);

diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 7686c1a9a6349a1e36492c85393f042bdd6a512e..c916079fbb35a00a4f98683849f3ddf9ddb09825 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -528,6 +528,7 @@ int lpfc_sli4_post_all_rpi_hdrs(struct lpfc_hba *);
 struct lpfc_rpi_hdr *lpfc_sli4_create_rpi_hdr(struct lpfc_hba *);
 void lpfc_sli4_remove_rpi_hdrs(struct lpfc_hba *);
 int lpfc_sli4_alloc_rpi(struct lpfc_hba *);
+void __lpfc_sli4_free_rpi(struct lpfc_hba *, int);
 void lpfc_sli4_free_rpi(struct lpfc_hba *, int);
 void lpfc_sli4_remove_rpis(struct lpfc_hba *);
 void lpfc_sli4_async_event_proc(struct lpfc_hba *);