From 671cc9d7855cfdecf764e70ca40cebb8657f733b Mon Sep 17 00:00:00 2001 From: Seeta Rama Raju Date: Wed, 15 May 2019 12:34:15 +0530 Subject: [PATCH] gpu: nvgpu: MISRA 10.x fix -- This will MISRA 10.x violations in semaphore_pool.c, nvgpu_mem.h, nvgpu_mem.c and posix-nvgpu_mem.c. JIRA NVGPU-3177 Change-Id: I1db234a47c7097da28fdfd3236d9b7c5fe385d79 Signed-off-by: Seeta Rama Raju Reviewed-on: https://git-master.nvidia.com/r/2119524 Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Vaibhav Kachore Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/semaphore/semaphore_pool.c | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h | 2 +- drivers/gpu/nvgpu/os/linux/nvgpu_mem.c | 2 +- drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nvgpu/common/semaphore/semaphore_pool.c b/drivers/gpu/nvgpu/common/semaphore/semaphore_pool.c index 7d27ebaee..2ce441f64 100644 --- a/drivers/gpu/nvgpu/common/semaphore/semaphore_pool.c +++ b/drivers/gpu/nvgpu/common/semaphore/semaphore_pool.c @@ -134,7 +134,7 @@ int nvgpu_semaphore_pool_map(struct nvgpu_semaphore_pool *p, */ err = nvgpu_mem_create_from_mem(vm->mm->g, &p->rw_mem, &p->sema_sea->sea_mem, - p->page_idx, 1); + p->page_idx, 1UL); if (err != 0) { goto fail_unmap; } @@ -257,4 +257,4 @@ u64 nvgpu_semaphore_pool_gpu_va(struct nvgpu_semaphore_pool *p, bool global) u64 nvgpu_semaphore_pool_get_page_idx(struct nvgpu_semaphore_pool *p) { return p->page_idx; -} \ No newline at end of file +} diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h index 2b7c2ad99..106deec2b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h @@ -220,7 +220,7 @@ static inline bool nvgpu_mem_is_valid(struct nvgpu_mem *mem) */ int nvgpu_mem_create_from_mem(struct gk20a *g, struct nvgpu_mem *dest, struct nvgpu_mem *src, - u64 start_page, int nr_pages); + u64 start_page, size_t nr_pages); /** * nvgpu_mem_create_from_phys - Create an nvgpu_mem from physical mem. diff --git a/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c index 62657c5f9..adc08df13 100644 --- a/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c @@ -141,7 +141,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, - u64 start_page, int nr_pages) + u64 start_page, size_t nr_pages) { int ret; u64 start = start_page * PAGE_SIZE; diff --git a/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c b/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c index c4861ffd8..b38b0cd4f 100644 --- a/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c +++ b/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c @@ -242,7 +242,7 @@ struct nvgpu_sgt *nvgpu_sgt_os_create_from_mem(struct gk20a *g, int nvgpu_mem_create_from_mem(struct gk20a *g, struct nvgpu_mem *dest, struct nvgpu_mem *src, - u64 start_page, int nr_pages) + u64 start_page, size_t nr_pages) { u64 start = start_page * U64(PAGE_SIZE); u64 size = U64(nr_pages) * U64(PAGE_SIZE);