leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

habanalabs: extend QMAN0 job timeout

Browse Source 
This patch fix a bug where the timeout for sending a job on QMAN0 by KMD
wasn't enough in palladium environment.

Signed-off-by: Omer Shpigelman <oshpigelman@habana.ai>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Omer Shpigelman 2019-02-28 10:46:16 +02:00 committed by Greg Kroah-Hartman
parent 887f7d38e4
commit 3dccd18787
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/misc/habanalabs/goya/goya.c
View File

@ -83,6 +83,7 @@
#define GOYA_CPU_TIMEOUT_USEC 10000000 /* 10s */ #define GOYA_CPU_TIMEOUT_USEC 10000000 /* 10s */
#define GOYA_TEST_QUEUE_WAIT_USEC 100000 /* 100ms */ #define GOYA_TEST_QUEUE_WAIT_USEC 100000 /* 100ms */
#define GOYA_PLDM_MMU_TIMEOUT_USEC (MMU_CONFIG_TIMEOUT_USEC * 100) #define GOYA_PLDM_MMU_TIMEOUT_USEC (MMU_CONFIG_TIMEOUT_USEC * 100)
#define GOYA_PLDM_QMAN0_TIMEOUT_USEC (HL_DEVICE_TIMEOUT_USEC * 30)
#define GOYA_QMAN0_FENCE_VAL 0xD169B243 #define GOYA_QMAN0_FENCE_VAL 0xD169B243
@ -3126,9 +3127,14 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)
u32 *fence_ptr; u32 *fence_ptr;
dma_addr_t fence_dma_addr; dma_addr_t fence_dma_addr;
struct hl_cb *cb; struct hl_cb *cb;
u32 tmp; u32 tmp, timeout;
int rc; int rc;
if (hdev->pldm)
timeout = GOYA_PLDM_QMAN0_TIMEOUT_USEC;
else
timeout = HL_DEVICE_TIMEOUT_USEC;
if (!hdev->asic_funcs->is_device_idle(hdev)) { if (!hdev->asic_funcs->is_device_idle(hdev)) {
dev_err_ratelimited(hdev->dev, dev_err_ratelimited(hdev->dev,
"Can't send KMD job on QMAN0 if device is not idle\n"); "Can't send KMD job on QMAN0 if device is not idle\n");
@ -3175,8 +3181,8 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)
goto free_fence_ptr; goto free_fence_ptr;
} }
rc = hl_poll_timeout_memory(hdev, (u64) (uintptr_t) fence_ptr, rc = hl_poll_timeout_memory(hdev, (u64) (uintptr_t) fence_ptr, timeout,
HL_DEVICE_TIMEOUT_USEC, &tmp); &tmp);
hl_hw_queue_inc_ci_kernel(hdev, GOYA_QUEUE_ID_DMA_0); hl_hw_queue_inc_ci_kernel(hdev, GOYA_QUEUE_ID_DMA_0);