commit 813e9d15e8f755a8c0b8ad167ded95f36c52071a
author Mate Toth-Pal <mate.toth-pal@arm.com> Thu Jan 17 15:51:29 2019 +0100
committer Mate Toth-Pal <mate.toth-pal@arm.com> Thu Mar 14 10:21:53 2019 +0100
tree 377c08a81a42a96c869f5af99d4f75dc57247f42
parent 478f99a07eb3df2dc678dd68f690e6a6aad1fdf6

Test: Add positive test suite to IPC build config

This patch adds support for positive core test suite under IPC mode.
Auto signal generation still not implemented that's why
tfm_ss_core_test*_signal.h files are created manually.

Details:
 * enable CORE_TEST in ConfigCoreIPC.cmake
 * implement secure function calls using the PSA API in test services
   and in the test suite
 * define signals for test services
 * update partition manifest files for test services to enumerate the
   available secure functions

Change-Id: I7cbb0acaabbed7cd44650c6a2f9ff3c632e05500
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c9b9fa2..df8f1e7 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -21,7 +21,7 @@
 set(APP_DIR ${CMAKE_CURRENT_LIST_DIR})
 get_filename_component(TFM_ROOT_DIR ${APP_DIR}/.. ABSOLUTE)
 set(INTERFACE_DIR ${TFM_ROOT_DIR}/interface)
-set(TEST_INTERFACE_DIR ${TFM_ROOT_DIR}/test/interface)
+set(TEST_DIR ${TFM_ROOT_DIR}/test)
 
 #Include BL2 bootloader related functions
 set(MCUBOOT_DIR "${TFM_ROOT_DIR}/bl2/ext/mcuboot")

app/tfm_integ_test.c

diff --git a/app/tfm_integ_test.c b/app/tfm_integ_test.c
index 63ec8f3..2d01809 100644
--- a/app/tfm_integ_test.c
+++ b/app/tfm_integ_test.c
@@ -42,16 +42,51 @@
                                                                    "generic!");\
         } \
     } while(0)
+
+#ifdef TFM_PSA_API
+static psa_status_t psa_test_common(uint32_t sid, uint32_t minor_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);
+    if (handle <= 0) {
+        return CORE_TEST_ERRNO_INVALID_PARAMETER;
+    }
+
+    status = psa_call(handle, in_vecs, in_len, out_vecs, out_len);
+    if (status < 0) {
+        status = CORE_TEST_ERRNO_UNEXPECTED_CORE_BEHAVIOUR;
+    }
+
+    psa_close(handle);
+    return status;
+}
+#endif /* TFM_PSA_API */
+
 /**
  * \brief secure_decrement_ns_lock_1
  *
  */
 void secure_decrement_ns_lock_1(void)
 {
+#ifndef TFM_PSA_API
     uint32_t testcase_id = CORE_TEST_ID_BLOCK;
     psa_invec in_vec = {&testcase_id, sizeof(testcase_id)};
 
     TRY_SFN(tfm_spm_core_test_sfn_veneer, &in_vec, 1, NULL, 0);
+#else
+    psa_status_t err;
+
+    err = psa_test_common(SPM_CORE_TEST_BLOCK_SID,
+                          SPM_CORE_TEST_BLOCK_MIN_VER,
+                          NULL, 0, NULL, 0);
+    if (err != PSA_SUCCESS) {
+        LOG_MSG("Secure call to sfn block failed, generic!");
+    }
+#endif
 }
 
 /**
@@ -60,10 +95,21 @@
  */
 void secure_decrement_ns_lock_2(void)
 {
+#ifndef TFM_PSA_API
     uint32_t testcase_id = CORE_TEST_ID_BLOCK;
     psa_invec in_vec = {&testcase_id, sizeof(testcase_id)};
 
     TRY_SFN(tfm_spm_core_test_sfn_veneer, &in_vec, 1, NULL, 0);
+#else
+    psa_status_t err;
+
+    err = psa_test_common(SPM_CORE_TEST_BLOCK_SID,
+                          SPM_CORE_TEST_BLOCK_MIN_VER,
+                          NULL, 0, NULL, 0);
+    if (err != PSA_SUCCESS) {
+        LOG_MSG("Secure call to sfn block failed, generic!");
+    }
+#endif
 }
 /**
  * \brief Test definition for the RTX - TFM integration tests