SST: Add uniform secure functions support
This patch adds the uniform secure functions support in SST.
Change-Id: I52475b43435ed3b6d289651ea777de9483116b7e
Signed-off-by: Marc Moreno <marc.morenoberengue@arm.com>
diff --git a/secure_fw/ns_callable/CMakeLists.inc b/secure_fw/ns_callable/CMakeLists.inc
index a09ff13..e9e2c18 100644
--- a/secure_fw/ns_callable/CMakeLists.inc
+++ b/secure_fw/ns_callable/CMakeLists.inc
@@ -24,7 +24,6 @@
endif()
set (SS_NS_CALLABLE_C_SRC "${CMAKE_CURRENT_LIST_DIR}/tfm_veneers.c"
- "${CMAKE_CURRENT_LIST_DIR}/tfm_sst_veneers.c"
"${CMAKE_CURRENT_LIST_DIR}/tfm_audit_veneers.c"
"${CMAKE_CURRENT_LIST_DIR}/tfm_crypto_veneers.c"
"${CMAKE_CURRENT_LIST_DIR}/tfm_platform_veneers.c")
diff --git a/secure_fw/ns_callable/tfm_sst_veneers.c b/secure_fw/ns_callable/tfm_sst_veneers.c
deleted file mode 100644
index 5348d5d..0000000
--- a/secure_fw/ns_callable/tfm_sst_veneers.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#include "tfm_sst_veneers.h"
-
-#include "secure_fw/core/tfm_secure_api.h"
-#include "secure_fw/services/secure_storage/tfm_protected_storage.h"
-#include "secure_fw/spm/spm_partition_defs.h"
-
-__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t tfm_sst_veneer_set(const psa_ps_uid_t *uid,
- uint32_t data_length,
- const void *p_data,
- psa_ps_create_flags_t create_flags)
-{
- TFM_CORE_SFN_REQUEST(TFM_SP_STORAGE_ID, tfm_sst_set,
- uid, data_length, p_data, create_flags);
-}
-
-__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t tfm_sst_veneer_get(const psa_ps_uid_t *uid,
- uint32_t data_offset,
- uint32_t data_length,
- void *p_data)
-{
- TFM_CORE_SFN_REQUEST(TFM_SP_STORAGE_ID, tfm_sst_get,
- uid, data_offset, data_length, p_data);
-}
-
-__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t tfm_sst_veneer_get_info(const psa_ps_uid_t *uid,
- struct psa_ps_info_t *p_info)
-{
- TFM_CORE_SFN_REQUEST(TFM_SP_STORAGE_ID, tfm_sst_get_info,
- uid, p_info, 0, 0);
-}
-
-__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t tfm_sst_veneer_remove(const psa_ps_uid_t *uid)
-{
- TFM_CORE_SFN_REQUEST(TFM_SP_STORAGE_ID, tfm_sst_remove,
- uid, 0, 0, 0);
-}
-
-__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t tfm_sst_veneer_get_support(uint32_t *support_flags)
-{
- TFM_CORE_SFN_REQUEST(TFM_SP_STORAGE_ID, tfm_sst_get_support,
- support_flags, 0, 0, 0);
-}
diff --git a/secure_fw/ns_callable/tfm_veneers.c b/secure_fw/ns_callable/tfm_veneers.c
index 9e9063f..d8c66b6 100644
--- a/secure_fw/ns_callable/tfm_veneers.c
+++ b/secure_fw/ns_callable/tfm_veneers.c
@@ -12,11 +12,11 @@
#include "secure_fw/spm/spm_partition_defs.h"
/******** TFM_SP_STORAGE ********/
-psa_status_t tfm_sst_set(struct psa_invec *, size_t, struct psa_outvec *, size_t);
-psa_status_t tfm_sst_get(struct psa_invec *, size_t, struct psa_outvec *, size_t);
-psa_status_t tfm_sst_get_info(struct psa_invec *, size_t, struct psa_outvec *, size_t);
-psa_status_t tfm_sst_remove(struct psa_invec *, size_t, struct psa_outvec *, size_t);
-psa_status_t tfm_sst_get_support(struct psa_invec *, size_t, struct psa_outvec *, size_t);
+psa_status_t tfm_sst_set_req(struct psa_invec *, size_t, struct psa_outvec *, size_t);
+psa_status_t tfm_sst_get_req(struct psa_invec *, size_t, struct psa_outvec *, size_t);
+psa_status_t tfm_sst_get_info_req(struct psa_invec *, size_t, struct psa_outvec *, size_t);
+psa_status_t tfm_sst_remove_req(struct psa_invec *, size_t, struct psa_outvec *, size_t);
+psa_status_t tfm_sst_get_support_req(struct psa_invec *, size_t, struct psa_outvec *, size_t);
/******** TFM_SP_AUDIT_LOG ********/
psa_status_t audit_core_retrieve_record(struct psa_invec *, size_t, struct psa_outvec *, size_t);
@@ -107,11 +107,11 @@
}
/******** TFM_SP_STORAGE ********/
-TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_set)
-TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_get)
-TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_get_info)
-TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_remove)
-TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_get_support)
+TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_set_req)
+TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_get_req)
+TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_get_info_req)
+TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_remove_req)
+TFM_VENEER_FUNCTION(TFM_SP_STORAGE, tfm_sst_get_support_req)
/******** TFM_SP_AUDIT_LOG ********/
TFM_VENEER_FUNCTION(TFM_SP_AUDIT_LOG, audit_core_retrieve_record)