[PATCH 0/3] ARM: at91: pm: fixes

[PATCH 0/3] ARM: at91: pm: fixes

[Claudiu Beznea]

Hi,

The following series adds fixes for AT91 platform power management 
code.

Thank you,
Claudiu Beznea

Claudiu Beznea (3):
  ARM: dts: at91: sama7g5ek: add suspend voltage for ddr3l rail
  ARM: at91: pm: group constants and addresses loading
  ARM: at91: pm: preload base address of controllers in tlb

 arch/arm/boot/dts/at91-sama7g5ek.dts |  2 ++
 arch/arm/mach-at91/pm_suspend.S      | 42 ++++++++++++++++++++++------
 2 files changed, 35 insertions(+), 9 deletions(-)

-- 
2.25.1

[PATCH 1/3] ARM: dts: at91: sama7g5ek: add suspend voltage for ddr3l rail

[Claudiu Beznea]

SAMA7G5-EK board has DDR3L type of memory soldered. This needs 1.35V. The
1.35V for DDR3L rail at run-time is selected by the proper configuration
on SELV2 pin (for 1.35V it needs to be in high-z state). When suspended
the MCP16502 PMIC soldered on SAMA7G5-EK will use different sets of
configuration registers to provide proper voltages on its rail. Run-time
configuration registers could be configured differently than suspend
configuration register for MCP16502 (VSEL2 affects only run-time
configuration). In suspend states the DDR3L memory soldered on SAMA7G5-EK
switches to self-refresh. Even on self-refresh it needs to be powered by
a 1.35V rail. Thus, make sure the PMIC is configured properly when system
is suspended.

Fixes: 7540629e2fc7 (ARM: dts: at91: add sama7g5 SoC DT and sama7g5-ek")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/boot/dts/at91-sama7g5ek.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-sama7g5ek.dts
index 4e6bcb7fdfd4..be905eb1da31 100644
--- a/arch/arm/boot/dts/at91-sama7g5ek.dts
+++ b/arch/arm/boot/dts/at91-sama7g5ek.dts
@@ -206,11 +206,13 @@ vddioddr: VDD_DDR {
 
 					regulator-state-standby {
 						regulator-on-in-suspend;
+						regulator-suspend-microvolt = <1350000>;
 						regulator-mode = <4>;
 					};
 
 					regulator-state-mem {
 						regulator-on-in-suspend;
+						regulator-suspend-microvolt = <1350000>;
 						regulator-mode = <4>;
 					};
 				};
-- 
2.25.1

[PATCH 2/3] ARM: at91: pm: group constants and addresses loading

[Claudiu Beznea]

Group constants and addresses loading. This commit prepares the field for
the next one. Added fixes tag on this commit as the next one will fail
to apply if backported alone to older kernels.

Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/mach-at91/pm_suspend.S | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index cbd61a3bcab1..34f251fdb743 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram)
 	mov	tmp1, #0
 	mcr	p15, 0, tmp1, c7, c10, 4
 
+	ldr	tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
+	str	tmp1, .mckr_offset
+	ldr	tmp1, [r0, #PM_DATA_PMC_VERSION]
+	str	tmp1, .pmc_version
+	ldr	tmp1, [r0, #PM_DATA_MEMCTRL]
+	str	tmp1, .memtype
+	ldr	tmp1, [r0, #PM_DATA_MODE]
+	str	tmp1, .pm_mode
+
 	ldr	tmp1, [r0, #PM_DATA_PMC]
 	str	tmp1, .pmc_base
 	ldr	tmp1, [r0, #PM_DATA_RAMC0]
@@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram)
 	str	tmp1, .sramc1_base
 	ldr	tmp1, [r0, #PM_DATA_RAMC_PHY]
 	str	tmp1, .sramc_phy_base
-	ldr	tmp1, [r0, #PM_DATA_MEMCTRL]
-	str	tmp1, .memtype
-	ldr	tmp1, [r0, #PM_DATA_MODE]
-	str	tmp1, .pm_mode
-	ldr	tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
-	str	tmp1, .mckr_offset
-	ldr	tmp1, [r0, #PM_DATA_PMC_VERSION]
-	str	tmp1, .pmc_version
 	/* Both ldrne below are here to preload their address in the TLB */
 	ldr	tmp1, [r0, #PM_DATA_SHDWC]
 	str	tmp1, .shdwc
-- 
2.25.1

Re: [PATCH 2/3] ARM: at91: pm: group constants and addresses loading

[Alexandre Belloni]

Hello,

On 28/09/2021 11:42:56+0300, Claudiu Beznea wrote:
> Group constants and addresses loading. This commit prepares the field for
> the next one. Added fixes tag on this commit as the next one will fail
> to apply if backported alone to older kernels.

The proper notation is to use Depends-on: on the next patch.

> 
> Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5")
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
>  arch/arm/mach-at91/pm_suspend.S | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
> index cbd61a3bcab1..34f251fdb743 100644
> --- a/arch/arm/mach-at91/pm_suspend.S
> +++ b/arch/arm/mach-at91/pm_suspend.S
> @@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram)
>  	mov	tmp1, #0
>  	mcr	p15, 0, tmp1, c7, c10, 4
>  
> +	ldr	tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
> +	str	tmp1, .mckr_offset
> +	ldr	tmp1, [r0, #PM_DATA_PMC_VERSION]
> +	str	tmp1, .pmc_version
> +	ldr	tmp1, [r0, #PM_DATA_MEMCTRL]
> +	str	tmp1, .memtype
> +	ldr	tmp1, [r0, #PM_DATA_MODE]
> +	str	tmp1, .pm_mode
> +
>  	ldr	tmp1, [r0, #PM_DATA_PMC]
>  	str	tmp1, .pmc_base
>  	ldr	tmp1, [r0, #PM_DATA_RAMC0]
> @@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram)
>  	str	tmp1, .sramc1_base
>  	ldr	tmp1, [r0, #PM_DATA_RAMC_PHY]
>  	str	tmp1, .sramc_phy_base
> -	ldr	tmp1, [r0, #PM_DATA_MEMCTRL]
> -	str	tmp1, .memtype
> -	ldr	tmp1, [r0, #PM_DATA_MODE]
> -	str	tmp1, .pm_mode
> -	ldr	tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
> -	str	tmp1, .mckr_offset
> -	ldr	tmp1, [r0, #PM_DATA_PMC_VERSION]
> -	str	tmp1, .pmc_version
>  	/* Both ldrne below are here to preload their address in the TLB */
>  	ldr	tmp1, [r0, #PM_DATA_SHDWC]
>  	str	tmp1, .shdwc
> -- 
> 2.25.1
> 

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 2/3] ARM: at91: pm: group constants and addresses loading

[Claudiu.Beznea]

On 28.09.2021 13:01, Alexandre Belloni wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Hello,
> 
> On 28/09/2021 11:42:56+0300, Claudiu Beznea wrote:
>> Group constants and addresses loading. This commit prepares the field for
>> the next one. Added fixes tag on this commit as the next one will fail
>> to apply if backported alone to older kernels.
> 
> The proper notation is to use Depends-on: on the next patch.

At the moment this patch has no sha1 associated so I will ask Nicolas to
add the Depends-on when he will take it. Do you see other options?

> 
>>
>> Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5")
>> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
>> ---
>>  arch/arm/mach-at91/pm_suspend.S | 17 +++++++++--------
>>  1 file changed, 9 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
>> index cbd61a3bcab1..34f251fdb743 100644
>> --- a/arch/arm/mach-at91/pm_suspend.S
>> +++ b/arch/arm/mach-at91/pm_suspend.S
>> @@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram)
>>       mov     tmp1, #0
>>       mcr     p15, 0, tmp1, c7, c10, 4
>>
>> +     ldr     tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
>> +     str     tmp1, .mckr_offset
>> +     ldr     tmp1, [r0, #PM_DATA_PMC_VERSION]
>> +     str     tmp1, .pmc_version
>> +     ldr     tmp1, [r0, #PM_DATA_MEMCTRL]
>> +     str     tmp1, .memtype
>> +     ldr     tmp1, [r0, #PM_DATA_MODE]
>> +     str     tmp1, .pm_mode
>> +
>>       ldr     tmp1, [r0, #PM_DATA_PMC]
>>       str     tmp1, .pmc_base
>>       ldr     tmp1, [r0, #PM_DATA_RAMC0]
>> @@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram)
>>       str     tmp1, .sramc1_base
>>       ldr     tmp1, [r0, #PM_DATA_RAMC_PHY]
>>       str     tmp1, .sramc_phy_base
>> -     ldr     tmp1, [r0, #PM_DATA_MEMCTRL]
>> -     str     tmp1, .memtype
>> -     ldr     tmp1, [r0, #PM_DATA_MODE]
>> -     str     tmp1, .pm_mode
>> -     ldr     tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
>> -     str     tmp1, .mckr_offset
>> -     ldr     tmp1, [r0, #PM_DATA_PMC_VERSION]
>> -     str     tmp1, .pmc_version
>>       /* Both ldrne below are here to preload their address in the TLB */
>>       ldr     tmp1, [r0, #PM_DATA_SHDWC]
>>       str     tmp1, .shdwc
>> --
>> 2.25.1
>>
> 
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 

Re: [PATCH 2/3] ARM: at91: pm: group constants and addresses loading

[Nicolas Ferre]

On 30/09/2021 at 12:16, Claudiu Beznea - M18063 wrote:
> On 28.09.2021 13:01, Alexandre Belloni wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> Hello,
>>
>> On 28/09/2021 11:42:56+0300, Claudiu Beznea wrote:
>>> Group constants and addresses loading. This commit prepares the field for
>>> the next one. Added fixes tag on this commit as the next one will fail
>>> to apply if backported alone to older kernels.
>>
>> The proper notation is to use Depends-on: on the next patch.
> 
> At the moment this patch has no sha1 associated so I will ask Nicolas to
> add the Depends-on when he will take it. Do you see other options?

Depends-on added when queuing on at91-fixes.

Thanks, best regards,
   Nicolas

>>> Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5")
>>> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
>>> ---
>>>   arch/arm/mach-at91/pm_suspend.S | 17 +++++++++--------
>>>   1 file changed, 9 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
>>> index cbd61a3bcab1..34f251fdb743 100644
>>> --- a/arch/arm/mach-at91/pm_suspend.S
>>> +++ b/arch/arm/mach-at91/pm_suspend.S
>>> @@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram)
>>>        mov     tmp1, #0
>>>        mcr     p15, 0, tmp1, c7, c10, 4
>>>
>>> +     ldr     tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
>>> +     str     tmp1, .mckr_offset
>>> +     ldr     tmp1, [r0, #PM_DATA_PMC_VERSION]
>>> +     str     tmp1, .pmc_version
>>> +     ldr     tmp1, [r0, #PM_DATA_MEMCTRL]
>>> +     str     tmp1, .memtype
>>> +     ldr     tmp1, [r0, #PM_DATA_MODE]
>>> +     str     tmp1, .pm_mode
>>> +
>>>        ldr     tmp1, [r0, #PM_DATA_PMC]
>>>        str     tmp1, .pmc_base
>>>        ldr     tmp1, [r0, #PM_DATA_RAMC0]
>>> @@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram)
>>>        str     tmp1, .sramc1_base
>>>        ldr     tmp1, [r0, #PM_DATA_RAMC_PHY]
>>>        str     tmp1, .sramc_phy_base
>>> -     ldr     tmp1, [r0, #PM_DATA_MEMCTRL]
>>> -     str     tmp1, .memtype
>>> -     ldr     tmp1, [r0, #PM_DATA_MODE]
>>> -     str     tmp1, .pm_mode
>>> -     ldr     tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
>>> -     str     tmp1, .mckr_offset
>>> -     ldr     tmp1, [r0, #PM_DATA_PMC_VERSION]
>>> -     str     tmp1, .pmc_version
>>>        /* Both ldrne below are here to preload their address in the TLB */
>>>        ldr     tmp1, [r0, #PM_DATA_SHDWC]
>>>        str     tmp1, .shdwc
>>> --
>>> 2.25.1
>>>
>>
>> --
>> Alexandre Belloni, co-owner and COO, Bootlin
>> Embedded Linux and Kernel engineering
>> https://bootlin.com
>>
> 


-- 
Nicolas Ferre

[PATCH 3/3] ARM: at91: pm: preload base address of controllers in tlb

[Claudiu Beznea]

In suspend/resume procedure for AT91 architecture different controllers
(PMC, SHDWC, RAM, RAM PHY, SFRBU) are accessed to do the proper settings
for power saving. Commit f0bbf17958e8 ("ARM: at91: pm: add self-refresh
support for sama7g5") introduced the access to RAMC PHY controller for
SAMA7G5. The access to this controller is done after RAMC ports are
closed, thus any TLB walk necessary for RAMC PHY virtual address will
fail. In the development branch this was not encountered. However, on
current kernel the issue is reproducible.

To solve the issue the previous mechanism of pre-loading the TLB with
the RAMC PHY virtual address has been used. However, only the addition
of this new pre-load breaks the functionality for ARMv5 based
devices (SAM9X60). This behavior has been encountered previously
while debugging this code and using the same mechanism for pre-loading
address for different controllers (e.g. pin controller, the assumption
being that other requested translations are replaced from TLB).

To solve this new issue the TBL flush + the extension of pre-loading
the rest of controllers to TBL (e.g. PMC, RAMC) has been added. The
rest of the controllers should have been pre-loaded previously, anyway.

Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/mach-at91/pm_suspend.S | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index 34f251fdb743..fdb4f63ecde4 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -1014,6 +1014,10 @@ ENTRY(at91_pm_suspend_in_sram)
 	mov	tmp1, #0
 	mcr	p15, 0, tmp1, c7, c10, 4
 
+	/* Flush tlb. */
+	mov	r4, #0
+	mcr	p15, 0, r4, c8, c7, 0
+
 	ldr	tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
 	str	tmp1, .mckr_offset
 	ldr	tmp1, [r0, #PM_DATA_PMC_VERSION]
@@ -1023,23 +1027,42 @@ ENTRY(at91_pm_suspend_in_sram)
 	ldr	tmp1, [r0, #PM_DATA_MODE]
 	str	tmp1, .pm_mode
 
+	/*
+	 * ldrne below are here to preload their address in the TLB as access
+	 * to RAM may be limited while in self-refresh.
+	 */
 	ldr	tmp1, [r0, #PM_DATA_PMC]
 	str	tmp1, .pmc_base
+	cmp	tmp1, #0
+	ldrne	tmp2, [tmp1, #0]
+
 	ldr	tmp1, [r0, #PM_DATA_RAMC0]
 	str	tmp1, .sramc_base
+	cmp	tmp1, #0
+	ldrne	tmp2, [tmp1, #0]
+
 	ldr	tmp1, [r0, #PM_DATA_RAMC1]
 	str	tmp1, .sramc1_base
+	cmp	tmp1, #0
+	ldrne	tmp2, [tmp1, #0]
+
+#ifndef CONFIG_SOC_SAM_V4_V5
+	/* ldrne below are here to preload their address in the TLB */
 	ldr	tmp1, [r0, #PM_DATA_RAMC_PHY]
 	str	tmp1, .sramc_phy_base
-	/* Both ldrne below are here to preload their address in the TLB */
+	cmp	tmp1, #0
+	ldrne	tmp2, [tmp1, #0]
+
 	ldr	tmp1, [r0, #PM_DATA_SHDWC]
 	str	tmp1, .shdwc
 	cmp	tmp1, #0
 	ldrne	tmp2, [tmp1, #0]
+
 	ldr	tmp1, [r0, #PM_DATA_SFRBU]
 	str	tmp1, .sfrbu
 	cmp	tmp1, #0
 	ldrne	tmp2, [tmp1, #0x10]
+#endif
 
 	/* Active the self-refresh mode */
 	at91_sramc_self_refresh_ena
-- 
2.25.1

Re: [PATCH 3/3] ARM: at91: pm: preload base address of controllers in tlb

[Alexandre Belloni]

On 28/09/2021 11:42:57+0300, Claudiu Beznea wrote:
> In suspend/resume procedure for AT91 architecture different controllers
> (PMC, SHDWC, RAM, RAM PHY, SFRBU) are accessed to do the proper settings
> for power saving. Commit f0bbf17958e8 ("ARM: at91: pm: add self-refresh
> support for sama7g5") introduced the access to RAMC PHY controller for
> SAMA7G5. The access to this controller is done after RAMC ports are
> closed, thus any TLB walk necessary for RAMC PHY virtual address will
> fail. In the development branch this was not encountered. However, on
> current kernel the issue is reproducible.
> 
> To solve the issue the previous mechanism of pre-loading the TLB with
> the RAMC PHY virtual address has been used. However, only the addition
> of this new pre-load breaks the functionality for ARMv5 based
> devices (SAM9X60). This behavior has been encountered previously
> while debugging this code and using the same mechanism for pre-loading
> address for different controllers (e.g. pin controller, the assumption
> being that other requested translations are replaced from TLB).
> 
> To solve this new issue the TBL flush + the extension of pre-loading
> the rest of controllers to TBL (e.g. PMC, RAMC) has been added. The

s/TBL/TLB

> rest of the controllers should have been pre-loaded previously, anyway.
> 
> Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5")
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
>  arch/arm/mach-at91/pm_suspend.S | 25 ++++++++++++++++++++++++-
>  1 file changed, 24 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
> index 34f251fdb743..fdb4f63ecde4 100644
> --- a/arch/arm/mach-at91/pm_suspend.S
> +++ b/arch/arm/mach-at91/pm_suspend.S
> @@ -1014,6 +1014,10 @@ ENTRY(at91_pm_suspend_in_sram)
>  	mov	tmp1, #0
>  	mcr	p15, 0, tmp1, c7, c10, 4
>  
> +	/* Flush tlb. */
> +	mov	r4, #0
> +	mcr	p15, 0, r4, c8, c7, 0
> +
>  	ldr	tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
>  	str	tmp1, .mckr_offset
>  	ldr	tmp1, [r0, #PM_DATA_PMC_VERSION]
> @@ -1023,23 +1027,42 @@ ENTRY(at91_pm_suspend_in_sram)
>  	ldr	tmp1, [r0, #PM_DATA_MODE]
>  	str	tmp1, .pm_mode
>  
> +	/*
> +	 * ldrne below are here to preload their address in the TLB as access
> +	 * to RAM may be limited while in self-refresh.
> +	 */
>  	ldr	tmp1, [r0, #PM_DATA_PMC]
>  	str	tmp1, .pmc_base
> +	cmp	tmp1, #0
> +	ldrne	tmp2, [tmp1, #0]
> +
>  	ldr	tmp1, [r0, #PM_DATA_RAMC0]
>  	str	tmp1, .sramc_base
> +	cmp	tmp1, #0
> +	ldrne	tmp2, [tmp1, #0]
> +
>  	ldr	tmp1, [r0, #PM_DATA_RAMC1]
>  	str	tmp1, .sramc1_base
> +	cmp	tmp1, #0
> +	ldrne	tmp2, [tmp1, #0]
> +
> +#ifndef CONFIG_SOC_SAM_V4_V5
> +	/* ldrne below are here to preload their address in the TLB */
>  	ldr	tmp1, [r0, #PM_DATA_RAMC_PHY]
>  	str	tmp1, .sramc_phy_base
> -	/* Both ldrne below are here to preload their address in the TLB */
> +	cmp	tmp1, #0
> +	ldrne	tmp2, [tmp1, #0]
> +
>  	ldr	tmp1, [r0, #PM_DATA_SHDWC]
>  	str	tmp1, .shdwc
>  	cmp	tmp1, #0
>  	ldrne	tmp2, [tmp1, #0]
> +
>  	ldr	tmp1, [r0, #PM_DATA_SFRBU]
>  	str	tmp1, .sfrbu
>  	cmp	tmp1, #0
>  	ldrne	tmp2, [tmp1, #0x10]
> +#endif
>  
>  	/* Active the self-refresh mode */
>  	at91_sramc_self_refresh_ena
> -- 
> 2.25.1
> 

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com