[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>

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index f68753ea941f..7b66b71a14fe 100644
--- 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;
 }