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

Merge "services: Fix pmr_el1 rewrote issue in sdei_disaptch_event()" into integration

Browse source
This commit is contained in:
Joanna Farley 2021-07-28 21:25:53 +02:00 • committed by TrustedFirmware Code Review
commit 20ceff34c3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -636,15 +636,15 @@ int sdei_dispatch_event(int ev_num)
if (!can_sdei_state_trans(se, DO_DISPATCH)) if (!can_sdei_state_trans(se, DO_DISPATCH))
return -1; return -1;
/* Activate the priority corresponding to the event being dispatched */
ehf_activate_priority(sdei_event_priority(map));
/* /*
* Prepare for NS dispatch by restoring the Non-secure context and * Prepare for NS dispatch by restoring the Non-secure context and
* marking that as active. * marking that as active.
*/ */
ns_ctx = restore_and_resume_ns_context(); ns_ctx = restore_and_resume_ns_context();
/* Activate the priority corresponding to the event being dispatched */
ehf_activate_priority(sdei_event_priority(map));
/* Dispatch event synchronously */ /* Dispatch event synchronously */
setup_ns_dispatch(map, se, ns_ctx, &dispatch_jmp); setup_ns_dispatch(map, se, ns_ctx, &dispatch_jmp);
begin_sdei_synchronous_dispatch(&dispatch_jmp); begin_sdei_synchronous_dispatch(&dispatch_jmp);