Build: Align service version convention to PSA FF 1.0
Replace minor_version by version field
Replace minor_policy by version_policy field
Change-Id: I51b6f35fa4e5b529188168b7e99765a4add1cc47
Signed-off-by: Jaykumar Pitambarbhai Patel <jay08ec71@yahoo.com>
diff --git a/app/tfm_integ_test.c b/app/tfm_integ_test.c
index 357397e..19b079d 100644
--- a/app/tfm_integ_test.c
+++ b/app/tfm_integ_test.c
@@ -47,14 +47,14 @@
} while(0)
#ifdef TFM_PSA_API
-static psa_status_t psa_test_common(uint32_t sid, uint32_t minor_version,
+static psa_status_t psa_test_common(uint32_t sid, uint32_t version,
const psa_invec *in_vecs, size_t in_len,
psa_outvec *out_vecs, size_t out_len)
{
psa_handle_t handle;
psa_status_t status;
- handle = psa_connect(sid, minor_version);
+ handle = psa_connect(sid, version);
if (handle <= 0) {
return CORE_TEST_ERRNO_INVALID_PARAMETER;
}
diff --git a/docs/design_documents/tfm_partition_and_service_design_document.rst b/docs/design_documents/tfm_partition_and_service_design_document.rst
index 01685f6..e20f701 100644
--- a/docs/design_documents/tfm_partition_and_service_design_document.rst
+++ b/docs/design_documents/tfm_partition_and_service_design_document.rst
@@ -128,7 +128,7 @@
- Service database contains service name, partition id, service signal, service
identifier, non-secure client(if it can be called by non-secure client),
- minor_version and minor_policy.
+ version and version_policy.
- Partition points to the secure partition data.
- Handle list contains the handle connected to the service.
- Message queue contains the message for the service.
diff --git a/interface/include/psa_manifest/sid.h.template b/interface/include/psa_manifest/sid.h.template
index f49c730..44d8bb5 100644
--- a/interface/include/psa_manifest/sid.h.template
+++ b/interface/include/psa_manifest/sid.h.template
@@ -25,7 +25,7 @@
{% set str = service.name + "_SID" %}
#define {{"%-58s"|format(str)}} ({{"%10s"|format(service.sid)}}U)
{% set str = service.name + "_VERSION" %}
-#define {{"%-58s"|format(str)}} ({{"%d"|format(service.minor_version)}}U)
+#define {{"%-58s"|format(str)}} ({{"%d"|format(service.version)}}U)
{% endfor %}
{% endif %}
{% if manifest.attr.conditional %}
diff --git a/interface/include/tfm_mailbox.h b/interface/include/tfm_mailbox.h
index f6bdae4..2c0ccc5 100644
--- a/interface/include/tfm_mailbox.h
+++ b/interface/include/tfm_mailbox.h
@@ -54,7 +54,7 @@
struct {
uint32_t sid;
- uint32_t minor_version;
+ uint32_t version;
} psa_connect_params;
struct {
diff --git a/interface/src/tfm_multi_core_psa_ns_api.c b/interface/src/tfm_multi_core_psa_ns_api.c
index d765af8..25161ce 100644
--- a/interface/src/tfm_multi_core_psa_ns_api.c
+++ b/interface/src/tfm_multi_core_psa_ns_api.c
@@ -112,7 +112,7 @@
return version;
}
-psa_handle_t psa_connect(uint32_t sid, uint32_t minor_version)
+psa_handle_t psa_connect(uint32_t sid, uint32_t version)
{
struct psa_client_params_t params;
mailbox_msg_handle_t handle;
@@ -120,7 +120,7 @@
int32_t ret;
params.psa_connect_params.sid = sid;
- params.psa_connect_params.minor_version = minor_version;
+ params.psa_connect_params.version = version;
if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
return PSA_NULL_HANDLE;
diff --git a/secure_fw/core/ipc/include/tfm_psa_client_call.h b/secure_fw/core/ipc/include/tfm_psa_client_call.h
index c033430..017d0ae 100644
--- a/secure_fw/core/ipc/include/tfm_psa_client_call.h
+++ b/secure_fw/core/ipc/include/tfm_psa_client_call.h
@@ -30,8 +30,7 @@
*
* \retval PSA_VERSION_NONE The RoT Service is not implemented, or the
* caller is not permitted to access the service.
- * \retval > 0 The minor version of the implemented RoT
- * Service.
+ * \retval > 0 The version of the implemented RoT Service.
*/
uint32_t tfm_psa_version(uint32_t sid, int32_t ns_caller);
@@ -39,7 +38,7 @@
* \brief handler for \ref psa_connect.
*
* \param[in] sid RoT Service identity.
- * \param[in] minor_version The minor version of the RoT Service.
+ * \param[in] version The version of the RoT Service.
* \param[in] ns_caller If 'non-zero', call from non-secure client.
* Otherwise from secure client.
*
@@ -52,7 +51,7 @@
* supported, or the caller is not permitted to
* access the service.
*/
-psa_status_t tfm_psa_connect(uint32_t sid, uint32_t minor_version,
+psa_status_t tfm_psa_connect(uint32_t sid, uint32_t version,
int32_t ns_caller);
/**
@@ -108,4 +107,4 @@
*/
void tfm_psa_close(psa_handle_t handle, int32_t ns_caller);
-#endif
\ No newline at end of file
+#endif
diff --git a/secure_fw/core/ipc/include/tfm_rpc.h b/secure_fw/core/ipc/include/tfm_rpc.h
index 6080604..ec83a6e 100644
--- a/secure_fw/core/ipc/include/tfm_rpc.h
+++ b/secure_fw/core/ipc/include/tfm_rpc.h
@@ -40,7 +40,7 @@
size_t in_len;
psa_outvec *out_vec;
size_t out_len;
- uint32_t minor_version;
+ uint32_t version;
};
/*
@@ -74,8 +74,7 @@
*
* \retval PSA_VERSION_NONE The RoT Service is not implemented, or the
* caller is not permitted to access the service.
- * \retval > 0 The minor version of the implemented RoT
- * Service.
+ * \retval > 0 The version of the implemented RoT Service.
*/
uint32_t tfm_rpc_psa_version(const struct client_call_params_t *params,
int32_t ns_caller);
diff --git a/secure_fw/core/ipc/include/tfm_svcalls.h b/secure_fw/core/ipc/include/tfm_svcalls.h
index dbb7f03..ac127f6 100644
--- a/secure_fw/core/ipc/include/tfm_svcalls.h
+++ b/secure_fw/core/ipc/include/tfm_svcalls.h
@@ -27,8 +27,7 @@
*
* \retval PSA_VERSION_NONE The RoT Service is not implemented, or the
* caller is not permitted to access the service.
- * \retval > 0 The minor version of the implemented RoT
- * Service.
+ * \retval > 0 The version of the implemented RoT Service.
*/
uint32_t tfm_svcall_psa_version(uint32_t *args, int32_t ns_caller);
@@ -36,7 +35,7 @@
* \brief SVC handler for \ref psa_connect.
*
* \param[in] args Include all input arguments:
- * sid, minor_version.
+ * sid, version.
* \param[in] ns_caller If 'non-zero', call from non-secure client.
* Or from secure client.
*
diff --git a/secure_fw/core/ipc/tfm_psa_client_call.c b/secure_fw/core/ipc/tfm_psa_client_call.c
index 5347f3e..56da86a 100644
--- a/secure_fw/core/ipc/tfm_psa_client_call.c
+++ b/secure_fw/core/ipc/tfm_psa_client_call.c
@@ -42,10 +42,10 @@
return PSA_VERSION_NONE;
}
- return service->service_db->minor_version;
+ return service->service_db->version;
}
-psa_status_t tfm_psa_connect(uint32_t sid, uint32_t minor_version,
+psa_status_t tfm_psa_connect(uint32_t sid, uint32_t version,
int32_t ns_caller)
{
struct tfm_spm_service_t *service;
@@ -79,7 +79,7 @@
* It is a fatal error if the version of the RoT Service requested is not
* supported on the platform.
*/
- if (tfm_spm_check_client_version(service, minor_version) != IPC_SUCCESS) {
+ if (tfm_spm_check_client_version(service, version) != IPC_SUCCESS) {
tfm_panic();
}
diff --git a/secure_fw/core/ipc/tfm_rpc.c b/secure_fw/core/ipc/tfm_rpc.c
index 80f674e..62389b2 100644
--- a/secure_fw/core/ipc/tfm_rpc.c
+++ b/secure_fw/core/ipc/tfm_rpc.c
@@ -43,7 +43,7 @@
{
TFM_ASSERT(params != NULL);
- return tfm_psa_connect(params->sid, params->minor_version, ns_caller);
+ return tfm_psa_connect(params->sid, params->version, ns_caller);
}
psa_status_t tfm_rpc_psa_call(const struct client_call_params_t *params,
diff --git a/secure_fw/core/ipc/tfm_spe_mailbox.c b/secure_fw/core/ipc/tfm_spe_mailbox.c
index 0175381..c2c66a3 100644
--- a/secure_fw/core/ipc/tfm_spe_mailbox.c
+++ b/secure_fw/core/ipc/tfm_spe_mailbox.c
@@ -38,7 +38,7 @@
return MAILBOX_SUCCESS;
case MAILBOX_PSA_CONNECT:
spm_params.sid = params->psa_connect_params.sid;
- spm_params.minor_version = params->psa_connect_params.minor_version;
+ spm_params.version = params->psa_connect_params.version;
*psa_ret = (uint32_t)tfm_rpc_psa_connect(&spm_params, NS_CALLER_FLAG);
return MAILBOX_SUCCESS;
case MAILBOX_PSA_CALL:
diff --git a/secure_fw/core/ipc/tfm_svcalls.c b/secure_fw/core/ipc/tfm_svcalls.c
index e09d6e3..093d857 100644
--- a/secure_fw/core/ipc/tfm_svcalls.c
+++ b/secure_fw/core/ipc/tfm_svcalls.c
@@ -53,13 +53,13 @@
psa_status_t tfm_svcall_psa_connect(uint32_t *args, int32_t ns_caller)
{
uint32_t sid;
- uint32_t minor_version;
+ uint32_t version;
TFM_ASSERT(args != NULL);
sid = (uint32_t)args[0];
- minor_version = (uint32_t)args[1];
+ version = (uint32_t)args[1];
- return tfm_psa_connect(sid, minor_version, ns_caller);
+ return tfm_psa_connect(sid, version, ns_caller);
}
psa_status_t tfm_svcall_psa_call(uint32_t *args, int32_t ns_caller, uint32_t lr)
diff --git a/secure_fw/services/audit_logging/tfm_audit_logging.yaml b/secure_fw/services/audit_logging/tfm_audit_logging.yaml
index fb56a6a..a011613 100644
--- a/secure_fw/services/audit_logging/tfm_audit_logging.yaml
+++ b/secure_fw/services/audit_logging/tfm_audit_logging.yaml
@@ -26,40 +26,40 @@
"signal": "AUDIT_CORE_RETRIEVE_RECORD",
"sid": "0x00000000",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_AUDIT_ADD_RECORD",
"signal": "AUDIT_CORE_ADD_RECORD",
"sid": "0x00000001",
"non_secure_clients": false,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_AUDIT_GET_INFO",
"signal": "AUDIT_CORE_GET_INFO",
"sid": "0x00000002",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_AUDIT_GET_RECORD_INFO",
"signal": "AUDIT_CORE_GET_RECORD_INFO",
"sid": "0x00000003",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_AUDIT_DELETE_RECORD",
"signal": "AUDIT_CORE_DELETE_RECORD",
"sid": "0x00000004",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/secure_fw/services/crypto/tfm_crypto.yaml b/secure_fw/services/crypto/tfm_crypto.yaml
index 9f1379d..c2ca83c 100644
--- a/secure_fw/services/crypto/tfm_crypto.yaml
+++ b/secure_fw/services/crypto/tfm_crypto.yaml
@@ -18,316 +18,316 @@
"name": "TFM_CRYPTO_ALLOCATE_KEY",
"signal": "TFM_CRYPTO_ALLOCATE_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_OPEN_KEY",
"signal": "TFM_CRYPTO_OPEN_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CLOSE_KEY",
"signal": "TFM_CRYPTO_CLOSE_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_IMPORT_KEY",
"signal": "TFM_CRYPTO_IMPORT_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_DESTROY_KEY",
"signal": "TFM_CRYPTO_DESTROY_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GET_KEY_INFORMATION",
"signal": "TFM_CRYPTO_GET_KEY_INFORMATION",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_EXPORT_KEY",
"signal": "TFM_CRYPTO_EXPORT_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_EXPORT_PUBLIC_KEY",
"signal": "TFM_CRYPTO_EXPORT_PUBLIC_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_COPY_KEY",
"signal": "TFM_CRYPTO_COPY_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_SET_KEY_POLICY",
"signal": "TFM_CRYPTO_SET_KEY_POLICY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GET_KEY_POLICY",
"signal": "TFM_CRYPTO_GET_KEY_POLICY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GET_KEY_LIFETIME",
"signal": "TFM_CRYPTO_GET_KEY_LIFETIME",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_GENERATE_IV",
"signal": "TFM_CRYPTO_CIPHER_GENERATE_IV",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_SET_IV",
"signal": "TFM_CRYPTO_CIPHER_SET_IV",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP",
"signal": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP",
"signal": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_UPDATE",
"signal": "TFM_CRYPTO_CIPHER_UPDATE",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_ABORT",
"signal": "TFM_CRYPTO_CIPHER_ABORT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_CIPHER_FINISH",
"signal": "TFM_CRYPTO_CIPHER_FINISH",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_HASH_SETUP",
"signal": "TFM_CRYPTO_HASH_SETUP",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_HASH_UPDATE",
"signal": "TFM_CRYPTO_HASH_UPDATE",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_HASH_FINISH",
"signal": "TFM_CRYPTO_HASH_FINISH",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_HASH_VERIFY",
"signal": "TFM_CRYPTO_HASH_VERIFY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_HASH_ABORT",
"signal": "TFM_CRYPTO_HASH_ABORT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_HASH_CLONE",
"signal": "TFM_CRYPTO_HASH_CLONE",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_MAC_SIGN_SETUP",
"signal": "TFM_CRYPTO_MAC_SIGN_SETUP",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_MAC_VERIFY_SETUP",
"signal": "TFM_CRYPTO_MAC_VERIFY_SETUP",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_MAC_UPDATE",
"signal": "TFM_CRYPTO_MAC_UPDATE",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_MAC_SIGN_FINISH",
"signal": "TFM_CRYPTO_MAC_SIGN_FINISH",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_MAC_VERIFY_FINISH",
"signal": "TFM_CRYPTO_MAC_VERIFY_FINISH",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_MAC_ABORT",
"signal": "TFM_CRYPTO_MAC_ABORT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_AEAD_ENCRYPT",
"signal": "TFM_CRYPTO_AEAD_ENCRYPT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_AEAD_DECRYPT",
"signal": "TFM_CRYPTO_AEAD_DECRYPT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_ASYMMETRIC_SIGN",
"signal": "TFM_CRYPTO_ASYMMETRIC_SIGN",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_ASYMMETRIC_VERIFY",
"signal": "TFM_CRYPTO_ASYMMETRIC_VERIFY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT",
"signal": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_ASYMMETRIC_DECRYPT",
"signal": "TFM_CRYPTO_ASYMMETRIC_DECRYPT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GET_GENERATOR_CAPACITY",
"signal": "TFM_CRYPTO_GET_GENERATOR_CAPACITY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GENERATOR_READ",
"signal": "TFM_CRYPTO_GENERATOR_READ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GENERATOR_IMPORT_KEY",
"signal": "TFM_CRYPTO_GENERATOR_IMPORT_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GENERATOR_ABORT",
"signal": "TFM_CRYPTO_GENERATOR_ABORT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_KEY_DERIVATION",
"signal": "TFM_CRYPTO_KEY_DERIVATION",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_KEY_AGREEMENT",
"signal": "TFM_CRYPTO_KEY_AGREEMENT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GENERATE_RANDOM",
"signal": "TFM_CRYPTO_GENERATE_RANDOM",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CRYPTO_GENERATE_KEY",
"signal": "TFM_CRYPTO_GENERATE_KEY",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
],
"services" : [
@@ -336,8 +336,8 @@
"sid": "0x00000080",
"signal": "TFM_CRYPTO_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
],
"linker_pattern": {
diff --git a/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml b/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml
index 27372c2..4a002e1 100644
--- a/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml
+++ b/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml
@@ -19,16 +19,16 @@
"signal": "INITIAL_ATTEST_GET_TOKEN",
"sid": "0x00000020",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_ATTEST_GET_TOKEN_SIZE",
"signal": "INITIAL_ATTEST_GET_TOKEN_SIZE",
"sid": "0x00000021",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
@@ -42,16 +42,16 @@
"sid": "0x00000020",
"signal": "PSA_ATTEST_GET_TOKEN_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_ATTEST_GET_TOKEN_SIZE",
"sid": "0x00000021",
"signal": "PSA_ATTEST_GET_TOKEN_SIZE_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
]
}
diff --git a/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml b/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml
index 06afa04..fb0bf52 100644
--- a/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml
+++ b/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml
@@ -18,29 +18,29 @@
"sfid": "TFM_ITS_SET",
"signal": "TFM_ITS_SET_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"sfid": "TFM_ITS_GET",
"signal": "TFM_ITS_GET_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"sfid": "TFM_ITS_GET_INFO",
"signal": "TFM_ITS_GET_INFO_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"sfid": "TFM_ITS_REMOVE",
"signal": "TFM_ITS_REMOVE_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"services" : [{
@@ -48,32 +48,32 @@
"sid": "0x00000070",
"signal": "TFM_ITS_SET_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_ITS_GET",
"sid": "0x00000071",
"signal": "TFM_ITS_GET_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_ITS_GET_INFO",
"sid": "0x00000072",
"signal": "TFM_ITS_GET_INFO_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_ITS_REMOVE",
"sid": "0x00000073",
"signal": "TFM_ITS_REMOVE_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/secure_fw/services/platform/tfm_platform.yaml b/secure_fw/services/platform/tfm_platform.yaml
index 2274e38..b1e19a7 100644
--- a/secure_fw/services/platform/tfm_platform.yaml
+++ b/secure_fw/services/platform/tfm_platform.yaml
@@ -19,16 +19,16 @@
"signal": "PLATFORM_SP_SYSTEM_RESET",
"sid": "0x00000040",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SP_PLATFORM_IOCTL",
"signal": "PLATFORM_SP_IOCTL",
"sid": "0x00000041",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/secure_fw/services/secure_storage/tfm_secure_storage.yaml b/secure_fw/services/secure_storage/tfm_secure_storage.yaml
index 2b2b3eb..59efd18 100644
--- a/secure_fw/services/secure_storage/tfm_secure_storage.yaml
+++ b/secure_fw/services/secure_storage/tfm_secure_storage.yaml
@@ -18,36 +18,36 @@
"name": "TFM_SST_SET",
"signal": "TFM_SST_SET_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_GET",
"signal": "TFM_SST_GET_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_GET_INFO",
"signal": "TFM_SST_GET_INFO_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_REMOVE",
"signal": "TFM_SST_REMOVE_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_GET_SUPPORT",
"signal": "TFM_SST_GET_SUPPORT_REQ",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"services" : [{
@@ -55,40 +55,40 @@
"sid": "0x00000060",
"signal": "TFM_SST_SET_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_GET",
"sid": "0x00000061",
"signal": "TFM_SST_GET_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_GET_INFO",
"sid": "0x00000062",
"signal": "TFM_SST_GET_INFO_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_REMOVE",
"sid": "0x00000063",
"signal": "TFM_SST_REMOVE_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_SST_GET_SUPPORT",
"sid": "0x00000064",
"signal": "TFM_SST_GET_SUPPORT_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/secure_fw/services/tfm_service_list.inc b/secure_fw/services/tfm_service_list.inc
index 19e968b..3ae22ae 100644
--- a/secure_fw/services/tfm_service_list.inc
+++ b/secure_fw/services/tfm_service_list.inc
@@ -32,8 +32,8 @@
.signal = TFM_SST_SET_SIG,
.sid = 0x00000060,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_SST_GET",
@@ -41,8 +41,8 @@
.signal = TFM_SST_GET_SIG,
.sid = 0x00000061,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_SST_GET_INFO",
@@ -50,8 +50,8 @@
.signal = TFM_SST_GET_INFO_SIG,
.sid = 0x00000062,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_SST_REMOVE",
@@ -59,8 +59,8 @@
.signal = TFM_SST_REMOVE_SIG,
.sid = 0x00000063,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_SST_GET_SUPPORT",
@@ -68,8 +68,8 @@
.signal = TFM_SST_GET_SUPPORT_SIG,
.sid = 0x00000064,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
/******** TFM_SP_ITS ********/
@@ -79,8 +79,8 @@
.signal = TFM_ITS_SET_SIG,
.sid = 0x00000070,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_ITS_GET",
@@ -88,8 +88,8 @@
.signal = TFM_ITS_GET_SIG,
.sid = 0x00000071,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_ITS_GET_INFO",
@@ -97,8 +97,8 @@
.signal = TFM_ITS_GET_INFO_SIG,
.sid = 0x00000072,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_ITS_REMOVE",
@@ -106,8 +106,8 @@
.signal = TFM_ITS_REMOVE_SIG,
.sid = 0x00000073,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
/******** TFM_SP_CRYPTO ********/
@@ -117,8 +117,8 @@
.signal = TFM_CRYPTO_SIG,
.sid = 0x00000080,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
/******** TFM_SP_INITIAL_ATTESTATION ********/
@@ -128,8 +128,8 @@
.signal = PSA_ATTEST_GET_TOKEN_SIG,
.sid = 0x00000020,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "TFM_ATTEST_GET_TOKEN_SIZE",
@@ -137,8 +137,8 @@
.signal = PSA_ATTEST_GET_TOKEN_SIZE_SIG,
.sid = 0x00000021,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#ifdef TFM_PARTITION_TEST_CORE
@@ -149,8 +149,8 @@
.signal = SPM_CORE_TEST_INIT_SUCCESS_SIGNAL,
.sid = 0x0000F020,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_DIRECT_RECURSION",
@@ -158,8 +158,8 @@
.signal = SPM_CORE_TEST_DIRECT_RECURSION_SIGNAL,
.sid = 0x0000F021,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_MPU_ACCESS",
@@ -167,8 +167,8 @@
.signal = SPM_CORE_TEST_MPU_ACCESS_SIGNAL,
.sid = 0x0000F022,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_MEMORY_PERMISSIONS",
@@ -176,8 +176,8 @@
.signal = SPM_CORE_TEST_MEMORY_PERMISSIONS_SIGNAL,
.sid = 0x0000F023,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_SS_TO_SS",
@@ -185,8 +185,8 @@
.signal = SPM_CORE_TEST_SS_TO_SS_SIGNAL,
.sid = 0x0000F024,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_SS_TO_SS_BUFFER",
@@ -194,8 +194,8 @@
.signal = SPM_CORE_TEST_SS_TO_SS_BUFFER_SIGNAL,
.sid = 0x0000F025,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_OUTVEC_WRITE",
@@ -203,8 +203,8 @@
.signal = SPM_CORE_TEST_OUTVEC_WRITE_SIGNAL,
.sid = 0x0000F026,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_PERIPHERAL_ACCESS",
@@ -212,8 +212,8 @@
.signal = SPM_CORE_TEST_PERIPHERAL_ACCESS_SIGNAL,
.sid = 0x0000F027,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_GET_CALLER_CLIENT_ID",
@@ -221,8 +221,8 @@
.signal = SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SIGNAL,
.sid = 0x0000F028,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_SPM_REQUEST",
@@ -230,8 +230,8 @@
.signal = SPM_CORE_TEST_SPM_REQUEST_SIGNAL,
.sid = 0x0000F029,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_BLOCK",
@@ -239,8 +239,8 @@
.signal = SPM_CORE_TEST_BLOCK_SIGNAL,
.sid = 0x0000F02A,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_NS_THREAD",
@@ -248,8 +248,8 @@
.signal = SPM_CORE_TEST_NS_THREAD_SIGNAL,
.sid = 0x0000F02B,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#endif /* TFM_PARTITION_TEST_CORE */
@@ -261,8 +261,8 @@
.signal = SPM_CORE_TEST_2_SLAVE_SERVICE_SIGNAL,
.sid = 0x0000F040,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
@@ -270,8 +270,8 @@
.signal = SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SIGNAL,
.sid = 0x0000F041,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
@@ -279,8 +279,8 @@
.signal = SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SIGNAL,
.sid = 0x0000F042,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_2_INVERT",
@@ -288,8 +288,8 @@
.signal = SPM_CORE_TEST_2_INVERT_SIGNAL,
.sid = 0x0000F043,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO",
@@ -297,8 +297,8 @@
.signal = SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F044,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO",
@@ -306,8 +306,8 @@
.signal = SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F045,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#endif /* TFM_PARTITION_TEST_CORE */
@@ -319,8 +319,8 @@
.signal = TFM_SECURE_CLIENT_SFN_RUN_TESTS_SIG,
.sid = 0x0000F000,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
@@ -332,8 +332,8 @@
.signal = IPC_SERVICE_TEST_BASIC_SIGNAL,
.sid = 0x0000F080,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM",
@@ -341,8 +341,8 @@
.signal = IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SIGNAL,
.sid = 0x0000F081,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
@@ -350,8 +350,8 @@
.signal = IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL,
.sid = 0x0000F082,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM",
@@ -359,8 +359,8 @@
.signal = IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SIGNAL,
.sid = 0x0000F083,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#endif /* TFM_PARTITION_TEST_CORE_IPC */
@@ -372,8 +372,8 @@
.signal = IPC_CLIENT_TEST_BASIC_SIGNAL,
.sid = 0x0000F060,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM",
@@ -381,8 +381,8 @@
.signal = IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SIGNAL,
.sid = 0x0000F061,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
@@ -390,8 +390,8 @@
.signal = IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL,
.sid = 0x0000F062,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM",
@@ -399,8 +399,8 @@
.signal = IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SIGNAL,
.sid = 0x0000F063,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "IPC_CLIENT_TEST_MEM_CHECK",
@@ -408,8 +408,8 @@
.signal = IPC_CLIENT_TEST_MEM_CHECK_SIGNAL,
.sid = 0x0000F064,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#endif /* TFM_PARTITION_TEST_CORE_IPC */
@@ -421,8 +421,8 @@
.signal = SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F0A0,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
{
.name = "SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO",
@@ -430,8 +430,8 @@
.signal = SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F0A1,
.non_secure_client = true,
- .minor_version = 1,
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
},
#endif /* TFM_ENABLE_IRQ_TEST */
diff --git a/secure_fw/services/tfm_service_list.inc.template b/secure_fw/services/tfm_service_list.inc.template
index 02c63d3..2a25920 100644
--- a/secure_fw/services/tfm_service_list.inc.template
+++ b/secure_fw/services/tfm_service_list.inc.template
@@ -34,15 +34,15 @@
{% else %}
.non_secure_client = false,
{% endif %}
- {% if service.minor_version %}
- .minor_version = {{service.minor_version}},
+ {% if service.version %}
+ .version = {{service.version}},
{% else %}
- .minor_version = 1,
+ .version = 1,
{% endif %}
- {% if service.minor_policy %}
- .minor_policy = TFM_VERSION_POLICY_{{service.minor_policy}}
+ {% if service.version_policy %}
+ .version_policy = TFM_VERSION_POLICY_{{service.version_policy}}
{% else %}
- .minor_policy = TFM_VERSION_POLICY_STRICT
+ .version_policy = TFM_VERSION_POLICY_STRICT
{% endif %}
{{'}'}},
{% endfor %}
diff --git a/secure_fw/spm/spm_api.h b/secure_fw/spm/spm_api.h
index 1ab4356..ce042f7 100644
--- a/secure_fw/spm/spm_api.h
+++ b/secure_fw/spm/spm_api.h
@@ -126,8 +126,8 @@
psa_signal_t signal; /* Service signal */
uint32_t sid; /* Service identifier */
bool non_secure_client; /* If can be called by non secure client */
- uint32_t minor_version; /* Minor version */
- uint32_t minor_policy; /* Minor version policy */
+ uint32_t version; /* Service version */
+ uint32_t version_policy; /* Service version policy */
};
/* RoT Service data */
@@ -584,19 +584,19 @@
struct tfm_msg_body_t *msg);
/**
- * \brief Check the client minor version according to
+ * \brief Check the client version according to
* version policy
*
* \param[in] service Target service context pointer, which can be get
* by partition management functions
- * \param[in] minor_version Client support minor version
+ * \param[in] version Client support version
*
* \retval IPC_SUCCESS Success
* \retval IPC_ERROR_BAD_PARAMETERS Bad parameters input
* \retval IPC_ERROR_VERSION Check failed
*/
int32_t tfm_spm_check_client_version(struct tfm_spm_service_t *service,
- uint32_t minor_version);
+ uint32_t version);
/**
* \brief Check the memory reference is valid.
diff --git a/secure_fw/spm/spm_api_ipc.c b/secure_fw/spm/spm_api_ipc.c
index 4677421..e42c5a1 100644
--- a/secure_fw/spm/spm_api_ipc.c
+++ b/secure_fw/spm/spm_api_ipc.c
@@ -220,18 +220,18 @@
}
int32_t tfm_spm_check_client_version(struct tfm_spm_service_t *service,
- uint32_t minor_version)
+ uint32_t version)
{
TFM_ASSERT(service);
- switch (service->service_db->minor_policy) {
+ switch (service->service_db->version_policy) {
case TFM_VERSION_POLICY_RELAXED:
- if (minor_version > service->service_db->minor_version) {
+ if (version > service->service_db->version) {
return IPC_ERROR_VERSION;
}
break;
case TFM_VERSION_POLICY_STRICT:
- if (minor_version != service->service_db->minor_version) {
+ if (version != service->service_db->version) {
return IPC_ERROR_VERSION;
}
break;
diff --git a/test/suites/core/non_secure/core_ns_positive_testsuite.c b/test/suites/core/non_secure/core_ns_positive_testsuite.c
index 80c115c..776dbe3 100644
--- a/test/suites/core/non_secure/core_ns_positive_testsuite.c
+++ b/test/suites/core/non_secure/core_ns_positive_testsuite.c
@@ -114,14 +114,14 @@
}
#ifdef TFM_PSA_API
-static psa_status_t psa_test_common(uint32_t sid, uint32_t minor_version,
+static psa_status_t psa_test_common(uint32_t sid, uint32_t version,
const psa_invec *in_vecs, size_t in_len,
psa_outvec *out_vecs, size_t out_len)
{
psa_handle_t handle;
psa_status_t status;
- handle = psa_connect(sid, minor_version);
+ handle = psa_connect(sid, version);
if (handle <= 0) {
return CORE_TEST_ERRNO_INVALID_PARAMETER;
}
diff --git a/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c b/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
index a1bc5df..d17fe6f 100644
--- a/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
+++ b/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
@@ -37,7 +37,7 @@
{&tfm_ipc_test_1001, "TFM_IPC_TEST_1001",
"Get PSA framework version", {0}},
{&tfm_ipc_test_1002, "TFM_IPC_TEST_1002",
- "Get minor version of a RoT Service", {0}},
+ "Get version of a RoT Service", {0}},
{&tfm_ipc_test_1003, "TFM_IPC_TEST_1003",
"Connect to a RoT Service", {0}},
{&tfm_ipc_test_1004, "TFM_IPC_TEST_1004",
@@ -91,7 +91,7 @@
}
/**
- * \brief Retrieve the minor version of a RoT Service.
+ * \brief Retrieve the version of a RoT Service.
*/
static void tfm_ipc_test_1002(struct test_result_t *ret)
{
@@ -104,7 +104,7 @@
return;
} else {
/* Valid version number */
- TEST_LOG("The minor version is %d.\r\n", version);
+ TEST_LOG("The service version is %d.\r\n", version);
}
ret->val = TEST_PASSED;
}
@@ -142,10 +142,10 @@
{str4, sizeof(str4)/sizeof(char)}};
psa_handle_t handle;
psa_status_t status;
- uint32_t min_version;
+ uint32_t version;
- min_version = psa_version(IPC_SERVICE_TEST_BASIC_SID);
- TEST_LOG("TFM service support minor version is %d.\r\n", min_version);
+ version = psa_version(IPC_SERVICE_TEST_BASIC_SID);
+ TEST_LOG("TFM service support version is %d.\r\n", version);
handle = psa_connect(IPC_SERVICE_TEST_BASIC_SID,
IPC_SERVICE_TEST_BASIC_VERSION);
status = psa_call(handle, PSA_IPC_CALL, invecs, 2, outvecs, 2);
diff --git a/test/test_services/tfm_core_test/tfm_ss_core_test.c b/test/test_services/tfm_core_test/tfm_ss_core_test.c
index fad7688..35f6e65 100644
--- a/test/test_services/tfm_core_test/tfm_ss_core_test.c
+++ b/test/test_services/tfm_core_test/tfm_ss_core_test.c
@@ -41,14 +41,14 @@
#else /* !defined(TFM_PSA_API) */
-static psa_status_t psa_test_common(uint32_t sid, uint32_t minor_version,
+static psa_status_t psa_test_common(uint32_t sid, uint32_t version,
const psa_invec *in_vecs, size_t in_len,
psa_outvec *out_vecs, size_t out_len)
{
psa_handle_t handle;
psa_status_t status;
- handle = psa_connect(sid, minor_version);
+ handle = psa_connect(sid, version);
if (handle <= 0) {
return CORE_TEST_ERRNO_INVALID_PARAMETER;
}
diff --git a/test/test_services/tfm_core_test/tfm_test_core.yaml b/test/test_services/tfm_core_test/tfm_test_core.yaml
index f481c11..2f5e44dc 100644
--- a/test/test_services/tfm_core_test/tfm_test_core.yaml
+++ b/test/test_services/tfm_core_test/tfm_test_core.yaml
@@ -24,22 +24,22 @@
"name": "TFM_CORE_TEST_SFN",
"signal": "SPM_CORE_TEST_SFN",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_SFN_INIT_SUCCESS",
"signal": "SPM_CORE_TEST_SFN_INIT_SUCCESS",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_SFN_DIRECT_RECURSION",
"signal": "SPM_CORE_TEST_SFN_DIRECT_RECURSION",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
@@ -53,96 +53,96 @@
"sid": "0x0000F020",
"signal": "SPM_CORE_TEST_INIT_SUCCESS_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_DIRECT_RECURSION",
"sid": "0x0000F021",
"signal": "SPM_CORE_TEST_DIRECT_RECURSION_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_MPU_ACCESS",
"sid": "0x0000F022",
"signal": "SPM_CORE_TEST_MPU_ACCESS_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_MEMORY_PERMISSIONS",
"sid": "0x0000F023",
"signal": "SPM_CORE_TEST_MEMORY_PERMISSIONS_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_SS_TO_SS",
"sid": "0x0000F024",
"signal": "SPM_CORE_TEST_SS_TO_SS_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_SS_TO_SS_BUFFER",
"sid": "0x0000F025",
"signal": "SPM_CORE_TEST_SS_TO_SS_BUFFER_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_OUTVEC_WRITE",
"sid": "0x0000F026",
"signal": "SPM_CORE_TEST_OUTVEC_WRITE_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_PERIPHERAL_ACCESS",
"sid": "0x0000F027",
"signal": "SPM_CORE_TEST_PERIPHERAL_ACCESS_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_GET_CALLER_CLIENT_ID",
"sid": "0x0000F028",
"signal": "SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_SPM_REQUEST",
"sid": "0x0000F029",
"signal": "SPM_CORE_TEST_SPM_REQUEST_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_BLOCK",
"sid": "0x0000F02A",
"signal": "SPM_CORE_TEST_BLOCK_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_NS_THREAD",
"sid": "0x0000F02B",
"signal": "SPM_CORE_TEST_NS_THREAD_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
]
}
diff --git a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml b/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
index dce7c1a..8309ec1 100644
--- a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
+++ b/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
@@ -18,43 +18,43 @@
"name": "TFM_CORE_TEST_2_SFN_SLAVE_SERVICE",
"signal": "SPM_CORE_TEST_2_SLAVE_SERVICE",
"non_secure_clients": false,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_2_SFN_INVERT",
"signal": "SPM_CORE_TEST_2_SFN_INVERT",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_2_SFN_CHECK_CALLER_CLIENT_ID",
"signal": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_2_SFN_GET_EVERY_SECOND_BYTE",
"signal": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_2_SFN_PREPARE_TEST_SCENARIO",
"signal": "SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "TFM_CORE_TEST_2_SFN_EXECUTE_TEST_SCENARIO",
"signal": "SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
@@ -68,48 +68,48 @@
"sid": "0x0000F040",
"signal": "SPM_CORE_TEST_2_SLAVE_SERVICE_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
"sid": "0x0000F041",
"signal": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
"sid": "0x0000F042",
"signal": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_2_INVERT",
"sid": "0x0000F043",
"signal": "SPM_CORE_TEST_2_INVERT_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO",
"sid": "0x0000F044",
"signal": "SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO",
"sid": "0x0000F045",
"signal": "SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
]
}
diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
index e8b3495..2bab050 100644
--- a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
+++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
@@ -21,40 +21,40 @@
"sid": "0x0000F060",
"signal": "IPC_CLIENT_TEST_BASIC_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM",
"sid": "0x0000F061",
"signal": "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
"sid": "0x0000F062",
"signal": "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM",
"sid": "0x0000F063",
"signal": "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_CLIENT_TEST_MEM_CHECK",
"sid": "0x0000F064",
"signal": "IPC_CLIENT_TEST_MEM_CHECK_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
index 8640dc9..1a9c508 100644
--- a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
+++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
@@ -21,32 +21,32 @@
"sid": "0x0000F080",
"signal": "IPC_SERVICE_TEST_BASIC_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM",
"sid": "0x0000F081",
"signal": "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
"sid": "0x0000F082",
"signal": "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM",
"sid": "0x0000F083",
"signal": "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml
index 0ba3873..f9e3317 100644
--- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml
+++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml
@@ -24,15 +24,15 @@
"name": "SPM_IRQ_TEST_1_PREPARE_TEST_SCENARIO",
"signal": "SPM_IRQ_TEST_1_PREPARE_TEST_SCENARIO",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_IRQ_TEST_1_EXECUTE_TEST_SCENARIO",
"signal": "SPM_IRQ_TEST_1_EXECUTE_TEST_SCENARIO",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
"irqs": [
@@ -54,16 +54,16 @@
"sid": "0x0000F0A0",
"signal": "SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
{
"name": "SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO",
"sid": "0x0000F0A1",
"signal": "SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_SIGNAL",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
]
}
diff --git a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
index 1fce243..b5c9b5c 100644
--- a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
+++ b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
@@ -24,8 +24,8 @@
"name": "TFM_SECURE_CLIENT_SFN_RUN_TESTS",
"signal": "TFM_SECURE_CLIENT_SERVICE_SFN_RUN_TESTS",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
},
],
"services": [
@@ -34,8 +34,8 @@
"sid": "0x0000F000",
"signal": "TFM_SECURE_CLIENT_SFN_RUN_TESTS_SIG",
"non_secure_clients": true,
- "minor_version": 1,
- "minor_policy": "STRICT"
+ "version": 1,
+ "version_policy": "STRICT"
}
],
# Currently there is no platform dependent section of the manifest file,