diff options
| author | Juan Castillo <juan.castillo@arm.com> | 2014-06-05 09:45:36 +0100 |
|---|---|---|
| committer | Juan Castillo <juan.castillo@arm.com> | 2014-07-28 12:20:16 +0100 |
| commit | d3280beb700321b0ef47b4f61d84667ba501bc61 (patch) | |
| tree | 8a6c3f70a6f8d289256ac3fb940ea07a339072a1 /bl31 | |
| parent | 592dd7cbe658cc33ae2818c9ed543ac57e97f784 (diff) | |
Rework incorrect use of assert() and panic() in codebase
Assert a valid security state using the macro sec_state_is_valid().
Replace assert() with panic() in those cases that might arise
because of runtime errors and not programming errors.
Replace panic() with assert() in those cases that might arise
because of programming errors.
Fixes ARM-software/tf-issues#96
Change-Id: I51e9ef0439fd5ff5e0edfef49050b69804bf14d5
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/bl31_main.c | 2 | ||||
| -rw-r--r-- | bl31/context_mgmt.c | 4 | ||||
| -rw-r--r-- | bl31/interrupt_mgmt.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 861b3914..ff3c53b5 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -125,7 +125,7 @@ void bl31_main(void) ******************************************************************************/ void bl31_set_next_image_type(uint32_t security_state) { - assert(security_state == NON_SECURE || security_state == SECURE); + assert(sec_state_is_valid(security_state)); next_image_type = security_state; } diff --git a/bl31/context_mgmt.c b/bl31/context_mgmt.c index 65f12137..4502e5dc 100644 --- a/bl31/context_mgmt.c +++ b/bl31/context_mgmt.c @@ -71,7 +71,7 @@ void cm_init(void) ******************************************************************************/ void *cm_get_context_by_mpidr(uint64_t mpidr, uint32_t security_state) { - assert(security_state <= NON_SECURE); + assert(sec_state_is_valid(security_state)); return get_cpu_data_by_mpidr(mpidr, cpu_context[security_state]); } @@ -82,7 +82,7 @@ void *cm_get_context_by_mpidr(uint64_t mpidr, uint32_t security_state) ******************************************************************************/ void cm_set_context_by_mpidr(uint64_t mpidr, void *context, uint32_t security_state) { - assert(security_state <= NON_SECURE); + assert(sec_state_is_valid(security_state)); set_cpu_data_by_mpidr(mpidr, cpu_context[security_state], context); } diff --git a/bl31/interrupt_mgmt.c b/bl31/interrupt_mgmt.c index 2b0c7970..e595634e 100644 --- a/bl31/interrupt_mgmt.c +++ b/bl31/interrupt_mgmt.c @@ -107,7 +107,7 @@ uint32_t get_scr_el3_from_routing_model(uint32_t security_state) { uint32_t scr_el3; - assert(security_state <= NON_SECURE); + assert(sec_state_is_valid(security_state)); scr_el3 = intr_type_descs[INTR_TYPE_NS].scr_el3[security_state]; scr_el3 |= intr_type_descs[INTR_TYPE_S_EL1].scr_el3[security_state]; scr_el3 |= intr_type_descs[INTR_TYPE_EL3].scr_el3[security_state]; |