commit ace4c3f2d51440136e59d5bcd9557fb00c4babfb
author Miklos Balint <miklos.balint@arm.com> Mon Jul 30 12:31:15 2018 +0200
committer Mate Toth-Pal <mate.toth-pal@arm.com> Fri Aug 24 15:13:31 2018 +0200
tree 7361bf1c2796a60a25e9ef58cbae8d63be2232a1
parent ee551bc5bb3f86b890b92f91f855013acb2359c2

Core: Thread mode transition from NS to S

Change TF-M Core to require NS client to make secure
function requests in thread mode instead of handler
mode.
Different secure API options of DEPRIORITIZE and
SVCCLEAR are obsolete, remove them.
Clear registers on secure function entry to avoid
leaking data.
Set AIRCR.PRIS flag by default to avoid NS pre-emption
of secure fault handler and SVC handlers.

Change-Id: Ib771485ebc6b28c0080316ab8d028ba9849a9fcb
Signed-off-by: Miklos Balint <miklos.balint@arm.com>

secure_fw/spm/spm_api.h

diff --git a/secure_fw/spm/spm_api.h b/secure_fw/spm/spm_api.h
index 7743d45..67cbfbf 100644
--- a/secure_fw/spm/spm_api.h
+++ b/secure_fw/spm/spm_api.h
@@ -42,13 +42,9 @@
 struct spm_partition_runtime_data_t {
     uint32_t partition_state;
     uint32_t caller_partition_idx;
-    uint32_t orig_psp;
-    uint32_t orig_psplim;
-    uint32_t orig_lr;
     uint32_t share;
-#if TFM_LVL != 1
     uint32_t stack_ptr;
-#endif
+    uint32_t lr;
 };
 
 
@@ -159,6 +155,18 @@
 void tfm_spm_partition_set_stack(uint32_t partition_id, uint32_t stack_ptr);
 
 /**
+ * \brief Save stack pointer and link register for partition in database
+ *
+ * \param[in] partition_idx  Partition index
+ * \param[in] stack_ptr      Stack pointer to be stored
+ * \param[in] lr             Link register to be stored
+ *
+ * \note This function doesn't check if partition_idx is valid.
+ */
+void tfm_spm_partition_store_context(uint32_t partition_idx,
+        uint32_t stack_ptr, uint32_t lr);
+
+/**
  * \brief Set the current state of a partition
  *
  * \param[in] partition_idx  Partition index
@@ -181,37 +189,6 @@
                                                 uint32_t caller_partition_idx);
 
 /**
- * \brief Set the original PSP value of a partition
- *
- * \param[in] partition_idx  Partition index
- * \param[in] orig_psp       The PSP value to set
- *
- * \note This function doesn't check if partition_idx is valid.
- */
-void tfm_spm_partition_set_orig_psp(uint32_t partition_idx, uint32_t orig_psp);
-
-/**
- * \brief Set the original PSP limit value of a partition
- *
- * \param[in] partition_idx  Partition index
- * \param[in] orig_psplim    The PSP limit value to set
- *
- * \note This function doesn't check if partition_idx is valid.
- */
-void tfm_spm_partition_set_orig_psplim(uint32_t partition_idx,
-                                       uint32_t orig_psplim);
-
-/**
- * \brief Set the original link register value of a partition
- *
- * \param[in] partition_idx  Partition index
- * \param[in] orig_lr        The link register value to set
- *
- * \note This function doesn't check if partition_id is valid.
- */
-void tfm_spm_partition_set_orig_lr(uint32_t partition_idx, uint32_t orig_lr);
-
-/**
  * \brief Set the buffer share region of the partition
  *
  * \param[in] partition_idx  Partition index