diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2017-12-18 10:51:58 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-01-08 09:58:15 +0000 |
| commit | 26bd5f82459e45a2d5955cff0a25247489799db6 (patch) | |
| tree | 0f5a54bcec08a51a2b3565cef88adafc49ccc543 /services | |
| parent | 34c2b9c2f144e213533c00bbdedb8da5b786311b (diff) | |
SPM: Move initialization flag to context struct
Whether a Secure Partition is being initialized or not is something
related to that specific partition, so it should be saved with the
rest of the information related to it.
Change-Id: Ie8a780f70df83fb03ef9c01ba37960208d9b5319
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/std_svc/spm/spm_main.c | 11 | ||||
| -rw-r--r-- | services/std_svc/spm/spm_private.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/services/std_svc/spm/spm_main.c b/services/std_svc/spm/spm_main.c index ae71c1df..e156106a 100644 --- a/services/std_svc/spm/spm_main.c +++ b/services/std_svc/spm/spm_main.c @@ -29,7 +29,6 @@ static spinlock_t mem_attr_smc_lock; * Secure Partition context information. ******************************************************************************/ static secure_partition_context_t sp_ctx; -unsigned int sp_init_in_progress; /******************************************************************************* * Replace the S-EL1 re-entry information with S-EL0 re-entry @@ -128,10 +127,10 @@ int32_t spm_init(void) /* * Arrange for an entry into the secure partition. */ - sp_init_in_progress = 1; + sp_ctx.sp_init_in_progress = 1; rc = spm_synchronous_sp_entry(&sp_ctx); assert(rc == 0); - sp_init_in_progress = 0; + sp_ctx.sp_init_in_progress = 0; VERBOSE("SP_MEMORY_ATTRIBUTES_SET_AARCH64 availability has been revoked\n"); return rc; @@ -358,7 +357,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid, cm_el1_sysregs_context_save(SECURE); spm_setup_next_eret_into_sel0(handle); - if (sp_init_in_progress) { + if (sp_ctx.sp_init_in_progress) { /* * SPM reports completion. The SPM must have * initiated the original request through a @@ -391,7 +390,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid, case SP_MEMORY_ATTRIBUTES_GET_AARCH64: INFO("Received SP_MEMORY_ATTRIBUTES_GET_AARCH64 SMC\n"); - if (!sp_init_in_progress) { + if (!sp_ctx.sp_init_in_progress) { WARN("SP_MEMORY_ATTRIBUTES_GET_AARCH64 is available at boot time only\n"); SMC_RET1(handle, SPM_NOT_SUPPORTED); } @@ -400,7 +399,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid, case SP_MEMORY_ATTRIBUTES_SET_AARCH64: INFO("Received SP_MEMORY_ATTRIBUTES_SET_AARCH64 SMC\n"); - if (!sp_init_in_progress) { + if (!sp_ctx.sp_init_in_progress) { WARN("SP_MEMORY_ATTRIBUTES_SET_AARCH64 is available at boot time only\n"); SMC_RET1(handle, SPM_NOT_SUPPORTED); } diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h index 16993e8c..2fc46c8d 100644 --- a/services/std_svc/spm/spm_private.h +++ b/services/std_svc/spm/spm_private.h @@ -43,6 +43,7 @@ struct entry_point_info; typedef struct secure_partition_context { uint64_t c_rt_ctx; cpu_context_t cpu_ctx; + unsigned int sp_init_in_progress; } secure_partition_context_t; uint64_t spm_secure_partition_enter(uint64_t *c_rt_ctx); |