habanalabs: remove redundant CB size adjustment
PATCH 1/3 habanalabs: remove redundant CB size adjustment
Driver-initiated DMA jobs are synchronized jobs, i.e. the driver polls on fence object until the job is finished. There is no interrupt from the device. Therefore, no need to add space for 2 * msg_prot packets to the end of the CB. Only a single msg_prot is needed (to write the fence).
--- drivers/misc/habanalabs/goya/goya.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/misc/habanalabs/goya/goya.c +1 -8
@@ -2827,12 +2827,6 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)goya_qman0_set_security (hdev, true); -/* -* goya cs parser saves space for 2xpacket_msg_prot at end of CB. For -* synchronized kernel jobs we only need space for 1 packet_msg_prot -*/ - job->job_cb_size -=sizeof (struct packet_msg_prot ); - cb = job->patched_cb; fence_pkt = (struct packet_msg_prot *) (uintptr_t) (cb->kernel_address +
@@ -4452,8 +4446,7 @@ static int goya_memset_device_memory(struct hl_device *hdev, u64 addr, u32 size, job->user_cb_size = cb_size; job->hw_queue_id =GOYA_QUEUE_ID_DMA_0 ; job->patched_cb = job->user_cb; - job->job_cb_size = job->user_cb_size + -sizeof (struct packet_msg_prot ) *2 ; + job->job_cb_size = job->user_cb_size +sizeof (struct packet_msg_prot );hl_debugfs_add_job (hdev, job);
Signature · 1 line
2.17.1
PATCH 2/3 habanalabs: remove redundant memory clear
The driver allocates memory for fence object with GFP_ZERO flag, so there is no need to explicitly write 0 to the allocated object after the allocation.
--- drivers/misc/habanalabs/goya/goya.c | 2 -- 1 file changed, 2 deletions(-)
drivers/misc/habanalabs/goya/goya.c +0 -2
@@ -2823,8 +2823,6 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)return -ENOMEM ; } - *fence_ptr =0 ; -goya_qman0_set_security (hdev, true); cb = job->patched_cb;
Signature · 1 line
2.17.1
PATCH 3/3 habanalabs: change polling functions to macros
In reply to Oded GabbayThis patch changes two polling functions to macros, in order to make their API the same as the standard readl_poll_timeout so we would be able to define the "condition for exit" when calling these macros.
This will simplify the code as it will eliminate the need to check both for timeout and for the (cond) in the calling function.
--- drivers/misc/habanalabs/command_submission.c | 10 +-- drivers/misc/habanalabs/device.c | 89 -------------------- drivers/misc/habanalabs/firmware_if.c | 29 +++---- drivers/misc/habanalabs/goya/goya.c | 25 +++--- drivers/misc/habanalabs/habanalabs.h | 57 ++++++++++++- 5 files changed, 81 insertions(+), 129 deletions(-)
drivers/misc/habanalabs/command_submission.c +4 -6
@@ -682,14 +682,12 @@ int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data)u32 tmp; rc =hl_poll_timeout_memory (hdev, - (u64) (uintptr_t) &ctx->thread_ctx_switch_wait_token, -jiffies_to_usecs (hdev->timeout_jiffies), - &tmp); + &ctx->thread_ctx_switch_wait_token, tmp, (tmp ==1 ), +100 ,jiffies_to_usecs (hdev->timeout_jiffies)); -if (rc || !tmp) { +if (rc == -ETIMEDOUT ) {dev_err (hdev->dev, -"context switch phase didn't finish in time\n" ); - rc = -ETIMEDOUT ; +"context switch phase timeout (%d)\n" , tmp); goto out; } }
drivers/misc/habanalabs/device.c +0 -89
95 lines not on this page · raw message
drivers/misc/habanalabs/firmware_if.c +12 -17
@@ -117,33 +117,28 @@ int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg, goto out; } - rc =hl_poll_timeout_memory (hdev, (u64) (uintptr_t) &pkt->fence, - timeout, &tmp); + rc =hl_poll_timeout_memory (hdev, &pkt->fence, tmp, + (tmp ==ARMCP_PACKET_FENCE_VAL ),1000 , timeout);hl_hw_queue_inc_ci_kernel (hdev, hw_queue_id);if (rc == -ETIMEDOUT ) { -dev_err (hdev->dev,"Timeout while waiting for device CPU\n" ); +dev_err (hdev->dev,"Device CPU packet timeout (0x%x)\n" , tmp); hdev->device_cpu_disabled = true; goto out; } -if (tmp ==ARMCP_PACKET_FENCE_VAL ) { -u32 ctl =le32_to_cpu (pkt->ctl); + tmp =le32_to_cpu (pkt->ctl); - rc = (ctl &ARMCP_PKT_CTL_RC_MASK ) >>ARMCP_PKT_CTL_RC_SHIFT ; -if (rc) { -dev_err (hdev->dev, -"F/W ERROR %d for CPU packet %d\n" , - rc, (ctl &ARMCP_PKT_CTL_OPCODE_MASK ) + rc = (tmp &ARMCP_PKT_CTL_RC_MASK ) >>ARMCP_PKT_CTL_RC_SHIFT ; +if (rc) { +dev_err (hdev->dev,"F/W ERROR %d for CPU packet %d\n" , + rc, + (tmp &ARMCP_PKT_CTL_OPCODE_MASK ) >>ARMCP_PKT_CTL_OPCODE_SHIFT ); - rc = -EINVAL ; - }else if (result) { - *result = (long )le64_to_cpu (pkt->result); - } - }else { -dev_err (hdev->dev,"CPU packet wrong fence value\n" ); - rc = -EINVAL ; + rc = -EIO ; + }else if (result) { + *result = (long )le64_to_cpu (pkt->result); } out:
drivers/misc/habanalabs/goya/goya.c +12 -13
@@ -2844,14 +2844,14 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job) goto free_fence_ptr; } - rc =hl_poll_timeout_memory (hdev, (u64 ) (uintptr_t ) fence_ptr, timeout, - &tmp); + rc =hl_poll_timeout_memory (hdev, fence_ptr, tmp, + (tmp ==GOYA_QMAN0_FENCE_VAL ),1000 , timeout);hl_hw_queue_inc_ci_kernel (hdev,GOYA_QUEUE_ID_DMA_0 ); -if ((rc) || (tmp !=GOYA_QMAN0_FENCE_VAL )) { -dev_err (hdev->dev,"QMAN0 Job hasn't finished in time\n" ); - rc = -ETIMEDOUT ; +if (rc == -ETIMEDOUT ) { +dev_err (hdev->dev,"QMAN0 Job timeout (0x%x)\n" , tmp); + goto free_fence_ptr; } free_fence_ptr:
@@ -2925,20 +2925,19 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id) goto free_pkt; } - rc =hl_poll_timeout_memory (hdev, (u64 ) (uintptr_t ) fence_ptr, -GOYA_TEST_QUEUE_WAIT_USEC , &tmp); + rc =hl_poll_timeout_memory (hdev, fence_ptr, tmp, (tmp == fence_val), +1000 ,GOYA_TEST_QUEUE_WAIT_USEC );hl_hw_queue_inc_ci_kernel (hdev, hw_queue_id); -if ((!rc) && (tmp == fence_val)) { -dev_info (hdev->dev, -"queue test on H/W queue %d succeeded\n" , - hw_queue_id); - }else { +if (rc == -ETIMEDOUT ) {dev_err (hdev->dev,"H/W queue %d test failed (scratch(0x%08llX) == 0x%08X)\n" , hw_queue_id, (unsigned long long ) fence_dma_addr, tmp); - rc = -EINVAL ; + rc = -EIO ; + }else { +dev_info (hdev->dev,"queue test on H/W queue %d succeeded\n" , + hw_queue_id); } free_pkt:
drivers/misc/habanalabs/habanalabs.h +53 -4
69 lines not on this page · raw message
Signature · 1 line
2.17.1