diff options
Diffstat (limited to 'aarch64/el0_common/el0_common.h')
| -rw-r--r-- | aarch64/el0_common/el0_common.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/aarch64/el0_common/el0_common.h b/aarch64/el0_common/el0_common.h index 58ad537..ae9bca7 100644 --- a/aarch64/el0_common/el0_common.h +++ b/aarch64/el0_common/el0_common.h @@ -8,14 +8,15 @@ #include "arm_builtins.h" #include "el0.h" #include "debug.h" +#include "tztest.h" + +extern sys_control_t *syscntl; /* Make the below globals volatile as found that the compiler uses the * register value ratherh than the memory value making it look like the writes * actually happened. */ -extern sys_control_t *syscntl; - #define INC_TEST_COUNT() (syscntl->test_cntl->test_count += 1) #define INC_FAIL_COUNT() (syscntl->test_cntl->fail_count += 1) @@ -49,16 +50,11 @@ extern sys_control_t *syscntl; syscntl->_el.ec = 0; \ } while (0) -#define TEST_EL1S_EXCEPTION(_fn, _excp) \ - TEST_EXCEPTION(_fn, _excp, el1_excp[SEC]) -#define TEST_EL1NS_EXCEPTION(_fn, _excp) \ - TEST_EXCEPTION(_fn, _excp, el1_excp[NSEC]) +#define TEST_EL1_EXCEPTION(_fn, _excp) \ + TEST_EXCEPTION(_fn, _excp, el1_excp[SEC_STATE]) #define TEST_EL3_EXCEPTION(_fn, _excp) \ TEST_EXCEPTION(_fn, _excp, el3_excp) -extern uint32_t P0_nonsecure_check_smc(); -extern uint32_t P0_check_register_access(); -extern uint32_t P0_check_trap_to_EL3(); extern void *alloc_mem(int type, size_t len); extern void map_va(void *va, size_t len, int type); |