7 files changed, 74 insertions, 56 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index c94fc536..7f4a0948 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -2672,7 +2672,7 @@ void gk20a_fifo_isr(struct gk20a *g)
         return;
 }
 
-int gk20a_fifo_nonstall_isr(struct gk20a *g)
+u32 gk20a_fifo_nonstall_isr(struct gk20a *g)
 {
         u32 fifo_intr = gk20a_readl(g, fifo_intr_0_r());
         u32 clear_intr = 0;
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
index 576a4ac8..cf3ac167 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __FIFO_GK20A_H__
-#define __FIFO_GK20A_H__
+#ifndef FIFO_GK20A_H
+#define FIFO_GK20A_H
 
 #include "channel_gk20a.h"
 #include "tsg_gk20a.h"
@@ -103,10 +103,10 @@ struct fifo_runlist_info_gk20a {
 };
 
 enum {
-        ENGINE_GR_GK20A     = 0,
-        ENGINE_GRCE_GK20A    = 1,
-        ENGINE_ASYNC_CE_GK20A  = 2,
-        ENGINE_INVAL_GK20A
+        ENGINE_GR_GK20A        = 0U,
+        ENGINE_GRCE_GK20A      = 1U,
+        ENGINE_ASYNC_CE_GK20A  = 2U,
+        ENGINE_INVAL_GK20A     = 3U,
 };
 
 struct fifo_pbdma_exception_info_gk20a {
@@ -140,7 +140,7 @@ struct fifo_engine_info_gk20a {
 };
 
 enum {
-        PROFILE_IOCTL_ENTRY = 0,
+        PROFILE_IOCTL_ENTRY = 0U,
         PROFILE_ENTRY,
         PROFILE_JOB_TRACKING,
         PROFILE_APPEND,
@@ -231,7 +231,7 @@ int gk20a_init_fifo_support(struct gk20a *g);
 int gk20a_init_fifo_setup_hw(struct gk20a *g);
 
 void gk20a_fifo_isr(struct gk20a *g);
-int gk20a_fifo_nonstall_isr(struct gk20a *g);
+u32 gk20a_fifo_nonstall_isr(struct gk20a *g);
 
 int gk20a_fifo_preempt_channel(struct gk20a *g, u32 chid);
 int gk20a_fifo_preempt_tsg(struct gk20a *g, u32 tsgid);
@@ -454,4 +454,4 @@ void gk20a_fifo_add_sema_cmd(struct gk20a *g,
         struct nvgpu_semaphore *s, u64 sema_va,
         struct priv_cmd_entry *cmd,
         u32 off, bool acquire, bool wfi);
-#endif /*__GR_GK20A_H__*/
+#endif /* FIFO_GK20A_H */
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 076bf89f..84d3f639 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1076,7 +1076,7 @@ struct gpu_ops {
                 u32 (*intr_nonstall)(struct gk20a *g);
                 void (*intr_nonstall_pause)(struct gk20a *g);
                 void (*intr_nonstall_resume)(struct gk20a *g);
-                int (*isr_nonstall)(struct gk20a *g);
+                u32 (*isr_nonstall)(struct gk20a *g);
                 void (*enable)(struct gk20a *g, u32 units);
                 void (*disable)(struct gk20a *g, u32 units);
                 void (*reset)(struct gk20a *g, u32 units);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index c7d028b2..5fd0eb0c 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -6134,18 +6134,18 @@ int gk20a_gr_isr(struct gk20a *g)
         return 0;
 }
 
-int gk20a_gr_nonstall_isr(struct gk20a *g)
+u32 gk20a_gr_nonstall_isr(struct gk20a *g)
 {
-        int ops = 0;
+        u32 ops = 0;
         u32 gr_intr = gk20a_readl(g, gr_intr_nonstall_r());
 
         nvgpu_log(g, gpu_dbg_intr, "pgraph nonstall intr %08x", gr_intr);
 
-        if (gr_intr & gr_intr_nonstall_trap_pending_f()) {
+        if ((gr_intr & gr_intr_nonstall_trap_pending_f()) != 0U) {
                 /* Clear the interrupt */
                 gk20a_writel(g, gr_intr_nonstall_r(),
                         gr_intr_nonstall_trap_pending_f());
-                ops |= (gk20a_nonstall_ops_wakeup_semaphore |
+                ops |= (u32)(gk20a_nonstall_ops_wakeup_semaphore |
                         gk20a_nonstall_ops_post_events);
         }
         return ops;
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index a703ef9d..8c21a714 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -24,6 +24,8 @@
 #ifndef GR_GK20A_H
 #define GR_GK20A_H
 
+#include <nvgpu/types.h>
+
 #include "gr_ctx_gk20a.h"
 #include "mm_gk20a.h"
 
@@ -566,7 +568,7 @@ int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a);
 int gk20a_alloc_obj_ctx(struct channel_gk20a  *c, u32 class_num, u32 flags);
 
 int gk20a_gr_isr(struct gk20a *g);
-int gk20a_gr_nonstall_isr(struct gk20a *g);
+u32 gk20a_gr_nonstall_isr(struct gk20a *g);
 
 /* zcull */
 u32 gr_gk20a_get_ctxsw_zcull_size(struct gk20a *g, struct gr_gk20a *gr);
@@ -603,15 +605,17 @@ u32 gk20a_gr_get_sm_no_lock_down_hww_global_esr_mask(struct gk20a *g);
 #define gr_gk20a_elpg_protected_call(g, func) \
         ({ \
                 int err = 0; \
-                if (g->support_pmu && g->elpg_enabled) {\
+                if ((g->support_pmu) && (g->elpg_enabled)) {\
                         err = nvgpu_pmu_disable_elpg(g); \
-                        if (err) \
+                        if (err != 0) {\
                                 nvgpu_pmu_enable_elpg(g); \
+                        } \
                 } \
-                if (!err) { \
+                if (err == 0) { \
                         err = func; \
-                        if (g->support_pmu && g->elpg_enabled) \
+                        if ((g->support_pmu) && (g->elpg_enabled)) {\
                                 nvgpu_pmu_enable_elpg(g); \
+                        } \
                 } \
                 err; \
         })
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
index 9473ad4f..69d165af 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
@@ -45,7 +45,7 @@ void mc_gk20a_isr_stall(struct gk20a *g)
         for (engine_id_idx = 0; engine_id_idx < g->fifo.num_engines; engine_id_idx++) {
                 active_engine_id = g->fifo.active_engines_list[engine_id_idx];
 
-                if (mc_intr_0 & g->fifo.engine_info[active_engine_id].intr_mask) {
+                if ((mc_intr_0 & g->fifo.engine_info[active_engine_id].intr_mask) != 0U) {
                         engine_enum = g->fifo.engine_info[active_engine_id].engine_enum;
                         /* GR Engine */
                         if (engine_enum == ENGINE_GR_GK20A) {
@@ -55,28 +55,33 @@ void mc_gk20a_isr_stall(struct gk20a *g)
                         /* CE Engine */
                         if (((engine_enum == ENGINE_GRCE_GK20A) ||
                                 (engine_enum == ENGINE_ASYNC_CE_GK20A)) &&
-                                g->ops.ce2.isr_stall){
+                                (g->ops.ce2.isr_stall != NULL)) {
                                         g->ops.ce2.isr_stall(g,
                                         g->fifo.engine_info[active_engine_id].inst_id,
                                         g->fifo.engine_info[active_engine_id].pri_base);
                         }
                 }
         }
-        if (mc_intr_0 & mc_intr_0_pfifo_pending_f())
+        if ((mc_intr_0 & mc_intr_0_pfifo_pending_f()) != 0U) {
                 gk20a_fifo_isr(g);
-        if (mc_intr_0 & mc_intr_0_pmu_pending_f())
+        }
+        if ((mc_intr_0 & mc_intr_0_pmu_pending_f()) != 0U) {
                 gk20a_pmu_isr(g);
-        if (mc_intr_0 & mc_intr_0_priv_ring_pending_f())
+        }
+        if ((mc_intr_0 & mc_intr_0_priv_ring_pending_f()) != 0U) {
                 g->ops.priv_ring.isr(g);
-        if (mc_intr_0 & mc_intr_0_ltc_pending_f())
+        }
+        if ((mc_intr_0 & mc_intr_0_ltc_pending_f()) != 0U) {
                 g->ops.ltc.isr(g);
-        if (mc_intr_0 & mc_intr_0_pbus_pending_f())
+        }
+        if ((mc_intr_0 & mc_intr_0_pbus_pending_f()) != 0U) {
                 g->ops.bus.isr(g);
+        }
 }
 
-int mc_gk20a_isr_nonstall(struct gk20a *g)
+u32 mc_gk20a_isr_nonstall(struct gk20a *g)
 {
-        int ops = 0;
+        u32 ops = 0;
         u32 mc_intr_1;
         u32 engine_id_idx;
         u32 active_engine_id = 0;
@@ -84,8 +89,9 @@ int mc_gk20a_isr_nonstall(struct gk20a *g)
 
         mc_intr_1 = g->ops.mc.intr_nonstall(g);
 
-        if (g->ops.mc.is_intr1_pending(g, NVGPU_UNIT_FIFO, mc_intr_1))
+        if (g->ops.mc.is_intr1_pending(g, NVGPU_UNIT_FIFO, mc_intr_1) != 0U) {
                 ops |= gk20a_fifo_nonstall_isr(g);
+        }
 
         for (engine_id_idx = 0; engine_id_idx < g->fifo.num_engines;
                                                         engine_id_idx++) {
@@ -94,19 +100,20 @@ int mc_gk20a_isr_nonstall(struct gk20a *g)
                 active_engine_id = g->fifo.active_engines_list[engine_id_idx];
                 engine_info = &g->fifo.engine_info[active_engine_id];
 
-                if (mc_intr_1 & engine_info->intr_mask) {
+                if ((mc_intr_1 & engine_info->intr_mask) != 0U) {
                         engine_enum = engine_info->engine_enum;
                         /* GR Engine */
-                        if (engine_enum == ENGINE_GR_GK20A)
+                        if (engine_enum == ENGINE_GR_GK20A) {
                                 ops |= gk20a_gr_nonstall_isr(g);
-
+                        }
                         /* CE Engine */
                         if (((engine_enum == ENGINE_GRCE_GK20A) ||
                              (engine_enum == ENGINE_ASYNC_CE_GK20A)) &&
-                              g->ops.ce2.isr_nonstall)
+                              (g->ops.ce2.isr_nonstall != NULL)) {
                                 ops |= g->ops.ce2.isr_nonstall(g,
                                         engine_info->inst_id,
                                         engine_info->pri_base);
+                        }
                 }
         }
 
@@ -219,7 +226,7 @@ void gk20a_mc_enable(struct gk20a *g, u32 units)
         pmc = gk20a_readl(g, mc_enable_r());
         pmc |= units;
         gk20a_writel(g, mc_enable_r(), pmc);
-        gk20a_readl(g, mc_enable_r());
+        pmc = gk20a_readl(g, mc_enable_r());
         nvgpu_spinlock_release(&g->mc_enable_lock);
 
         nvgpu_udelay(20);
@@ -228,10 +235,11 @@ void gk20a_mc_enable(struct gk20a *g, u32 units)
 void gk20a_mc_reset(struct gk20a *g, u32 units)
 {
         g->ops.mc.disable(g, units);
-        if (units & gk20a_fifo_get_all_ce_engine_reset_mask(g))
+        if ((units & gk20a_fifo_get_all_ce_engine_reset_mask(g)) != 0U) {
                 nvgpu_udelay(500);
-        else
+        } else {
                 nvgpu_udelay(20);
+        }
         g->ops.mc.enable(g, units);
 }
 
@@ -239,19 +247,22 @@ u32 gk20a_mc_boot_0(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev)
 {
         u32 val = __nvgpu_readl(g, mc_boot_0_r());
 
-        if (val == 0xffffffff)
-                return val;
+        if (val != 0xffffffffU) {
 
-        if (arch)
-                *arch = mc_boot_0_architecture_v(val) <<
-                        NVGPU_GPU_ARCHITECTURE_SHIFT;
+                if (arch != NULL) {
+                        *arch = mc_boot_0_architecture_v(val) <<
+                                NVGPU_GPU_ARCHITECTURE_SHIFT;
+                }
 
-        if (impl)
-                *impl = mc_boot_0_implementation_v(val);
+                if (impl != NULL) {
+                        *impl = mc_boot_0_implementation_v(val);
+                }
 
-        if (rev)
-                *rev = (mc_boot_0_major_revision_v(val) << 4) |
-                        mc_boot_0_minor_revision_v(val);
+                if (rev != NULL) {
+                        *rev = (mc_boot_0_major_revision_v(val) << 4) |
+                                mc_boot_0_minor_revision_v(val);
+                }
+        }
 
         return val;
 }
@@ -259,7 +270,7 @@ u32 gk20a_mc_boot_0(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev)
 bool mc_gk20a_is_intr1_pending(struct gk20a *g,
                                enum nvgpu_unit unit, u32 mc_intr_1)
 {
-        u32 mask = 0;
+        u32 mask = 0U;
         bool is_pending;
 
         switch (unit) {
@@ -270,11 +281,11 @@ bool mc_gk20a_is_intr1_pending(struct gk20a *g,
                 break;
         }
 
-        if (mask == 0) {
+        if (mask == 0U) {
                 nvgpu_err(g, "unknown unit %d", unit);
                 is_pending = false;
         } else {
-                is_pending = (mc_intr_1 & mask) ? true : false;
+                is_pending = ((mc_intr_1 & mask) != 0U) ? true : false;
         }
 
         return is_pending;
@@ -284,9 +295,12 @@ void mc_gk20a_handle_intr_nonstall(struct gk20a *g, u32 ops)
 {
         bool semaphore_wakeup, post_events;
 
-        semaphore_wakeup = ops & gk20a_nonstall_ops_wakeup_semaphore;
-        post_events = ops & gk20a_nonstall_ops_post_events;
+        semaphore_wakeup = (((ops & (u32)gk20a_nonstall_ops_wakeup_semaphore) != 0U) ?
+                                        true : false);
+        post_events = (((ops & (u32)gk20a_nonstall_ops_post_events) != 0U) ?
+                                        true: false);
 
-        if (semaphore_wakeup)
+        if (semaphore_wakeup) {
                 g->ops.semaphore_wakeup(g, post_events);
+        }
 }
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.h b/drivers/gpu/nvgpu/gk20a/mc_gk20a.h
index 1ce308b8..1b59d634 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,7 +32,7 @@ u32 mc_gk20a_intr_stall(struct gk20a *g);
 void mc_gk20a_intr_stall_pause(struct gk20a *g);
 void mc_gk20a_intr_stall_resume(struct gk20a *g);
 u32 mc_gk20a_intr_nonstall(struct gk20a *g);
-int mc_gk20a_isr_nonstall(struct gk20a *g);
+u32 mc_gk20a_isr_nonstall(struct gk20a *g);
 void mc_gk20a_intr_nonstall_pause(struct gk20a *g);
 void mc_gk20a_intr_nonstall_resume(struct gk20a *g);
 void gk20a_mc_enable(struct gk20a *g, u32 units);
@@ -42,4 +42,4 @@ u32 gk20a_mc_boot_0(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev);
 bool mc_gk20a_is_intr1_pending(struct gk20a *g,
                 enum nvgpu_unit unit, u32 mc_intr_1);
 void mc_gk20a_handle_intr_nonstall(struct gk20a *g, u32 ops);
-#endif
+#endif /* MC_GK20A_H */