diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_fw_config.dts b/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_fw_config.dts index 53cd3b0fa..89e30e9f5 100644 --- a/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_fw_config.dts +++ b/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_fw_config.dts @@ -12,6 +12,12 @@ dtb-registry { compatible = "fconf,dyn_cfg-dtb_registry"; + tos_fw-config { + load-address = <0x0 0x70000>; + max-size = <0x1000>; + id = ; + }; + hw-config { load-address = <0x0 0x83000000>; max-size = <0x8000>; diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_optee_spmc_manifest.dts b/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_optee_spmc_manifest.dts new file mode 100644 index 000000000..c28cadf67 --- /dev/null +++ b/plat/arm/board/automotive_rd/platform/rd1ae/fdts/rd1ae_optee_spmc_manifest.dts @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2024, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/dts-v1/; + +/ { + compatible = "arm,ffa-core-manifest-1.0"; + #address-cells = <2>; + #size-cells = <1>; + + /* + * BL32 image details needed by SPMC + */ + + attribute { + spmc_id = <0x8000>; + maj_ver = <0x1>; + min_ver = <0x0>; + exec_state = <0x0>; + load_address = <0x0 0xffc00000>; + entrypoint = <0x0 0xffc00000>; + binary_size = <0x00400000>; + }; +}; diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/include/platform_def.h b/plat/arm/board/automotive_rd/platform/rd1ae/include/platform_def.h index 44c8ee3c9..b71be401c 100644 --- a/plat/arm/board/automotive_rd/platform/rd1ae/include/platform_def.h +++ b/plat/arm/board/automotive_rd/platform/rd1ae/include/platform_def.h @@ -45,6 +45,9 @@ #define PLAT_CSS_MHU_BASE UL(0x2A920000) #define PLAT_ARM_NSTIMER_FRAME_ID U(0) +#define PLAT_ARM_SPMC_BASE UL(0xFFC00000) +#define PLAT_ARM_SPMC_SIZE UL(0x00400000) + #define SOC_CSS_SEC_UART_BASE UL(0x2A410000) #define SOC_CSS_NSEC_UART_BASE UL(0x2A400000) #define SOC_CSS_UART_SIZE UL(0x10000) @@ -115,10 +118,14 @@ MT_SECURE) #define RD1AE_MAP_NS_DRAM1 MAP_REGION_FLAT(ARM_DRAM1_BASE, \ - ARM_DRAM1_SIZE, \ + ARM_DRAM1_SIZE - PLAT_ARM_SPMC_SIZE, \ MT_MEMORY | MT_RW | \ MT_NS) +#define RD1AE_MAP_S_DRAM1 MAP_REGION_FLAT(PLAT_ARM_SPMC_BASE, \ + PLAT_ARM_SPMC_SIZE, \ + MT_MEMORY | MT_RW | MT_SECURE) + #define RD1AE_DEVICE_BASE (0x20000000) #define RD1AE_DEVICE_SIZE (0x20000000) #define RD1AE_MAP_DEVICE MAP_REGION_FLAT(RD1AE_DEVICE_BASE, \ diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/platform.mk b/plat/arm/board/automotive_rd/platform/rd1ae/platform.mk index 35cd8a19d..6773ae02b 100644 --- a/plat/arm/board/automotive_rd/platform/rd1ae/platform.mk +++ b/plat/arm/board/automotive_rd/platform/rd1ae/platform.mk @@ -32,6 +32,7 @@ ENABLE_MPAM_FOR_LOWER_ELS := 1 GIC_ENABLE_V4_EXTN := 1 GICV3_SUPPORT_GIC600 := 1 HW_ASSISTED_COHERENCY := 1 +NEED_BL32 := yes PLAT_MHU_VERSION := 1 RESET_TO_BL2 := 1 SVE_VECTOR_LEN := 128 @@ -68,15 +69,19 @@ endif # Add the FDT_SOURCES and options for Dynamic Config FDT_SOURCES += ${RD1AE_BASE}/fdts/${PLAT}_fw_config.dts \ - fdts/${PLAT}.dts + fdts/${PLAT}.dts \ + ${RD1AE_BASE}/fdts/${PLAT}_optee_spmc_manifest.dts FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb +TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_optee_spmc_manifest.dtb # Add the FW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config,${FW_CONFIG})) # Add the HW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config,${HW_CONFIG})) +# Add the TOS_FW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${TOS_FW_CONFIG},--tos-fw-config,${TOS_FW_CONFIG})) ifeq (${TRUSTED_BOARD_BOOT},1) FIP_BL2_ARGS := tb-fw diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl2_mem_params_desc.c b/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl2_mem_params_desc.c index 30cc90f09..8d0b96f2b 100644 --- a/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl2_mem_params_desc.c +++ b/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl2_mem_params_desc.c @@ -36,7 +36,7 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { .image_info.image_base = BL31_BASE, .image_info.image_max_size = BL31_LIMIT - BL31_BASE, - .next_handoff_image_id = BL33_IMAGE_ID, + .next_handoff_image_id = BL32_IMAGE_ID, }, /* Fill HW_CONFIG related information */ { @@ -48,6 +48,30 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { VERSION_2, image_info_t, IMAGE_ATTRIB_SKIP_LOADING), .next_handoff_image_id = INVALID_IMAGE_ID, }, + /* Fill BL32 related information */ + { + .image_id = BL32_IMAGE_ID, + + SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP, + VERSION_2, entry_point_info_t, SECURE | EXECUTABLE), + .ep_info.pc = BL32_BASE, + + SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, + VERSION_2, image_info_t, 0), + .image_info.image_base = BL32_BASE, + .image_info.image_max_size = BL32_LIMIT - BL32_BASE, + + .next_handoff_image_id = BL33_IMAGE_ID, + }, + /* Fill TOS_FW_CONFIG related information */ + { + .image_id = TOS_FW_CONFIG_ID, + SET_STATIC_PARAM_HEAD(ep_info, PARAM_IMAGE_BINARY, + VERSION_2, entry_point_info_t, SECURE | NON_EXECUTABLE), + SET_STATIC_PARAM_HEAD(image_info, PARAM_IMAGE_BINARY, + VERSION_2, image_info_t, IMAGE_ATTRIB_SKIP_LOADING), + .next_handoff_image_id = INVALID_IMAGE_ID, + }, /* Fill BL33 related information */ { .image_id = BL33_IMAGE_ID, diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl31_setup.c b/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl31_setup.c index ce7bad75a..6cfe34a2e 100644 --- a/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl31_setup.c +++ b/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_bl31_setup.c @@ -26,3 +26,14 @@ const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops) { return css_scmi_override_pm_ops(ops); } + +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) +/* + * A dummy implementation of the platform handler for Group0 secure interrupt. + */ +int plat_spmd_handle_group0_interrupt(uint32_t intid) +{ + (void)intid; + return -1; +} +#endif /* defined(SPD_spmd) && (SPMC_AT_EL3 == 0) */ diff --git a/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_plat.c b/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_plat.c index e917330b0..229ab241a 100644 --- a/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_plat.c +++ b/plat/arm/board/automotive_rd/platform/rd1ae/rd1ae_plat.c @@ -19,6 +19,7 @@ const mmap_region_t plat_arm_mmap[] = { #if IMAGE_BL2 RD1AE_MAP_NS_DRAM1, #endif + RD1AE_MAP_S_DRAM1, {0} };