Core: Separate library code from spm_api.c file
- Moves library-model-only APIs into another file spm_api_func.c.
- Separates spm code into 3 parts: for library model (func), IPC model
(ipc) and common.
Change-Id: I35bc43c21415e89c1f353a4c798aa3d8f69ec168
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
diff --git a/secure_fw/spm/spm_api.c b/secure_fw/spm/spm_api.c
index 36f4afd..80d6575 100644
--- a/secure_fw/spm/spm_api.c
+++ b/secure_fw/spm/spm_api.c
@@ -5,7 +5,7 @@
*
*/
-/* This file contains the APIs exported by the SPM to tfm core */
+/* All the APIs defined in this file are common for library and IPC model. */
#include <stdio.h>
#include <string.h>
@@ -23,62 +23,9 @@
#define NON_SECURE_INTERNAL_PARTITION_DB_IDX 0
#define TFM_CORE_INTERNAL_PARTITION_DB_IDX 1
-#ifndef TFM_PSA_API
-typedef enum {
- TFM_INIT_FAILURE,
-} sp_error_type_t;
-
-/* The size of this struct must be multiple of 4 bytes as it is stacked to an
- * uint32_t[] array
- */
-struct interrupted_ctx_stack_frame_t {
-#if TFM_LVL != 1
- uint32_t stack_ptr;
-#endif
- uint32_t partition_state;
-};
-
-/* The size of this struct must be multiple of 4 bytes as it is stacked to an
- * uint32_t[] array
- */
-struct handler_ctx_stack_frame_t {
- uint32_t partition_state;
- uint32_t caller_partition_idx;
-};
-#endif /* !defined(TFM_PSA_API) */
-
/* Define SPM DB structure */
#include "secure_fw/services/tfm_spm_db.inc"
-/*
- * This function is called when a secure partition causes an error.
- * In case of an error in the error handling, a non-zero value have to be
- * returned.
- */
-#ifndef TFM_PSA_API
-static void tfm_spm_partition_err_handler(
- const struct spm_partition_desc_t *partition,
- sp_error_type_t err_type,
- int32_t err_code)
-{
-#ifdef TFM_CORE_DEBUG
- if (err_type == TFM_INIT_FAILURE) {
- printf("Partition init failed for partition id 0x%08X\r\n",
- partition->static_data.partition_id);
- } else {
- printf(
- "Unknown partition error %d (code: %d) for partition id 0x%08X\r\n",
- err_type, err_code, partition->static_data.partition_id);
- }
-#else
- (void)err_type;
- (void)err_code;
-#endif
- tfm_spm_partition_set_state(partition->static_data.partition_id,
- SPM_PARTITION_STATE_CLOSED);
-}
-#endif /* !defined(TFM_PSA_API) */
-
uint32_t get_partition_idx(uint32_t partition_id)
{
uint32_t i;
@@ -148,13 +95,13 @@
tfm_nspm_configure_clients();
+#ifndef TFM_PSA_API
/* For the TF-M core environment itself */
part_ptr = &(g_spm_partition_db.partitions[
TFM_CORE_INTERNAL_PARTITION_DB_IDX]);
part_ptr->static_data.partition_id = TFM_SP_CORE_ID;
part_ptr->static_data.partition_flags =
SPM_PART_FLAG_APP_ROT | SPM_PART_FLAG_PSA_ROT;
-#ifndef TFM_PSA_API
part_ptr->runtime_data.partition_state = SPM_PARTITION_STATE_UNINIT;
part_ptr->runtime_data.ctx_stack_ptr = tfm_core_interrupt_ctx_stack;
#endif /* !defined(TFM_PSA_API) */
@@ -164,120 +111,6 @@
return SPM_ERR_OK;
}
-#ifndef TFM_PSA_API
-enum spm_err_t tfm_spm_partition_init(void)
-{
- struct spm_partition_desc_t *part;
- struct tfm_sfn_req_s desc;
- int32_t args[4] = {0};
- int32_t fail_cnt = 0;
- uint32_t idx;
-
- /* Call the init function for each partition */
- for (idx = 0; idx < g_spm_partition_db.partition_count; ++idx) {
- part = &g_spm_partition_db.partitions[idx];
- tfm_spm_hal_configure_default_isolation(part->platform_data);
- if (part->static_data.partition_init == NULL) {
- tfm_spm_partition_set_state(idx, SPM_PARTITION_STATE_IDLE);
- tfm_spm_partition_set_caller_partition_idx(idx,
- SPM_INVALID_PARTITION_IDX);
- } else {
- int32_t res;
-
- desc.args = args;
- desc.ns_caller = 0U;
- desc.iovec_api = TFM_SFN_API_IOVEC;
- desc.sfn = (sfn_t)part->static_data.partition_init;
- desc.sp_id = part->static_data.partition_id;
- res = tfm_core_sfn_request(&desc);
- if (res == (int32_t)TFM_SUCCESS) {
- tfm_spm_partition_set_state(idx, SPM_PARTITION_STATE_IDLE);
- } else {
- tfm_spm_partition_err_handler(part, TFM_INIT_FAILURE, res);
- fail_cnt++;
- }
- }
- }
-
- tfm_secure_api_init_done();
-
- if (fail_cnt == 0) {
- return SPM_ERR_OK;
- } else {
- return SPM_ERR_PARTITION_NOT_AVAILABLE;
- }
-}
-
-void tfm_spm_partition_push_interrupted_ctx(uint32_t partition_idx)
-{
- struct spm_partition_runtime_data_t *runtime_data =
- &g_spm_partition_db.partitions[partition_idx].runtime_data;
- struct interrupted_ctx_stack_frame_t *stack_frame =
- (struct interrupted_ctx_stack_frame_t *)
- runtime_data->ctx_stack_ptr;
-
- stack_frame->partition_state = runtime_data->partition_state;
-#if TFM_LVL != 1
- stack_frame->stack_ptr = runtime_data->stack_ptr;
-#endif
- runtime_data->ctx_stack_ptr +=
- sizeof(struct interrupted_ctx_stack_frame_t) / sizeof(uint32_t);
-}
-
-void tfm_spm_partition_pop_interrupted_ctx(uint32_t partition_idx)
-{
- struct spm_partition_runtime_data_t *runtime_data =
- &g_spm_partition_db.partitions[partition_idx].runtime_data;
- struct interrupted_ctx_stack_frame_t *stack_frame;
-
- runtime_data->ctx_stack_ptr -=
- sizeof(struct interrupted_ctx_stack_frame_t) / sizeof(uint32_t);
- stack_frame = (struct interrupted_ctx_stack_frame_t *)
- runtime_data->ctx_stack_ptr;
- tfm_spm_partition_set_state(partition_idx, stack_frame->partition_state);
- stack_frame->partition_state = 0;
-#if TFM_LVL != 1
- tfm_spm_partition_set_stack(partition_idx, stack_frame->stack_ptr);
- stack_frame->stack_ptr = 0;
-#endif
-}
-
-void tfm_spm_partition_push_handler_ctx(uint32_t partition_idx)
-{
- struct spm_partition_runtime_data_t *runtime_data =
- &g_spm_partition_db.partitions[partition_idx].runtime_data;
- struct handler_ctx_stack_frame_t *stack_frame =
- (struct handler_ctx_stack_frame_t *)
- runtime_data->ctx_stack_ptr;
-
- stack_frame->partition_state = runtime_data->partition_state;
- stack_frame->caller_partition_idx = runtime_data->caller_partition_idx;
-
- runtime_data->ctx_stack_ptr +=
- sizeof(struct handler_ctx_stack_frame_t) / sizeof(uint32_t);
-}
-
-void tfm_spm_partition_pop_handler_ctx(uint32_t partition_idx)
-{
- struct spm_partition_runtime_data_t *runtime_data =
- &g_spm_partition_db.partitions[partition_idx].runtime_data;
- struct handler_ctx_stack_frame_t *stack_frame;
-
- runtime_data->ctx_stack_ptr -=
- sizeof(struct handler_ctx_stack_frame_t) / sizeof(uint32_t);
-
- stack_frame = (struct handler_ctx_stack_frame_t *)
- runtime_data->ctx_stack_ptr;
-
- tfm_spm_partition_set_state(partition_idx, stack_frame->partition_state);
- stack_frame->partition_state = 0;
- tfm_spm_partition_set_caller_partition_idx(
- partition_idx, stack_frame->caller_partition_idx);
- stack_frame->caller_partition_idx = 0;
-}
-
-#endif /* !defined(TFM_PSA_API) */
-
#if (TFM_LVL != 1) || defined(TFM_PSA_API)
uint32_t tfm_spm_partition_get_stack_bottom(uint32_t partition_idx)
{
@@ -291,65 +124,6 @@
}
#endif
-#if (TFM_LVL != 1) && !defined(TFM_PSA_API)
-enum spm_err_t tfm_spm_partition_sandbox_config(uint32_t partition_idx)
-{
- struct spm_partition_desc_t *part;
- if (!g_spm_partition_db.is_init) {
- return SPM_ERR_PARTITION_DB_NOT_INIT;
- }
-
- part = &g_spm_partition_db.partitions[partition_idx];
-
- return tfm_spm_hal_partition_sandbox_config(&(part->memory_data),
- part->platform_data);
-}
-
-enum spm_err_t tfm_spm_partition_sandbox_deconfig(uint32_t partition_idx)
-{
- /* This function takes a partition id and disables the
- * SPM partition for that partition
- */
-
- struct spm_partition_desc_t *part;
-
- part = &g_spm_partition_db.partitions[partition_idx];
-
- return tfm_spm_hal_partition_sandbox_deconfig(&(part->memory_data),
- part->platform_data);
-}
-
-uint32_t tfm_spm_partition_get_zi_start(uint32_t partition_idx)
-{
- return g_spm_partition_db.partitions[partition_idx].
- memory_data.zi_start;
-}
-
-uint32_t tfm_spm_partition_get_zi_limit(uint32_t partition_idx)
-{
- return g_spm_partition_db.partitions[partition_idx].
- memory_data.zi_limit;
-}
-
-uint32_t tfm_spm_partition_get_rw_start(uint32_t partition_idx)
-{
- return g_spm_partition_db.partitions[partition_idx].
- memory_data.rw_start;
-}
-
-uint32_t tfm_spm_partition_get_rw_limit(uint32_t partition_idx)
-{
- return g_spm_partition_db.partitions[partition_idx].
- memory_data.rw_limit;
-}
-
-void tfm_spm_partition_set_stack(uint32_t partition_idx, uint32_t stack_ptr)
-{
- g_spm_partition_db.partitions[partition_idx].
- runtime_data.stack_ptr = stack_ptr;
-}
-#endif
-
uint32_t tfm_spm_partition_get_partition_id(uint32_t partition_idx)
{
return g_spm_partition_db.partitions[partition_idx].static_data.
@@ -362,127 +136,6 @@
partition_flags;
}
-#ifndef TFM_PSA_API
-void tfm_spm_partition_store_context(uint32_t partition_idx,
- uint32_t stack_ptr, uint32_t lr)
-{
- g_spm_partition_db.partitions[partition_idx].
- runtime_data.stack_ptr = stack_ptr;
- g_spm_partition_db.partitions[partition_idx].
- runtime_data.lr = lr;
-}
-
-const struct spm_partition_runtime_data_t *
- tfm_spm_partition_get_runtime_data(uint32_t partition_idx)
-{
- return &(g_spm_partition_db.partitions[partition_idx].runtime_data);
-}
-
-void tfm_spm_partition_set_state(uint32_t partition_idx, uint32_t state)
-{
- g_spm_partition_db.partitions[partition_idx].runtime_data.partition_state =
- state;
- if (state == SPM_PARTITION_STATE_RUNNING ||
- state == SPM_PARTITION_STATE_HANDLING_IRQ) {
- g_spm_partition_db.running_partition_idx = partition_idx;
- }
-}
-
-void tfm_spm_partition_set_caller_partition_idx(uint32_t partition_idx,
- uint32_t caller_partition_idx)
-{
- g_spm_partition_db.partitions[partition_idx].runtime_data.
- caller_partition_idx = caller_partition_idx;
-}
-
-void tfm_spm_partition_set_signal_mask(uint32_t partition_idx,
- uint32_t signal_mask)
-{
- g_spm_partition_db.partitions[partition_idx].runtime_data.
- signal_mask = signal_mask;
-}
-
-void tfm_spm_partition_set_caller_client_id(uint32_t partition_idx,
- int32_t caller_client_id)
-{
- g_spm_partition_db.partitions[partition_idx].runtime_data.
- caller_client_id = caller_client_id;
-}
-
-enum spm_err_t tfm_spm_partition_set_share(uint32_t partition_idx,
- uint32_t share)
-{
- enum spm_err_t ret = SPM_ERR_OK;
-
-#if TFM_LVL != 1
- /* Only need to set configuration on levels higher than 1 */
- ret = tfm_spm_hal_set_share_region(share);
-#endif
-
- if (ret == SPM_ERR_OK) {
- g_spm_partition_db.partitions[partition_idx].runtime_data.share = share;
- }
- return ret;
-}
-
-enum spm_err_t tfm_spm_partition_set_iovec(uint32_t partition_idx,
- const int32_t *args)
-{
- struct spm_partition_runtime_data_t *runtime_data =
- &g_spm_partition_db.partitions[partition_idx].runtime_data;
- size_t i;
-
- if ((args[1] < 0) || (args[3] < 0)) {
- return SPM_ERR_INVALID_PARAMETER;
- }
-
- runtime_data->iovec_args.in_len = (size_t)args[1];
- for (i = 0U; i < runtime_data->iovec_args.in_len; ++i) {
- runtime_data->iovec_args.in_vec[i].base =
- ((psa_invec *)args[0])[i].base;
- runtime_data->iovec_args.in_vec[i].len = ((psa_invec *)args[0])[i].len;
- }
- runtime_data->iovec_args.out_len = (size_t)args[3];
- for (i = 0U; i < runtime_data->iovec_args.out_len; ++i) {
- runtime_data->iovec_args.out_vec[i].base =
- ((psa_outvec *)args[2])[i].base;
- runtime_data->iovec_args.out_vec[i].len =
- ((psa_outvec *)args[2])[i].len;
- }
- runtime_data->orig_outvec = (psa_outvec *)args[2];
- runtime_data->iovec_api = 1;
-
- return SPM_ERR_OK;
-}
-
-uint32_t tfm_spm_partition_get_running_partition_idx(void)
-{
- return g_spm_partition_db.running_partition_idx;
-}
-
-void tfm_spm_partition_cleanup_context(uint32_t partition_idx)
-{
- struct spm_partition_desc_t *partition =
- &(g_spm_partition_db.partitions[partition_idx]);
- int32_t i;
-
- partition->runtime_data.caller_partition_idx = SPM_INVALID_PARTITION_IDX;
- partition->runtime_data.share = 0;
- partition->runtime_data.iovec_args.in_len = 0;
- for (i = 0; i < PSA_MAX_IOVEC; ++i) {
- partition->runtime_data.iovec_args.in_vec[i].base = 0;
- partition->runtime_data.iovec_args.in_vec[i].len = 0;
- }
- partition->runtime_data.iovec_args.out_len = 0;
- for (i = 0; i < PSA_MAX_IOVEC; ++i) {
- partition->runtime_data.iovec_args.out_vec[i].base = 0;
- partition->runtime_data.iovec_args.out_vec[i].len = 0;
- }
- partition->runtime_data.orig_outvec = 0;
- partition->runtime_data.iovec_api = 0;
-}
-#endif /* !defined(TFM_PSA_API) */
-
__attribute__((section("SFN")))
void tfm_spm_partition_change_privilege(uint32_t privileged)
{