Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1443 from jeenu-arm/sdei-fixes

Browse source 
SDEI client EL determination fix
This commit is contained in:
Dimitris Papastamos 2018-06-22 12:42:17 +01:00 • committed by GitHub
commit b70dcbc172
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/std_svc/sdei/sdei_intr_mgmt.c
View file

@ -601,7 +601,7 @@ int sdei_dispatch_event(int ev_num)
return 0;
}
static void end_sdei_explicit_dispatch(struct jmpbuf *buffer)
static void end_sdei_synchronous_dispatch(struct jmpbuf *buffer)
{
longjmp(buffer);
}
@ -679,7 +679,7 @@ int sdei_event_complete(int resume, uint64_t pc)
}
/* End the outstanding dispatch */
end_sdei_explicit_dispatch(disp_ctx->dispatch_jmp);
end_sdei_synchronous_dispatch(disp_ctx->dispatch_jmp);
return 0;
}

2
services/std_svc/sdei/sdei_private.h
View file

@ -164,7 +164,7 @@ static inline unsigned int sdei_client_el(void)
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 :
return read_ctx_reg(el3_ctx, CTX_SCR_EL3) & SCR_HCE_BIT ? MODE_EL2 :
MODE_EL1;
}