Merge pull request #9064 from ARMmbed/release-candidate

Release candidate for mbed-os-5.11.0-rc3

Author: 0xc0170

.travis.yml

@@ -280,3 +280,9 @@ matrix:
         - echo 'Checking that there is no GPL licence text in code'
         - ! git grep -q --ignore-case "gnu general public";
         - ! git grep -q --ignore-case "gnu library general public";
+    - env:
+        - NAME=psa-autogen
+      script:
+        # Run SPM code generator and check that changes are not needed
+        - python tools/spm/generate_partition_code.py
+        - git diff --exit-code

TESTS/mbed-crypto/sanity/main.cpp

@@ -72,11 +72,9 @@ static void hard_fault_handler_test()
 
 static void mpu_fault_test(const volatile uint16_t *mem_function)
 {
-    mbed_mpu_init();
-
-    // Verify that the mpu causes faults when executing ram
+    // Verify that the mpu causes faults when executing ram after init
     fault_count = 0;
-    mbed_mpu_enable_ram_xn(true);
+    mbed_mpu_init();
     call_mem(mem_function);
     TEST_ASSERT_EQUAL(1, fault_count);
 
@@ -86,7 +84,7 @@ static void mpu_fault_test(const volatile uint16_t *mem_function)
     call_mem(mem_function);
     TEST_ASSERT_EQUAL(0, fault_count);
 
-    // Verify that the mpu causes faults when executing ram
+    // Verify that the mpu can be turned back on
     fault_count = 0;
     mbed_mpu_enable_ram_xn(true);
     call_mem(mem_function);

TESTS/mbed_hal/mpu/main.cpp

@@ -23,6 +23,10 @@
 #error [NOT_SUPPORTED] this test is supported on GCC only
 #endif
 
+#if defined(TARGET_FUTURE_SEQUANA_PSA)
+#error [NOT_SUPPORTED] Disable this Test until FUTURE_SEQUANA_PSA enables Memory protection
+#endif
+
 #include "utest/utest.h"
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"

TESTS/mbed_hal/spm/main.cpp

@@ -66,6 +66,33 @@
 
 using namespace utest::v1;
 
+#if (defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#include "entropy.h"
+#include "entropy_poll.h"
+#include "crypto.h"
+#if !defined(MAX)
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+/* Calculating the minimum allowed entropy size in bytes */
+#define MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE \
+            MAX(MBEDTLS_ENTROPY_MIN_PLATFORM, MBEDTLS_ENTROPY_BLOCK_SIZE)
+
+void inject_entropy_for_psa()
+{
+    if (psa_crypto_init() == PSA_ERROR_INSUFFICIENT_ENTROPY) {
+        uint8_t seed[MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE] = {0};
+        /* inject some a seed for test*/
+        for (int i = 0; i < MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE; ++i) {
+            seed[i] = i;
+        }
+
+        /* don't really care if this succeed this is just to make crypto init pass*/
+        mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);
+    }
+}
+#endif // (defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+
 static int fill_buffer_trng(uint8_t *buffer, trng_t *trng_obj, size_t trng_len)
 {
     size_t temp_size = 0, output_length = 0;
@@ -241,7 +268,13 @@ Specification specification(greentea_test_setup, cases, greentea_test_teardown_h
 
 int main()
 {
+#if (defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+    inject_entropy_for_psa();
+#endif
     bool ret = !Harness::run(specification);
 
     return ret;
 }
+
+
+

TESTS/mbed_hal/trng/main.cpp

@@ -33,6 +33,8 @@ using namespace utest::v1;
 #define THREAD_STACK_SIZE   512
 #elif defined(__ARM_FM)
 #define THREAD_STACK_SIZE   512
+#elif defined(TARGET_FUTURE_SEQUANA_PSA)
+#define THREAD_STACK_SIZE   512
 #else
 #define THREAD_STACK_SIZE   320 /* larger stack cause out of heap memory on some 16kB RAM boards in multi thread test*/
 #endif

TESTS/mbedmicro-rtos-mbed/mail/main.cpp

@@ -41,6 +41,8 @@ volatile bool thread_should_continue = true;
 #define THREAD_STACK_SIZE   512
 #elif defined(__ARM_FM)
 #define THREAD_STACK_SIZE   512
+#elif defined(TARGET_FUTURE_SEQUANA_PSA)
+#define THREAD_STACK_SIZE   512
 #else
 #define THREAD_STACK_SIZE   256
 #endif

TESTS/mbedmicro-rtos-mbed/malloc/main.cpp

@@ -36,6 +36,8 @@
 #define PARALLEL_THREAD_STACK_SIZE 512
 #elif defined(__ARM_FM)
 #define PARALLEL_THREAD_STACK_SIZE 512
+#elif defined(TARGET_FUTURE_SEQUANA_PSA)
+#define PARALLEL_THREAD_STACK_SIZE   512
 #else
 #define PARALLEL_THREAD_STACK_SIZE 384
 #endif

TESTS/mbedmicro-rtos-mbed/threads/main.cpp

@@ -84,6 +84,32 @@ Case cases[] = {
 #endif /* MBEDTLS_SELF_TEST */
 };
 
+#if (defined(MBEDTLS_ENTROPY_C) && defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#include "crypto.h"
+#if !defined(MAX)
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+/* Calculating the minimum allowed entropy size in bytes */
+#define MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE \
+            MAX(MBEDTLS_ENTROPY_MIN_PLATFORM, MBEDTLS_ENTROPY_BLOCK_SIZE)
+
+void inject_entropy_for_psa()
+{
+    if (psa_crypto_init() == PSA_ERROR_INSUFFICIENT_ENTROPY) {
+        uint8_t seed[MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE] = {0};
+        /* inject some a seed for test*/
+        for (int i = 0; i < MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE; ++i) {
+            seed[i] = i;
+        }
+
+        /* don't really care if this succeed this is just to make crypto init pass*/
+        mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);
+    }
+}
+#endif // (defined(MBEDTLS_ENTROPY_C) && defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+
+
 utest::v1::status_t test_setup(const size_t num_cases)
 {
     GREENTEA_SETUP(120, "default_auto");
@@ -101,6 +127,11 @@ int main()
         return 1;
     }
 #endif
+
+#if (defined(MBEDTLS_ENTROPY_C) && defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+    inject_entropy_for_psa();
+#endif
+
     ret = (Harness::run(specification) ? 0 : 1);
 #if defined(MBEDTLS_PLATFORM_C)
     mbedtls_platform_teardown(NULL);

TESTS/mbedtls/selftest/main.cpp

@@ -0,0 +1,83 @@
+/* Copyright (c) 2017-2018 ARM Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/***********************************************************************************************************************
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
+ **********************************************************************************************************************/
+
+#include "spm_panic.h"
+#include "spm_internal.h"
+#include "handles_manager.h"
+#include "cmsis.h"
+#include "psa_crypto_srv_partition.h"
+#include "psa_its_partition.h"
+
+extern const uint32_t crypto_srv_external_sids[4];
+
+spm_partition_t g_partitions[2] = {
+    {
+        .partition_id = CRYPTO_SRV_ID,
+        .thread_id = 0,
+        .flags_rot_srv = CRYPTO_SRV_WAIT_ANY_SID_MSK,
+        .flags_interrupts = 0,
+        .rot_services = NULL,
+        .rot_services_count = CRYPTO_SRV_ROT_SRV_COUNT,
+        .extern_sids = crypto_srv_external_sids,
+        .extern_sids_count = CRYPTO_SRV_EXT_ROT_SRV_COUNT,
+        .irq_mapper = NULL,
+    },
+    {
+        .partition_id = ITS_ID,
+        .thread_id = 0,
+        .flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
+        .flags_interrupts = 0,
+        .rot_services = NULL,
+        .rot_services_count = ITS_ROT_SRV_COUNT,
+        .extern_sids = NULL,
+        .extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
+        .irq_mapper = NULL,
+    },
+};
+
+/* Check all the defined memory regions for overlapping. */
+
+/* A list of all the memory regions. */
+const mem_region_t *mem_regions = NULL;
+
+const uint32_t mem_region_count = 0;
+
+// forward declaration of partition initializers
+void crypto_srv_init(spm_partition_t *partition);
+void its_init(spm_partition_t *partition);
+
+uint32_t init_partitions(spm_partition_t **partitions)
+{
+    if (NULL == partitions) {
+        SPM_PANIC("partitions is NULL!\n");
+    }
+
+    crypto_srv_init(&(g_partitions[0]));
+    its_init(&(g_partitions[1]));
+
+    *partitions = g_partitions;
+    return 2;
+}
+