diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-28 00:30:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 00:30:55 +0000 |
| commit | 99e198ecd869d33a5948445dd17c5e0920ef5477 (patch) | |
| tree | fcb32f01655de3e22a040c81bfab2360aabbbe2e /services | |
| parent | b39d2896b3f6e79c98ea781ee20ad639793ae135 (diff) | |
| parent | 472be0f74e8d4559471c6eb95169455001f236de (diff) | |
Merge pull request #1284 from jeenu-arm/tspd-ehf
TSPD and EHF
Diffstat (limited to 'services')
| -rw-r--r-- | services/spd/tspd/tspd_main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index c564f8b8..3d06e0b8 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -549,9 +549,10 @@ uint64_t tspd_smc_handler(uint32_t smc_fid, * preempt Secure execution. However, for * yielding SMCs, we want preemption to happen; * so explicitly allow NS preemption in this - * case. + * case, and supply the preemption return code + * for TSP. */ - ehf_allow_ns_preemption(); + ehf_allow_ns_preemption(TSP_PREEMPTED); #endif } @@ -662,9 +663,10 @@ uint64_t tspd_smc_handler(uint32_t smc_fid, #if EL3_EXCEPTION_HANDLING /* * Allow the resumed yielding SMC processing to be preempted by - * Non-secure interrupts. + * Non-secure interrupts. Also, supply the preemption return + * code for TSP. */ - ehf_allow_ns_preemption(); + ehf_allow_ns_preemption(TSP_PREEMPTED); #endif /* We just need to return to the preempted point in |