Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-01 08:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(spmd): relax use of EHF with SPMC at S-EL2" into integration

Browse source
This commit is contained in:
Manish V Badarkhe 2023-06-13 18:21:39 +02:00 • committed by TrustedFirmware Code Review
commit c219b03df6
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
services/std_svc/spmd/spmd_main.c
View file

@ -249,6 +249,7 @@ static uint64_t spmd_secure_interrupt_handler(uint32_t id,
SMC_RET0(&ctx->cpu_ctx); SMC_RET0(&ctx->cpu_ctx);
} }
#if (EL3_EXCEPTION_HANDLING == 0)
/******************************************************************************* /*******************************************************************************
* spmd_group0_interrupt_handler_nwd * spmd_group0_interrupt_handler_nwd
* Group0 secure interrupt in the normal world are trapped to EL3. Delegate the * Group0 secure interrupt in the normal world are trapped to EL3. Delegate the
@ -281,6 +282,7 @@ static uint64_t spmd_group0_interrupt_handler_nwd(uint32_t id,
return 0U; return 0U;
} }
#endif
/******************************************************************************* /*******************************************************************************
* spmd_handle_group0_intr_swd * spmd_handle_group0_intr_swd
@ -560,6 +562,18 @@ static int spmd_spmc_init(void *pm_addr)
panic(); panic();
} }
/*
* Permit configurations where the SPM resides at S-EL1/2 and upon a
* Group0 interrupt triggering while the normal world runs, the
* interrupt is routed either through the EHF or directly to the SPMD:
*
* EL3_EXCEPTION_HANDLING=0: the Group0 interrupt is routed to the SPMD
* for handling by spmd_group0_interrupt_handler_nwd.
*
* EL3_EXCEPTION_HANDLING=1: the Group0 interrupt is routed to the EHF.
*
*/
#if (EL3_EXCEPTION_HANDLING == 0)
/* /*
* Register an interrupt handler routing Group0 interrupts to SPMD * Register an interrupt handler routing Group0 interrupts to SPMD
* while the NWd is running. * while the NWd is running.
@ -570,6 +584,8 @@ static int spmd_spmc_init(void *pm_addr)
if (rc != 0) { if (rc != 0) {
panic(); panic();
} }
#endif
return 0; return 0;
} }