1 files changed, 66 insertions, 16 deletions

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 0d822297aa80..554349029628 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -599,15 +599,7 @@ static struct beiscsi_hba *beiscsi_hba_alloc(struct pci_dev *pcidev)
         pci_set_drvdata(pcidev, phba);
         phba->interface_handle = 0xFFFFFFFF;
 
-        if (iscsi_host_add(shost, &phba->pcidev->dev))
-                goto free_devices;
-
         return phba;
-
-free_devices:
-        pci_dev_put(phba->pcidev);
-        iscsi_host_free(phba->shost);
-        return NULL;
 }
 
 static void beiscsi_unmap_pci_function(struct beiscsi_hba *phba)
@@ -2279,6 +2271,7 @@ static int be_iopoll(struct blk_iopoll *iop, int budget)
 
         pbe_eq = container_of(iop, struct be_eq_obj, iopoll);
         ret = beiscsi_process_cq(pbe_eq);
+        pbe_eq->cq_count += ret;
         if (ret < budget) {
                 phba = pbe_eq->phba;
                 blk_iopoll_complete(iop);
@@ -3692,7 +3685,7 @@ static void hwi_cleanup(struct beiscsi_hba *phba)
         struct hwi_controller *phwi_ctrlr;
         struct hwi_context_memory *phwi_context;
         struct hwi_async_pdu_context *pasync_ctx;
-        int i, eq_num, ulp_num;
+        int i, eq_for_mcc, ulp_num;
 
         phwi_ctrlr = phba->phwi_ctrlr;
         phwi_context = phwi_ctrlr->phwi_ctxt;
@@ -3729,16 +3722,17 @@ static void hwi_cleanup(struct beiscsi_hba *phba)
                 if (q->created)
                         beiscsi_cmd_q_destroy(ctrl, q, QTYPE_CQ);
         }
+
+        be_mcc_queues_destroy(phba);
         if (phba->msix_enabled)
-                eq_num = 1;
+                eq_for_mcc = 1;
         else
-                eq_num = 0;
-        for (i = 0; i < (phba->num_cpus + eq_num); i++) {
+                eq_for_mcc = 0;
+        for (i = 0; i < (phba->num_cpus + eq_for_mcc); i++) {
                 q = &phwi_context->be_eq[i].q;
                 if (q->created)
                         beiscsi_cmd_q_destroy(ctrl, q, QTYPE_EQ);
         }
-        be_mcc_queues_destroy(phba);
         be_cmd_fw_uninit(ctrl);
 }
 
@@ -3833,9 +3827,9 @@ static int hwi_init_port(struct beiscsi_hba *phba)
 
         phwi_ctrlr = phba->phwi_ctrlr;
         phwi_context = phwi_ctrlr->phwi_ctxt;
-        phwi_context->max_eqd = 0;
+        phwi_context->max_eqd = 128;
         phwi_context->min_eqd = 0;
-        phwi_context->cur_eqd = 64;
+        phwi_context->cur_eqd = 0;
         be_cmd_fw_initialize(&phba->ctrl);
 
         status = beiscsi_create_eqs(phba, phwi_context);
@@ -5290,6 +5284,57 @@ static void beiscsi_msix_enable(struct beiscsi_hba *phba)
         return;
 }
 
+static void be_eqd_update(struct beiscsi_hba *phba)
+{
+        struct be_set_eqd set_eqd[MAX_CPUS];
+        struct be_aic_obj *aic;
+        struct be_eq_obj *pbe_eq;
+        struct hwi_controller *phwi_ctrlr;
+        struct hwi_context_memory *phwi_context;
+        int eqd, i, num = 0;
+        ulong now;
+        u32 pps, delta;
+        unsigned int tag;
+
+        phwi_ctrlr = phba->phwi_ctrlr;
+        phwi_context = phwi_ctrlr->phwi_ctxt;
+
+        for (i = 0; i <= phba->num_cpus; i++) {
+                aic = &phba->aic_obj[i];
+                pbe_eq = &phwi_context->be_eq[i];
+                now = jiffies;
+                if (!aic->jiffs || time_before(now, aic->jiffs) ||
+                    pbe_eq->cq_count < aic->eq_prev) {
+                        aic->jiffs = now;
+                        aic->eq_prev = pbe_eq->cq_count;
+                        continue;
+                }
+                delta = jiffies_to_msecs(now - aic->jiffs);
+                pps = (((u32)(pbe_eq->cq_count - aic->eq_prev) * 1000) / delta);
+                eqd = (pps / 1500) << 2;
+
+                if (eqd < 8)
+                        eqd = 0;
+                eqd = min_t(u32, eqd, phwi_context->max_eqd);
+                eqd = max_t(u32, eqd, phwi_context->min_eqd);
+
+                aic->jiffs = now;
+                aic->eq_prev = pbe_eq->cq_count;
+
+                if (eqd != aic->prev_eqd) {
+                        set_eqd[num].delay_multiplier = (eqd * 65)/100;
+                        set_eqd[num].eq_id = pbe_eq->q.id;
+                        aic->prev_eqd = eqd;
+                        num++;
+                }
+        }
+        if (num) {
+                tag = be_cmd_modify_eq_delay(phba, set_eqd, num);
+                if (tag)
+                        beiscsi_mccq_compl(phba, tag, NULL, NULL);
+        }
+}
+
 /*
  * beiscsi_hw_health_check()- Check adapter health
  * @work: work item to check HW health
@@ -5303,6 +5348,8 @@ beiscsi_hw_health_check(struct work_struct *work)
                 container_of(work, struct beiscsi_hba,
                              beiscsi_hw_check_task.work);
 
+        be_eqd_update(phba);
+
         beiscsi_ue_detect(phba);
 
         schedule_delayed_work(&phba->beiscsi_hw_check_task,
@@ -5579,7 +5626,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
                 phba->ctrl.mcc_numtag[i + 1] = 0;
                 phba->ctrl.mcc_tag_available++;
                 memset(&phba->ctrl.ptag_state[i].tag_mem_state, 0,
-                       sizeof(struct beiscsi_mcc_tag_state));
+                       sizeof(struct be_dma_mem));
         }
 
         phba->ctrl.mcc_alloc_index = phba->ctrl.mcc_free_index = 0;
@@ -5621,6 +5668,9 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
         }
         hwi_enable_intr(phba);
 
+        if (iscsi_host_add(phba->shost, &phba->pcidev->dev))
+                goto free_blkenbld;
+
         if (beiscsi_setup_boot_info(phba))
                 /*
                  * log error but continue, because we may not be using