gpu: nvgpu: Changed enum gmmu_pgsz_gk20a into macros

Changed the enum gmmu_pgsz_gk20a into macros and changed all the
instances of it.

The enum gmmu_pgsz_gk20a was being used in for loops, where it was
compared with an integer. This violates MISRA rule 10.4, which only
allows arithmetic operations on operands of the same essential type
category. Changing this enum into macro will fix this violation.

JIRA NVGPU-993

Change-Id: I6f18b08bc7548093d99e8229378415bcdec749e3
Signed-off-by: Amulya <Amurthyreddy@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1795593
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 13 insertions, 16 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
index 886a79da..a83b0dd8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
@@ -38,12 +38,10 @@
 struct vm_gk20a;
 struct nvgpu_mem;
 
-enum gmmu_pgsz_gk20a {
-        gmmu_page_size_small  = 0,
-        gmmu_page_size_big    = 1,
-        gmmu_page_size_kernel = 2,
-        gmmu_nr_page_sizes    = 3,
-};
+#define GMMU_PAGE_SIZE_SMALL    0U
+#define GMMU_PAGE_SIZE_BIG      1U
+#define GMMU_PAGE_SIZE_KERNEL   2U
+#define GMMU_NR_PAGE_SIZES      3U
 
 enum gk20a_mem_rw_flag {
         gk20a_mem_flag_none = 0,        /* RW */
@@ -197,9 +195,8 @@ struct gk20a_mmu_level {
         /*
          * Get pde page size
          */
-        enum gmmu_pgsz_gk20a (*get_pgsz)(struct gk20a *g,
-                                         const struct gk20a_mmu_level *l,
-                                         struct nvgpu_gmmu_pd *pd, u32 pd_idx);
+        u32 (*get_pgsz)(struct gk20a *g, const struct gk20a_mmu_level *l,
+                                struct nvgpu_gmmu_pd *pd, u32 pd_idx);
 };
 
 static inline const char *nvgpu_gmmu_perm_str(enum gk20a_mem_rw_flag p)
diff --git a/drivers/gpu/nvgpu/include/nvgpu/mm.h b/drivers/gpu/nvgpu/include/nvgpu/mm.h
index 3a1b2a6c..e627296d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/mm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/mm.h
@@ -204,9 +204,9 @@ static inline u64 __nv_gmmu_va_small_page_limit(void)
         return ((u64)SZ_1G * 56);
 }
 
-enum gmmu_pgsz_gk20a __get_pte_size_fixed_map(struct vm_gk20a *vm,
+u32 __get_pte_size_fixed_map(struct vm_gk20a *vm,
                                               u64 base, u64 size);
-enum gmmu_pgsz_gk20a __get_pte_size(struct vm_gk20a *vm, u64 base, u64 size);
+u32 __get_pte_size(struct vm_gk20a *vm, u64 base, u64 size);
 
 void nvgpu_init_mm_ce_context(struct gk20a *g);
 int nvgpu_init_mm_support(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h
index 30a2d71d..ad8c7cca 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h
@@ -172,7 +172,7 @@ struct vm_gk20a {
          * not. vma[] allows the code to be agnostic to this by always using
          * address spaces through this pointer array.
          */
-        struct nvgpu_allocator *vma[gmmu_nr_page_sizes];
+        struct nvgpu_allocator *vma[GMMU_NR_PAGE_SIZES];
         struct nvgpu_allocator kernel;
         struct nvgpu_allocator user;
         struct nvgpu_allocator user_lp;
@@ -184,7 +184,7 @@ struct vm_gk20a {
 #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
         u64 handle;
 #endif
-        u32 gmmu_page_sizes[gmmu_nr_page_sizes];
+        u32 gmmu_page_sizes[GMMU_NR_PAGE_SIZES];
 
         /* if non-NULL, kref_put will use this batch when
            unmapping. Must hold vm->update_gmmu_lock. */
@@ -322,8 +322,8 @@ struct vm_gk20a *nvgpu_vm_init(struct gk20a *g,
  * will be used by the vgpu code.
  */
 u64 __nvgpu_vm_alloc_va(struct vm_gk20a *vm, u64 size,
-                        enum gmmu_pgsz_gk20a pgsz_idx);
+                                u32 pgsz_idx);
 int __nvgpu_vm_free_va(struct vm_gk20a *vm, u64 addr,
-                       enum gmmu_pgsz_gk20a pgsz_idx);
+                                u32 pgsz_idx);
 
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm_area.h b/drivers/gpu/nvgpu/include/nvgpu/vm_area.h
index 92852633..a055ada3 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm_area.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm_area.h
@@ -69,7 +69,7 @@ int nvgpu_vm_area_free(struct vm_gk20a *vm, u64 addr);
 
 struct nvgpu_vm_area *nvgpu_vm_area_find(struct vm_gk20a *vm, u64 addr);
 int nvgpu_vm_area_validate_buffer(struct vm_gk20a *vm,
-                                  u64 map_offset, u64 map_size, int pgsz_idx,
+                                  u64 map_offset, u64 map_size, u32 pgsz_idx,
                                   struct nvgpu_vm_area **pvm_area);
 
 #endif