Core: Context structure refine
- Change the architecture context name to 'struct tfm_arch_ctx_t'.
- Rename EXC_RETURN value in LR to Macro 'EXC_RETURN_THREAD_S_PSP'.
Change-Id: Ia13f3ae5c477e4ad4dc092f11bdba1f2b32dd00b
Signed-off-by: Summer Qin <summer.qin@arm.com>
diff --git a/secure_fw/spm/spm_api.h b/secure_fw/spm/spm_api.h
index a99033a..56a112a 100644
--- a/secure_fw/spm/spm_api.h
+++ b/secure_fw/spm/spm_api.h
@@ -669,13 +669,13 @@
* PendSV specified function.
*
* Parameters :
- * ctxb - State context storage pointer
+ * p_actx - Architecture context storage pointer
*
* Notes:
* This is a staging API. Scheduler should be called in SPM finally and
* this function will be obsoleted later.
*/
-void tfm_pendsv_do_schedule(struct tfm_state_context_ext *ctxb);
+void tfm_pendsv_do_schedule(struct tfm_arch_ctx_t *p_actx);
/**
* \brief SPM initialization implementation
diff --git a/secure_fw/spm/spm_api_ipc.c b/secure_fw/spm/spm_api_ipc.c
index ec25b41..340c778 100644
--- a/secure_fw/spm/spm_api_ipc.c
+++ b/secure_fw/spm/spm_api_ipc.c
@@ -616,10 +616,10 @@
*/
tfm_core_thrd_start_scheduler(p_ns_entry_thread);
- return p_ns_entry_thread->state_ctx.ctxb.lr;
+ return p_ns_entry_thread->arch_ctx.lr;
}
-void tfm_pendsv_do_schedule(struct tfm_state_context_ext *ctxb)
+void tfm_pendsv_do_schedule(struct tfm_arch_ctx_t *p_actx)
{
#if TFM_LVL == 2
struct spm_partition_desc_t *p_next_partition;
@@ -648,7 +648,7 @@
tfm_spm_partition_change_privilege(is_privileged);
#endif
- tfm_core_thrd_switch_context(ctxb, pth_curr, pth_next);
+ tfm_core_thrd_switch_context(p_actx, pth_curr, pth_next);
}
/*