From a18f364fd28cf6a19edcb55b22a9b458d29a826d Mon Sep 17 00:00:00 2001 From: Scott Long Date: Fri, 31 Aug 2018 15:43:24 -0700 Subject: gpu: nvgpu: fix various MISRA 10.1 bool violations This patch corrects a handful of MISRA 10.1 violations involving illegal arithmetic operations (e.g. bitwise OR) on boolean values: * fix to status handling in regops validation code * fix to debugger event handling in gr code * fix to entries_left tracking in runlist construct code * fix to verbose channel dumping and reset tracking in fifo code JIRA NVGPU-650 Change-Id: I3c3d9123b5a0e08fc936d0e63d51de99fc310ade Signed-off-by: Scott Long Reviewed-on: https://git-master.nvidia.com/r/1810957 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/regops_gk20a.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/regops_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c index cd3fe2f7..26ba944a 100644 --- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c @@ -404,7 +404,6 @@ static bool validate_reg_ops(struct dbg_session_gk20a *dbg_s, u32 op_count) { u32 i; - int err; bool ok = true; struct gk20a *g = dbg_s->g; @@ -412,8 +411,9 @@ static bool validate_reg_ops(struct dbg_session_gk20a *dbg_s, * a separate error code if needed */ for (i = 0; i < op_count; i++) { - err = validate_reg_op_info(dbg_s, &ops[i]); - ok &= !err; + if (validate_reg_op_info(dbg_s, &ops[i]) != 0) { + ok = false; + } if (reg_op_is_gr_ctx(ops[i].type)) { if (reg_op_is_read(ops[i].op)) @@ -424,8 +424,9 @@ static bool validate_reg_ops(struct dbg_session_gk20a *dbg_s, /* if "allow_all" flag enabled, dont validate offset */ if (!g->allow_all) { - err = validate_reg_op_offset(dbg_s, &ops[i]); - ok &= !err; + if (validate_reg_op_offset(dbg_s, &ops[i]) != 0) { + ok = false; + } } } -- cgit v1.2.2