Renesas update 1 2

bl2/ext/mcuboot/bl2_main.c

@@ -29,6 +29,7 @@
 #include "flash_map_backend/flash_map_backend.h"
 #include "boot_hal.h"
 #include "uart_stdout.h"
+#include "rm_mcuboot_port.h"
 
 /* Avoids the semihosting issue */
 #if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
@@ -43,45 +44,9 @@ __asm("  .global __ARM_use_no_argv\n");
 
 /* Static buffer to be used by mbedtls for memory allocation */
 static uint8_t mbedtls_mem_buf[BL2_MBEDTLS_MEM_BUF_LEN];
+int bl2_main(void);
 
-static void do_boot(struct boot_rsp *rsp)
-{
-    struct boot_arm_vector_table *vt;
-    uintptr_t flash_base;
-    int rc;
-
-    /* The beginning of the image is the ARM vector table, containing
-     * the initial stack pointer address and the reset vector
-     * consecutively. Manually set the stack pointer and jump into the
-     * reset vector
-     */
-    rc = flash_device_base(rsp->br_flash_dev_id, &flash_base);
-    assert(rc == 0);
-
-    if (rsp->br_hdr->ih_flags & IMAGE_F_RAM_LOAD) {
-       /* The image has been copied to SRAM, find the vector table
-        * at the load address instead of image's address in flash
-        */
-        vt = (struct boot_arm_vector_table *)(rsp->br_hdr->ih_load_addr +
-                                         rsp->br_hdr->ih_hdr_size);
-    } else {
-        /* Using the flash address as not executing in SRAM */
-        vt = (struct boot_arm_vector_table *)(flash_base +
-                                         rsp->br_image_off +
-                                         rsp->br_hdr->ih_hdr_size);
-    }
-
-#if MCUBOOT_LOG_LEVEL > MCUBOOT_LOG_LEVEL_OFF
-    stdio_uninit();
-#endif
-
-    /* This function never returns, because it calls the secure application
-     * Reset_Handler().
-     */
-    boot_platform_quit(vt);
-}
-
-int main(void)
+int bl2_main(void)
 {
     struct boot_rsp rsp;
     fih_int fih_rc = FIH_FAILURE;
@@ -118,7 +83,8 @@ int main(void)
     BOOT_LOG_INF("Bootloader chainload address offset: 0x%x",
                  rsp.br_image_off);
     BOOT_LOG_INF("Jumping to the first image slot");
-    do_boot(&rsp);
+    // do_boot(&rsp);
+    RM_MCUBOOT_PORT_BootApp(&rsp);
 
     BOOT_LOG_ERR("Never should get here");
     FIH_PANIC;

bl2/ext/mcuboot/include/mcuboot_config/mcuboot_config.h

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018 Open Source Foundries Limited
+ * Copyright (c) 2019 Arm Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Original code taken from mcuboot project at:
+ * https://github.com/JuulLabs-OSS/mcuboot
+ * Git SHA of the original version: ac55554059147fff718015be9f4bd3108123f50a
+ */
+
+#ifndef __MCUBOOT_CONFIG_H__
+#define __MCUBOOT_CONFIG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * This file is also included by the simulator, but we don't want to
+ * define anything here in simulator builds.
+ *
+ * Instead of using mcuboot_config.h, the simulator adds MCUBOOT_xxx
+ * configuration flags to the compiler command lines based on the
+ * values of environment variables. However, the file still must
+ * exist, or bootutil won't build.
+ */
+#ifndef __BOOTSIM__
+
+/*
+ * In TF-M most of the configuration flags (e.g. signature type,
+ * upgrade mode ...) are handled by the CMake-based buildsystem and
+ * added to the compiler command lines.
+ */
+
+/*
+ * Cryptographic settings
+ */
+#define MCUBOOT_USE_MBED_TLS
+
+/*
+ * Logging
+ */
+#define MCUBOOT_HAVE_LOGGING    1
+
+#endif /* !__BOOTSIM__ */
+
+/*
+ * Maximum size of the measured boot record.
+ *
+ * Its size can be calculated based on the following aspects:
+ *     - There are 5 allowed software component claims,
+ *     - SHA256 is used as the measurement method for the other claims.
+ * Considering these aspects, the only claim which size can vary is the type
+ * of the software component with a maximum length of 12 bytes, which means
+ * the boot record size can be up to 100 bytes.
+ */
+#define MAX_BOOT_RECORD_SZ  (100u)
+
+/*
+ * Watchdog feeding
+ */
+#define MCUBOOT_WATCHDOG_FEED()     \
+    do {                            \
+        /* Do nothing. */           \
+    } while (0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MCUBOOT_CONFIG_H__ */

bl2/ext/mcuboot/include/mcuboot_config/mcuboot_logging.h

@@ -20,6 +20,7 @@
 
 #include "bootutil/ignore.h"
 #include <stdio.h>
+#include "rm_bl2_cfg.h"
 
 #ifdef __cplusplus
 extern "C" {

bl2/ext/mcuboot/keys.c

@@ -26,6 +26,7 @@
 
 #include <stddef.h>
 #include <bootutil/sign_key.h>
+#include "rm_bl2_cfg.h"
 #include "mcuboot_config/mcuboot_config.h"
 #include "tfm_plat_crypto_keys.h"
 

interface/include/psa/client.h

@@ -11,6 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "tfm_common_config.h"
 #include "psa/error.h"
 
 #ifdef __cplusplus

interface/include/psa/crypto.h

@@ -921,7 +921,7 @@ psa_status_t psa_hash_compare(psa_algorithm_t alg,
                               const uint8_t *input,
                               size_t input_length,
                               const uint8_t *hash,
-                              size_t hash_length);
+                              const size_t hash_length);
 
 /** The type of the state data structure for multipart hash operations.
  *
@@ -1289,7 +1289,7 @@ psa_status_t psa_mac_verify(psa_key_handle_t handle,
                             const uint8_t *input,
                             size_t input_length,
                             const uint8_t *mac,
-                            size_t mac_length);
+                            const size_t mac_length);
 
 /** The type of the state data structure for multipart MAC operations.
  *

interface/include/psa_manifest/pid.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
+
+#ifndef __PSA_MANIFEST_PID_H__
+#define __PSA_MANIFEST_PID_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TFM_SP_PS                                                      (256)
+#define TFM_SP_ITS                                                     (257)
+#define TFM_SP_AUDIT_LOG                                               (258)
+#define TFM_SP_CRYPTO                                                  (259)
+#define TFM_SP_PLATFORM                                                (260)
+#define TFM_SP_INITIAL_ATTESTATION                                     (261)
+#define TFM_SP_CORE_TEST                                               (262)
+#define TFM_SP_CORE_TEST_2                                             (263)
+#define TFM_SP_SECURE_TEST_PARTITION                                   (264)
+#define TFM_SP_IPC_SERVICE_TEST                                        (265)
+#define TFM_SP_IPC_CLIENT_TEST                                         (266)
+#define TFM_IRQ_TEST_1                                                 (267)
+#define TFM_SP_PS_TEST                                                 (268)
+#define TFM_SP_SECURE_CLIENT_2                                         (269)
+
+#define TFM_MAX_USER_PARTITIONS                                        (14)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PSA_MANIFEST_PID_H__ */

interface/include/psa_manifest/sid.h

@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
+
+#ifndef __PSA_MANIFEST_SID_H__
+#define __PSA_MANIFEST_SID_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/******** TFM_SP_PS ********/
+#define TFM_PS_SET_SID                                             (0x00000060U)
+#define TFM_PS_SET_VERSION                                         (1U)
+#define TFM_PS_GET_SID                                             (0x00000061U)
+#define TFM_PS_GET_VERSION                                         (1U)
+#define TFM_PS_GET_INFO_SID                                        (0x00000062U)
+#define TFM_PS_GET_INFO_VERSION                                    (1U)
+#define TFM_PS_REMOVE_SID                                          (0x00000063U)
+#define TFM_PS_REMOVE_VERSION                                      (1U)
+#define TFM_PS_GET_SUPPORT_SID                                     (0x00000064U)
+#define TFM_PS_GET_SUPPORT_VERSION                                 (1U)
+
+/******** TFM_SP_ITS ********/
+#define TFM_ITS_SET_SID                                            (0x00000070U)
+#define TFM_ITS_SET_VERSION                                        (1U)
+#define TFM_ITS_GET_SID                                            (0x00000071U)
+#define TFM_ITS_GET_VERSION                                        (1U)
+#define TFM_ITS_GET_INFO_SID                                       (0x00000072U)
+#define TFM_ITS_GET_INFO_VERSION                                   (1U)
+#define TFM_ITS_REMOVE_SID                                         (0x00000073U)
+#define TFM_ITS_REMOVE_VERSION                                     (1U)
+
+/******** TFM_SP_CRYPTO ********/
+#define TFM_CRYPTO_SID                                             (0x00000080U)
+#define TFM_CRYPTO_VERSION                                         (1U)
+
+/******** TFM_SP_PLATFORM ********/
+#define TFM_SP_PLATFORM_SYSTEM_RESET_SID                           (0x00000040U)
+#define TFM_SP_PLATFORM_SYSTEM_RESET_VERSION                       (1U)
+#define TFM_SP_PLATFORM_IOCTL_SID                                  (0x00000041U)
+#define TFM_SP_PLATFORM_IOCTL_VERSION                              (1U)
+#define TFM_SP_PLATFORM_NV_COUNTER_SID                             (0x00000042U)
+#define TFM_SP_PLATFORM_NV_COUNTER_VERSION                         (1U)
+
+/******** TFM_SP_INITIAL_ATTESTATION ********/
+#define TFM_ATTEST_GET_TOKEN_SID                                   (0x00000020U)
+#define TFM_ATTEST_GET_TOKEN_VERSION                               (1U)
+#define TFM_ATTEST_GET_TOKEN_SIZE_SID                              (0x00000021U)
+#define TFM_ATTEST_GET_TOKEN_SIZE_VERSION                          (1U)
+#define TFM_ATTEST_GET_PUBLIC_KEY_SID                              (0x00000022U)
+#define TFM_ATTEST_GET_PUBLIC_KEY_VERSION                          (1U)
+
+/******** TFM_SP_CORE_TEST ********/
+#define SPM_CORE_TEST_INIT_SUCCESS_SID                             (0x0000F020U)
+#define SPM_CORE_TEST_INIT_SUCCESS_VERSION                         (1U)
+#define SPM_CORE_TEST_DIRECT_RECURSION_SID                         (0x0000F021U)
+#define SPM_CORE_TEST_DIRECT_RECURSION_VERSION                     (1U)
+#define SPM_CORE_TEST_SS_TO_SS_SID                                 (0x0000F024U)
+#define SPM_CORE_TEST_SS_TO_SS_VERSION                             (1U)
+#define SPM_CORE_TEST_SS_TO_SS_BUFFER_SID                          (0x0000F025U)
+#define SPM_CORE_TEST_SS_TO_SS_BUFFER_VERSION                      (1U)
+#define SPM_CORE_TEST_OUTVEC_WRITE_SID                             (0x0000F026U)
+#define SPM_CORE_TEST_OUTVEC_WRITE_VERSION                         (1U)
+#define SPM_CORE_TEST_PERIPHERAL_ACCESS_SID                        (0x0000F027U)
+#define SPM_CORE_TEST_PERIPHERAL_ACCESS_VERSION                    (1U)
+#define SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SID                     (0x0000F028U)
+#define SPM_CORE_TEST_GET_CALLER_CLIENT_ID_VERSION                 (1U)
+#define SPM_CORE_TEST_SPM_REQUEST_SID                              (0x0000F029U)
+#define SPM_CORE_TEST_SPM_REQUEST_VERSION                          (1U)
+#define SPM_CORE_TEST_BLOCK_SID                                    (0x0000F02AU)
+#define SPM_CORE_TEST_BLOCK_VERSION                                (1U)
+#define SPM_CORE_TEST_NS_THREAD_SID                                (0x0000F02BU)
+#define SPM_CORE_TEST_NS_THREAD_VERSION                            (1U)
+
+/******** TFM_SP_CORE_TEST_2 ********/
+#define SPM_CORE_TEST_2_SLAVE_SERVICE_SID                          (0x0000F040U)
+#define SPM_CORE_TEST_2_SLAVE_SERVICE_VERSION                      (1U)
+#define SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SID                 (0x0000F041U)
+#define SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_VERSION             (1U)
+#define SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SID                  (0x0000F042U)
+#define SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_VERSION              (1U)
+#define SPM_CORE_TEST_2_INVERT_SID                                 (0x0000F043U)
+#define SPM_CORE_TEST_2_INVERT_VERSION                             (1U)
+#define SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO_SID                  (0x0000F044U)
+#define SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO_VERSION              (1U)
+#define SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO_SID                  (0x0000F045U)
+#define SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO_VERSION              (1U)
+
+/******** TFM_SP_SECURE_TEST_PARTITION ********/
+#define TFM_SECURE_CLIENT_SFN_RUN_TESTS_SID                        (0x0000F000U)
+#define TFM_SECURE_CLIENT_SFN_RUN_TESTS_VERSION                    (1U)
+
+/******** TFM_SP_IPC_SERVICE_TEST ********/
+#define IPC_SERVICE_TEST_BASIC_SID                                 (0x0000F080U)
+#define IPC_SERVICE_TEST_BASIC_VERSION                             (1U)
+#define IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SID                    (0x0000F081U)
+#define IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_VERSION                (1U)
+#define IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SID          (0x0000F082U)
+#define IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_VERSION      (1U)
+#define IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SID                    (0x0000F083U)
+#define IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_VERSION                (1U)
+#define IPC_SERVICE_TEST_CLIENT_PROGRAMMER_ERROR_SID               (0x0000F084U)
+#define IPC_SERVICE_TEST_CLIENT_PROGRAMMER_ERROR_VERSION           (1U)
+
+/******** TFM_SP_IPC_CLIENT_TEST ********/
+#define IPC_CLIENT_TEST_BASIC_SID                                  (0x0000F060U)
+#define IPC_CLIENT_TEST_BASIC_VERSION                              (1U)
+#define IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SID                     (0x0000F061U)
+#define IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_VERSION                 (1U)
+#define IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SID           (0x0000F062U)
+#define IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_VERSION       (1U)
+#define IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SID                     (0x0000F063U)
+#define IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_VERSION                 (1U)
+#define IPC_CLIENT_TEST_MEM_CHECK_SID                              (0x0000F064U)
+#define IPC_CLIENT_TEST_MEM_CHECK_VERSION                          (1U)
+#define IPC_CLIENT_TEST_RETRIEVE_APP_MEM_SID                       (0x0000F065U)
+#define IPC_CLIENT_TEST_RETRIEVE_APP_MEM_VERSION                   (1U)
+
+/******** TFM_IRQ_TEST_1 ********/
+#define SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO_SID              (0x0000F0A0U)
+#define SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO_VERSION          (1U)
+#define SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_SID              (0x0000F0A1U)
+#define SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_VERSION          (1U)
+
+/******** TFM_SP_PS_TEST ********/
+#define TFM_PS_TEST_PREPARE_SID                                    (0x0000F0C0U)
+#define TFM_PS_TEST_PREPARE_VERSION                                (1U)
+
+/******** TFM_SP_SECURE_CLIENT_2 ********/
+#define TFM_SECURE_CLIENT_2_SID                                    (0x0000F0E0U)
+#define TFM_SECURE_CLIENT_2_VERSION                                (1U)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PSA_MANIFEST_SID_H__ */

interface/include/tfm_api.h

@@ -13,6 +13,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include "tfm_common_config.h"
 #include "psa/client.h"
 
 #define TFM_INVALID_CLIENT_ID 0