]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
habanalabs: remove redundant CPU checks
authorOmer Shpigelman <oshpigelman@habana.ai>
Sun, 5 May 2019 08:21:16 +0000 (11:21 +0300)
committerOded Gabbay <oded.gabbay@gmail.com>
Sun, 5 May 2019 08:21:16 +0000 (11:21 +0300)
This patch removes redundant CPU availability checks in:
goya_test_queues() - will be done in goya_test_cpu_queue().
goya_ring_doorbell() - was done earlier in goya_send_cpu_message().

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>
drivers/misc/habanalabs/goya/goya.c

index 02d116b01a1a25a84696fba053fc5095533f4731..aaa88d442ffed73184dff25fa15048a6fd07a4a7 100644 (file)
@@ -2629,7 +2629,6 @@ static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,
 void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi)
 {
        u32 db_reg_offset, db_value;
-       bool invalid_queue = false;
 
        switch (hw_queue_id) {
        case GOYA_QUEUE_ID_DMA_0:
@@ -2653,10 +2652,7 @@ void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi)
                break;
 
        case GOYA_QUEUE_ID_CPU_PQ:
-               if (hdev->cpu_queues_enable)
-                       db_reg_offset = mmCPU_IF_PF_PQ_PI;
-               else
-                       invalid_queue = true;
+               db_reg_offset = mmCPU_IF_PF_PQ_PI;
                break;
 
        case GOYA_QUEUE_ID_MME:
@@ -2696,12 +2692,8 @@ void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi)
                break;
 
        default:
-               invalid_queue = true;
-       }
-
-       if (invalid_queue) {
                /* Should never get here */
-               dev_err(hdev->dev, "h/w queue %d is invalid. Can't set pi\n",
+               dev_err(hdev->dev, "H/W queue %d is invalid. Can't set pi\n",
                        hw_queue_id);
                return;
        }
@@ -2990,11 +2982,9 @@ int goya_test_queues(struct hl_device *hdev)
                        ret_val = -EINVAL;
        }
 
-       if (hdev->cpu_queues_enable) {
-               rc = goya_test_cpu_queue(hdev);
-               if (rc)
-                       ret_val = -EINVAL;
-       }
+       rc = goya_test_cpu_queue(hdev);
+       if (rc)
+               ret_val = -EINVAL;
 
        return ret_val;
 }