]> git.baikalelectronics.ru Git - arm-tf.git/commitdiff
feat(imx8m): add support for high assurance boot
authorAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Mon, 26 Sep 2022 20:25:33 +0000 (22:25 +0200)
committerAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Wed, 19 Oct 2022 13:55:15 +0000 (15:55 +0200)
Introduce support for High Assurance Boot (HABv4), which is used to
establish and extend the Root-of-Trust during FW loading at any given
boot stage.

This commit introduces support for HAB ROM Vector Table (RVT) API, which
is normally used by post-ROM code to authenticate additional boot images
(Kernel, FDT, FIT, etc.) that are taking part in the Root-of-Trust.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Change-Id: I780d308369824fa4850844eb9e91768e417166a0

plat/imx/common/imx_sip_svc.c
plat/imx/common/include/imx_sip_svc.h
plat/imx/imx8m/imx8mm/platform.mk
plat/imx/imx8m/imx8mn/platform.mk
plat/imx/imx8m/imx8mp/platform.mk
plat/imx/imx8m/imx_hab.c [new file with mode: 0644]

index fae97509d4f703ce72454972816d763d4faabb67..11d02f3f55a5c682f72012007f6fbe87aa4437c2 100644 (file)
@@ -59,6 +59,11 @@ static uintptr_t imx_sip_handler(unsigned int smc_fid,
        case IMX_SIP_SRC:
                SMC_RET1(handle, imx_src_handler(smc_fid, x1, x2, x3, handle));
                break;
+#endif
+#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp)
+       case IMX_SIP_HAB:
+               SMC_RET1(handle, imx_hab_handler(smc_fid, x1, x2, x3, x4));
+               break;
 #endif
        case  IMX_SIP_BUILDINFO:
                SMC_RET1(handle, imx_buildinfo_handler(smc_fid, x1, x2, x3, x4));
index c6e98790269452919bb47c5078ff26c417c7dcee..1f459858be82d802c1acff43d89e22d6ada60441 100644 (file)
 
 #define IMX_SIP_GET_SOC_INFO           0xC2000006
 
+#define IMX_SIP_HAB                    0xC2000007
+#define IMX_SIP_HAB_AUTH_IMG           0x00
+#define IMX_SIP_HAB_ENTRY              0x01
+#define IMX_SIP_HAB_EXIT               0x02
+#define IMX_SIP_HAB_REPORT_EVENT       0x03
+#define IMX_SIP_HAB_REPORT_STATUS      0x04
+#define IMX_SIP_HAB_FAILSAFE           0x05
+#define IMX_SIP_HAB_CHECK_TARGET       0x06
+#define IMX_SIP_HAB_GET_VERSION                0x07
+#define IMX_SIP_HAB_AUTH_IMG_NO_DCD    0x08
+
 #define IMX_SIP_WAKEUP_SRC             0xC2000009
 #define IMX_SIP_WAKEUP_SRC_SCU         0x1
 #define IMX_SIP_WAKEUP_SRC_IRQSTEER    0x2
@@ -58,6 +69,11 @@ int imx_src_handler(uint32_t smc_fid, u_register_t x1,
                    u_register_t x2, u_register_t x3, void *handle);
 #endif
 
+#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp)
+int imx_hab_handler(uint32_t smc_fid, u_register_t x1,
+                   u_register_t x2, u_register_t x3, u_register_t x4);
+#endif
+
 #if (defined(PLAT_imx8qm) || defined(PLAT_imx8qx))
 int imx_cpufreq_handler(uint32_t smc_fid, u_register_t x1,
                        u_register_t x2, u_register_t x3);
index e3e5c0c5a53479b896e711631148356fe2ff8899..ebf5c7b890d10da5fb878938b20d60e53b18f8d4 100644 (file)
@@ -32,6 +32,7 @@ IMX_GIC_SOURCES               :=      ${GICV3_SOURCES}                        \
 
 BL31_SOURCES           +=      plat/imx/common/imx8_helpers.S                  \
                                plat/imx/imx8m/gpc_common.c                     \
+                               plat/imx/imx8m/imx_hab.c                        \
                                plat/imx/imx8m/imx_aipstz.c                     \
                                plat/imx/imx8m/imx_rdc.c                        \
                                plat/imx/imx8m/imx8m_csu.c                      \
index 0f3ad1a20542bd4507baeec61543a5b0fd9b317b..c70f3a171f57562eb3907c5534c83f2412272d8d 100644 (file)
@@ -27,6 +27,7 @@ IMX_GIC_SOURCES               :=      ${GICV3_SOURCES}                        \
 
 BL31_SOURCES           +=      plat/imx/common/imx8_helpers.S                  \
                                plat/imx/imx8m/gpc_common.c                     \
+                               plat/imx/imx8m/imx_hab.c                        \
                                plat/imx/imx8m/imx_aipstz.c                     \
                                plat/imx/imx8m/imx_rdc.c                        \
                                plat/imx/imx8m/imx8m_caam.c                     \
index e8669e5f844754468855a1c69605413e0f342856..09f9ee9857fc588e076428de51ecc7545977280b 100644 (file)
@@ -28,6 +28,7 @@ IMX_GIC_SOURCES               :=      ${GICV3_SOURCES}                        \
 
 BL31_SOURCES           +=      plat/imx/common/imx8_helpers.S                  \
                                plat/imx/imx8m/gpc_common.c                     \
+                               plat/imx/imx8m/imx_hab.c                        \
                                plat/imx/imx8m/imx_aipstz.c                     \
                                plat/imx/imx8m/imx_rdc.c                        \
                                plat/imx/imx8m/imx8m_caam.c                     \
diff --git a/plat/imx/imx8m/imx_hab.c b/plat/imx/imx8m/imx_hab.c
new file mode 100644 (file)
index 0000000..222046f
--- /dev/null
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2017-2020 NXP
+ * Copyright 2022 Leica Geosystems AG
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <common/runtime_svc.h>
+#include <imx_sip_svc.h>
+
+#define HAB_CID_ATF    U(2)    /* TF-A Caller ID */
+
+/* HAB Status definitions */
+enum hab_status {
+       HAB_STS_ANY = 0x00,     /* Match any status in report_event() */
+       HAB_FAILURE = 0x33,     /* Operation failed */
+       HAB_WARNING = 0x69,     /* Operation completed with warning */
+       HAB_SUCCESS = 0xf0      /* Operation completed successfully */
+};
+
+/* HAB Configuration definitions */
+enum hab_config {
+       HAB_CFG_RETURN = 0x33,  /* Field Return IC */
+       HAB_CFG_OPEN   = 0xf0,  /* Non-secure IC */
+       HAB_CFG_CLOSED = 0xcc   /* Secure IC */
+};
+
+/* HAB State definitions */
+enum hab_state {
+       HAB_STATE_INITIAL   = 0x33,     /* Initializing state (transitory) */
+       HAB_STATE_CHECK     = 0x55,     /* Check state (non-secure) */
+       HAB_STATE_NONSECURE = 0x66,     /* Non-secure state */
+       HAB_STATE_TRUSTED   = 0x99,     /* Trusted state */
+       HAB_STATE_SECURE    = 0xaa,     /* Secure state */
+       HAB_STATE_FAIL_SOFT = 0xcc,     /* Soft fail state */
+       HAB_STATE_FAIL_HARD = 0xff,     /* Hard fail state (terminal) */
+       HAB_STATE_NONE      = 0xf0      /* No security state machine */
+};
+
+/* HAB Verification Target definitions */
+enum hab_target {
+       HAB_TGT_MEMORY     = 0x0f,      /* Check memory allowed list */
+       HAB_TGT_PERIPHERAL = 0xf0,      /* Check peripheral allowed list */
+       HAB_TGT_ANY        = 0x55       /* Check memory & peripheral allowed list */
+};
+
+/* Authenticate Image Loader Callback prototype */
+typedef enum hab_status hab_loader_callback_f_t(void **, size_t *, const void *);
+
+/*
+ * HAB Rom VectorTable (RVT) structure.
+ * This table provides function pointers into the HAB library in ROM for
+ * use by post-ROM boot sequence components.
+ * Functions are ordered in the structure below based on the offsets in ROM
+ * image, and shall not be changed!
+ * Details on API allocation offsets and function description could be
+ * found in following documents from NXP:
+ * - High Assurance Boot Version 4 Application Programming Interface
+ *   Reference Manual (available in CST package)
+ * - HABv4 RVT Guidelines and Recommendations (AN12263)
+ */
+struct hab_rvt_api {
+       uint64_t        hdr;
+       enum hab_status (*entry)(void);
+       enum hab_status (*exit)(void);
+       enum hab_status (*check_target)(enum hab_target type, const void *start, size_t bytes);
+       void* (*authenticate_image)(uint8_t cid, long ivt_offset, void **start,
+               size_t *bytes, hab_loader_callback_f_t loader);
+       enum hab_status (*run_dcd)(const uint8_t *dcd);
+       enum hab_status (*run_csf)(const uint8_t *csf, uint8_t cid, uint32_t srkmask);
+       enum hab_status (*assert)(long type, const void *data, uint32_t count);
+       enum hab_status (*report_event)(enum hab_status status, uint32_t index,
+               uint8_t *event, size_t *bytes);
+       enum hab_status (*report_status)(enum hab_config *config, enum hab_state *state);
+       void (*failsafe)(void);
+       void* (*authenticate_image_no_dcd)(uint8_t cid, long ivt_offset, void **start,
+               size_t *bytes, hab_loader_callback_f_t loader);
+       uint32_t (*get_version)(void);
+       enum hab_status (*authenticate_container)(uint8_t cid, long ivt_offset, void **start,
+               size_t *bytes, hab_loader_callback_f_t loader, uint32_t srkmask, int skip_dcd);
+};
+
+struct hab_rvt_api *g_hab_rvt_api = (struct hab_rvt_api *)HAB_RVT_BASE;
+
+/*******************************************************************************
+ * Handler for servicing HAB SMC calls
+ ******************************************************************************/
+int imx_hab_handler(uint32_t smc_fid,
+                       u_register_t x1,
+                       u_register_t x2,
+                       u_register_t x3,
+                       u_register_t x4)
+{
+       switch (x1) {
+       case IMX_SIP_HAB_ENTRY:
+               return g_hab_rvt_api->entry();
+       case IMX_SIP_HAB_EXIT:
+               return g_hab_rvt_api->exit();
+       case IMX_SIP_HAB_CHECK_TARGET:
+               return g_hab_rvt_api->check_target((enum hab_target)x2,
+                       (const void *)x3, (size_t)x4);
+       case IMX_SIP_HAB_AUTH_IMG:
+               return (unsigned long)g_hab_rvt_api->authenticate_image(HAB_CID_ATF,
+                       x2, (void **)x3, (size_t *)x4, NULL);
+       case IMX_SIP_HAB_REPORT_EVENT:
+               return g_hab_rvt_api->report_event(HAB_FAILURE,
+                       (uint32_t)x2, (uint8_t *)x3, (size_t *)x4);
+       case IMX_SIP_HAB_REPORT_STATUS:
+               return g_hab_rvt_api->report_status((enum hab_config *)x2,
+                       (enum hab_state *)x3);
+       case IMX_SIP_HAB_FAILSAFE:
+               g_hab_rvt_api->failsafe();
+               break;
+       case IMX_SIP_HAB_AUTH_IMG_NO_DCD:
+               return (unsigned long)g_hab_rvt_api->authenticate_image_no_dcd(
+                       HAB_CID_ATF, x2, (void **)x3, (size_t *)x4, NULL);
+       case IMX_SIP_HAB_GET_VERSION:
+               return g_hab_rvt_api->get_version();
+       default:
+               return SMC_UNK;
+       };
+
+       return SMC_OK;
+}