From a43c85db2d4c2f6f91e1b534418ab14869327be6 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Mon, 8 Jan 2018 09:59:33 +0000 Subject: [PATCH] SPM: Allow secondary CPUs to use the Secure Partition The Secure Partition should be able to be used from any CPU, not just the lead one. This patch point the secure contexts of all secondary CPUs to the same one used by the lead CPU for the Secure Partition. This way, they can also use it. In order to prevent more than one CPU from using the Secure Partition at the same time, a lock has been added. Change-Id: Ica76373127c3626498b06c558a4874ce72201ff7 Signed-off-by: Antonio Nino Diaz --- services/std_svc/spm/spm_main.c | 13 +++++++++++++ services/std_svc/spm/spm_private.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/services/std_svc/spm/spm_main.c b/services/std_svc/spm/spm_main.c index e156106a..979b9a8f 100644 --- a/services/std_svc/spm/spm_main.c +++ b/services/std_svc/spm/spm_main.c @@ -124,6 +124,13 @@ int32_t spm_init(void) cm_init_my_context(secure_partition_ep_info); secure_partition_setup(); + /* + * Make all CPUs use the same secure context. + */ + for (unsigned int i = 0; i < PLATFORM_CORE_COUNT; i++) { + cm_set_context_by_index(i, &sp_ctx.cpu_ctx, SECURE); + } + /* * Arrange for an entry into the secure partition. */ @@ -369,6 +376,9 @@ uint64_t spm_smc_handler(uint32_t smc_fid, assert(0); } + /* Release the Secure Partition context */ + spin_unlock(&sp_ctx.lock); + /* * This is the result from the Secure partition of an * earlier request. Copy the result into the non-secure @@ -442,6 +452,9 @@ uint64_t spm_smc_handler(uint32_t smc_fid, /* Save the Normal world context */ cm_el1_sysregs_context_save(NON_SECURE); + /* Lock the Secure Partition context. */ + spin_lock(&sp_ctx.lock); + /* * Restore the secure world context and prepare for * entry in S-EL0 diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h index 2fc46c8d..1d16b458 100644 --- a/services/std_svc/spm/spm_private.h +++ b/services/std_svc/spm/spm_private.h @@ -32,6 +32,7 @@ #ifndef __ASSEMBLY__ +#include #include #include @@ -44,6 +45,7 @@ typedef struct secure_partition_context { uint64_t c_rt_ctx; cpu_context_t cpu_ctx; unsigned int sp_init_in_progress; + spinlock_t lock; } secure_partition_context_t; uint64_t spm_secure_partition_enter(uint64_t *c_rt_ctx); -- 2.30.2