From 2dd9bb03dd56ca86b0e61b89fab38d38a58ecddf Mon Sep 17 00:00:00 2001 From: Sai Nikhil Date: Mon, 27 Aug 2018 12:42:02 +0530 Subject: gpu: nvgpu: changing page_idx from int to u64 page_idx is an element of the struct nvgpu_semaphore_pool, defined in include/nvgpu/semaphore.h file. page_idx can not be negative so changing it from int to u64 and its related changes in various files. This also fixes MISRA 10.4 violations in these files. Jira NVGPU-992 Change-Id: Ie9696dab7da9e139bc31563783b422c84144f18b Signed-off-by: Sai Nikhil Reviewed-on: https://git-master.nvidia.com/r/1801632 Reviewed-by: Adeel Raza GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/nvgpu_mem.c | 2 +- drivers/gpu/nvgpu/os/linux/sync_sema_android.c | 2 +- drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/os') diff --git a/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c index 4fc95db9..c57e3fdf 100644 --- a/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c @@ -135,7 +135,7 @@ u64 nvgpu_mem_get_phys_addr(struct gk20a *g, struct nvgpu_mem *mem) */ int nvgpu_mem_create_from_mem(struct gk20a *g, struct nvgpu_mem *dest, struct nvgpu_mem *src, - int start_page, int nr_pages) + u64 start_page, int nr_pages) { int ret; u64 start = start_page * PAGE_SIZE; diff --git a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c index 50465d0c..59e3b7a6 100644 --- a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c +++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c @@ -284,7 +284,7 @@ static void gk20a_sync_pt_value_str_for_sema(struct gk20a_sync_pt *pt, { struct nvgpu_semaphore *s = pt->sema; - snprintf(str, size, "S: pool=%d [v=%u,r_v=%u]", + snprintf(str, size, "S: pool=%llu [v=%u,r_v=%u]", s->location.pool->page_idx, nvgpu_semaphore_get_value(s), nvgpu_semaphore_read(s)); diff --git a/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c b/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c index fa92a7c6..26770e47 100644 --- a/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c +++ b/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c @@ -114,7 +114,7 @@ struct nvgpu_sgt *nvgpu_sgt_create_from_mem(struct gk20a *g, int nvgpu_mem_create_from_mem(struct gk20a *g, struct nvgpu_mem *dest, struct nvgpu_mem *src, - int start_page, int nr_pages) + u64 start_page, int nr_pages) { u64 start = start_page * PAGE_SIZE; u64 size = nr_pages * PAGE_SIZE; -- cgit v1.2.2