From e4fc743b3b25bcf0572c91ccf5a6068f4467ace1 Mon Sep 17 00:00:00 2001 From: Krish Agarwal Date: Tue, 27 Jun 2023 02:25:38 -0700 Subject: [PATCH] drivers: pva: rename exe_id to exe_id1 - rename exe_id in pva_submit_task to exe_id1 - rename exe_id in nvpva_ioctl_task to exe_id1 JIRA PVAAS-12334 Change-Id: Ieba0b6b8ac3e8af8ab3340dadabdfe64df4831ea Signed-off-by: Krish Agarwal Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2874243 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2999152 Reviewed-by: Amruta Sai Anusha Bhamidipati Reviewed-by: Omar Nemri Tested-by: Omar Nemri GVS: Gerrit_Virtual_Submit --- drivers/video/tegra/host/pva/pva_dma.c | 10 +++++----- drivers/video/tegra/host/pva/pva_ioctl.c | 6 +++--- drivers/video/tegra/host/pva/pva_queue.c | 22 +++++++++++----------- drivers/video/tegra/host/pva/pva_queue.h | 2 +- include/uapi/linux/nvpva_ioctl.h | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/video/tegra/host/pva/pva_dma.c b/drivers/video/tegra/host/pva/pva_dma.c index 00ad4028..4b357e8e 100644 --- a/drivers/video/tegra/host/pva/pva_dma.c +++ b/drivers/video/tegra/host/pva/pva_dma.c @@ -329,7 +329,7 @@ patch_dma_desc_address(struct pva_submit_task *task, goto out; } - err = pva_get_sym_offset(&task->client->elf_ctx, task->exe_id, + err = pva_get_sym_offset(&task->client->elf_ctx, task->exe_id1, umd_dma_desc->srcPtr, &addr, &size); if (err) { err = -EINVAL; @@ -371,7 +371,7 @@ patch_dma_desc_address(struct pva_submit_task *task, /* calculate symbol address */ /* TODO: check VPUC handling in ELF segment */ - err = pva_get_sym_offset(&task->client->elf_ctx, task->exe_id, + err = pva_get_sym_offset(&task->client->elf_ctx, task->exe_id1, umd_dma_desc->srcPtr, &addr, &size); if (err) { task_err(task, "ERROR: Invalid offset or address"); @@ -516,7 +516,7 @@ patch_dma_desc_address(struct pva_submit_task *task, goto out; } - err = pva_get_sym_offset(&task->client->elf_ctx, task->exe_id, + err = pva_get_sym_offset(&task->client->elf_ctx, task->exe_id1, umd_dma_desc->dstPtr, &addr, &size); if (err) { err = -EINVAL; @@ -528,7 +528,7 @@ patch_dma_desc_address(struct pva_submit_task *task, if (umd_dma_desc->dst2Ptr != NVPVA_INVALID_SYMBOL_ID) { err = pva_get_sym_offset(&task->client->elf_ctx, - task->exe_id, + task->exe_id1, umd_dma_desc->dst2Ptr, &addr2, &size2); @@ -887,7 +887,7 @@ static int32_t nvpva_task_dma_desc_mapping(struct pva_submit_task *task, /* DMA_DESC_FRDA */ if (umd_dma_desc->dst2Ptr != NVPVA_INVALID_SYMBOL_ID) { err = pva_get_sym_offset(&task->client->elf_ctx, - task->exe_id, + task->exe_id1, umd_dma_desc->dst2Ptr, &addr, &size); diff --git a/drivers/video/tegra/host/pva/pva_ioctl.c b/drivers/video/tegra/host/pva/pva_ioctl.c index bc7e69e3..b252914b 100644 --- a/drivers/video/tegra/host/pva/pva_ioctl.c +++ b/drivers/video/tegra/host/pva/pva_ioctl.c @@ -169,14 +169,14 @@ static int pva_copy_task(struct nvpva_ioctl_task *ioctl_task, * These fields are clear-text in the task descriptor. Just * copy them. */ - task->exe_id = ioctl_task->exe_id; + task->exe_id1 = ioctl_task->exe_id1; task->stream_id = ioctl_task->stream_id; task->prog_id = ioctl_task->prog_id; task->l2_alloc_size = ioctl_task->l2_alloc_size; task->symbol_payload_size = ioctl_task->symbol_payload.size; task->flags = ioctl_task->flags; - if (task->exe_id < NVPVA_NOOP_EXE_ID) - image = get_elf_image(&task->client->elf_ctx, task->exe_id); + if (task->exe_id1 < NVPVA_NOOP_EXE_ID) + image = get_elf_image(&task->client->elf_ctx, task->exe_id1); task->is_system_app = (image != NULL) && image->is_system_app; diff --git a/drivers/video/tegra/host/pva/pva_queue.c b/drivers/video/tegra/host/pva/pva_queue.c index 36cb9e6d..19aca391 100644 --- a/drivers/video/tegra/host/pva/pva_queue.c +++ b/drivers/video/tegra/host/pva/pva_queue.c @@ -86,7 +86,7 @@ static void pva_task_dump(struct pva_submit_task *task) { int i; - nvpva_dbg_info(task->pva, "task=%p, exe_id=%u", task, task->exe_id); + nvpva_dbg_info(task->pva, "task=%p, exe_id1=%u", task, task->exe_id1); for (i = 0; i < task->num_input_task_status; i++) nvpva_dbg_info(task->pva, "input task status %d: pin_id=%u, offset=%u", i, @@ -562,11 +562,11 @@ pva_task_write_vpu_parameter(struct pva_submit_task *task, u32 tail_count = 0U; struct pva_vpu_parameters_s *hw_task_param_list; - if ((task->exe_id == NVPVA_NOOP_EXE_ID) || (task->num_symbols == 0U)) + if ((task->exe_id1 == NVPVA_NOOP_EXE_ID) || (task->num_symbols == 0U)) goto out; tail_index = ((u32)task->num_symbols - 1U); - elf = get_elf_image(&task->client->elf_ctx, task->exe_id); + elf = get_elf_image(&task->client->elf_ctx, task->exe_id1); if (task->num_symbols > elf->num_symbols) { task_err(task, "invalid number of symbols"); err = -EINVAL; @@ -707,11 +707,11 @@ pva_task_write_vpu_parameter(struct pva_submit_task *task, + offsetof(struct pva_hw_task, param_info); err = pva_task_acquire_ref_vpu_app(&task->client->elf_ctx, - task->exe_id); + task->exe_id1); if (err) { task_err(task, "unable to acquire ref count for app with id = %u", - task->exe_id); + task->exe_id1); } task->pinned_app = true; @@ -758,9 +758,9 @@ static int pva_task_write(struct pva_submit_task *task) u32 pre_ptr, post_ptr; int err = 0; - if (!pva_vpu_elf_is_registered(&task->client->elf_ctx, task->exe_id) && - (task->exe_id != NVPVA_NOOP_EXE_ID)) { - task_err(task, "invalid exe id: %d", task->exe_id); + if (!pva_vpu_elf_is_registered(&task->client->elf_ctx, task->exe_id1) && + (task->exe_id1 != NVPVA_NOOP_EXE_ID)) { + task_err(task, "invalid exe id: %d", task->exe_id1); return -EINVAL; } /* Task start from the memory base */ @@ -808,7 +808,7 @@ static int pva_task_write(struct pva_submit_task *task) goto out; hw_task->task.bin_info = - phys_get_bin_info(&task->client->elf_ctx, task->exe_id); + phys_get_bin_info(&task->client->elf_ctx, task->exe_id1); if (task->stdout) { hw_task->stdout_cb_info.buffer = task->stdout->buffer_addr; @@ -929,7 +929,7 @@ void pva_task_free(struct kref *ref) pva_task_unpin_mem(task); if (task->pinned_app) pva_task_release_ref_vpu_app(&task->client->elf_ctx, - task->exe_id); + task->exe_id1); nvhost_module_idle(task->pva->pdev); nvpva_client_context_put(task->client); @@ -1053,7 +1053,7 @@ pva_queue_dump(struct nvpva_queue *queue, struct seq_file *s) seq_printf(s, "Queue %u, Tasks\n", queue->id); mutex_lock(&queue->list_lock); list_for_each_entry(task, &queue->tasklist, node) { - seq_printf(s, " #%u: exe_id = %u\n", i++, task->exe_id); + seq_printf(s, " #%u: exe_id1 = %u\n", i++, task->exe_id1); } mutex_unlock(&queue->list_lock); diff --git a/drivers/video/tegra/host/pva/pva_queue.h b/drivers/video/tegra/host/pva/pva_queue.h index e91f7a24..03ef6d60 100644 --- a/drivers/video/tegra/host/pva/pva_queue.h +++ b/drivers/video/tegra/host/pva/pva_queue.h @@ -107,7 +107,7 @@ struct pva_submit_task { int pool_index; bool pinned_app; - u32 exe_id; + u32 exe_id1; u64 stream_id; u64 prog_id; diff --git a/include/uapi/linux/nvpva_ioctl.h b/include/uapi/linux/nvpva_ioctl.h index 4e846560..79cb097b 100644 --- a/include/uapi/linux/nvpva_ioctl.h +++ b/include/uapi/linux/nvpva_ioctl.h @@ -474,7 +474,7 @@ struct nvpva_hwseq_config { struct nvpva_ioctl_task { uint64_t prog_id; uint64_t stream_id; - uint16_t exe_id; + uint16_t exe_id1; uint32_t flags; uint32_t l2_alloc_size; /* Not applicable for Xavier */ struct nvpva_ioctl_part prefences;