stm32mp: psci: Retain PLL3CR, PLL4CR, RCC_MSSCKSELR across suspend
Subsystems (3)
PATCH 1/1 stm32mp: psci: Retain PLL3CR, PLL4CR, RCC_MSSCKSELR across suspend
The SoC seems to lose the values of PLL3CR, PLL4CR, RCC_MSSCKSELR during suspend/resume cycle, cache them and reinstate their values on resume.
--- arch/arm/mach-stm32mp/psci.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm/mach-stm32mp/psci.c +13 -0
@@ -26,6 +26,7 @@#define PWR_MPUCR_CSSF BIT(9)/* RCC */ +#define RCC_MSSCKSELR 0x48#define RCC_DDRITFCR 0xd8#define RCC_DDRITFCR_DDRC1EN BIT(0)
@@ -49,6 +50,9 @@#define RCC_MP_CIFR 0x418#define RCC_MP_CIFR_WKUPF BIT(20) +#define RCC_PLL3CR 0x880 +#define RCC_PLL4CR 0x894 +/* SYSCFG */ #define SYSCFG_CMPCR 0x20#define SYSCFG_CMPCR_SW_CTRL BIT(2)
@@ -690,6 +694,7 @@ static void __secure ddr_sw_self_refresh_exit(void) void __secure psci_system_suspend(u32 __always_unused function_id,u32 ep,u32 context_id) { +u32 saved_pll3cr, saved_pll4cr, saved_mssckselr;u32 saved_pwrctl, reg;/* Disable IO compensation */
@@ -708,6 +713,10 @@ void __secure psci_system_suspend(u32 __always_unused function_id,setbits_le32 (STM32_PWR_BASE +PWR_MPUCR ,PWR_MPUCR_CSSF |PWR_MPUCR_CSTDBYDIS |PWR_MPUCR_PDDS ); + saved_pll3cr =readl (STM32_RCC_BASE +RCC_PLL3CR ); + saved_pll4cr =readl (STM32_RCC_BASE +RCC_PLL4CR ); + saved_mssckselr =readl (STM32_RCC_BASE +RCC_MSSCKSELR ); +psci_v7_flush_dcache_all ();ddr_sr_mode_ssr (&saved_pwrctl);ddr_sw_self_refresh_in ();
@@ -724,6 +733,10 @@ void __secure psci_system_suspend(u32 __always_unused function_id,ddr_sw_self_refresh_exit ();ddr_sr_mode_restore (saved_pwrctl); +writel (saved_pll3cr,STM32_RCC_BASE +RCC_PLL3CR ); +writel (saved_pll4cr,STM32_RCC_BASE +RCC_PLL4CR ); +writel (saved_mssckselr,STM32_RCC_BASE +RCC_MSSCKSELR ); +writel (SYSCFG_CMPENR_MPUEN ,STM32_SYSCFG_BASE +SYSCFG_CMPENSETR );clrbits_le32 (STM32_SYSCFG_BASE +SYSCFG_CMPCR ,SYSCFG_CMPCR_SW_CTRL ); }
Signature · 1 line
2.35.1
HI Marek
Quoted 53 lines · Marek Vasut
The SoC seems to lose the values of PLL3CR, PLL4CR,
RCC_MSSCKSELRduring suspend/resume cycle, cache them and reinstate their values on resume.Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- arch/arm/mach-stm32mp/psci.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)arch/arm/mach-stm32mp/psci.c +9
-0@@ -26,6 +26,7 @@#define PWR_MPUCR_CSSF BIT(9)/* RCC */ +#define RCC_MSSCKSELR 0x48#define RCC_DDRITFCR 0xd8#define RCC_DDRITFCR_DDRC1EN BIT(0)@@ -49,6 +50,9 @@#define RCC_MP_CIFR 0x418#define RCC_MP_CIFR_WKUPF BIT(20) +#define RCC_PLL3CR 0x880 +#define RCC_PLL4CR 0x894 +/* SYSCFG */ #define SYSCFG_CMPCR 0x20#define SYSCFG_CMPCR_SW_CTRL BIT(2)@@ -690,6 +694,7 @@ static void __secure ddr_sw_self_refresh_exit(void) void __secure psci_system_suspend(u32 __always_unused function_id,u32 ep,u32 context_id) { +u32 saved_pll3cr, saved_pll4cr, saved_mssckselr;u32 saved_pwrctl, reg;/* Disable IO compensation */ @@ -708,6 +713,10 @@ void __secure psci_system_suspend(u32 __always_unused function_id,setbits_le32 (STM32_PWR_BASE +PWR_MPUCR ,PWR_MPUCR_CSSF |PWR_MPUCR_CSTDBYDIS |PWR_MPUCR_PDDS ); + saved_pll3cr =readl (STM32_RCC_BASE +RCC_PLL3CR ); + saved_pll4cr =readl (STM32_RCC_BASE +RCC_PLL4CR ); + saved_mssckselr =readl (STM32_RCC_BASE +RCC_MSSCKSELR ); +psci_v7_flush_dcache_all ();ddr_sr_mode_ssr (&saved_pwrctl);ddr_sw_self_refresh_in ();
arch/arm/mach-stm32mp/psci.c void __secure psci_system_suspend(u32 __always_unused function_id, · line 742
Quoted 10 lines
arch/arm/mach-stm32mp/psci.c +4
-0@@ -724,6 +733,10 @@ void __secure psci_system_suspend(u32 __always_unused function_id,ddr_sw_self_refresh_exit ();ddr_sr_mode_restore (saved_pwrctl); +writel (saved_pll3cr,STM32_RCC_BASE +RCC_PLL3CR ); +writel (saved_pll4cr,STM32_RCC_BASE +RCC_PLL4CR ); +writel (saved_mssckselr,STM32_RCC_BASE +RCC_MSSCKSELR ); +writel (SYSCFG_CMPENR_MPUEN ,STM32_SYSCFG_BASE +SYSCFG_CMPENSETR );clrbits_le32 (STM32_SYSCFG_BASE +SYSCFG_CMPCR ,SYSCFG_CMPCR_SW_CTRL ); }
Thanks
Patrice
Hi,
Quoted 53 lines · Marek Vasut
The SoC seems to lose the values of PLL3CR, PLL4CR,
RCC_MSSCKSELRduring suspend/resume cycle, cache them and reinstate their values on resume.Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- arch/arm/mach-stm32mp/psci.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)arch/arm/mach-stm32mp/psci.c +9
-0@@ -26,6 +26,7 @@#define PWR_MPUCR_CSSF BIT(9)/* RCC */ +#define RCC_MSSCKSELR 0x48#define RCC_DDRITFCR 0xd8#define RCC_DDRITFCR_DDRC1EN BIT(0)@@ -49,6 +50,9 @@#define RCC_MP_CIFR 0x418#define RCC_MP_CIFR_WKUPF BIT(20) +#define RCC_PLL3CR 0x880 +#define RCC_PLL4CR 0x894 +/* SYSCFG */ #define SYSCFG_CMPCR 0x20#define SYSCFG_CMPCR_SW_CTRL BIT(2)@@ -690,6 +694,7 @@ static void __secure ddr_sw_self_refresh_exit(void) void __secure psci_system_suspend(u32 __always_unused function_id,u32 ep,u32 context_id) { +u32 saved_pll3cr, saved_pll4cr, saved_mssckselr;u32 saved_pwrctl, reg;/* Disable IO compensation */ @@ -708,6 +713,10 @@ void __secure psci_system_suspend(u32 __always_unused function_id,setbits_le32 (STM32_PWR_BASE +PWR_MPUCR ,PWR_MPUCR_CSSF |PWR_MPUCR_CSTDBYDIS |PWR_MPUCR_PDDS ); + saved_pll3cr =readl (STM32_RCC_BASE +RCC_PLL3CR ); + saved_pll4cr =readl (STM32_RCC_BASE +RCC_PLL4CR ); + saved_mssckselr =readl (STM32_RCC_BASE +RCC_MSSCKSELR ); +psci_v7_flush_dcache_all ();ddr_sr_mode_ssr (&saved_pwrctl);ddr_sw_self_refresh_in ();
arch/arm/mach-stm32mp/psci.c void __secure psci_system_suspend(u32 __always_unused function_id, · line 738
Quoted 6 lines
arch/arm/mach-stm32mp/psci.c +3
-0@@ -724,6 +733,10 @@ void __secure psci_system_suspend(u32 __always_unused function_id,ddr_sw_self_refresh_exit ();ddr_sr_mode_restore (saved_pwrctl); +writel (saved_pll3cr,STM32_RCC_BASE +RCC_PLL3CR ); +writel (saved_pll4cr,STM32_RCC_BASE +RCC_PLL4CR ); +writel (saved_mssckselr,STM32_RCC_BASE +RCC_MSSCKSELR );
need to save and restore RCC_MCUDIVR also I think.
based on TF-A drivers/st/clk/stm32mp1_clk.c::stm32mp1_clock_stopmode_resume()
arch/arm/mach-stm32mp/psci.c void __secure psci_system_suspend(u32 __always_unused function_id, · line 742
Quoted 4 lines
arch/arm/mach-stm32mp/psci.c +1
-0+writel (SYSCFG_CMPENR_MPUEN ,STM32_SYSCFG_BASE +SYSCFG_CMPENSETR );clrbits_le32 (STM32_SYSCFG_BASE +SYSCFG_CMPCR ,SYSCFG_CMPCR_SW_CTRL ); }
Patrick