From 06f54be8c979720515d22e24cb4a20868af45f59 Mon Sep 17 00:00:00 2001 From: Amulya Date: Tue, 14 Aug 2018 10:30:46 +0530 Subject: gpu: nvgpu: Fix MISRA 10.1-Using boolean as a bit Fix violations where a boolean is used as an operand in bit-shift operations and is interpreted as a numerical value. JIRA NVGPU-649 Change-Id: I4494c3b69d0e53319331b47d0a4de0b3de279f4f Signed-off-by: Amulya Reviewed-on: https://git-master.nvidia.com/r/1799322 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Tested-by: Amulya Murthyreddy Reviewed-by: Amulya Murthyreddy Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 85 ++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 36 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index bc659a7b..8b3253a1 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "gk20a/gk20a.h" #include "gk20a/gr_gk20a.h" @@ -235,9 +236,10 @@ static int gr_gv11b_handle_l1_tag_exception(struct gk20a *g, u32 gpc, u32 tpc, l1_tag_ecc_corrected_err_status, is_l1_tag_ecc_corrected_total_err_overflow); /* HW uses 16-bits counter */ - l1_tag_corrected_err_count_delta += - (is_l1_tag_ecc_corrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_l1_tag_ecc_corrected_err_count_total_s()); + if (is_l1_tag_ecc_corrected_total_err_overflow) { + l1_tag_corrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_l1_tag_ecc_corrected_err_count_total_s()); + } g->ecc.gr.sm_l1_tag_ecc_corrected_err_count[gpc][tpc].counter += l1_tag_corrected_err_count_delta; gk20a_writel(g, @@ -250,9 +252,10 @@ static int gr_gv11b_handle_l1_tag_exception(struct gk20a *g, u32 gpc, u32 tpc, l1_tag_ecc_uncorrected_err_status, is_l1_tag_ecc_uncorrected_total_err_overflow); /* HW uses 16-bits counter */ - l1_tag_uncorrected_err_count_delta += - (is_l1_tag_ecc_uncorrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_l1_tag_ecc_uncorrected_err_count_total_s()); + if (is_l1_tag_ecc_uncorrected_total_err_overflow) { + l1_tag_uncorrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_l1_tag_ecc_uncorrected_err_count_total_s()); + } g->ecc.gr.sm_l1_tag_ecc_uncorrected_err_count[gpc][tpc].counter += l1_tag_uncorrected_err_count_delta; gk20a_writel(g, @@ -328,9 +331,10 @@ static int gr_gv11b_handle_lrf_exception(struct gk20a *g, u32 gpc, u32 tpc, lrf_ecc_corrected_err_status, is_lrf_ecc_corrected_total_err_overflow); /* HW uses 16-bits counter */ - lrf_corrected_err_count_delta += - (is_lrf_ecc_corrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_lrf_ecc_corrected_err_count_total_s()); + if (is_lrf_ecc_corrected_total_err_overflow) { + lrf_corrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_lrf_ecc_corrected_err_count_total_s()); + } g->ecc.gr.sm_lrf_ecc_single_err_count[gpc][tpc].counter += lrf_corrected_err_count_delta; gk20a_writel(g, @@ -343,9 +347,10 @@ static int gr_gv11b_handle_lrf_exception(struct gk20a *g, u32 gpc, u32 tpc, lrf_ecc_uncorrected_err_status, is_lrf_ecc_uncorrected_total_err_overflow); /* HW uses 16-bits counter */ - lrf_uncorrected_err_count_delta += - (is_lrf_ecc_uncorrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_lrf_ecc_uncorrected_err_count_total_s()); + if (is_lrf_ecc_uncorrected_total_err_overflow) { + lrf_uncorrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_lrf_ecc_uncorrected_err_count_total_s()); + } g->ecc.gr.sm_lrf_ecc_double_err_count[gpc][tpc].counter += lrf_uncorrected_err_count_delta; gk20a_writel(g, @@ -488,9 +493,10 @@ static int gr_gv11b_handle_cbu_exception(struct gk20a *g, u32 gpc, u32 tpc, cbu_ecc_corrected_err_status, is_cbu_ecc_corrected_total_err_overflow); /* HW uses 16-bits counter */ - cbu_corrected_err_count_delta += - (is_cbu_ecc_corrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_cbu_ecc_corrected_err_count_total_s()); + if (is_cbu_ecc_corrected_total_err_overflow) { + cbu_corrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_cbu_ecc_corrected_err_count_total_s()); + } g->ecc.gr.sm_cbu_ecc_corrected_err_count[gpc][tpc].counter += cbu_corrected_err_count_delta; gk20a_writel(g, @@ -503,9 +509,10 @@ static int gr_gv11b_handle_cbu_exception(struct gk20a *g, u32 gpc, u32 tpc, cbu_ecc_uncorrected_err_status, is_cbu_ecc_uncorrected_total_err_overflow); /* HW uses 16-bits counter */ - cbu_uncorrected_err_count_delta += - (is_cbu_ecc_uncorrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_cbu_ecc_uncorrected_err_count_total_s()); + if (is_cbu_ecc_uncorrected_total_err_overflow) { + cbu_uncorrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_cbu_ecc_uncorrected_err_count_total_s()); + } g->ecc.gr.sm_cbu_ecc_uncorrected_err_count[gpc][tpc].counter += cbu_uncorrected_err_count_delta; gk20a_writel(g, @@ -569,9 +576,10 @@ static int gr_gv11b_handle_l1_data_exception(struct gk20a *g, u32 gpc, u32 tpc, l1_data_ecc_corrected_err_status, is_l1_data_ecc_corrected_total_err_overflow); /* HW uses 16-bits counter */ - l1_data_corrected_err_count_delta += - (is_l1_data_ecc_corrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_l1_data_ecc_corrected_err_count_total_s()); + if (is_l1_data_ecc_corrected_total_err_overflow) { + l1_data_corrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_l1_data_ecc_corrected_err_count_total_s()); + } g->ecc.gr.sm_l1_data_ecc_corrected_err_count[gpc][tpc].counter += l1_data_corrected_err_count_delta; gk20a_writel(g, @@ -584,9 +592,10 @@ static int gr_gv11b_handle_l1_data_exception(struct gk20a *g, u32 gpc, u32 tpc, l1_data_ecc_uncorrected_err_status, is_l1_data_ecc_uncorrected_total_err_overflow); /* HW uses 16-bits counter */ - l1_data_uncorrected_err_count_delta += - (is_l1_data_ecc_uncorrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_l1_data_ecc_uncorrected_err_count_total_s()); + if (is_l1_data_ecc_uncorrected_total_err_overflow) { + l1_data_uncorrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_l1_data_ecc_uncorrected_err_count_total_s()); + } g->ecc.gr.sm_l1_data_ecc_uncorrected_err_count[gpc][tpc].counter += l1_data_uncorrected_err_count_delta; gk20a_writel(g, @@ -654,9 +663,10 @@ static int gr_gv11b_handle_icache_exception(struct gk20a *g, u32 gpc, u32 tpc, icache_ecc_corrected_err_status, is_icache_ecc_corrected_total_err_overflow); /* HW uses 16-bits counter */ - icache_corrected_err_count_delta += - (is_icache_ecc_corrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_icache_ecc_corrected_err_count_total_s()); + if (is_icache_ecc_corrected_total_err_overflow) { + icache_corrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_icache_ecc_corrected_err_count_total_s()); + } g->ecc.gr.sm_icache_ecc_corrected_err_count[gpc][tpc].counter += icache_corrected_err_count_delta; gk20a_writel(g, @@ -669,9 +679,10 @@ static int gr_gv11b_handle_icache_exception(struct gk20a *g, u32 gpc, u32 tpc, icache_ecc_uncorrected_err_status, is_icache_ecc_uncorrected_total_err_overflow); /* HW uses 16-bits counter */ - icache_uncorrected_err_count_delta += - (is_icache_ecc_uncorrected_total_err_overflow << - gr_pri_gpc0_tpc0_sm_icache_ecc_uncorrected_err_count_total_s()); + if (is_icache_ecc_uncorrected_total_err_overflow) { + icache_uncorrected_err_count_delta += + BIT32(gr_pri_gpc0_tpc0_sm_icache_ecc_uncorrected_err_count_total_s()); + } g->ecc.gr.sm_icache_ecc_uncorrected_err_count[gpc][tpc].counter += icache_uncorrected_err_count_delta; gk20a_writel(g, @@ -759,9 +770,10 @@ int gr_gv11b_handle_gcc_exception(struct gk20a *g, u32 gpc, u32 tpc, gcc_l15_ecc_corrected_err_status, is_gcc_l15_ecc_corrected_total_err_overflow); /* HW uses 16-bits counter */ - gcc_l15_corrected_err_count_delta += - (is_gcc_l15_ecc_corrected_total_err_overflow << - gr_pri_gpc0_gcc_l15_ecc_corrected_err_count_total_s()); + if (is_gcc_l15_ecc_corrected_total_err_overflow) { + gcc_l15_corrected_err_count_delta += + BIT32(gr_pri_gpc0_gcc_l15_ecc_corrected_err_count_total_s()); + } g->ecc.gr.gcc_l15_ecc_corrected_err_count[gpc].counter += gcc_l15_corrected_err_count_delta; gk20a_writel(g, @@ -774,9 +786,10 @@ int gr_gv11b_handle_gcc_exception(struct gk20a *g, u32 gpc, u32 tpc, gcc_l15_ecc_uncorrected_err_status, is_gcc_l15_ecc_uncorrected_total_err_overflow); /* HW uses 16-bits counter */ - gcc_l15_uncorrected_err_count_delta += - (is_gcc_l15_ecc_uncorrected_total_err_overflow << - gr_pri_gpc0_gcc_l15_ecc_uncorrected_err_count_total_s()); + if (is_gcc_l15_ecc_uncorrected_total_err_overflow) { + gcc_l15_uncorrected_err_count_delta += + BIT32(gr_pri_gpc0_gcc_l15_ecc_uncorrected_err_count_total_s()); + } g->ecc.gr.gcc_l15_ecc_uncorrected_err_count[gpc].counter += gcc_l15_uncorrected_err_count_delta; gk20a_writel(g, -- cgit v1.2.2