diff options
| -rw-r--r-- | services/std_svc/sdei/sdei_intr_mgmt.c | 1 | ||||
| -rw-r--r-- | services/std_svc/sdei/sdei_main.c | 1 | ||||
| -rw-r--r-- | services/std_svc/sdei/sdei_private.h | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/services/std_svc/sdei/sdei_intr_mgmt.c b/services/std_svc/sdei/sdei_intr_mgmt.c index a7104b4f..d6324b9c 100644 --- a/services/std_svc/sdei/sdei_intr_mgmt.c +++ b/services/std_svc/sdei/sdei_intr_mgmt.c @@ -8,7 +8,6 @@ #include <assert.h> #include <bl_common.h> #include <cassert.h> -#include <context_mgmt.h> #include <debug.h> #include <ehf.h> #include <interrupt_mgmt.h> diff --git a/services/std_svc/sdei/sdei_main.c b/services/std_svc/sdei/sdei_main.c index f881ba82..d6d092de 100644 --- a/services/std_svc/sdei/sdei_main.c +++ b/services/std_svc/sdei/sdei_main.c @@ -10,7 +10,6 @@ #include <bl_common.h> #include <cassert.h> #include <context.h> -#include <context_mgmt.h> #include <debug.h> #include <ehf.h> #include <interrupt_mgmt.h> diff --git a/services/std_svc/sdei/sdei_private.h b/services/std_svc/sdei/sdei_private.h index 45d537f5..ec4148c6 100644 --- a/services/std_svc/sdei/sdei_private.h +++ b/services/std_svc/sdei/sdei_private.h @@ -8,6 +8,7 @@ #define __SDEI_PRIVATE_H__ #include <arch_helpers.h> +#include <context_mgmt.h> #include <debug.h> #include <errno.h> #include <interrupt_mgmt.h> @@ -159,7 +160,11 @@ static inline int is_secure_sgi(unsigned int intr) */ static inline unsigned int sdei_client_el(void) { - return read_scr_el3() & SCR_HCE_BIT ? MODE_EL2 : MODE_EL1; + cpu_context_t *ns_ctx = cm_get_context(NON_SECURE); + el3_state_t *el3_ctx = get_el3state_ctx(ns_ctx); + + return read_ctx_reg(el3_ctx, CTX_SPSR_EL3) & SCR_HCE_BIT ? MODE_EL2 : + MODE_EL1; } static inline unsigned int sdei_event_priority(sdei_ev_map_t *map) |