habanalabs: remove redundant member from parser struct
PATCH 1/3 habanalabs: remove redundant member from parser struct
From: Dalit Ben Zoor <[email protected]>
use_virt_addr member was used for telling whether to treat the addresses in the CB as virtual during parsing. We disabled it only when calling the parser from the driver memset device function, and since this call had been removed, it should always be enabled.
--- drivers/misc/habanalabs/command_submission.c | 1 - drivers/misc/habanalabs/goya/goya.c | 2 +- drivers/misc/habanalabs/habanalabs.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/misc/habanalabs/command_submission.c +0 -1
@@ -93,7 +93,6 @@ static int cs_parser(struct hl_fpriv *hpriv, struct hl_cs_job *job) parser.user_cb_size = job->user_cb_size; parser.ext_queue = job->ext_queue; job->patched_cb =NULL ; - parser.use_virt_addr = hdev->mmu_enable; rc = hdev->asic_funcs->cs_parser (hdev, &parser);if (job->ext_queue) {
drivers/misc/habanalabs/goya/goya.c +1 -1
@@ -3903,7 +3903,7 @@ int goya_cs_parser(struct hl_device *hdev, struct hl_cs_parser *parser)if (!parser->ext_queue)return goya_parse_cb_no_ext_queue (hdev, parser); -if ((goya->hw_cap_initialized &HW_CAP_MMU ) && parser->use_virt_addr) +if (goya->hw_cap_initialized &HW_CAP_MMU )return goya_parse_cb_mmu (hdev, parser);else return goya_parse_cb_no_mmu (hdev, parser);
drivers/misc/habanalabs/habanalabs.h +0 -3
@@ -779,8 +779,6 @@ struct hl_cs_job {* @patched_cb_size: the size of the CB after parsing. * @ext_queue: whether the job is for external queue or internal queue. * @job_id: the id of the related job inside the related CS. -* @use_virt_addr: whether to treat the addresses in the CB as virtual during -* parsing. */ struct hl_cs_parser {struct hl_cb *user_cb;
@@ -793,7 +791,6 @@ struct hl_cs_parser {u32 patched_cb_size;u8 ext_queue;u8 job_id; -u8 use_virt_addr; };
Signature · 1 line
2.17.1
PATCH 2/3 habanalabs: remove condition that is always true
From: Dalit Ben Zoor <[email protected]>
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.
--- drivers/misc/habanalabs/goya/goya.c | 48 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 25 deletions(-)
drivers/misc/habanalabs/goya/goya.c +23 -25
@@ -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 ; } }
Signature · 1 line
2.17.1
PATCH 3/3 habanalabs: increase timeout if working with simulator
In reply to Oded GabbayFrom: Dalit Ben Zoor <[email protected]>
Where there is a spike in the CPU consumption, it may cause random failures in the C/I since the KMD timeout for CPU and/or QMAN0 jobs expires and it stops communicating to the simulator. This commit fixes it by increasing timeout on polling functions if working with simulator.
--- drivers/misc/habanalabs/device.c | 8 +++++++- drivers/misc/habanalabs/habanalabs.h | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/device.c +7 -1
@@ -1147,7 +1147,13 @@ int hl_poll_timeout_memory(struct hl_device *hdev, u64 addr,* either by the direct access of the device or by another core */ u32 *paddr = (u32 *) (uintptr_t ) addr; -ktime_t timeout =ktime_add_us (ktime_get (), timeout_us); +ktime_t timeout; + +/* timeout should be longer when working with simulator */ +if (!hdev->pdev) + timeout_us *=10 ; + + timeout =ktime_add_us (ktime_get (), timeout_us);might_sleep ();
drivers/misc/habanalabs/habanalabs.h +6 -1
@@ -1042,7 +1042,12 @@ void hl_wreg(struct hl_device *hdev, u32 reg, u32 val);#define hl_poll_timeout (hdev, addr, val, cond, sleep_us, timeout_us) \ ({ \ - ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \ + ktime_t __timeout; \ +/* timeout should be longer when working with simulator */ \ +if (hdev->pdev) \ + __timeout =ktime_add_us (ktime_get (), timeout_us); \ +else \ + __timeout =ktime_add_us (ktime_get (), (timeout_us *10 )); \might_sleep_if (sleep_us); \for (;;) { \ (val) =RREG32 (addr); \
Signature · 1 line
2.17.1