michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: silabs: Add soc_prep_hook() for Series 2

Browse source 
CMSIS SystemInit is not used in Zephyr. Implement the functionality
that isn't already done by Zephyr startup using soc_prep_hook().

The reason the lack of TrustZone init did not create immediately obvious
issues previously is that SMU faults can only happen if the SMU clock is
enabled.

Signed-off-by: Aksel Skauge Mellbye <aksel.mellbye@silabs.com>
This commit is contained in:
Aksel Skauge Mellbye 2024-10-03 21:38:18 +02:00 • committed by Carles Cufí
commit d12de2d6b4
5 changed files with 69 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soc/silabs/silabs_s2/Kconfig
View file

@ -6,8 +6,12 @@ if SOC_FAMILY_SILABS_S2
config SOC_FAMILY_SILABS_S2
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
select BUILD_OUTPUT_HEX
select SOC_PREP_HOOK
select SOC_EARLY_INIT_HOOK
rsource "*/Kconfig"
config ARM_SECURE_FIRMWARE
default y
endif

1
soc/silabs/silabs_s2/efr32mg21/Kconfig
View file

@ -6,6 +6,7 @@ config SOC_SERIES_EFR32MG21
select CPU_CORTEX_M33
select CPU_CORTEX_M_HAS_DWT
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
select CPU_HAS_FPU
select CPU_HAS_ARM_MPU
select CPU_HAS_ARM_SAU

63
soc/silabs/silabs_s2/soc.c
View file

@ -18,6 +18,18 @@
#include <sl_hfxo_manager.h>
#include <sl_power_manager.h>
#if defined(CONFIG_PRINTK) || defined(CONFIG_LOG)
#define PR_EXC(...) LOG_ERR(__VA_ARGS__)
#else
#define PR_EXC(...)
#endif /* CONFIG_PRINTK || CONFIG_LOG */
#if (CONFIG_FAULT_DUMP == 2)
#define PR_FAULT_INFO(...) PR_EXC(__VA_ARGS__)
#else
#define PR_FAULT_INFO(...)
#endif
LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
void soc_early_init_hook(void)
@ -35,3 +47,54 @@ void soc_early_init_hook(void)
sl_hfxo_manager_init();
}
}
#if defined(CONFIG_ARM_SECURE_FIRMWARE) && !defined(CONFIG_ARM_FIRMWARE_HAS_SECURE_ENTRY_FUNCS)
static void smu_fault(void)
{
PR_FAULT_INFO("***** SMU FAULT *****");
if (SMU->IF & SMU_IF_BMPUSEC) {
PR_FAULT_INFO("Bus Manager Fault");
PR_EXC("SMU.BMPUFS=%d", SMU->BMPUFS);
}
if (SMU->IF & SMU_IF_PPUSEC) {
PR_FAULT_INFO("Peripheral Access Fault");
PR_EXC("SMU.PPUFS=%d", SMU->PPUFS);
}
z_fatal_error(K_ERR_CPU_EXCEPTION, NULL);
}
#endif
void soc_prep_hook(void)
{
/* Initialize TrustZone state of the device.
* If this is a secure app with no non-secure callable functions, it is a secure-only app.
* Configure all peripherals except the SMU and SEMAILBOX to non-secure aliases, and make
* all bus transactions from the CPU have non-secure attribution.
* This makes the secure-only app behave more like a non-secure app, allowing the use of
* libraries that only expect to use non-secure peripherals, such as the radio subsystem.
*/
#if defined(CONFIG_ARM_SECURE_FIRMWARE) && !defined(CONFIG_ARM_FIRMWARE_HAS_SECURE_ENTRY_FUNCS)
#if defined(CMU_CLKEN1_SMU)
CMU_S->CLKEN1_SET = CMU_CLKEN1_SMU;
#endif
SMU->PPUSATD0_CLR = _SMU_PPUSATD0_MASK;
#if defined(SEMAILBOX_PRESENT)
SMU->PPUSATD1_CLR = (_SMU_PPUSATD1_MASK & (~SMU_PPUSATD1_SMU & ~SMU_PPUSATD1_SEMAILBOX));
#else
SMU->PPUSATD1_CLR = (_SMU_PPUSATD1_MASK & ~SMU_PPUSATD1_SMU);
#endif
SAU->CTRL = SAU_CTRL_ALLNS_Msk;
__DSB();
__ISB();
NVIC_ClearPendingIRQ(SMU_SECURE_IRQn);
SMU->IF_CLR = SMU_IF_PPUSEC | SMU_IF_BMPUSEC;
SMU->IEN = SMU_IEN_PPUSEC | SMU_IEN_BMPUSEC;
IRQ_DIRECT_CONNECT(SMU_SECURE_IRQn, 0, smu_fault, 0);
irq_enable(SMU_SECURE_IRQn);
#endif
}