michaelh/zephyr
1
0
Fork 0
Code Releases Activity

intel_adsp/ace: power: Restore PS after power gate

Browse source 
We are arbitrarily setting a value to PS after power gates and
losing valid information like OWB, CALLINC and INTLEVEL.

We need to properly save/restore them to avoid possible wrong behavior.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2024-01-22 23:22:19 -08:00 • committed by Maureen Helm
commit ff43667497
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soc/xtensa/intel_adsp/ace/power.c
View file

@ -111,6 +111,7 @@ struct core_state {
uint32_t excsave3; uint32_t excsave3;
uint32_t thread_ptr; uint32_t thread_ptr;
uint32_t intenable; uint32_t intenable;
uint32_t ps;
uint32_t bctl; uint32_t bctl;
}; };
@ -127,6 +128,7 @@ struct lpsram_header {
static ALWAYS_INLINE void _save_core_context(uint32_t core_id) static ALWAYS_INLINE void _save_core_context(uint32_t core_id)
{ {
core_desc[core_id].ps = XTENSA_RSR("PS");
core_desc[core_id].vecbase = XTENSA_RSR("VECBASE"); core_desc[core_id].vecbase = XTENSA_RSR("VECBASE");
core_desc[core_id].excsave2 = XTENSA_RSR("EXCSAVE2"); core_desc[core_id].excsave2 = XTENSA_RSR("EXCSAVE2");
core_desc[core_id].excsave3 = XTENSA_RSR("EXCSAVE3"); core_desc[core_id].excsave3 = XTENSA_RSR("EXCSAVE3");
@ -140,6 +142,7 @@ static ALWAYS_INLINE void _restore_core_context(void)
{ {
uint32_t core_id = arch_proc_id(); uint32_t core_id = arch_proc_id();
XTENSA_WSR("PS", core_desc[core_id].ps);
XTENSA_WSR("VECBASE", core_desc[core_id].vecbase); XTENSA_WSR("VECBASE", core_desc[core_id].vecbase);
XTENSA_WSR("EXCSAVE2", core_desc[core_id].excsave2); XTENSA_WSR("EXCSAVE2", core_desc[core_id].excsave2);
XTENSA_WSR("EXCSAVE3", core_desc[core_id].excsave3); XTENSA_WSR("EXCSAVE3", core_desc[core_id].excsave3);
@ -404,6 +407,11 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
} }
z_xt_ints_on(core_desc[cpu].intenable); z_xt_ints_on(core_desc[cpu].intenable);
/* We don't have the key used to lock interruptions here.
* Just set PS.INTLEVEL to 0.
*/
__asm__ volatile ("rsil a2, 0");
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */