Skip to contentSkip to conversation

stm32mp1: ram: driver update

PATCH New Patrick Delaunay 1 participant 10 messages Apr 10, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover stm32mp1: ram: driver update

Serie with some update on the DDR driver for stm32mp1 boards

Warning: the serie need to be apply after
1) http://patchwork.ozlabs.org/project/uboot/list/?series=89855
=> for STPMIC1 rename
2) http://patchwork.ozlabs.org/project/uboot/list/?series=91497
=> for DK1/DK2, DDR configuration

The serie also introduce the DDR interactive mode described in:
https://wiki.st.com/stm32mpu/index.php/U-Boot_SPL:_DDR_interactive_mode

This mode is used by the CubeMX: DDR tuning tool.
https://wiki.st.com/stm32mpu/index.php/STM32CubeMX

The DDR interactive mode is NOT activated by default because it increase the SPL size and slow down the boot time (200ms wait added).

Patrick Delaunay (9):
stm32mp1: ram: update mask for operating mode
stm32mp1: ram: increase the delay after reset to 128 cycles
stm32mp1: ram: change ddr speed to kHz
ARM: dts: stm32mp1: DDR config v1.44
stm32mp1: ram: update parameter array initialization
stm32mp1: ram: add support for LPDDR2/LPDDR3
stm32mp1: ram: add interactive mode for DDR configuration
stm32mp1: ram: add tests in DDR interactive mode
stm32mp1: ram: add tuning in DDR interactive mode

 arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi   |    8 +-
 arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi   |   24 +-
 arch/arm/mach-stm32mp/include/mach/ddr.h           |    9 +-
 board/st/stm32mp1/board.c                          |  171 ++-
 common/Makefile                                    |    1 +
 .../memory-controllers/st,stm32mp1-ddr.txt         |    6 +-
 drivers/ram/stm32mp1/Kconfig                       |   37 +
 drivers/ram/stm32mp1/Makefile                      |    8 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                |  368 ++++-
 drivers/ram/stm32mp1/stm32mp1_ddr.h                |    4 +-
 drivers/ram/stm32mp1/stm32mp1_ddr_regs.h           |    3 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c        |  483 +++++++
 drivers/ram/stm32mp1/stm32mp1_ram.c                |   18 +-
 drivers/ram/stm32mp1/stm32mp1_tests.c              | 1426 ++++++++++++++++++++
 drivers/ram/stm32mp1/stm32mp1_tests.h              |   34 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c             | 1380 +++++++++++++++++++
 16 files changed, 3876 insertions(+), 104 deletions(-)
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_interactive.c
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_tests.c
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_tests.h
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_tuning.c
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/9 stm32mp1: ram: update mask for operating mode

Regression introduced by rebase, when loop
was replaced by readl_poll_timeout() function.

---

 drivers/ram/stm32mp1/stm32mp1_ddr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ram/stm32mp1/stm32mp1_ddr.c +1 -1
index c7c3ba7..caa7813 100644
@@ -312,7 +312,7 @@ static void wait_operating_mode(struct ddr_info *priv, int mode)
 	/* self-refresh due to software => check also STAT.selfref_type */
 	if (mode == DDRCTRL_STAT_OPERATING_MODE_SR) {
 		mask |= DDRCTRL_STAT_SELFREF_TYPE_MASK;
-		stat |= DDRCTRL_STAT_SELFREF_TYPE_SR;
+		val |= DDRCTRL_STAT_SELFREF_TYPE_SR;
 	} else if (mode == DDRCTRL_STAT_OPERATING_MODE_NORMAL) {
 		/* normal mode: handle also automatic self refresh */
 		mask2 = DDRCTRL_STAT_OPERATING_MODE_MASK |
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/9 stm32mp1: ram: increase the delay after reset to 128 cycles

In reply to Patrick Delaunay

Component Notification DDR controller errata (3.00a):9001313030 Synchronization Time Waited After De-assertion of presetn is 128 pclk Cycles.

---

 drivers/ram/stm32mp1/stm32mp1_ddr.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/ram/stm32mp1/stm32mp1_ddr.c +3 -5
index caa7813..8200366 100644
@@ -401,11 +401,9 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
 	 */
 	clrbits_le32(priv->rcc + RCC_DDRITFCR, RCC_DDRITFCR_DDRCAPBRST);
 
-/* 1.4. wait 4 cycles for synchronization */
-	asm(" nop");
-	asm(" nop");
-	asm(" nop");
-	asm(" nop");
+/* 1.4. wait 128 cycles to permit initialization of end logic */
+	udelay(2);
+	/* for PCLK = 133MHz => 1 us is enough, 2 to allow lower frequency */
 
 /* 1.5. initialize registers ddr_umctl2 */
 	/* Stop uMCTL2 before PHY is ready */
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/9 stm32mp1: ram: change ddr speed to kHz

In reply to Patrick Delaunay

Allow fractional support in DDR tools.

---

 arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi           |  2 +-
 arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi           |  2 +-
 .../memory-controllers/st,stm32mp1-ddr.txt                 |  4 ++--
 drivers/ram/stm32mp1/stm32mp1_ddr.c                        |  4 ++--
 drivers/ram/stm32mp1/stm32mp1_ddr.h                        |  4 ++--
 drivers/ram/stm32mp1/stm32mp1_ram.c                        | 14 +++++++-------
 6 files changed, 15 insertions(+), 15 deletions(-)
arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi +1 -1
index 7d9b95c..b86a1c0 100644
@@ -17,7 +17,7 @@
  * Tc > + 85C : N
  */
 #define DDR_MEM_NAME "DDR3-1066/888 bin G 1x4Gb 533MHz v1.43"
-#define DDR_MEM_SPEED 533
+#define DDR_MEM_SPEED 533000
 #define DDR_MEM_SIZE 0x20000000
 
 #define DDR_MSTR 0x00041401
arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi +1 -1
index 8a5a821..99e5200 100644
@@ -18,7 +18,7 @@
  */
 
 #define DDR_MEM_NAME "DDR3-1066 bin G 2x4Gb 533MHz v1.36"
-#define DDR_MEM_SPEED 533
+#define DDR_MEM_SPEED 533000
 #define DDR_MEM_SIZE 0x40000000
 
 #define DDR_MSTR 0x00040401
doc/device-tree-bindings/memory-controllers/st,stm32mp1-ddr.txt +2 -2
index 3028636..e5b1bb5 100644
@@ -16,7 +16,7 @@ included in STM32 Cube tool
 info attributes:
 ----------------
 - st,mem-name	: name for DDR configuration, simple string for information
-- st,mem-speed	: DDR expected speed for the setting in MHz
+- st,mem-speed	: DDR expected speed for the setting in kHz
 - st,mem-size	: DDR mem size in byte
 
 
@@ -173,7 +173,7 @@ Example:
 				      "ddrphycapb";
 
 			st,mem-name = "DDR3 2x4Gb 533MHz";
-			st,mem-speed = <533>;
+			st,mem-speed = <533000>;
 			st,mem-size = <0x40000000>;
 
 			st,ctl-reg = <
drivers/ram/stm32mp1/stm32mp1_ddr.c +2 -2
index 8200366..1c40a32 100644
@@ -373,7 +373,7 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
 		panic("ddr power init failed\n");
 
 	debug("name = %s\n", config->info.name);
-	debug("speed = %d MHz\n", config->info.speed);
+	debug("speed = %d kHz\n", config->info.speed);
 	debug("size  = 0x%x\n", config->info.size);
 /*
  * 1. Program the DWC_ddr_umctl2 registers
@@ -389,7 +389,7 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
 
 /* 1.2. start CLOCK */
 	if (stm32mp1_ddr_clk_enable(priv, config->info.speed))
-		panic("invalid DRAM clock : %d MHz\n",
+		panic("invalid DRAM clock : %d kHz\n",
 		      config->info.speed);
 
 /* 1.3. deassert reset */
drivers/ram/stm32mp1/stm32mp1_ddr.h +2 -2
index 3cd0161..a8eed89 100644
@@ -157,7 +157,7 @@ struct stm32mp1_ddrphy_cal {
 
 struct stm32mp1_ddr_info {
 	const char *name;
-	u16 speed; /* in MHZ */
+	u32 speed; /* in kHZ */
 	u32 size;  /* memory size in byte = col * row * width */
 };
 
@@ -172,7 +172,7 @@ struct stm32mp1_ddr_config {
 	struct stm32mp1_ddrphy_cal p_cal;
 };
 
-int stm32mp1_ddr_clk_enable(struct ddr_info *priv, u16 mem_speed);
+int stm32mp1_ddr_clk_enable(struct ddr_info *priv, u32 mem_speed);
 void stm32mp1_ddrphy_init(struct stm32mp1_ddrphy *phy, u32 pir);
 void stm32mp1_refresh_disable(struct stm32mp1_ddrctl *ctl);
 void stm32mp1_refresh_restore(struct stm32mp1_ddrctl *ctl,
drivers/ram/stm32mp1/stm32mp1_ram.c +7 -7
index e45a3b2..d04c6aa 100644
@@ -20,7 +20,7 @@ static const char *const clkname[] = {
 	"ddrphyc" /* LAST clock => used for get_rate() */
 };
 
-int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint16_t mem_speed)
+int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint32_t mem_speed)
 {
 	unsigned long ddrphy_clk;
 	unsigned long ddr_clk;
@@ -43,13 +43,13 @@ int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint16_t mem_speed)
 	priv->clk = clk;
 	ddrphy_clk = clk_get_rate(&priv->clk);
 
-	debug("DDR: mem_speed (%d MHz), RCC %d MHz\n",
-	      mem_speed, (u32)(ddrphy_clk / 1000 / 1000));
+	debug("DDR: mem_speed (%d kHz), RCC %d kHz\n",
+	      mem_speed, (u32)(ddrphy_clk / 1000));
 	/* max 10% frequency delta */
-	ddr_clk = abs(ddrphy_clk - mem_speed * 1000 * 1000);
-	if (ddr_clk > (mem_speed * 1000 * 100)) {
-		pr_err("DDR expected freq %d MHz, current is %d MHz\n",
-		       mem_speed, (u32)(ddrphy_clk / 1000 / 1000));
+	ddr_clk = abs(ddrphy_clk - mem_speed * 1000);
+	if (ddr_clk > (mem_speed * 100)) {
+		pr_err("DDR expected freq %d kHz, current is %d kHz\n",
+		       mem_speed, (u32)(ddrphy_clk / 1000));
 		return -EINVAL;
 	}
 
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/9 ARM: dts: stm32mp1: DDR config v1.44

In reply to Patrick Delaunay

Update DDR configuration with the latest update:

- PUBL_regs: DXnGCR[0]= according to ddr_width to disable Byte

                        lane 2/3 in 16bit

- fix LPDDR2/3 timing_calc to step RL/WL in relaxed timings mode
- remove LPDDR3 RL3 (optional) support vs MR0[7] because MR0[7] can't be read instead always apply worse RL/WL for LPDDR3 when freq < 166MHz)
- change MR3 to 48ohm drive for LPDDR2/3
- change default ZPROG[7:4] = 0x1 for LPDDR2/3 , '0' is not allowed even when ODT not used
- use DQSTRN for LPDDR2/3 (it was not set in PIR)
- LPDDR3: set dqsge/dwsgx gate extension to 2,2 like LPDDR2
-DDRCTRL.dfitmg0:
+ for LPDDR3 tphy_wrlat = WL (as LPDDR2)
+ improvement for relaxed mode vs RL/Wl at corner case. For example @533MHz RL/WL (relaxed) = 9/5 for LPDDR2/3 and correction to MR2 accordingly
- DDR_PCFGQOS1_1: port1 timeout relaxed from 0x00 to 0x40, for LTDC.
- DDR_PCFGWQOS0_0: change vpr level from
11 to 12 in order to include the CPU on
the variable priority queue.
- DDR_SCHED: fix to consider 13 levels (13 levels - 1 = 0xC)

---

 arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi |  6 +++---
 arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi +3 -3
index b86a1c0..dc30360 100644
@@ -16,7 +16,7 @@
  * address mapping : RBC
  * Tc > + 85C : N
  */
-#define DDR_MEM_NAME "DDR3-1066/888 bin G 1x4Gb 533MHz v1.43"
+#define DDR_MEM_NAME "DDR3-1066/888 bin G 1x4Gb 533MHz v1.44"
 #define DDR_MEM_SPEED 533000
 #define DDR_MEM_SIZE 0x20000000
 
@@ -108,11 +108,11 @@
 #define DDR_DX1DLLCR 0x40000000
 #define DDR_DX1DQTR 0xFFFFFFFF
 #define DDR_DX1DQSTR 0x3DB02000
-#define DDR_DX2GCR 0x0000CE81
+#define DDR_DX2GCR 0x0000CE80
 #define DDR_DX2DLLCR 0x40000000
 #define DDR_DX2DQTR 0xFFFFFFFF
 #define DDR_DX2DQSTR 0x3DB02000
-#define DDR_DX3GCR 0x0000CE81
+#define DDR_DX3GCR 0x0000CE80
 #define DDR_DX3DLLCR 0x40000000
 #define DDR_DX3DQTR 0xFFFFFFFF
 #define DDR_DX3DQSTR 0x3DB02000
arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi +11 -11
index 99e5200..8158a56 100644
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- */
-
-/* STM32MP157C ED1 and ED2 BOARD configuration
+ *
+ * STM32MP157C ED1 BOARD configuration
  * 2x DDR3L 4Gb each, 16-bit, 533MHz, Single Die Package in flyby topology.
  * Reference used NT5CC256M16DP-DI from NANYA
  *
@@ -15,9 +14,10 @@
  * timing mode	optimized
  * Scheduling/QoS options : type = 2
  * address mapping : RBC
+ * Tc > + 85C : N
  */
 
-#define DDR_MEM_NAME "DDR3-1066 bin G 2x4Gb 533MHz v1.36"
+#define DDR_MEM_NAME "DDR3-1066/888 bin G 2x4Gb 533MHz v1.44"
 #define DDR_MEM_SPEED 533000
 #define DDR_MEM_SIZE 0x40000000
 
@@ -62,7 +62,7 @@
 #define DDR_ADDRMAP11 0x00000000
 #define DDR_ODTCFG 0x06000600
 #define DDR_ODTMAP 0x00000001
-#define DDR_SCHED 0x00001201
+#define DDR_SCHED 0x00000C01
 #define DDR_SCHED1 0x00000000
 #define DDR_PERFHPR1 0x01000001
 #define DDR_PERFLPR1 0x08000200
@@ -74,15 +74,15 @@
 #define DDR_PCCFG 0x00000010
 #define DDR_PCFGR_0 0x00010000
 #define DDR_PCFGW_0 0x00000000
-#define DDR_PCFGQOS0_0 0x02100B03
+#define DDR_PCFGQOS0_0 0x02100C03
 #define DDR_PCFGQOS1_0 0x00800100
-#define DDR_PCFGWQOS0_0 0x01100B03
+#define DDR_PCFGWQOS0_0 0x01100C03
 #define DDR_PCFGWQOS1_0 0x01000200
 #define DDR_PCFGR_1 0x00010000
 #define DDR_PCFGW_1 0x00000000
-#define DDR_PCFGQOS0_1 0x02100B03
-#define DDR_PCFGQOS1_1 0x00800100
-#define DDR_PCFGWQOS0_1 0x01100B03
+#define DDR_PCFGQOS0_1 0x02100C03
+#define DDR_PCFGQOS1_1 0x00800040
+#define DDR_PCFGWQOS0_1 0x01100C03
 #define DDR_PCFGWQOS1_1 0x01000200
 #define DDR_PGCR 0x01442E02
 #define DDR_PTR0 0x0022AA5B
@@ -100,7 +100,7 @@
 #define DDR_MR2 0x00000208
 #define DDR_MR3 0x00000000
 #define DDR_ODTCR 0x00010000
-#define DDR_ZQ0CR1 0x0000005B
+#define DDR_ZQ0CR1 0x00000038
 #define DDR_DX0GCR 0x0000CE81
 #define DDR_DX0DLLCR 0x40000000
 #define DDR_DX0DQTR 0xFFFFFFFF
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/9 stm32mp1: ram: update parameter array initialization

In reply to Patrick Delaunay

Force alignment of the size of parameters array with the expected value in the binding, that allows compilation error when the array size change.

---

 .../memory-controllers/st,stm32mp1-ddr.txt         |  2 +-
 drivers/ram/stm32mp1/stm32mp1_ddr.c                | 45 +++++++++++++++-------
 drivers/ram/stm32mp1/stm32mp1_ram.c                |  4 +-
 3 files changed, 34 insertions(+), 17 deletions(-)
doc/device-tree-bindings/memory-controllers/st,stm32mp1-ddr.txt +1 -1
index e5b1bb5..ee708ce 100644
@@ -102,7 +102,7 @@ controlleur attributes:
 phyc attributes:
 ----------------
 - st,phy-reg	: phy values depending of the DDR type (DDR3/LPDDR2/LPDDR3)
-	for STM32MP15x: 10 values are requested in this order
+	for STM32MP15x: 11 values are requested in this order
 		PGCR
 		ACIOCR
 		DXCCR
drivers/ram/stm32mp1/stm32mp1_ddr.c +31 -14

106 lines not on this page · raw message

drivers/ram/stm32mp1/stm32mp1_ram.c +2 -2
index d04c6aa..84e39d0 100644
@@ -102,8 +102,8 @@ static __maybe_unused int stm32mp1_ddr_setup(struct udevice *dev)
 		debug("%s: %s[0x%x] = %d\n", __func__,
 		      param[idx].name, param[idx].size, ret);
 		if (ret) {
-			pr_err("%s: Cannot read %s\n",
-			       __func__, param[idx].name);
+			pr_err("%s: Cannot read %s, error=%d\n",
+			       __func__, param[idx].name, ret);
 			return -EINVAL;
 		}
 	}
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/9 stm32mp1: ram: add support for LPDDR2/LPDDR3

In reply to Patrick Delaunay

Manage power supply configuration for board using stpmic1 with LPDDR2 or with LPDDR3:
+ VDD_DDR1 = 1.8V with BUCK3 (bypass if possible)
+ VDD_DDR2 = 1.2V with BUCK2

---

 arch/arm/mach-stm32mp/include/mach/ddr.h |   9 +-
 board/st/stm32mp1/board.c                | 171 ++++++++++++++++++++++---------
 drivers/ram/stm32mp1/stm32mp1_ddr.c      |  11 +-
 drivers/ram/stm32mp1/stm32mp1_ddr_regs.h |   2 +
 4 files changed, 141 insertions(+), 52 deletions(-)
arch/arm/mach-stm32mp/include/mach/ddr.h +8 -1
index 1857584..b8a17cf 100644
@@ -6,6 +6,13 @@
 #ifndef __MACH_STM32MP_DDR_H_
 #define __MACH_STM32MP_DDR_H_
 
-int board_ddr_power_init(void);
+/* DDR power initializations */
+enum ddr_type {
+	STM32MP_DDR3,
+	STM32MP_LPDDR2,
+	STM32MP_LPDDR3,
+};
+
+int board_ddr_power_init(enum ddr_type ddr_type);
 
 #endif
board/st/stm32mp1/board.c +123 -48

185 lines not on this page · raw message

drivers/ram/stm32mp1/stm32mp1_ddr.c +8 -3
index 5e1041d..cfd223e 100644
@@ -372,7 +372,7 @@ void stm32mp1_refresh_restore(struct stm32mp1_ddrctl *ctl,
 }
 
 /* board-specific DDR power initializations. */
-__weak int board_ddr_power_init(void)
+__weak int board_ddr_power_init(enum ddr_type ddr_type)
 {
 	return 0;
 }
@@ -382,9 +382,14 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
 		       const struct stm32mp1_ddr_config *config)
 {
 	u32 pir;
-	int ret;
+	int ret = -EINVAL;
 
-	ret = board_ddr_power_init();
+	if (config->c_reg.mstr & DDRCTRL_MSTR_DDR3)
+		ret = board_ddr_power_init(STM32MP_DDR3);
+	else if (config->c_reg.mstr & DDRCTRL_MSTR_LPDDR2)
+		ret = board_ddr_power_init(STM32MP_LPDDR2);
+	else if (config->c_reg.mstr & DDRCTRL_MSTR_LPDDR3)
+		ret = board_ddr_power_init(STM32MP_LPDDR3);
 
 	if (ret)
 		panic("ddr power init failed\n");
drivers/ram/stm32mp1/stm32mp1_ddr_regs.h +2 -0
index a606b2b..97f268e 100644
@@ -234,6 +234,8 @@ struct stm32mp1_ddrphy {
 
 /* DDRCTRL REGISTERS */
 #define DDRCTRL_MSTR_DDR3			BIT(0)
+#define DDRCTRL_MSTR_LPDDR2			BIT(2)
+#define DDRCTRL_MSTR_LPDDR3			BIT(3)
 #define DDRCTRL_MSTR_DATA_BUS_WIDTH_MASK	GENMASK(13, 12)
 #define DDRCTRL_MSTR_DATA_BUS_WIDTH_FULL	(0 << 12)
 #define DDRCTRL_MSTR_DATA_BUS_WIDTH_HALF	(1 << 12)
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/9 stm32mp1: ram: add interactive mode for DDR configuration

In reply to Patrick Delaunay

This debug mode is used by CubeMX DDR tuning tools or manualy for tests during board bring-up.
It is simple console used to change DDR parameters and check initialization.

---

 common/Makefile                             |   1 +
 drivers/ram/stm32mp1/Kconfig                |  19 ++
 drivers/ram/stm32mp1/Makefile               |   6 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c         | 298 +++++++++++++++++++++
 drivers/ram/stm32mp1/stm32mp1_interactive.c | 390 ++++++++++++++++++++++++++++
 5 files changed, 714 insertions(+)
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_interactive.c
common/Makefile +1 -0
index 8c92feb..c7e41ef 100644
@@ -124,6 +124,7 @@ endif
 
 obj-y += cli.o
 obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o
+obj-$(CONFIG_STM32MP1_DDR_INTERACTIVE) += cli_simple.o cli_readline.o
 obj-$(CONFIG_DFU_OVER_USB) += dfu.o
 obj-y += command.o
 obj-$(CONFIG_$(SPL_TPL_)LOG) += log.o
drivers/ram/stm32mp1/Kconfig +19 -0
index b9c8166..511eaf2 100644
@@ -10,3 +10,22 @@ config STM32MP1_DDR
 		family:	support for LPDDR2, LPDDR3 and DDR3
 		the SDRAM parameters for controleur and phy need to be provided
 		in device tree (computed by DDR tuning tools)
+
+config STM32MP1_DDR_INTERACTIVE
+	bool "STM32MP1 DDR driver : interactive support"
+	depends on STM32MP1_DDR
+	help
+		activate interactive support in STM32MP1 DDR controller driver
+		used for DDR tuning tools
+		to enter in intercative mode type 'd' during SPL DDR driver
+		initialisation
+
+config STM32MP1_DDR_INTERACTIVE_FORCE
+	bool "STM32MP1 DDR driver : force interactive mode"
+	depends on STM32MP1_DDR_INTERACTIVE
+	default n
+	help
+		force interactive mode in STM32MP1 DDR controller driver
+		skip the polling of character 'd' in console
+		useful when SPL is loaded in sysram
+		directly by programmer
drivers/ram/stm32mp1/Makefile +6 -0
index 79eb028..7b1f095 100644
@@ -5,3 +5,9 @@
 
 obj-y += stm32mp1_ram.o
 obj-y += stm32mp1_ddr.o
+
+obj-$(CONFIG_STM32MP1_DDR_INTERACTIVE) += stm32mp1_interactive.o
+
+ifneq ($(DDR_INTERACTIVE),)
+CFLAGS_stm32mp1_interactive.o += -DCONFIG_STM32MP1_DDR_INTERACTIVE_FORCE=y
+endif
drivers/ram/stm32mp1/stm32mp1_ddr.c +298 -0

356 lines not on this page · raw message

drivers/ram/stm32mp1/stm32mp1_interactive.c new file +390 -0

390 lines not on this page · raw message

Signature · 1 line
2.7.4
#8 lore raw

PATCH 8/9 stm32mp1: ram: add tests in DDR interactive mode

In reply to Patrick Delaunay

Add command tests for DDR interactive mode, used during board bring-up or with CubeMX DDR tools to verify the DDR configuration.

---

 drivers/ram/stm32mp1/Kconfig                |    8 +
 drivers/ram/stm32mp1/Makefile               |    1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c |   75 ++
 drivers/ram/stm32mp1/stm32mp1_tests.c       | 1426 +++++++++++++++++++++++++++
 drivers/ram/stm32mp1/stm32mp1_tests.h       |   31 +
 5 files changed, 1541 insertions(+)
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_tests.c
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_tests.h
drivers/ram/stm32mp1/Kconfig +8 -0
index 511eaf2..4e682b4 100644
@@ -29,3 +29,11 @@ config STM32MP1_DDR_INTERACTIVE_FORCE
 		skip the polling of character 'd' in console
 		useful when SPL is loaded in sysram
 		directly by programmer
+
+config STM32MP1_DDR_TESTS
+	bool "STM32MP1 DDR driver : tests support"
+	depends on STM32MP1_DDR_INTERACTIVE
+	default y
+	help
+		activate test support for interactive support in
+		STM32MP1 DDR controller driver: command test
drivers/ram/stm32mp1/Makefile +1 -0
index 7b1f095..71ded6b 100644
@@ -7,6 +7,7 @@ obj-y += stm32mp1_ram.o
 obj-y += stm32mp1_ddr.o
 
 obj-$(CONFIG_STM32MP1_DDR_INTERACTIVE) += stm32mp1_interactive.o
+obj-$(CONFIG_STM32MP1_DDR_TESTS) += stm32mp1_tests.o
 
 ifneq ($(DDR_INTERACTIVE),)
 CFLAGS_stm32mp1_interactive.o += -DCONFIG_STM32MP1_DDR_INTERACTIVE_FORCE=y
drivers/ram/stm32mp1/stm32mp1_interactive.c +75 -0

111 lines not on this page · raw message

drivers/ram/stm32mp1/stm32mp1_tests.c new file +1426 -0

1,426 lines not on this page · raw message

drivers/ram/stm32mp1/stm32mp1_tests.h new file +31 -0
new file mode 100644
index 0000000..8436780
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
+/*
+ * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
+ */
+
+#ifndef _RAM_STM32MP1_TESTS_H_
+#define _RAM_STM32MP1_TESTS_H_
+
+#include "stm32mp1_ddr_regs.h"
+
+enum test_result {
+	TEST_PASSED,
+	TEST_FAILED,
+	TEST_ERROR
+};
+
+struct test_desc {
+	enum test_result (*fct)(struct stm32mp1_ddrctl *ctl,
+				struct stm32mp1_ddrphy *phy,
+				char *string,
+				int argc, char *argv[]);
+	const char *name;
+	const char *usage;
+	const char *help;
+	u8 max_args;
+};
+
+extern const struct test_desc test[];
+extern const int test_nb;
+
+#endif
Signature · 1 line
2.7.4
#9 lore raw

PATCH 9/9 stm32mp1: ram: add tuning in DDR interactive mode

In reply to Patrick Delaunay

Add command tuning for DDR interactive mode, used during board bring-up or with CubeMX DDR tools to execute software tuning for the DDR configuration:
- software read DQS Gating (replace the built-in one)
- Bit de-skew
- Eye Training or DQS training

---

 drivers/ram/stm32mp1/Kconfig                |   10 +
 drivers/ram/stm32mp1/Makefile               |    1 +
 drivers/ram/stm32mp1/stm32mp1_ddr_regs.h    |    1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c |   20 +-
 drivers/ram/stm32mp1/stm32mp1_tests.h       |    3 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c      | 1380 +++++++++++++++++++++++++++
 6 files changed, 1414 insertions(+), 1 deletion(-)
 create mode 100644 drivers/ram/stm32mp1/stm32mp1_tuning.c
drivers/ram/stm32mp1/Kconfig +10 -0
index 4e682b4..2fd8c7b 100644
@@ -37,3 +37,13 @@ config STM32MP1_DDR_TESTS
 	help
 		activate test support for interactive support in
 		STM32MP1 DDR controller driver: command test
+
+config STM32MP1_DDR_TUNING
+	bool "STM32MP1 DDR driver : support of tuning"
+	depends on STM32MP1_DDR_INTERACTIVE
+	default y
+	help
+		activate tuning command in STM32MP1 DDR interactive mode
+		used for DDR tuning tools
+		- DQ Deskew algorithm
+		- DQS Trimming
drivers/ram/stm32mp1/Makefile +1 -0
index 71ded6b..e1e9135 100644
@@ -8,6 +8,7 @@ obj-y += stm32mp1_ddr.o
 
 obj-$(CONFIG_STM32MP1_DDR_INTERACTIVE) += stm32mp1_interactive.o
 obj-$(CONFIG_STM32MP1_DDR_TESTS) += stm32mp1_tests.o
+obj-$(CONFIG_STM32MP1_DDR_TUNING) += stm32mp1_tuning.o
 
 ifneq ($(DDR_INTERACTIVE),)
 CFLAGS_stm32mp1_interactive.o += -DCONFIG_STM32MP1_DDR_INTERACTIVE_FORCE=y
drivers/ram/stm32mp1/stm32mp1_ddr_regs.h +1 -0
index 97f268e..9d33186 100644
@@ -332,6 +332,7 @@ struct stm32mp1_ddrphy {
 
 #define DDRPHYC_DXNGCR_DXEN			BIT(0)
 
+#define DDRPHYC_DXNDLLCR_DLLSRST		BIT(30)
 #define DDRPHYC_DXNDLLCR_DLLDIS			BIT(31)
 #define DDRPHYC_DXNDLLCR_SDPHASE_MASK		GENMASK(17, 14)
 #define DDRPHYC_DXNDLLCR_SDPHASE_SHIFT		14
drivers/ram/stm32mp1/stm32mp1_interactive.c +19 -1
index 62d61ac..cc9b2e7 100644
@@ -55,6 +55,9 @@ enum ddr_command stm32mp1_get_command(char *cmd, int argc)
 #ifdef CONFIG_STM32MP1_DDR_TESTS
 		[DDR_CMD_TEST] = "test",
 #endif
+#ifdef CONFIG_STM32MP1_DDR_TUNING
+		[DDR_CMD_TUNING] = "tuning",
+#endif
 	};
 	/* min and max number of argument */
 	const char cmd_arg[DDR_CMD_UNKNOWN][2] = {
@@ -71,6 +74,9 @@ enum ddr_command stm32mp1_get_command(char *cmd, int argc)
 #ifdef CONFIG_STM32MP1_DDR_TESTS
 		[DDR_CMD_TEST] = { 0, 255 },
 #endif
+#ifdef CONFIG_STM32MP1_DDR_TUNING
+		[DDR_CMD_TUNING] = { 0, 255 },
+#endif
 	};
 	int i;
 
@@ -115,6 +121,9 @@ static void stm32mp1_do_usage(void)
 #ifdef CONFIG_STM32MP1_DDR_TESTS
 		"test [help] | <n> [...]    lists (with help) or executes test <n>\n"
 #endif
+#ifdef CONFIG_STM32MP1_DDR_TUNING
+		"tuning [help] | <n> [...]  lists (with help) or execute tuning <n>\n"
+#endif
 		"\nwith for [type|reg]:\n"
 		"  all registers if absent\n"
 		"  <type> = ctl, phy\n"
@@ -297,7 +306,7 @@ end:
 	return step;
 }
 
-#if defined(CONFIG_STM32MP1_DDR_TESTS)
+#if defined(CONFIG_STM32MP1_DDR_TESTS) || defined(CONFIG_STM32MP1_DDR_TUNING)
 static const char * const s_result[] = {
 		[TEST_PASSED] = "Pass",
 		[TEST_FAILED] = "Failed",
@@ -457,6 +466,15 @@ bool stm32mp1_ddr_interactive(void *priv,
 			break;
 #endif
 
+#ifdef CONFIG_STM32MP1_DDR_TUNING
+		case DDR_CMD_TUNING:
+			if (!stm32mp1_check_step(step, STEP_DDR_READY))
+				continue;
+			stm32mp1_ddr_subcmd(priv, argc, argv,
+					    tuning, tuning_nb);
+			break;
+#endif
+
 		default:
 			break;
 		}
drivers/ram/stm32mp1/stm32mp1_tests.h +3 -0
index 8436780..55f5d6d 100644
@@ -28,4 +28,7 @@ struct test_desc {
 extern const struct test_desc test[];
 extern const int test_nb;
 
+extern const struct test_desc tuning[];
+extern const int tuning_nb;
+
 #endif
drivers/ram/stm32mp1/stm32mp1_tuning.c new file +1380 -0

1,380 lines not on this page · raw message

Signature · 1 line
2.7.4