SST: Rename SST(Secure STorage) to PS(Protected Storage)
This patches renames SST(Secure STorage) to
PS(Protected Storage) for files, folders and any contents
in files to align with the PSA Storage API spec.
Change-Id: Icf991f59512875780c159f22737b521b3b2d4924
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/interface/include/psa_manifest/pid.h b/interface/include/psa_manifest/pid.h
index c1a8d4b..9cfa3f6 100644
--- a/interface/include/psa_manifest/pid.h
+++ b/interface/include/psa_manifest/pid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -14,7 +14,7 @@
extern "C" {
#endif
-#define TFM_SP_STORAGE (256)
+#define TFM_SP_PS (256)
#define TFM_SP_ITS (257)
#define TFM_SP_AUDIT_LOG (258)
#define TFM_SP_CRYPTO (259)
@@ -26,7 +26,7 @@
#define TFM_SP_IPC_SERVICE_TEST (265)
#define TFM_SP_IPC_CLIENT_TEST (266)
#define TFM_IRQ_TEST_1 (267)
-#define TFM_SP_SST_TEST (268)
+#define TFM_SP_PS_TEST (268)
#define TFM_SP_SECURE_CLIENT_2 (269)
#define TFM_SP_MULTI_CORE_TEST (270)
diff --git a/interface/include/psa_manifest/pid.h.template b/interface/include/psa_manifest/pid.h.template
index f5381f6..6670401 100644
--- a/interface/include/psa_manifest/pid.h.template
+++ b/interface/include/psa_manifest/pid.h.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/interface/include/psa_manifest/sid.h b/interface/include/psa_manifest/sid.h
index 4b9b8c9..f9bdf7c 100644
--- a/interface/include/psa_manifest/sid.h
+++ b/interface/include/psa_manifest/sid.h
@@ -14,17 +14,17 @@
extern "C" {
#endif
-/******** TFM_SP_STORAGE ********/
-#define TFM_SST_SET_SID (0x00000060U)
-#define TFM_SST_SET_VERSION (1U)
-#define TFM_SST_GET_SID (0x00000061U)
-#define TFM_SST_GET_VERSION (1U)
-#define TFM_SST_GET_INFO_SID (0x00000062U)
-#define TFM_SST_GET_INFO_VERSION (1U)
-#define TFM_SST_REMOVE_SID (0x00000063U)
-#define TFM_SST_REMOVE_VERSION (1U)
-#define TFM_SST_GET_SUPPORT_SID (0x00000064U)
-#define TFM_SST_GET_SUPPORT_VERSION (1U)
+/******** TFM_SP_PS ********/
+#define TFM_PS_SET_SID (0x00000060U)
+#define TFM_PS_SET_VERSION (1U)
+#define TFM_PS_GET_SID (0x00000061U)
+#define TFM_PS_GET_VERSION (1U)
+#define TFM_PS_GET_INFO_SID (0x00000062U)
+#define TFM_PS_GET_INFO_VERSION (1U)
+#define TFM_PS_REMOVE_SID (0x00000063U)
+#define TFM_PS_REMOVE_VERSION (1U)
+#define TFM_PS_GET_SUPPORT_SID (0x00000064U)
+#define TFM_PS_GET_SUPPORT_VERSION (1U)
/******** TFM_SP_ITS ********/
#define TFM_ITS_SET_SID (0x00000070U)
@@ -126,9 +126,9 @@
#define SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_SID (0x0000F0A1U)
#define SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_VERSION (1U)
-/******** TFM_SP_SST_TEST ********/
-#define TFM_SST_TEST_PREPARE_SID (0x0000F0C0U)
-#define TFM_SST_TEST_PREPARE_VERSION (1U)
+/******** TFM_SP_PS_TEST ********/
+#define TFM_PS_TEST_PREPARE_SID (0x0000F0C0U)
+#define TFM_PS_TEST_PREPARE_VERSION (1U)
/******** TFM_SP_SECURE_CLIENT_2 ********/
#define TFM_SECURE_CLIENT_2_SID (0x0000F0E0U)
diff --git a/interface/include/tfm_ps_defs.h b/interface/include/tfm_ps_defs.h
new file mode 100644
index 0000000..5dcf2f1
--- /dev/null
+++ b/interface/include/tfm_ps_defs.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __TFM_PS_DEFS_H__
+#define __TFM_PS_DEFS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Invalid UID */
+#define TFM_PS_INVALID_UID 0
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TFM_PS_DEFS_H__ */
diff --git a/interface/include/tfm_sst_defs.h b/interface/include/tfm_sst_defs.h
deleted file mode 100644
index 9132cce..0000000
--- a/interface/include/tfm_sst_defs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#ifndef __TFM_SST_DEFS_H__
-#define __TFM_SST_DEFS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Invalid UID */
-#define TFM_SST_INVALID_UID 0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TFM_SST_DEFS_H__ */
diff --git a/interface/include/tfm_veneers.h b/interface/include/tfm_veneers.h
index d2d9207..c66006a 100644
--- a/interface/include/tfm_veneers.h
+++ b/interface/include/tfm_veneers.h
@@ -16,14 +16,14 @@
extern "C" {
#endif
-#ifdef TFM_PARTITION_SECURE_STORAGE
-/******** TFM_SP_STORAGE ********/
-psa_status_t tfm_tfm_sst_set_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
-psa_status_t tfm_tfm_sst_get_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
-psa_status_t tfm_tfm_sst_get_info_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
-psa_status_t tfm_tfm_sst_remove_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
-psa_status_t tfm_tfm_sst_get_support_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+/******** TFM_SP_PS ********/
+psa_status_t tfm_tfm_ps_set_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+psa_status_t tfm_tfm_ps_get_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+psa_status_t tfm_tfm_ps_get_info_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+psa_status_t tfm_tfm_ps_remove_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+psa_status_t tfm_tfm_ps_get_support_req_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
/******** TFM_SP_ITS ********/
@@ -159,10 +159,10 @@
psa_status_t tfm_spm_irq_test_1_execute_test_scenario_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
#endif /* TFM_ENABLE_IRQ_TEST */
-#ifdef TFM_PARTITION_TEST_SST
-/******** TFM_SP_SST_TEST ********/
-psa_status_t tfm_tfm_sst_test_prepare_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
-#endif /* TFM_PARTITION_TEST_SST */
+#ifdef TFM_PARTITION_TEST_PS
+/******** TFM_SP_PS_TEST ********/
+psa_status_t tfm_tfm_ps_test_prepare_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+#endif /* TFM_PARTITION_TEST_PS */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
/******** TFM_SP_SECURE_CLIENT_2 ********/