michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: nordic: nrf54h: Add SCB retention for s2ram

Browse source 
For the Suspend to RAM procedures the SCB content
also needs to be retained.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
This commit is contained in:
Adam Kondraciuk 2025-03-06 11:17:46 +01:00 • committed by Benjamin Cabé
commit 2055f7d595
1 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

53
soc/nordic/nrf54h/pm_s2ram.c
View file

@ -40,9 +40,26 @@ typedef struct {
uint32_t CTRL; uint32_t CTRL;
} _mpu_context_t; } _mpu_context_t;
typedef struct {
uint32_t ICSR;
uint32_t VTOR;
uint32_t AIRCR;
uint32_t SCR;
uint32_t CCR;
uint32_t SHPR[12U];
uint32_t SHCSR;
uint32_t CFSR;
uint32_t HFSR;
uint32_t DFSR;
uint32_t MMFAR;
uint32_t BFAR;
uint32_t AFSR;
} _scb_context_t;
struct backup { struct backup {
_nvic_context_t nvic_context; _nvic_context_t nvic_context;
_mpu_context_t mpu_context; _mpu_context_t mpu_context;
_scb_context_t scb_context;
}; };
static __noinit struct backup backup_data; static __noinit struct backup backup_data;
@ -107,10 +124,45 @@ static void nvic_resume(_nvic_context_t *backup)
memcpy((uint32_t *)NVIC->IPR, backup->IPR, sizeof(NVIC->IPR)); memcpy((uint32_t *)NVIC->IPR, backup->IPR, sizeof(NVIC->IPR));
} }
static void scb_suspend(_scb_context_t *backup)
{
backup->ICSR = SCB->ICSR;
backup->VTOR = SCB->VTOR;
backup->AIRCR = SCB->AIRCR;
backup->SCR = SCB->SCR;
backup->CCR = SCB->CCR;
memcpy(backup->SHPR, (uint32_t *)SCB->SHPR, sizeof(SCB->SHPR));
backup->SHCSR = SCB->SHCSR;
backup->CFSR = SCB->CFSR;
backup->HFSR = SCB->HFSR;
backup->DFSR = SCB->DFSR;
backup->MMFAR = SCB->MMFAR;
backup->BFAR = SCB->BFAR;
backup->AFSR = SCB->AFSR;
}
static void scb_resume(_scb_context_t *backup)
{
SCB->ICSR = backup->ICSR;
SCB->VTOR = backup->VTOR;
SCB->AIRCR = backup->AIRCR;
SCB->SCR = backup->SCR;
SCB->CCR = backup->CCR;
memcpy((uint32_t *)SCB->SHPR, backup->SHPR, sizeof(SCB->SHPR));
SCB->SHCSR = backup->SHCSR;
SCB->CFSR = backup->CFSR;
SCB->HFSR = backup->HFSR;
SCB->DFSR = backup->DFSR;
SCB->MMFAR = backup->MMFAR;
SCB->BFAR = backup->BFAR;
SCB->AFSR = backup->AFSR;
}
int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off) int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
{ {
int ret; int ret;
scb_suspend(&backup_data.scb_context);
nvic_suspend(&backup_data.nvic_context); nvic_suspend(&backup_data.nvic_context);
mpu_suspend(&backup_data.mpu_context); mpu_suspend(&backup_data.mpu_context);
ret = arch_pm_s2ram_suspend(system_off); ret = arch_pm_s2ram_suspend(system_off);
@ -120,6 +172,7 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
mpu_resume(&backup_data.mpu_context); mpu_resume(&backup_data.mpu_context);
nvic_resume(&backup_data.nvic_context); nvic_resume(&backup_data.nvic_context);
scb_resume(&backup_data.scb_context);
return ret; return ret;
} }