MLK-19263 imx8m: hab: Add check target and failsafe sip call
imx_v2018.03 u-boot uses ROM's APIs: check_target and failsafe. So for iMX8M
platforms, we have to implement the sip calls and use ATF to call them when
u-boot running at non-secure world.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 3f6f4d802aba3853eb6f7d96246213d6d8ba9db7)
diff --git a/plat/imx/common/imx8m/hab.c b/plat/imx/common/imx8m/hab.c
index 1bb7992..8a99bbc 100644
--- a/plat/imx/common/imx8m/hab.c
+++ b/plat/imx/common/imx8m/hab.c
@@ -45,6 +45,12 @@
HAB_STATE_MAX
};
+enum hab_target {
+ HAB_TGT_MEMORY = 0x0f,
+ HAB_TGT_PERIPHERAL = 0xf0,
+ HAB_TGT_ANY = 0x55,
+};
+
typedef enum hab_status hab_rvt_report_event_t(enum hab_status, uint32_t,
uint8_t* , size_t*);
typedef enum hab_status hab_rvt_report_status_t(enum hab_config *,
@@ -54,18 +60,26 @@
typedef enum hab_status hab_rvt_exit_t(void);
typedef void *hab_rvt_authenticate_image_t(uint8_t, long,
void **, size_t *, hab_loader_callback_f_t);
+typedef enum hab_status hab_rvt_check_target_t(enum hab_target, const void *,
+ size_t);
+typedef void hab_rvt_failsafe_t(void);
#define HAB_RVT_ENTRY_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x08))
#define HAB_RVT_EXIT_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x10))
+#define HAB_RVT_CHECK_TARGET_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18))
#define HAB_RVT_AUTHENTICATE_IMAGE_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x20))
#define HAB_RVT_REPORT_EVENT_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x40))
#define HAB_RVT_REPORT_STATUS_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x48))
+#define HAB_RVT_FAILSAFE_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x50))
#define hab_rvt_authenticate_image_p ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_ARM64)
#define hab_rvt_entry_p ((hab_rvt_entry_t *)HAB_RVT_ENTRY_ARM64)
#define hab_rvt_exit_p ((hab_rvt_exit_t *)HAB_RVT_EXIT_ARM64)
#define hab_rvt_report_event_p ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_ARM64)
#define hab_rvt_report_status_p ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_ARM64)
+#define hab_rvt_check_target_p ((hab_rvt_check_target_t *)HAB_RVT_CHECK_TARGET_ARM64)
+#define hab_rvt_failsafe_p ((hab_rvt_failsafe_t *)HAB_RVT_FAILSAFE_ARM64)
+
#define HAB_CID_ATF 2 /**< ATF Caller ID*/
@@ -77,6 +91,8 @@
hab_rvt_exit_t *hab_rvt_exit;
hab_rvt_report_event_t *hab_rvt_report_event;
hab_rvt_report_status_t *hab_rvt_report_status;
+ hab_rvt_failsafe_t *hab_rvt_failsafe;
+ hab_rvt_check_target_t *hab_rvt_check_target;
switch(x1) {
case FSL_SIP_HAB_AUTHENTICATE:
@@ -94,6 +110,13 @@
case FSL_SIP_HAB_REPORT_STATUS:
hab_rvt_report_status = hab_rvt_report_status_p;
return hab_rvt_report_status((enum hab_config *)x2, (enum hab_state *)x3);
+ case FSL_SIP_HAB_FAILSAFE:
+ hab_rvt_failsafe = hab_rvt_failsafe_p;
+ hab_rvt_failsafe();
+ return SMC_OK;
+ case FSL_SIP_HAB_CHECK_TARGET:
+ hab_rvt_check_target = hab_rvt_check_target_p;
+ return hab_rvt_check_target((enum hab_target)x2, (const void *)x3, (size_t)x4);
default:
return SMC_UNK;
diff --git a/plat/imx/common/include/imx_sip.h b/plat/imx/common/include/imx_sip.h
index ab59e95..71b4a15 100644
--- a/plat/imx/common/include/imx_sip.h
+++ b/plat/imx/common/include/imx_sip.h
@@ -44,6 +44,8 @@
#define FSL_SIP_HAB_EXIT 0x02
#define FSL_SIP_HAB_REPORT_EVENT 0x03
#define FSL_SIP_HAB_REPORT_STATUS 0x04
+#define FSL_SIP_HAB_FAILSAFE 0x05
+#define FSL_SIP_HAB_CHECK_TARGET 0x06
#define FSL_SIP_NOC 0xc2000008
#define FSL_SIP_NOC_LCDIF 0x0
