habanalabs: re-factor H/W queues initialization

We want to remove the following restrictions/assumptions in our driver:
1. The H/W queue index is also the completion queue index.
2. The H/W queue index is also the IRQ number of the completion queue.
3. All queues of the same type have consecutive indexes.

Therefore we add the support for H/W queues of the same type with
nonconsecutive indexes and completion queue index and IRQ number different
than the H/W queue index.

Signed-off-by: Omer Shpigelman <oshpigelman@habana.ai>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/misc/habanalabs/device.c b/drivers/misc/habanalabs/device.c
index aef4de36b7aaeff8086d8d5f1f9ad2dde7e2bbfe..c89157dafa33740307ce0acce1df1510a0cc6f15 100644 (file)
--- a/drivers/misc/habanalabs/device.c
+++ b/drivers/misc/habanalabs/device.c
@@ -1062,7 +1062,7 @@ out_err:
  */
 int hl_device_init(struct hl_device *hdev, struct class *hclass)
 {
-       int i, rc, cq_ready_cnt;
+       int i, rc, cq_cnt, cq_ready_cnt;
        char *name;
        bool add_cdev_sysfs_on_err = false;
 
@@ -1120,14 +1120,16 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)
                goto sw_fini;
        }
 
+       cq_cnt = hdev->asic_prop.completion_queues_count;
+
        /*
         * Initialize the completion queues. Must be done before hw_init,
         * because there the addresses of the completion queues are being
         * passed as arguments to request_irq
         */
-       hdev->completion_queue =
-                       kcalloc(hdev->asic_prop.completion_queues_count,
-                               sizeof(*hdev->completion_queue), GFP_KERNEL);
+       hdev->completion_queue = kcalloc(cq_cnt,
+                                               sizeof(*hdev->completion_queue),
+                                               GFP_KERNEL);
 
        if (!hdev->completion_queue) {
                dev_err(hdev->dev, "failed to allocate completion queues\n");
@@ -1135,10 +1137,9 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)
                goto hw_queues_destroy;
        }
 
-       for (i = 0, cq_ready_cnt = 0;
-                       i < hdev->asic_prop.completion_queues_count;
-                       i++, cq_ready_cnt++) {
-               rc = hl_cq_init(hdev, &hdev->completion_queue[i], i);
+       for (i = 0, cq_ready_cnt = 0 ; i < cq_cnt ; i++, cq_ready_cnt++) {
+               rc = hl_cq_init(hdev, &hdev->completion_queue[i],
+                               hdev->asic_funcs->get_queue_id_for_cq(hdev, i));
                if (rc) {
                        dev_err(hdev->dev,
                                "failed to initialize completion queue\n");

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 08f1d40800081cd7700caa080600808ac629006a..f7eb60f5f6f92a2a4b8c8424b82b6eb7aacba266 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -890,6 +890,7 @@ void goya_init_dma_qmans(struct hl_device *hdev)
        q = &hdev->kernel_queues[0];
 
        for (i = 0 ; i < NUMBER_OF_EXT_HW_QUEUES ; i++, q++) {
+               q->cq_id = q->msi_vec = i;
                goya_init_dma_qman(hdev, i, q->bus_address);
                goya_init_dma_ch(hdev, i);
        }
@@ -5273,6 +5274,11 @@ static enum hl_device_hw_state goya_get_hw_state(struct hl_device *hdev)
        return RREG32(mmHW_STATE);
 }
 
+u32 goya_get_queue_id_for_cq(struct hl_device *hdev, u32 cq_idx)
+{
+       return cq_idx;
+}
+
 static const struct hl_asic_funcs goya_funcs = {
        .early_init = goya_early_init,
        .early_fini = goya_early_fini,
@@ -5332,7 +5338,8 @@ static const struct hl_asic_funcs goya_funcs = {
        .rreg = hl_rreg,
        .wreg = hl_wreg,
        .halt_coresight = goya_halt_coresight,
-       .get_clk_rate = goya_get_clk_rate
+       .get_clk_rate = goya_get_clk_rate,
+       .get_queue_id_for_cq = goya_get_queue_id_for_cq
 };
 
 /*

diff --git a/drivers/misc/habanalabs/goya/goyaP.h b/drivers/misc/habanalabs/goya/goyaP.h
index 1555d03e3cb2ae909583bdf2f96da422761b2c64..5db5f6ea1d98f6e6943736abc9cf09fd9d98093b 100644 (file)
--- a/drivers/misc/habanalabs/goya/goyaP.h
+++ b/drivers/misc/habanalabs/goya/goyaP.h
@@ -234,5 +234,6 @@ void goya_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,
 void goya_mmu_remove_device_cpu_mappings(struct hl_device *hdev);
 
 int goya_get_clk_rate(struct hl_device *hdev, u32 *cur_clk, u32 *max_clk);
+u32 goya_get_queue_id_for_cq(struct hl_device *hdev, u32 cq_idx);
 
 #endif /* GOYAP_H_ */

diff --git a/drivers/misc/habanalabs/habanalabs.h b/drivers/misc/habanalabs/habanalabs.h
index ae3db8eb2fb5737940c7552e5e329aa120b7c124..299add419e796eda65dfbd5d2f3d9a37d17f4835 100644 (file)
--- a/drivers/misc/habanalabs/habanalabs.h
+++ b/drivers/misc/habanalabs/habanalabs.h
@@ -365,6 +365,8 @@ struct hl_cs_job;
  * @pi: holds the queue's pi value.
  * @ci: holds the queue's ci value, AS CALCULATED BY THE DRIVER (not real ci).
  * @hw_queue_id: the id of the H/W queue.
+ * @cq_id: the id for the corresponding CQ for this H/W queue.
+ * @msi_vec: the IRQ number of the H/W queue.
  * @int_queue_len: length of internal queue (number of entries).
  * @valid: is the queue valid (we have array of 32 queues, not all of them
  *             exists).
@@ -377,6 +379,8 @@ struct hl_hw_queue {
        u32                     pi;
        u32                     ci;
        u32                     hw_queue_id;
+       u32                     cq_id;
+       u32                     msi_vec;
        u16                     int_queue_len;
        u8                      valid;
 };
@@ -534,6 +538,7 @@ enum hl_pll_frequency {
  * @wreg: Write a register. Needed for simulator support.
  * @halt_coresight: stop the ETF and ETR traces.
  * @get_clk_rate: Retrieve the ASIC current and maximum clock rate in MHz
+ * @get_queue_id_for_cq: Get the H/W queue id related to the given CQ index.
  */
 struct hl_asic_funcs {
        int (*early_init)(struct hl_device *hdev);
@@ -620,6 +625,7 @@ struct hl_asic_funcs {
        void (*wreg)(struct hl_device *hdev, u32 reg, u32 val);
        void (*halt_coresight)(struct hl_device *hdev);
        int (*get_clk_rate)(struct hl_device *hdev, u32 *cur_clk, u32 *max_clk);
+       u32 (*get_queue_id_for_cq)(struct hl_device *hdev, u32 cq_idx);
 };
 
 

diff --git a/drivers/misc/habanalabs/hw_queue.c b/drivers/misc/habanalabs/hw_queue.c
index 91579dde9262ae2925522c6ae11acf35597c7def..8248adcc7ef8a364fb75c2c6b8ca952993256ba6 100644 (file)
--- a/drivers/misc/habanalabs/hw_queue.c
+++ b/drivers/misc/habanalabs/hw_queue.c
@@ -111,7 +111,7 @@ static int ext_queue_sanity_checks(struct hl_device *hdev,
                                bool reserve_cq_entry)
 {
        atomic_t *free_slots =
-                       &hdev->completion_queue[q->hw_queue_id].free_slots_cnt;
+                       &hdev->completion_queue[q->cq_id].free_slots_cnt;
        int free_slots_cnt;
 
        /* Check we have enough space in the queue */
@@ -194,7 +194,7 @@ static int hw_queue_sanity_checks(struct hl_device *hdev, struct hl_hw_queue *q,
                                        int num_of_entries)
 {
        atomic_t *free_slots =
-                       &hdev->completion_queue[q->hw_queue_id].free_slots_cnt;
+                       &hdev->completion_queue[q->cq_id].free_slots_cnt;
 
        /*
         * Check we have enough space in the completion queue.
@@ -308,13 +308,13 @@ static void ext_queue_schedule_job(struct hl_cs_job *job)
         * No need to check if CQ is full because it was already
         * checked in ext_queue_sanity_checks
         */
-       cq = &hdev->completion_queue[q->hw_queue_id];
+       cq = &hdev->completion_queue[q->cq_id];
        cq_addr = cq->bus_address + cq->pi * sizeof(struct hl_cq_entry);
 
        hdev->asic_funcs->add_end_of_cb_packets(hdev, cb->kernel_address, len,
                                                cq_addr,
                                                le32_to_cpu(cq_pkt.data),
-                                               q->hw_queue_id);
+                                               q->msi_vec);
 
        q->shadow_queue[hl_pi_2_offset(q->pi)] = job;
 
@@ -401,7 +401,7 @@ static void hw_queue_schedule_job(struct hl_cs_job *job)
         * No need to check if CQ is full because it was already
         * checked in hw_queue_sanity_checks
         */
-       cq = &hdev->completion_queue[q->hw_queue_id];
+       cq = &hdev->completion_queue[q->cq_id];
        cq->pi = hl_cq_inc_ptr(cq->pi);
 
        ext_and_hw_queue_submit_bd(hdev, q, ctl, len, ptr);