diff options
author | Joanna Farley <joanna.farley@arm.com> | 2021-07-28 21:25:53 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-07-28 21:25:53 +0200 |
commit | 20ceff34c3e563ed69b20fd67efd4b4f3bb36761 (patch) | |
tree | 7175b31283055c8edf4cc39190a1ab3dc591646e | |
parent | 81bbb9216bf4df0e73e3863a06f9ffbbdbd5d768 (diff) | |
parent | d21f1ddb71fc9e13f4f352f34e2a707a5b7df301 (diff) | |
download | trusted-firmware-a-20ceff34c3e563ed69b20fd67efd4b4f3bb36761.tar.gz |
Merge "services: Fix pmr_el1 rewrote issue in sdei_disaptch_event()" into integration
-rw-r--r-- | services/std_svc/sdei/sdei_intr_mgmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/std_svc/sdei/sdei_intr_mgmt.c b/services/std_svc/sdei/sdei_intr_mgmt.c index f12b2ca3d9..5d176c2092 100644 --- a/services/std_svc/sdei/sdei_intr_mgmt.c +++ b/services/std_svc/sdei/sdei_intr_mgmt.c @@ -636,15 +636,15 @@ int sdei_dispatch_event(int ev_num) if (!can_sdei_state_trans(se, DO_DISPATCH)) 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 * marking that as active. */ 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 */ setup_ns_dispatch(map, se, ns_ctx, &dispatch_jmp); begin_sdei_synchronous_dispatch(&dispatch_jmp); |