From b3254e8547707ff57ed7766aba53933884bd6a1c Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Fri, 9 May 2014 11:23:11 +0100 Subject: Introduce IS_IN_ELX() macros The goal of these macros is to improve code readability by providing a concise way to check whether we are running in the expected exception level. Change-Id: If9aebadfb6299a5196e9a582b442f0971d9909b1 --- common/bl_common.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'common') diff --git a/common/bl_common.c b/common/bl_common.c index 5361c3830..86b0cc5cb 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -106,9 +106,7 @@ void __dead2 raise_el(aapcs64_params_t *args) */ void __dead2 change_el(el_change_info_t *info) { - unsigned long current_el = read_current_el(); - - if (GET_EL(current_el) == MODE_EL3) { + if (IS_IN_EL3()) { /* * We can go anywhere from EL3. So find where. * TODO: Lots to do if we are going non-secure. @@ -551,7 +549,6 @@ void __dead2 run_image(unsigned long entrypoint, void *second_arg) { el_change_info_t run_image_info; - unsigned long current_el = read_current_el(); /* Tell next EL what we want done */ run_image_info.args.arg0 = RUN_IMAGE; @@ -565,7 +562,7 @@ void __dead2 run_image(unsigned long entrypoint, * to jump to a higher EL and issue an SMC. Contents of argY * will go into the general purpose register xY e.g. arg0->x0 */ - if (GET_EL(current_el) == MODE_EL3) { + if (IS_IN_EL3()) { run_image_info.args.arg1 = (unsigned long) first_arg; run_image_info.args.arg2 = (unsigned long) second_arg; } else { -- cgit v1.2.3