From fd51b21573ec2e0d815caecb89cc323aac0fca6d Mon Sep 17 00:00:00 2001 From: Govindraj Raja Date: Wed, 10 May 2023 14:50:36 -0500 Subject: [PATCH] fix(spmd): fix build error with spmd Currently when we build with 'SPD=spmd SPMD_SPM_AT_SEL2=0' options, this causes a build failure as 'plat_spmd_handle_group0_interrupt' is called irrespective of 'SPMD_SPM_AT_SEL2' usage in 'spmd_group0_interrupt_handler_nwd' So make 'plat_spmd_handle_group0_interrupt' dummy implementation available just when spmd is enabled and SPMC_AT_EL3 is disabled. Change-Id: Iaccd38faab81671c98f9165f318145187dca9bc2 Signed-off-by: Govindraj Raja --- plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c | 4 ++-- plat/arm/board/n1sdp/n1sdp_bl31_setup.c | 4 ++-- plat/arm/board/tc/tc_bl31_setup.c | 4 ++-- plat/hisilicon/hikey960/hikey960_bl31_setup.c | 2 +- plat/qemu/common/qemu_common.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c b/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c index b6765a60e..2549d3566 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c +++ b/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c @@ -6,7 +6,7 @@ #include -#if defined(SPD_spmd) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) /* * A dummy implementation of the platform handler for Group0 secure interrupt. */ @@ -15,4 +15,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) (void)intid; return -1; } -#endif /*defined(SPD_spmd)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c index 6809541a6..bd0566006 100644 --- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c +++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c @@ -160,7 +160,7 @@ void bl31_platform_setup(void) remote_dmc_ecc_setup(plat_info.remote_ddr_size); } -#if defined(SPD_spmd) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) /* * A dummy implementation of the platform handler for Group0 secure interrupt. */ @@ -169,4 +169,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) (void)intid; return -1; } -#endif /*defined(SPD_spmd)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ diff --git a/plat/arm/board/tc/tc_bl31_setup.c b/plat/arm/board/tc/tc_bl31_setup.c index 630324fb3..6afbd9931 100644 --- a/plat/arm/board/tc/tc_bl31_setup.c +++ b/plat/arm/board/tc/tc_bl31_setup.c @@ -83,7 +83,7 @@ void __init bl31_plat_arch_setup(void) fconf_populate("HW_CONFIG", hw_config_info->config_addr); } -#if defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) void tc_bl31_plat_runtime_setup(void) { arm_bl31_plat_runtime_setup(); @@ -115,4 +115,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) return -1; } -#endif /*defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ diff --git a/plat/hisilicon/hikey960/hikey960_bl31_setup.c b/plat/hisilicon/hikey960/hikey960_bl31_setup.c index 1d7bc94a6..159eee9ee 100644 --- a/plat/hisilicon/hikey960/hikey960_bl31_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl31_setup.c @@ -245,7 +245,7 @@ static uint64_t hikey_debug_fiq_handler(uint32_t id, return 0; } -#elif defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1) +#elif defined(SPD_spmd) && (SPMC_AT_EL3 == 0) /* * A dummy implementation of the platform handler for Group0 secure interrupt. */ diff --git a/plat/qemu/common/qemu_common.c b/plat/qemu/common/qemu_common.c index 9aec213d2..98be4910d 100644 --- a/plat/qemu/common/qemu_common.c +++ b/plat/qemu/common/qemu_common.c @@ -163,7 +163,7 @@ int plat_spmc_shmem_reclaim(struct ffa_mtd *desc) } #endif -#if defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) /* * A dummy implementation of the platform handler for Group0 secure interrupt. */ @@ -172,4 +172,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) (void)intid; return -1; } -#endif /*defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ -- 2.39.5