4 files changed, 28 insertions, 28 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 54833028..a80116b7 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -174,7 +174,7 @@ struct gr_zcull_info {
 
 #define GK20A_ZBC_COLOR_VALUE_SIZE      4  /* RGBA */
 
-#define GK20A_STARTOF_ZBC_TABLE         1   /* index zero reserved to indicate "not ZBCd" */
+#define GK20A_STARTOF_ZBC_TABLE         1U   /* index zero reserved to indicate "not ZBCd" */
 #define GK20A_SIZEOF_ZBC_TABLE          16  /* match ltcs_ltss_dstg_zbc_index_address width (4) */
 #define GK20A_ZBC_TABLE_SIZE            (16 - 1)
 
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 6ec9aec5..0d9fd560 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -43,7 +43,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         /* max memory size (MB) to cover */
         u32 max_size = gr->max_comptag_mem;
         /* one tag line covers 128KB */
-        u32 max_comptag_lines = max_size << 3;
+        u32 max_comptag_lines = max_size << 3U;
 
         u32 hw_max_comptag_lines =
                 ltc_ltcs_ltss_cbc_ctrl3_clear_upper_bound_init_v();
@@ -53,7 +53,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         u32 comptags_per_cacheline =
                 ltc_ltcs_ltss_cbc_param_comptags_per_cache_line_v(cbc_param);
         u32 cacheline_size =
-                512 << ltc_ltcs_ltss_cbc_param_cache_line_size_v(cbc_param);
+                512U << ltc_ltcs_ltss_cbc_param_cache_line_size_v(cbc_param);
         u32 slices_per_ltc =
                 ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(cbc_param);
 
@@ -63,7 +63,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
 
         gk20a_dbg_fn("");
 
-        if (max_comptag_lines == 0)
+        if (max_comptag_lines == 0U)
                 return 0;
 
         if (max_comptag_lines > hw_max_comptag_lines)
@@ -113,12 +113,12 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
         struct gr_gk20a *gr = &g->gr;
         struct nvgpu_timeout timeout;
         int err = 0;
-        u32 ltc, slice, ctrl1, val, hw_op = 0;
+        u32 ltc, slice, ctrl1, val, hw_op = 0U;
         u32 slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(
                                 gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r()));
         u32 ltc_stride = nvgpu_get_litter_value(g, GPU_LIT_LTC_STRIDE);
         u32 lts_stride = nvgpu_get_litter_value(g, GPU_LIT_LTS_STRIDE);
-        const u32 max_lines = 16384;
+        const u32 max_lines = 16384U;
 
         gk20a_dbg_fn("");
 
@@ -237,7 +237,7 @@ void gm20b_ltc_isr(struct gk20a *g)
         mc_intr = gk20a_readl(g, mc_intr_ltc_r());
         nvgpu_err(g, "mc_ltc_intr: %08x", mc_intr);
         for (ltc = 0; ltc < g->ltc_count; ltc++) {
-                if ((mc_intr & 1 << ltc) == 0)
+                if ((mc_intr & 1U << ltc) == 0)
                         continue;
                 for (slice = 0; slice < g->gr.slices_per_ltc; slice++) {
                         ltc_intr = gk20a_readl(g, ltc_ltc0_lts0_intr_r() +
@@ -256,7 +256,7 @@ void gm20b_ltc_isr(struct gk20a *g)
 u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base)
 {
         u32 val = gk20a_readl(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r());
-        if (val == 2) {
+        if (val == 2U) {
                 return base * 2;
         } else if (val != 1) {
                 nvgpu_err(g, "Invalid number of active ltcs: %08x", val);
@@ -359,24 +359,24 @@ int gm20b_determine_L2_size_bytes(struct gk20a *g)
 
         active_sets_value = ltc_ltc0_lts0_tstg_cfg1_active_sets_v(tmp);
         if (active_sets_value == ltc_ltc0_lts0_tstg_cfg1_active_sets_all_v()) {
-                sets = 64;
+                sets = 64U;
         } else if (active_sets_value ==
                  ltc_ltc0_lts0_tstg_cfg1_active_sets_half_v()) {
-                sets = 32;
+                sets = 32U;
         } else if (active_sets_value ==
                  ltc_ltc0_lts0_tstg_cfg1_active_sets_quarter_v()) {
-                sets = 16;
+                sets = 16U;
         } else {
                 nvgpu_err(g, "Unknown constant %u for active sets",
                        (unsigned)active_sets_value);
-                sets = 0;
+                sets = 0U;
         }
 
         active_ltcs = g->gr.num_fbps;
 
         /* chip-specific values */
-        lts_per_ltc = 2;
-        bytes_per_line = 128;
+        lts_per_ltc = 2U;
+        bytes_per_line = 128U;
         cache_size = active_ltcs * lts_per_ltc * ways * sets * bytes_per_line;
 
         return cache_size;
@@ -424,7 +424,7 @@ void gm20b_ltc_set_zbc_depth_entry(struct gk20a *g,
 void gm20b_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
 {
         u32 max_size = gr->max_comptag_mem;
-        u32 max_comptag_lines = max_size << 3;
+        u32 max_comptag_lines = max_size << 3U;
 
         u32 compbit_base_post_divide;
         u64 compbit_base_post_multiply64;
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index d52a10ad..d6634b14 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -61,7 +61,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         /* max memory size (MB) to cover */
         u32 max_size = gr->max_comptag_mem;
         /* one tag line covers 64KB */
-        u32 max_comptag_lines = max_size << 4;
+        u32 max_comptag_lines = max_size << 4U;
 
         u32 hw_max_comptag_lines =
                 ltc_ltcs_ltss_cbc_ctrl3_clear_upper_bound_init_v();
@@ -71,7 +71,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         u32 comptags_per_cacheline =
                 ltc_ltcs_ltss_cbc_param_comptags_per_cache_line_v(cbc_param);
         u32 cacheline_size =
-                512 << ltc_ltcs_ltss_cbc_param_cache_line_size_v(cbc_param);
+                512U << ltc_ltcs_ltss_cbc_param_cache_line_size_v(cbc_param);
         u32 slices_per_ltc =
                 ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(cbc_param);
         u32 cbc_param2 =
@@ -85,7 +85,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
 
         gk20a_dbg_fn("");
 
-        if (max_comptag_lines == 0)
+        if (max_comptag_lines == 0U)
                 return 0;
 
         /* Already initialized */
@@ -138,18 +138,18 @@ int gp10b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
         struct gr_gk20a *gr = &g->gr;
         struct nvgpu_timeout timeout;
         int err = 0;
-        u32 ltc, slice, ctrl1, val, hw_op = 0;
+        u32 ltc, slice, ctrl1, val, hw_op = 0U;
         u32 slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(
                                 gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r()));
         u32 ltc_stride = nvgpu_get_litter_value(g, GPU_LIT_LTC_STRIDE);
         u32 lts_stride = nvgpu_get_litter_value(g, GPU_LIT_LTS_STRIDE);
-        const u32 max_lines = 16384;
+        const u32 max_lines = 16384U;
 
         nvgpu_log_fn(g, " ");
 
         trace_gk20a_ltc_cbc_ctrl_start(g->name, op, min, max);
 
-        if (gr->compbit_store.mem.size == 0)
+        if (gr->compbit_store.mem.size == 0U)
                 return 0;
 
         while (1) {
@@ -235,7 +235,7 @@ void gp10b_ltc_isr(struct gk20a *g)
         mc_intr = gk20a_readl(g, mc_intr_ltc_r());
         nvgpu_err(g, "mc_ltc_intr: %08x", mc_intr);
         for (ltc = 0; ltc < g->ltc_count; ltc++) {
-                if ((mc_intr & 1 << ltc) == 0)
+                if ((mc_intr & 1U << ltc) == 0)
                         continue;
                 for (slice = 0; slice < g->gr.slices_per_ltc; slice++) {
                         u32 offset = ltc_stride * ltc + lts_stride * slice;
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 9bfefa9e..9f6d176e 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -96,9 +96,9 @@ void gv11b_ltc_isr(struct gk20a *g)
 
         mc_intr = gk20a_readl(g, mc_intr_ltc_r());
         for (ltc = 0; ltc < g->ltc_count; ltc++) {
-                if ((mc_intr & 1 << ltc) == 0)
+                if ((mc_intr & 1U << ltc) == 0)
                         continue;
-                ltc_corrected = ltc_uncorrected = 0;
+                ltc_corrected = ltc_uncorrected = 0U;
 
                 for (slice = 0; slice < g->gr.slices_per_ltc; slice++) {
                         u32 offset = ltc_stride * ltc + lts_stride * slice;
@@ -133,10 +133,10 @@ void gv11b_ltc_isr(struct gk20a *g)
                                         ltc_ltc0_lts0_l2_cache_ecc_status_uncorrected_err_total_counter_overflow_m();
 
                                 /* clear the interrupt */
-                                if ((corrected_delta > 0) || corrected_overflow) {
+                                if ((corrected_delta > 0U) || corrected_overflow) {
                                         gk20a_writel(g, ltc_ltc0_lts0_l2_cache_ecc_corrected_err_count_r() + offset, 0);
                                 }
-                                if ((uncorrected_delta > 0) || uncorrected_overflow) {
+                                if ((uncorrected_delta > 0U) || uncorrected_overflow) {
                                         gk20a_writel(g,
                                                 ltc_ltc0_lts0_l2_cache_ecc_uncorrected_err_count_r() + offset, 0);
                                 }
@@ -146,9 +146,9 @@ void gv11b_ltc_isr(struct gk20a *g)
 
                                 /* update counters per slice */
                                 if (corrected_overflow)
-                                        corrected_delta += (0x1UL << ltc_ltc0_lts0_l2_cache_ecc_corrected_err_count_total_s());
+                                        corrected_delta += (0x1U << ltc_ltc0_lts0_l2_cache_ecc_corrected_err_count_total_s());
                                 if (uncorrected_overflow)
-                                        uncorrected_delta += (0x1UL << ltc_ltc0_lts0_l2_cache_ecc_uncorrected_err_count_total_s());
+                                        uncorrected_delta += (0x1U << ltc_ltc0_lts0_l2_cache_ecc_uncorrected_err_count_total_s());
 
                                 ltc_corrected += corrected_delta;
                                 ltc_uncorrected += uncorrected_delta;