From 68ffcd1bb22f2c2eac6c3329a1974b3e8ec6f515 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 13 Sep 2022 11:48:53 +0200 Subject: [PATCH] fix(versal): fix Misra-C violations in bl31_setup and pm_svc_main Fix some Misra-C violations. The similar fixes were done by commit eb0d2b17722c ("fix(zynqmp): resolve misra R15.6 warnings") and commit dd1fe7178b57 ("fix(zynqmp): resolve misra R14.4 warnings"). Signed-off-by: Michal Simek Change-Id: I3ffa92724a09871f7f99c9ac6c326994c165e9bd --- plat/xilinx/versal/bl31_versal_setup.c | 5 +++-- plat/xilinx/versal/pm_service/pm_svc_main.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plat/xilinx/versal/bl31_versal_setup.c b/plat/xilinx/versal/bl31_versal_setup.c index 349b85670..9b3620839 100644 --- a/plat/xilinx/versal/bl31_versal_setup.c +++ b/plat/xilinx/versal/bl31_versal_setup.c @@ -184,8 +184,9 @@ static uint64_t rdo_el3_interrupt_handler(uint32_t id, uint32_t flags, } } - if (handler != NULL) - handler(intr_id, flags, handle, cookie); + if (handler != NULL) { + return handler(intr_id, flags, handle, cookie); + } return 0; } diff --git a/plat/xilinx/versal/pm_service/pm_svc_main.c b/plat/xilinx/versal/pm_service/pm_svc_main.c index 4e26d87b2..b7d73db5b 100644 --- a/plat/xilinx/versal/pm_service/pm_svc_main.c +++ b/plat/xilinx/versal/pm_service/pm_svc_main.c @@ -355,7 +355,7 @@ uint64_t pm_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t api_id; /* Handle case where PM wasn't initialized properly */ - if (!pm_up) { + if (pm_up == false) { SMC_RET1(handle, SMC_UNK); } @@ -363,7 +363,7 @@ uint64_t pm_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3, * Mark BIT24 payload (i.e 1st bit of pm_arg[3] ) as non-secure (1) * if smc called is non secure */ - if (is_caller_non_secure(flags)) { + if (is_caller_non_secure(flags) != 0) { security_flag = NON_SECURE_FLAG; } -- 2.39.5