habanalabs: remove condition that is always true
authorDalit Ben Zoor <dbenzoor@habana.ai>
Wed, 1 May 2019 10:24:58 +0000 (13:24 +0300)
committerOded Gabbay <oded.gabbay@gmail.com>
Wed, 1 May 2019 10:24:58 +0000 (13:24 +0300)
After removing the parsing of the command submission
when doing memset of the device memory, goya_validate_dma_pkt_host
is never called by the kernel, so there is no need to check
context id.

Signed-off-by: Dalit Ben Zoor <dbenzoor@habana.ai>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
drivers/misc/habanalabs/goya/goya.c

index ba6790f9ec6b797ae1869e13c0c01fce49e02286..9bf572a2d29292bdfe012b2c6b21a645be7a295c 100644 (file)
@@ -3213,31 +3213,29 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,
                return -EFAULT;
        }
 
-       if (parser->ctx_id != HL_KERNEL_ASID_ID) {
-               if (sram_addr) {
-                       if (!hl_mem_area_inside_range(device_memory_addr,
-                                       le32_to_cpu(user_dma_pkt->tsize),
-                                       hdev->asic_prop.sram_user_base_address,
-                                       hdev->asic_prop.sram_end_address)) {
-
-                               dev_err(hdev->dev,
-                                       "SRAM address 0x%llx + 0x%x is invalid\n",
-                                       device_memory_addr,
-                                       user_dma_pkt->tsize);
-                               return -EFAULT;
-                       }
-               } else {
-                       if (!hl_mem_area_inside_range(device_memory_addr,
-                                       le32_to_cpu(user_dma_pkt->tsize),
-                                       hdev->asic_prop.dram_user_base_address,
-                                       hdev->asic_prop.dram_end_address)) {
-
-                               dev_err(hdev->dev,
-                                       "DRAM address 0x%llx + 0x%x is invalid\n",
-                                       device_memory_addr,
-                                       user_dma_pkt->tsize);
-                               return -EFAULT;
-                       }
+       if (sram_addr) {
+               if (!hl_mem_area_inside_range(device_memory_addr,
+                               le32_to_cpu(user_dma_pkt->tsize),
+                               hdev->asic_prop.sram_user_base_address,
+                               hdev->asic_prop.sram_end_address)) {
+
+                       dev_err(hdev->dev,
+                               "SRAM address 0x%llx + 0x%x is invalid\n",
+                               device_memory_addr,
+                               user_dma_pkt->tsize);
+                       return -EFAULT;
+               }
+       } else {
+               if (!hl_mem_area_inside_range(device_memory_addr,
+                               le32_to_cpu(user_dma_pkt->tsize),
+                               hdev->asic_prop.dram_user_base_address,
+                               hdev->asic_prop.dram_end_address)) {
+
+                       dev_err(hdev->dev,
+                               "DRAM address 0x%llx + 0x%x is invalid\n",
+                               device_memory_addr,
+                               user_dma_pkt->tsize);
+                       return -EFAULT;
                }
        }