SPM: Support multiple partitions
Change-Id: I6673a5f8c2f6afa7780483e0ce8d4dad4c8dc8ea
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/include/plat/arm/common/arm_spm_def.h b/include/plat/arm/common/arm_spm_def.h
index 8d17b90..630a29c 100644
--- a/include/plat/arm/common/arm_spm_def.h
+++ b/include/plat/arm/common/arm_spm_def.h
@@ -132,6 +132,8 @@
* Max number of elements supported by SPM in this platform. The defines below
* are used to allocate memory at compile time for different arrays in SPM.
*/
+#define PLAT_SPM_MAX_PARTITIONS U(2)
+
#define PLAT_SPM_MEM_REGIONS_MAX U(80)
#define PLAT_SPM_NOTIFICATIONS_MAX U(30)
#define PLAT_SPM_SERVICES_MAX U(30)
diff --git a/services/std_svc/spm/sp_xlat.c b/services/std_svc/spm/sp_xlat.c
index 77aa7be..0e7d243 100644
--- a/services/std_svc/spm/sp_xlat.c
+++ b/services/std_svc/spm/sp_xlat.c
@@ -40,7 +40,7 @@
static spinlock_t mem_attr_smc_lock;
/* Get handle of Secure Partition translation context */
-xlat_ctx_t *spm_get_sp_xlat_context(void)
+xlat_ctx_t *spm_sp_xlat_context_alloc(void)
{
return &sp_xlat_ctx;
};
diff --git a/services/std_svc/spm/spm_main.c b/services/std_svc/spm/spm_main.c
index c4cd888..e8dda0f 100644
--- a/services/std_svc/spm/spm_main.c
+++ b/services/std_svc/spm/spm_main.c
@@ -25,7 +25,24 @@
/*******************************************************************************
* Secure Partition context information.
******************************************************************************/
-static sp_context_t sp_ctx;
+sp_context_t sp_ctx_array[PLAT_SPM_MAX_PARTITIONS];
+
+/* Last Secure Partition last used by the CPU */
+sp_context_t *cpu_sp_ctx[PLATFORM_CORE_COUNT];
+
+void spm_cpu_set_sp_ctx(unsigned int linear_id, sp_context_t *sp_ctx)
+{
+ assert(linear_id < PLATFORM_CORE_COUNT);
+
+ cpu_sp_ctx[linear_id] = sp_ctx;
+}
+
+sp_context_t *spm_cpu_get_sp_ctx(unsigned int linear_id)
+{
+ assert(linear_id < PLATFORM_CORE_COUNT);
+
+ return cpu_sp_ctx[linear_id];
+}
/*******************************************************************************
* Set state of a Secure Partition context.
@@ -86,10 +103,12 @@
static uint64_t spm_sp_synchronous_entry(sp_context_t *sp_ctx)
{
uint64_t rc;
+ unsigned int linear_id = plat_my_core_pos();
assert(sp_ctx != NULL);
/* Assign the context of the SP to this CPU */
+ spm_cpu_set_sp_ctx(linear_id, sp_ctx);
cm_set_context(&(sp_ctx->cpu_ctx), SECURE);
/* Restore the context assigned above */
@@ -115,7 +134,9 @@
******************************************************************************/
__dead2 static void spm_sp_synchronous_exit(uint64_t rc)
{
- sp_context_t *ctx = &sp_ctx;
+ /* Get context of the SP in use by this CPU. */
+ unsigned int linear_id = plat_my_core_pos();
+ sp_context_t *ctx = spm_cpu_get_sp_ctx(linear_id);
/*
* The SPM must have initiated the original request through a
@@ -132,21 +153,28 @@
******************************************************************************/
static int32_t spm_init(void)
{
- uint64_t rc;
+ uint64_t rc = 0;
sp_context_t *ctx;
- INFO("Secure Partition init...\n");
+ for (unsigned int i = 0U; i < PLAT_SPM_MAX_PARTITIONS; i++) {
- ctx = &sp_ctx;
+ ctx = &sp_ctx_array[i];
- ctx->state = SP_STATE_RESET;
+ if (ctx->is_present == 0) {
+ continue;
+ }
+
+ INFO("Secure Partition %u init...\n", i);
- rc = spm_sp_synchronous_entry(ctx);
- assert(rc == 0);
+ ctx->state = SP_STATE_RESET;
- ctx->state = SP_STATE_IDLE;
+ rc = spm_sp_synchronous_entry(ctx);
+ assert(rc == 0);
- INFO("Secure Partition initialized.\n");
+ ctx->state = SP_STATE_IDLE;
+
+ INFO("Secure Partition %u initialized.\n", i);
+ }
return rc;
}
@@ -164,38 +192,58 @@
/* Disable MMU at EL1 (initialized by BL2) */
disable_mmu_icache_el1();
+ unsigned int i = 0U;
+
- /* Initialize context of the SP */
- INFO("Secure Partition context setup start...\n");
+ while (1) {
+ rc = plat_spm_sp_get_next_address(&sp_base, &sp_size,
+ &rd_base, &rd_size);
+ if (rc < 0) {
+ /* Reached the end of the package. */
+ break;
+ }
- ctx = &sp_ctx;
+ if (i >= PLAT_SPM_MAX_PARTITIONS) {
+ ERROR("Too many partitions in the package.\n");
+ panic();
+ }
- rc = plat_spm_sp_get_next_address(&sp_base, &sp_size,
- &rd_base, &rd_size);
- if (rc != 0) {
- ERROR("No Secure Partition found.\n");
- panic();
- }
+ ctx = &sp_ctx_array[i];
- /* Assign translation tables context. */
- ctx->xlat_ctx_handle = spm_get_sp_xlat_context();
+ assert(ctx->is_present == 0);
- /* Save location of the image in physical memory */
- ctx->image_base = (uintptr_t)sp_base;
- ctx->image_size = sp_size;
+ /* Initialize context of the SP */
+ INFO("Secure Partition %u context setup start...\n", i);
- rc = plat_spm_sp_rd_load(&ctx->rd, rd_base, rd_size);
- if (rc < 0) {
- ERROR("Error while loading RD blob.\n");
- panic();
+ /* Assign translation tables context. */
+ ctx->xlat_ctx_handle = spm_sp_xlat_context_alloc();
+
+ /* Save location of the image in physical memory */
+ ctx->image_base = (uintptr_t)sp_base;
+ ctx->image_size = sp_size;
+
+ rc = plat_spm_sp_rd_load(&ctx->rd, rd_base, rd_size);
+ if (rc < 0) {
+ ERROR("Error while loading RD blob.\n");
+ panic();
+ }
+
+ spm_sp_setup(ctx);
+
+ ctx->is_present = 1;
+
+ INFO("Secure Partition %u setup done.\n", i);
+
+ i++;
}
- spm_sp_setup(ctx);
+ if (i == 0U) {
+ ERROR("No present partitions in the package.\n");
+ panic();
+ }
/* Register init function for deferred init. */
bl31_register_bl32_init(&spm_init);
- INFO("Secure Partition setup done.\n");
-
return 0;
}
@@ -217,6 +265,8 @@
ns = is_caller_non_secure(flags);
if (ns == SMC_FROM_SECURE) {
+ unsigned int linear_id = plat_my_core_pos();
+ sp_context_t *sp_ctx = spm_cpu_get_sp_ctx(linear_id);
/* Handle SMCs from Secure world. */
@@ -233,24 +283,24 @@
case SP_MEMORY_ATTRIBUTES_GET_AARCH64:
INFO("Received SP_MEMORY_ATTRIBUTES_GET_AARCH64 SMC\n");
- if (sp_ctx.state != SP_STATE_RESET) {
+ if (sp_ctx->state != SP_STATE_RESET) {
WARN("SP_MEMORY_ATTRIBUTES_GET_AARCH64 is available at boot time only\n");
SMC_RET1(handle, SPM_NOT_SUPPORTED);
}
SMC_RET1(handle,
spm_memory_attributes_get_smc_handler(
- &sp_ctx, x1));
+ sp_ctx, x1));
case SP_MEMORY_ATTRIBUTES_SET_AARCH64:
INFO("Received SP_MEMORY_ATTRIBUTES_SET_AARCH64 SMC\n");
- if (sp_ctx.state != SP_STATE_RESET) {
+ if (sp_ctx->state != SP_STATE_RESET) {
WARN("SP_MEMORY_ATTRIBUTES_SET_AARCH64 is available at boot time only\n");
SMC_RET1(handle, SPM_NOT_SUPPORTED);
}
SMC_RET1(handle,
spm_memory_attributes_set_smc_handler(
- &sp_ctx, x1, x2, x3));
+ sp_ctx, x1, x2, x3));
default:
break;
}
diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h
index 7f9778e..cfd85a3 100644
--- a/services/std_svc/spm/spm_private.h
+++ b/services/std_svc/spm/spm_private.h
@@ -43,6 +43,9 @@
} sp_state_t;
typedef struct sp_context {
+ /* 1 if the partition is present, 0 otherwise */
+ int is_present;
+
/* Location of the image in physical memory */
unsigned long long image_base;
size_t image_size;
@@ -68,7 +71,7 @@
void spm_sp_setup(sp_context_t *sp_ctx);
/* Functions related to the translation tables management */
-xlat_ctx_t *spm_get_sp_xlat_context(void);
+xlat_ctx_t *spm_sp_xlat_context_alloc(void);
void sp_map_memory_regions(sp_context_t *sp_ctx);
int32_t spm_memory_attributes_get_smc_handler(sp_context_t *sp_ctx,
@@ -78,6 +81,10 @@
u_register_t pages_count,
u_register_t smc_attributes);
+/* Functions to handle Secure Partition contexts */
+void spm_cpu_set_sp_ctx(unsigned int linear_id, sp_context_t *sp_ctx);
+sp_context_t *spm_cpu_get_sp_ctx(unsigned int linear_id);
+
#endif /* __ASSEMBLY__ */
#endif /* SPM_PRIVATE_H */