diff options
| author | danh-arm <dan.handley@arm.com> | 2014-07-28 14:33:44 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-07-28 14:33:44 +0100 |
| commit | dd2bdee61682df0ec65dfc43371c126a86a30c30 (patch) | |
| tree | 12e1fca8b8e84230029bc9b6efa7f41b031ab069 /bl31 | |
| parent | 6397bf6a99d785caa9b50016cd6c8eb76083c117 (diff) | |
| parent | d3280beb700321b0ef47b4f61d84667ba501bc61 (diff) | |
Merge pull request #177 from jcastillo-arm/jc/tf-issues/096
Rework incorrect use of assert() and panic() in codebase
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 861b391..ff3c53b 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 65f1213..4502e5d 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 2b0c797..e595634 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]; |