diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-25 16:52:26 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-29 14:41:48 +0000 |
| commit | 40daecc1be51383c806c0ac953303e47026abcac (patch) | |
| tree | 62f705b7a8c4e21c3d6cafeead88165f364ce34b /lib/el3_runtime | |
| parent | 4012531547f63595f33e493dcd7ebd1730dfcedc (diff) | |
Fix MISRA defects in extension libs
No functional changes.
Change-Id: I2f28f20944f552447ac4e9e755493cd7c0ea1192
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'lib/el3_runtime')
| -rw-r--r-- | lib/el3_runtime/aarch32/context_mgmt.c | 7 | ||||
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/el3_runtime/aarch32/context_mgmt.c b/lib/el3_runtime/aarch32/context_mgmt.c index 11ef6e5f..80cea284 100644 --- a/lib/el3_runtime/aarch32/context_mgmt.c +++ b/lib/el3_runtime/aarch32/context_mgmt.c @@ -14,6 +14,7 @@ #include <platform.h> #include <platform_def.h> #include <smccc_helpers.h> +#include <stdbool.h> #include <string.h> #include <utils.h> @@ -129,7 +130,7 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep) * When EL2 is implemented but unused `el2_unused` is non-zero, otherwise * it is zero. ******************************************************************************/ -static void enable_extensions_nonsecure(int el2_unused) +static void enable_extensions_nonsecure(bool el2_unused) { #if IMAGE_BL32 #if ENABLE_AMU @@ -175,7 +176,7 @@ void cm_prepare_el3_exit(uint32_t security_state) { uint32_t hsctlr, scr; cpu_context_t *ctx = cm_get_context(security_state); - int el2_unused = 0; + bool el2_unused = false; assert(ctx); @@ -200,7 +201,7 @@ void cm_prepare_el3_exit(uint32_t security_state) isb(); } else if (read_id_pfr1() & (ID_PFR1_VIRTEXT_MASK << ID_PFR1_VIRTEXT_SHIFT)) { - el2_unused = 1; + el2_unused = true; /* * Set the NS bit to access NS copies of certain banked diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index d3984a28..f037e18a 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -18,6 +18,7 @@ #include <pubsub_events.h> #include <smccc_helpers.h> #include <spe.h> +#include <stdbool.h> #include <string.h> #include <sve.h> #include <utils.h> @@ -231,7 +232,7 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep) * When EL2 is implemented but unused `el2_unused` is non-zero, otherwise * it is zero. ******************************************************************************/ -static void enable_extensions_nonsecure(int el2_unused) +static void enable_extensions_nonsecure(bool el2_unused) { #if IMAGE_BL31 #if ENABLE_SPE_FOR_LOWER_ELS @@ -289,7 +290,7 @@ void cm_prepare_el3_exit(uint32_t security_state) { uint32_t sctlr_elx, scr_el3, mdcr_el2; cpu_context_t *ctx = cm_get_context(security_state); - int el2_unused = 0; + bool el2_unused = false; uint64_t hcr_el2 = 0; assert(ctx); @@ -304,7 +305,7 @@ void cm_prepare_el3_exit(uint32_t security_state) sctlr_elx |= SCTLR_EL2_RES1; write_sctlr_el2(sctlr_elx); } else if (EL_IMPLEMENTED(2)) { - el2_unused = 1; + el2_unused = true; /* * EL2 present but unused, need to disable safely. |