trusted-firmware-m: tf-m-tests: synchronize with upstream

Synchronize the tf-m-test directory with the
corresponding upstream repository up to commit
652bb8a1502c95bfd1ee8e44ccd1126ce74ae41f

Signed-off-by: Ioannis Glaropoulos <[email protected]>

Author: ioannisg

tf-m-tests/app/CMakeLists.txt

@@ -0,0 +1,155 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+
+cmake_minimum_required(VERSION 3.13)
+project(tfm_ns LANGUAGES ASM C)
+
+# For multi-core projects, the NS app can be run on a different CPU to the
+# Secure code. To facilitate this, we once again reload the compiler to load the
+# setting for the NS CPU. Cmake settings are directory scoped so this affects
+# anything loaded from or declared in this dir.
+if (TFM_MULTI_CORE_TOPOLOGY)
+    include(${CMAKE_SOURCE_DIR}/platform/ext/target/${TFM_PLATFORM}/preload_ns.cmake)
+endif()
+
+############################# PSA test integration #############################
+
+if(TEST_PSA_API)
+    set(SUITE ${TEST_PSA_API})
+
+    string(REGEX REPLACE ".*/" "" PSA_API_TEST_TARGET ${TFM_PLATFORM})
+
+    if (NOT "${TEST_PSA_API}" STREQUAL "IPC")
+        set(TARGET tgt_dev_apis_tfm_${PSA_API_TEST_TARGET})
+    else()
+        set(TARGET tgt_ff_tfm_${PSA_API_TEST_TARGET})
+    endif()
+
+    set(PSA_INCLUDE_PATHS ${CMAKE_SOURCE_DIR}/interface/include/
+                          ${PSA_ARCH_TESTS_PATH}/api-tests/platform/manifests/
+                          ${CMAKE_BINARY_DIR}/generated/interface/include
+    )
+
+    set(SP_HEAP_MEM_SUPP=0)
+    set(PLATFORM_PSA_ISOLATION_LEVEL ${TFM_ISOLATION_LEVEL})
+
+    if (${CMAKE_C_COMPILER_ID} STREQUAL GNU)
+        set(TOOLCHAIN GNUARM)
+    elseif (${CMAKE_C_COMPILER_ID} STREQUAL ARMClang)
+        set(TOOLCHAIN ARMCLANG)
+    endif()
+
+    if (${CMAKE_SYSTEM_ARCHITECTURE} STREQUAL armv8-m.main)
+        set(CPU_ARCH armv8m_ml)
+    elseif (${CMAKE_SYSTEM_ARCHITECTURE} STREQUAL armv8-m.base)
+        set(CPU_ARCH armv8m_bl)
+    elseif (${CMAKE_SYSTEM_ARCHITECTURE} STREQUAL armv7-m)
+        set(CPU_ARCH armv7m)
+    endif()
+
+    add_subdirectory(${PSA_ARCH_TESTS_PATH}/api-tests ${CMAKE_CURRENT_BINARY_DIR}/psa_api_tests)
+endif()
+
+############################# Test integration #################################
+
+add_library(tfm_ns_integration_test STATIC EXCLUDE_FROM_ALL)
+
+target_sources(tfm_ns_integration_test
+    PRIVATE
+        tfm_integ_test.c
+)
+
+target_include_directories(tfm_ns_integration_test
+    PUBLIC
+        .
+)
+
+target_link_libraries(tfm_ns_integration_test
+    PUBLIC
+        $<$<BOOL:${TEST_NS}>:tfm_ns_tests>
+        tfm_test_framework
+    PRIVATE
+        psa_interface
+        $<TARGET_PROPERTY:platform_ns,PLATFORM_RTX_LIB_PATH>
+        psa_api_ns
+        CMSIS_5_tfm_ns
+)
+
+target_compile_definitions(tfm_ns_integration_test
+    PUBLIC
+        $<$<BOOL:${TEST_NS}>:TEST_FRAMEWORK_NS>
+        $<$<BOOL:${TEST_S}>:TEST_FRAMEWORK_S>
+)
+
+############################# TFM NS app #######################################
+
+add_executable(tfm_ns)
+
+target_sources(tfm_ns
+    PRIVATE
+        main_ns.c
+        $<$<BOOL:${TEST_PSA_API}>:psa_api_test.c>
+)
+
+target_link_libraries(tfm_ns
+    PRIVATE
+        platform_ns
+        CMSIS_5_tfm_ns
+        $<$<OR:$<BOOL:${TEST_NS}>,$<BOOL:${TEST_S}>>:tfm_ns_integration_test>
+        $<$<BOOL:${TEST_PSA_API}>:val_nspe>
+        $<$<BOOL:${TEST_PSA_API}>:pal_nspe>
+        $<$<BOOL:${TEST_PSA_API}>:test_combine>
+        $<$<NOT:$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>>:tfm_s_veneers>
+        psa_api_ns
+)
+
+target_compile_definitions(tfm_ns
+    PUBLIC
+    $<$<BOOL:${TEST_PSA_API}>:PSA_API_TEST_NS>
+)
+
+set_target_properties(tfm_ns PROPERTIES
+    SUFFIX ".axf"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+)
+
+target_link_options(tfm_ns
+    PRIVATE
+        $<$<C_COMPILER_ID:GNU>:-Wl,-Map=${CMAKE_BINARY_DIR}/bin/tfm_ns.map>
+        $<$<C_COMPILER_ID:ARMClang>:--map>
+)
+
+add_convert_to_bin_target(tfm_ns)
+
+############################# CMSIS ############################################
+
+include(FetchContent)
+
+set(FETCHCONTENT_QUIET FALSE)
+cmake_policy(SET CMP0079 NEW)
+
+add_library(CMSIS_5_tfm_ns INTERFACE)
+
+target_sources(CMSIS_5_tfm_ns
+    INTERFACE
+        ${CMSIS_5_PATH}/RTOS2/RTX/Config/RTX_Config.c
+        ${CMSIS_5_PATH}/RTOS2/RTX/Source/rtx_lib.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/os_wrapper_cmsis_rtos_v2.c
+)
+
+target_include_directories(CMSIS_5_tfm_ns
+    INTERFACE
+        ${CMSIS_5_PATH}/Core/Include
+        ${CMSIS_5_PATH}/RTOS2/Include
+        ${CMSIS_5_PATH}/RTOS2/RTX/Include
+        ${CMSIS_5_PATH}/RTOS2/RTX/Config
+)
+
+target_link_libraries(CMSIS_5_tfm_ns
+    INTERFACE
+        platform_ns
+)

tf-m-tests/app/main_ns.c

@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#include "tfm_api.h"
+#include "cmsis_os2.h"
+#include "tfm_integ_test.h"
+#include "tfm_ns_svc.h"
+#include "tfm_ns_interface.h"
+#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S)
+#include "test_framework_integ_test.h"
+#endif
+#ifdef PSA_API_TEST_NS
+#include "psa_api_test.h"
+#endif
+#include "target_cfg.h"
+#include "tfm_plat_ns.h"
+#include "driver/Driver_USART.h"
+#include "device_cfg.h"
+#ifdef TFM_MULTI_CORE_TOPOLOGY
+#include "tfm_multi_core_api.h"
+#include "tfm_ns_mailbox.h"
+#endif
+#include "log/tfm_assert.h"
+#include "tfm_log.h"
+#include "uart_stdout.h"
+#include "region.h"
+
+/**
+ * \brief Modified table template for user defined SVC functions
+ *
+ * \details RTX has a weak definition of osRtxUserSVC, which
+ *          is overridden here
+ */
+#if (defined(__ARMCC_VERSION) && (__ARMCC_VERSION == 6110004))
+/* Workaround needed for a bug in Armclang 6.11, more details at:
+ * http://www.keil.com/support/docs/4089.htm
+ */
+__attribute__((section(".gnu.linkonce")))
+#endif
+extern void * const osRtxUserSVC[1+USER_SVC_COUNT];
+       void * const osRtxUserSVC[1+USER_SVC_COUNT] = {
+  (void *)USER_SVC_COUNT,
+
+#define X(SVC_ENUM, SVC_HANDLER) (void*)SVC_HANDLER,
+
+    /* SVC API for Services */
+#ifdef TFM_NS_CLIENT_IDENTIFICATION
+    LIST_SVC_NSPM
+#endif
+
+#undef X
+
+/*
+ * (void *)user_function1,
+ *  ...
+ */
+};
+
+/**
+ * \brief List of RTOS thread attributes
+ */
+#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S) \
+ || defined(PSA_API_TEST_NS)
+static uint64_t test_app_stack[(4u * 1024u) / (sizeof(uint64_t))]; /* 4KB */
+static const osThreadAttr_t thread_attr = {
+    .name = "test_thread",
+    .stack_mem = test_app_stack,
+    .stack_size = sizeof(test_app_stack),
+};
+#endif
+
+/**
+ * \brief Static globals to hold RTOS related quantities,
+ *        main thread
+ */
+#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S) \
+ || defined(PSA_API_TEST_NS)
+static osThreadFunc_t thread_func;
+#endif
+
+#ifdef TFM_MULTI_CORE_TOPOLOGY
+static struct ns_mailbox_queue_t ns_mailbox_queue;
+
+static void tfm_ns_multi_core_boot(void)
+{
+    int32_t ret;
+
+    LOG_MSG("Non-secure code running on non-secure core.");
+
+    if (tfm_ns_wait_for_s_cpu_ready()) {
+        LOG_MSG("Error sync'ing with secure core.");
+
+        /* Avoid undefined behavior after multi-core sync-up failed */
+        for (;;) {
+        }
+    }
+
+    ret = tfm_ns_mailbox_init(&ns_mailbox_queue);
+    if (ret != MAILBOX_SUCCESS) {
+        LOG_MSG("Non-secure mailbox initialization failed.");
+
+        /* Avoid undefined behavior after NS mailbox initialization failed */
+        for (;;) {
+        }
+    }
+}
+#endif
+
+/**
+ * \brief Platform peripherals and devices initialization.
+ *        Can be overridden for platform specific initialization.
+ *
+ * \return  ARM_DRIVER_OK if the initialization succeeds
+ */
+__WEAK int32_t tfm_ns_platform_init(void)
+{
+    stdio_init();
+
+    return ARM_DRIVER_OK;
+}
+
+/**
+ * \brief Platform peripherals and devices de-initialization.
+ *        Can be overridden for platform specific initialization.
+ *
+ * \return  ARM_DRIVER_OK if the de-initialization succeeds
+ */
+__WEAK int32_t tfm_ns_platform_uninit(void)
+{
+    stdio_uninit();
+
+    return ARM_DRIVER_OK;
+}
+
+/**
+ * \brief main() function
+ */
+#ifndef __GNUC__
+__attribute__((noreturn))
+#endif
+int main(void)
+{
+#if defined(__ARM_ARCH_8_1M_MAIN__) || defined(__ARM_ARCH_8M_MAIN__)
+    /* Set Main Stack Pointer limit */
+    REGION_DECLARE(Image$$, ARM_LIB_STACK_MSP, $$ZI$$Base);
+    __set_MSPLIM((uint32_t)&REGION_NAME(Image$$, ARM_LIB_STACK_MSP,
+                                        $$ZI$$Base));
+#endif
+
+    if (tfm_ns_platform_init() != ARM_DRIVER_OK) {
+        /* Avoid undefined behavior if platform init failed */
+        while(1);
+    }
+
+#ifdef TFM_MULTI_CORE_TOPOLOGY
+    tfm_ns_multi_core_boot();
+#endif
+
+    (void) osKernelInitialize();
+
+    /* Initialize the TFM NS interface */
+    tfm_ns_interface_init();
+
+#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S)
+    thread_func = test_app;
+#elif defined(PSA_API_TEST_NS)
+    thread_func = psa_api_test;
+#endif
+
+#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S) \
+ || defined(PSA_API_TEST_NS)
+    (void) osThreadNew(thread_func, NULL, &thread_attr);
+#endif
+
+    LOG_MSG("Non-Secure system starting...\r\n");
+    (void) osKernelStart();
+
+    /* Reached only in case of error */
+    for (;;) {
+    }
+}