Skip to contentSkip to conversation

ram: stm32mp1: Conditionally enable ASR

PATCH Superseded Marek Vasut 3 participants 7 messages Apr 13, 2022 – Apr 26, 2022 Arm STM32

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ram: stm32mp1: Conditionally enable ASR

Enable DRAM ASR, auto self-refresh, conditionally, based on DT property "st,mem-enable-asr" . While ASR does save considerable amount of power at runtime automatically, it also causes LTDC underruns on large panels. Let user select whether or not ASR is required or not, generally ASR should be enabled on portable and battery operated devices.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 drivers/ram/stm32mp1/stm32mp1_ddr.c | 3 ++-
 drivers/ram/stm32mp1/stm32mp1_ddr.h | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/ram/stm32mp1/stm32mp1_ddr.c +2 -1
index 528a171b454..fd11e02aff4 100644
@@ -845,7 +845,8 @@ start:
 				 config->c_reg.pwrctl);
 
 /* Enable auto-self-refresh, which saves a bit of power at runtime. */
-	stm32mp1_asr_enable(priv);
+	if (config->info.enable_asr)
+		stm32mp1_asr_enable(priv);
 
 	/* enable uMCTL2 AXI port 0 and 1 */
 	setbits_le32(&priv->ctl->pctrl_0, DDRCTRL_PCTRL_N_PORT_EN);
drivers/ram/stm32mp1/stm32mp1_ddr.h +1 -0
index 861efff92be..c74a9cea2cc 100644
@@ -144,6 +144,7 @@ struct stm32mp1_ddr_info {
 	const char *name;
 	u32 speed; /* in kHZ */
 	u32 size;  /* memory size in byte = col * row * width */
+	bool enable_asr;
 };
 
 struct stm32mp1_ddr_config {
drivers/ram/stm32mp1/stm32mp1_ram.c +1 -0
index 49b1262461b..f39cfad4764 100644
@@ -122,6 +122,7 @@ static int stm32mp1_ddr_setup(struct udevice *dev)
 	config.info.speed = ofnode_read_u32_default(node, "st,mem-speed", 0);
 	config.info.size = ofnode_read_u32_default(node, "st,mem-size", 0);
 	config.info.name = ofnode_read_string(node, "st,mem-name");
+	config.info.enable_asr = ofnode_read_bool(node, "st,mem-enable-asr");
 	if (!config.info.name) {
 		dev_dbg(dev, "no st,mem-name\n");
 		return -EINVAL;
Signature · 1 line
2.35.1
#1 lore raw

Hi Marek,

on ST platform the ASR/SSR/HSR request are already provided by the DDR settings with pwrctl register value

it is managed in TF-A by

arm-trusted-firmware/drivers/st/ddr/stm32mp1_ddr_helpers.c

enumstm32mp1_ddr_sr_mode ddr_read_sr_mode(void)
{
uint32_tpwrctl = mmio_read_32(stm32mp_ddrctrl_base() + DDRCTRL_PWRCTL); switch(pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)) {
case0U:
returnDDR_SSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE:
returnDDR_HSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN:
returnDDR_ASR_MODE;
default:
returnDDR_SR_MODE_INVALID;
}
}

no need to add an other property

I think

Quoted 20 lines · Marek Vasut

Enable DRAM ASR, auto self-refresh, conditionally, based on DT property "st,mem-enable-asr" . While ASR does save considerable amount of power at runtime automatically, it also causes LTDC underruns on large panels. Let user select whether or not ASR is required or not, generally ASR should be enabled on portable and battery operated devices.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
  drivers/ram/stm32mp1/stm32mp1_ddr.c | 3 ++-
  drivers/ram/stm32mp1/stm32mp1_ddr.h | 1 +
  drivers/ram/stm32mp1/stm32mp1_ram.c | 1 +
  3 files changed, 4 insertions(+), 1 deletion(-)
drivers/ram/stm32mp1/stm32mp1_ddr.c +0 -0
index 528a171b454..fd11e02aff4 100644

drivers/ram/stm32mp1/stm32mp1_ddr.c start: · line 848

Quoted 4 lines
drivers/ram/stm32mp1/stm32mp1_ddr.c +0 -1
@@ -845,7 +845,8 @@ start:
  				 config->c_reg.pwrctl);
 
  /* Enable auto-self-refresh, which saves a bit of power at runtime. */
-	stm32mp1_asr_enable(priv);

+ if (config->c_reg.pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE |

DDRCTRL_PWRCTL_SELFREF_SW) ==

(DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE |DDRCTRL_PWRCTL_SELFREF_SW))

+ stm32mp1_asr_enable(priv);

in DDR setting

#define DDR_PWRCTL 0x00000000

    => SSR

#define DDR_PWRCTL 0x00000028

    => ASR

Quoted 22 lines
drivers/ram/stm32mp1/stm32mp1_ddr.c +2 -0
+	if (config->info.enable_asr)
+		stm32mp1_asr_enable(priv);
 
  	/* enable uMCTL2 AXI port 0 and 1 */
  	setbits_le32(&priv->ctl->pctrl_0, DDRCTRL_PCTRL_N_PORT_EN);
drivers/ram/stm32mp1/stm32mp1_ddr.h +1 -0
index 861efff92be..c74a9cea2cc 100644
@@ -144,6 +144,7 @@ struct stm32mp1_ddr_info {
  	const char *name;
  	u32 speed; /* in kHZ */
  	u32 size;  /* memory size in byte = col * row * width */
+	bool enable_asr;
  };
 
  struct stm32mp1_ddr_config {
drivers/ram/stm32mp1/stm32mp1_ram.c +0 -0
index 49b1262461b..f39cfad4764 100644

drivers/ram/stm32mp1/stm32mp1_ram.c static int stm32mp1_ddr_setup(struct udevice *dev) · line 128

Quoted 7 lines
drivers/ram/stm32mp1/stm32mp1_ram.c +1 -0
@@ -122,6 +122,7 @@ static int stm32mp1_ddr_setup(struct udevice *dev)
  	config.info.speed = ofnode_read_u32_default(node, "st,mem-speed", 0);
  	config.info.size = ofnode_read_u32_default(node, "st,mem-size", 0);
  	config.info.name = ofnode_read_string(node, "st,mem-name");
+	config.info.enable_asr = ofnode_read_bool(node, "st,mem-enable-asr");
  	if (!config.info.name) {
  		dev_dbg(dev, "no st,mem-name\n");
  		return -EINVAL;

Regards

Patrick

#2 lore raw
Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 5 lines

on ST platform the ASR/SSR/HSR request are already provided by the DDR settings with pwrctl register value

it is managed in TF-A by

arm-trusted-firmware/drivers/st/ddr/stm32mp1_ddr_helpers.c

Sure, I don't use ATF and I have no intention of ever using ATF on this platform.

Quoted 16 lines

enumstm32mp1_ddr_sr_mode ddr_read_sr_mode(void)
{
uint32_tpwrctl = mmio_read_32(stm32mp_ddrctrl_base() + DDRCTRL_PWRCTL); switch(pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)) {
case0U:
returnDDR_SSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE:
returnDDR_HSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN:
returnDDR_ASR_MODE;
default:
returnDDR_SR_MODE_INVALID;
}
}

Quoted 1 line

no need to add an other property

This is for U-Boot, plain, stock, without any other software partaking in it.

#3 lore raw
Quoted 29 lines · Marek Vasut
Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 5 lines

on ST platform the ASR/SSR/HSR request are already provided by the DDR settings with pwrctl register value

it is managed in TF-A by

arm-trusted-firmware/drivers/st/ddr/stm32mp1_ddr_helpers.c

Sure, I don't use ATF and I have no intention of ever using ATF on this platform.

Quoted 16 lines

enumstm32mp1_ddr_sr_mode ddr_read_sr_mode(void)
{
uint32_tpwrctl = mmio_read_32(stm32mp_ddrctrl_base() + DDRCTRL_PWRCTL); switch(pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)) {
case0U:
returnDDR_SSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE:
returnDDR_HSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN:
returnDDR_ASR_MODE;
default:
returnDDR_SR_MODE_INVALID;
}
}

Quoted 3 lines
Quoted 1 line

no need to add an other property

This is for U-Boot, plain, stock, without any other software partaking in it.

Note that this patch just reinstates the old behavior before v2022.04 release, except it adds a DT property to enable the new behavior with ASR and makes it non-default.

#4 lore raw

Hi Marek,

Quoted 6 lines · Marek Vasut
Quoted 5 lines · Marek Vasut
Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 7 lines
Quoted 7 lines
Quoted 5 lines

on ST platform the ASR/SSR/HSR request are already provided by the DDR settings with pwrctl register value

it is managed in TF-A by

arm-trusted-firmware/drivers/st/ddr/stm32mp1_ddr_helpers.c

Sure, I don't use ATF and I have no intention of ever using ATF on this platform.

Yes i know.

Quoted 17 lines
Quoted 17 lines
Quoted 17 lines

enumstm32mp1_ddr_sr_mode ddr_read_sr_mode(void)
{
uint32_tpwrctl = mmio_read_32(stm32mp_ddrctrl_base() + DDRCTRL_PWRCTL); switch(pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)) {
case0U:
returnDDR_SSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE:
returnDDR_HSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN:
returnDDR_ASR_MODE;
default:
returnDDR_SR_MODE_INVALID;
}
}

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

no need to add an other property

This is for U-Boot, plain, stock, without any other software partaking in it.

Note that this patch just reinstates the old behavior before v2022.04 release, except it adds a DT property to enable the new behavior with ASR and makes it non-default.

I agree that ASR can't be activated by default to avoid issue, so the previous shortcut

(always activate ASR in SPL) must be changed.

Today my concerns is only the binding.

The same binding for DDR sub system (control and PHY) must be shared by all the bootloader; It is my request.

in stm32mp1_ddr_setup() = ddr_set_sr_mode(ddr_read_sr_mode());

The ASR activation is already managed by existing binding with the pwrctl register value => DDR_PWRCTL in ./arch/arm/dts/stm32mp15-ddr.dtsi

as it is explained in ST Microelectronics documentation (AN5168: DDR configuration on STM32MP1 Series MPUs) and managed by the tool CubeMX and TF-A driver.

I propose to do the same, by using the same/existing binding, so the same DDR configuration file

generated by CubeMX tools can be used of TF-A and SPL

=> ASR deactivated by default when the

in stm32mp1_ddr_setup() = ddr_set_sr_mode(ddr_read_sr_mode());

requested pwrctl value is 0x0 (default today)

=> ASR is activated when it is request with pwrctl value

So in futur the HSR mode could be also added, as it is done today in TF-A stm32mp1_ddr_setup() =

	ddr_set_sr_mode(ddr_read_sr_mode());

drivers/ram/stm32mp1/stm32mp1_ddr.c start: · line 849

Quoted 11 lines
drivers/ram/stm32mp1/stm32mp1_ddr.c +2 -1
index 528a171b454..fd11e02aff4 100644
@@ -845,7 +845,8 @@ start:
 				 config->c_reg.pwrctl);
 
 /* Enable auto-self-refresh, which saves a bit of power at runtime. */
-	stm32mp1_asr_enable(priv);
+	if (config->info.enable_asr)
+		stm32mp1_asr_enable(priv);

I propose (based on TF-A code = ddr_read_sr_mode())

/* Enable auto-self-refresh, which saves a bit of power at runtime. */
- stm32mp1_asr_enable(priv);

+ if (config->c_reg.pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN) == DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)

+ stm32mp1_asr_enable(priv);

With

#define DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE    BIT(3)

If one board need to activate the ASR mode, the associated field in the DDR node need to be change, with:

#define DDR_PWRCTL 0x00000009

Regards,

Patrick

#5 lore raw
Quoted 115 lines · Patrick DELAUNAY

Hi Marek,

Quoted 6 lines · Marek Vasut
Quoted 5 lines · Marek Vasut
Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 7 lines
Quoted 7 lines
Quoted 5 lines

on ST platform the ASR/SSR/HSR request are already provided by the DDR settings with pwrctl register value

it is managed in TF-A by

arm-trusted-firmware/drivers/st/ddr/stm32mp1_ddr_helpers.c

Sure, I don't use ATF and I have no intention of ever using ATF on this platform.

Yes i know.

Quoted 17 lines
Quoted 17 lines
Quoted 17 lines

enumstm32mp1_ddr_sr_mode ddr_read_sr_mode(void)
{
uint32_tpwrctl = mmio_read_32(stm32mp_ddrctrl_base() + DDRCTRL_PWRCTL); switch(pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)) {
case0U:
returnDDR_SSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE:
returnDDR_HSR_MODE; caseDDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN:
returnDDR_ASR_MODE;
default:
returnDDR_SR_MODE_INVALID;
}
}

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

no need to add an other property

This is for U-Boot, plain, stock, without any other software partaking in it.

Note that this patch just reinstates the old behavior before v2022.04 release, except it adds a DT property to enable the new behavior with ASR and makes it non-default.

I agree that ASR can't be activated by default to avoid issue, so the previous shortcut

(always activate ASR in SPL) must be changed.

Today my concerns is only the binding.

The same binding for DDR sub system (control and PHY) must be shared by all the bootloader; It is my request.

in stm32mp1_ddr_setup() = ddr_set_sr_mode(ddr_read_sr_mode());

The ASR activation is already managed by existing binding with the pwrctl register value => DDR_PWRCTL in ./arch/arm/dts/stm32mp15-ddr.dtsi

as it is explained in ST Microelectronics documentation (AN5168: DDR configuration on STM32MP1 Series MPUs) and managed by the tool CubeMX and TF-A driver.

I propose to do the same, by using the same/existing binding, so the same DDR configuration file

generated by CubeMX tools can be used of TF-A and SPL

=> ASR deactivated by default when the

in stm32mp1_ddr_setup() = ddr_set_sr_mode(ddr_read_sr_mode());

requested pwrctl value is 0x0 (default today)

=> ASR is activated when it is request with pwrctl value

So in futur the HSR mode could be also added, as it is done today in TF-A stm32mp1_ddr_setup() = ddr_set_sr_mode(ddr_read_sr_mode());

drivers/ram/stm32mp1/stm32mp1_ddr.c start: · line 849

Quoted 11 lines
drivers/ram/stm32mp1/stm32mp1_ddr.c +2 -1
index 528a171b454..fd11e02aff4 100644
@@ -845,7 +845,8 @@ start:
                   config->c_reg.pwrctl);
 
  /* Enable auto-self-refresh, which saves a bit of power at runtime. */
-    stm32mp1_asr_enable(priv);
+    if (config->info.enable_asr)
+        stm32mp1_asr_enable(priv);

I propose (based on TF-A code = ddr_read_sr_mode())

/* Enable auto-self-refresh, which saves a bit of power at runtime. */ -    stm32mp1_asr_enable(priv);

+ if (config->c_reg.pwrctl & (DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN) == DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE | DDRCTRL_PWRCTL_SELFREF_EN)

+ stm32mp1_asr_enable(priv);

With

#define DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE    BIT(3)

If one board need to activate the ASR mode, the associated field in the DDR node need to be change, with:

#define DDR_PWRCTL 0x00000009

Regards,

Patrick

Reviewed-by on v1 1/1
#6 lore raw
In reply to Marek Vasut

Hi Marek

Quoted 46 lines · Marek Vasut

Enable DRAM ASR, auto self-refresh, conditionally, based on DT property "st,mem-enable-asr" . While ASR does save considerable amount of power at runtime automatically, it also causes LTDC underruns on large panels. Let user select whether or not ASR is required or not, generally ASR should be enabled on portable and battery operated devices.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 drivers/ram/stm32mp1/stm32mp1_ddr.c | 3 ++-
 drivers/ram/stm32mp1/stm32mp1_ddr.h | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/ram/stm32mp1/stm32mp1_ddr.c +2 -1
index 528a171b454..fd11e02aff4 100644
@@ -845,7 +845,8 @@ start:
 				 config->c_reg.pwrctl);
 
 /* Enable auto-self-refresh, which saves a bit of power at runtime. */
-	stm32mp1_asr_enable(priv);
+	if (config->info.enable_asr)
+		stm32mp1_asr_enable(priv);
 
 	/* enable uMCTL2 AXI port 0 and 1 */
 	setbits_le32(&priv->ctl->pctrl_0, DDRCTRL_PCTRL_N_PORT_EN);
drivers/ram/stm32mp1/stm32mp1_ddr.h +1 -0
index 861efff92be..c74a9cea2cc 100644
@@ -144,6 +144,7 @@ struct stm32mp1_ddr_info {
 	const char *name;
 	u32 speed; /* in kHZ */
 	u32 size;  /* memory size in byte = col * row * width */
+	bool enable_asr;
 };
 
 struct stm32mp1_ddr_config {
drivers/ram/stm32mp1/stm32mp1_ram.c +0 -0
index 49b1262461b..f39cfad4764 100644

drivers/ram/stm32mp1/stm32mp1_ram.c static int stm32mp1_ddr_setup(struct udevice *dev) · line 128

Quoted 7 lines
drivers/ram/stm32mp1/stm32mp1_ram.c +1 -0
@@ -122,6 +122,7 @@ static int stm32mp1_ddr_setup(struct udevice *dev)
 	config.info.speed = ofnode_read_u32_default(node, "st,mem-speed", 0);
 	config.info.size = ofnode_read_u32_default(node, "st,mem-size", 0);
 	config.info.name = ofnode_read_string(node, "st,mem-name");
+	config.info.enable_asr = ofnode_read_bool(node, "st,mem-enable-asr");
 	if (!config.info.name) {
 		dev_dbg(dev, "no st,mem-name\n");
 		return -EINVAL;

Thanks
Patrice