Merge "fix(spmd): register group0 handler only if supported" into integration

This commit is contained in:
Manish Pandey 2024-04-02 12:51:57 +02:00 committed by TrustedFirmware Code Review
commit 42d4111dcf

View file

@ -593,15 +593,18 @@ static int spmd_spmc_init(void *pm_addr)
*/ */
#if (EL3_EXCEPTION_HANDLING == 0) #if (EL3_EXCEPTION_HANDLING == 0)
/* /*
* Register an interrupt handler routing Group0 interrupts to SPMD * If EL3 interrupts are supported by the platform, register an
* while the NWd is running. * interrupt handler routing Group0 interrupts to SPMD while the NWd is
* running.
*/ */
if (plat_ic_has_interrupt_type(INTR_TYPE_EL3)) {
rc = register_interrupt_type_handler(INTR_TYPE_EL3, rc = register_interrupt_type_handler(INTR_TYPE_EL3,
spmd_group0_interrupt_handler_nwd, spmd_group0_interrupt_handler_nwd,
flags); flags);
if (rc != 0) { if (rc != 0) {
panic(); panic();
} }
}
#endif #endif
return 0; return 0;