Skip to contentSkip to conversation

ARM: cache: Allow SPL to build cache-pl310.c

PATCH Superseded Philip Oberfichtner 2 participants 6 messages Aug 4, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: cache: Allow SPL to build cache-pl310.c

Before this commit, the SPL could enable the PL310 L2 cache [1], but the cache maintenance functions from cache-pl310.c were only useable for non-SPL builds.

After enabling the cache one must be able to flush it, too. Thus this commit allows cache-pl310.c to be included in the SPL build.

[1] See for example arch/arm/mach-imx/cache.c: v7_outer_cache_enable()

---

 arch/arm/lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/Makefile +1 -1
index c603fe61bc..ac1d4245bb 100644
@@ -33,7 +33,6 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
 obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
-obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
 else
 obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
 obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o
@@ -46,6 +45,7 @@ else
 obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o
 obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o
 endif
+obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
 obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += semihosting.o
 
 ifneq ($(filter y,$(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) $(CONFIG_SAVE_PREV_BL_FDT_ADDR)),)
Signature · 1 line
2.37.1
#1 lore raw

PATCH 2/2 ARM: imx6: dh-imx6: Enable d-cache early in SPL

From: Marek Vasut <[email protected]>

Enable d-cache early in SPL right after DRAM is started up. This reduces U-Boot proper load time by 650ms when loaded from SPI NOR.

---

 board/dhelectronics/dh_imx6/dh_imx6_spl.c | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
board/dhelectronics/dh_imx6/dh_imx6_spl.c +27 -0
index e49e97724a..2c0ddc527a 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
@@ -14,11 +15,13 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/cache.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
+#include <asm/system.h>
 #include <errno.h>
 #include <fuse.h>
 #include <fsl_esdhc_imx.h>
@@ -610,6 +613,20 @@ static void dhcom_spl_dram_init(void)
 	}
 }
 
+void dram_bank_mmu_setup(int bank)
+{
+	int i;
+
+	set_section_dcache(ROMCP_ARB_BASE_ADDR >> MMU_SECTION_SHIFT, DCACHE_DEFAULT_OPTION);
+	set_section_dcache(IRAM_BASE_ADDR >> MMU_SECTION_SHIFT, DCACHE_DEFAULT_OPTION);
+
+	for (i = MMDC0_ARB_BASE_ADDR >> MMU_SECTION_SHIFT;
+			i < ((MMDC0_ARB_BASE_ADDR >> MMU_SECTION_SHIFT) +
+			(SZ_1G >> MMU_SECTION_SHIFT));
+			i++)
+		set_section_dcache(i, DCACHE_DEFAULT_OPTION);
+}
+
 void board_init_f(ulong dummy)
 {
 	/* setup AIPS and disable watchdog */
@@ -636,9 +653,19 @@ void board_init_f(ulong dummy)
 	/* DDR3 initialization */
 	dhcom_spl_dram_init();
 
+	/* Set up early MMU tables at the beginning of DRAM and start d-cache */
+	gd->arch.tlb_addr = MMDC0_ARB_BASE_ADDR + SZ_32M;
+	gd->arch.tlb_size = PGTABLE_SIZE;
+	enable_caches();
+
 	/* Clear the BSS. */
 	memset(__bss_start, 0, __bss_end - __bss_start);
 
 	/* load/boot image from boot device */
 	board_init_r(NULL, 0);
 }
+
+void spl_board_prepare_for_boot(void)
+{
+	dcache_disable();
+}
Signature · 1 line
2.37.1
#2 lore raw

Re: [PATCH 2/2] ARM: imx6: dh-imx6: Enable d-cache early in SPL

Quoted 69 lines · Philip Oberfichtner

From: Marek Vasut <[email protected]>

Enable d-cache early in SPL right after DRAM is started up. This reduces U-Boot proper load time by 650ms when loaded from SPI NOR.

---

  board/dhelectronics/dh_imx6/dh_imx6_spl.c | 27 +++++++++++++++++++++++
  1 file changed, 27 insertions(+)
board/dhelectronics/dh_imx6/dh_imx6_spl.c +21 -0
index e49e97724a..2c0ddc527a 100644
@@ -6,6 +6,7 @@
   */
 
  #include <common.h>
+#include <cpu_func.h>
  #include <init.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/crm_regs.h>
@@ -14,11 +15,13 @@
  #include <asm/arch/mx6-ddr.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
+#include <asm/cache.h>
  #include <asm/gpio.h>
  #include <asm/mach-imx/boot_mode.h>
  #include <asm/mach-imx/iomux-v3.h>
  #include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
+#include <asm/system.h>
  #include <errno.h>
  #include <fuse.h>
  #include <fsl_esdhc_imx.h>
@@ -610,6 +613,20 @@ static void dhcom_spl_dram_init(void)
  	}
  }
 
+void dram_bank_mmu_setup(int bank)
+{
+	int i;
+
+	set_section_dcache(ROMCP_ARB_BASE_ADDR >> MMU_SECTION_SHIFT, DCACHE_DEFAULT_OPTION);
+	set_section_dcache(IRAM_BASE_ADDR >> MMU_SECTION_SHIFT, DCACHE_DEFAULT_OPTION);
+
+	for (i = MMDC0_ARB_BASE_ADDR >> MMU_SECTION_SHIFT;
+			i < ((MMDC0_ARB_BASE_ADDR >> MMU_SECTION_SHIFT) +
+			(SZ_1G >> MMU_SECTION_SHIFT));
+			i++)
+		set_section_dcache(i, DCACHE_DEFAULT_OPTION);
+}
+
  void board_init_f(ulong dummy)
  {
  	/* setup AIPS and disable watchdog */
@@ -636,9 +653,19 @@ void board_init_f(ulong dummy)
  	/* DDR3 initialization */
  	dhcom_spl_dram_init();
 
+	/* Set up early MMU tables at the beginning of DRAM and start d-cache */
+	gd->arch.tlb_addr = MMDC0_ARB_BASE_ADDR + SZ_32M;
+	gd->arch.tlb_size = PGTABLE_SIZE;
+	enable_caches();

board/dhelectronics/dh_imx6/dh_imx6_spl.c void board_init_f(ulong dummy) · line 669

Quoted 10 lines
board/dhelectronics/dh_imx6/dh_imx6_spl.c +4 -0
+
  	/* Clear the BSS. */
  	memset(__bss_start, 0, __bss_end - __bss_start);
 
  	/* load/boot image from boot device */
  	board_init_r(NULL, 0);
  }
+
+void spl_board_prepare_for_boot(void)
+{

An explanation why this is needed in a comment would be good to have.

Quoted 2 lines
board/dhelectronics/dh_imx6/dh_imx6_spl.c +2 -0
+	dcache_disable();
+}
#3 lore raw
In reply to Philip Oberfichtner
Quoted 28 lines · Philip Oberfichtner

Before this commit, the SPL could enable the PL310 L2 cache [1], but the cache maintenance functions from cache-pl310.c were only useable for non-SPL builds.

After enabling the cache one must be able to flush it, too. Thus this commit allows cache-pl310.c to be included in the SPL build.

[1] See for example arch/arm/mach-imx/cache.c: v7_outer_cache_enable()

---

  arch/arm/lib/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/Makefile +0 -1
index c603fe61bc..ac1d4245bb 100644
@@ -33,7 +33,6 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
  obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
  obj-$(CONFIG_CMD_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
-obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
  else
  obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
  obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o

arch/arm/lib/Makefile else · line 48

Quoted 4 lines
arch/arm/lib/Makefile +1 -0
@@ -46,6 +45,7 @@ else
  obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o
  obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o
  endif
+obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o

Doesn't this need SPL/TPL Kconfig symbols and

obj-$(CONFIG_$(SPL_TPL_)SYS_L2_PL310) += cache-pl310.o

?

#4 lore raw
Quoted 40 lines · Marek Vasut
Quoted 32 lines · Philip Oberfichtner

Before this commit, the SPL could enable the PL310 L2 cache [1], but the
cache maintenance functions from cache-pl310.c were only useable for
non-SPL builds.

After enabling the cache one must be able to flush it, too. Thus this
commit allows cache-pl310.c to be included in the SPL build.

[1] See for example arch/arm/mach-imx/cache.c:
v7_outer_cache_enable()

---

  arch/arm/lib/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/Makefile +0 -1
index c603fe61bc..ac1d4245bb 100644
@@ -33,7 +33,6 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
  obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
  obj-$(CONFIG_CMD_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
-obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
  else
  obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
  obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o

arch/arm/lib/Makefile else · line 48

Quoted 4 lines
arch/arm/lib/Makefile +1 -0
@@ -46,6 +45,7 @@ else
  obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o
  obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o
  endif
+obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o

Doesn't this need SPL/TPL Kconfig symbols and

Quoted 3 lines

obj-$(CONFIG_$(SPL_TPL_)SYS_L2_PL310) += cache-pl310.o

?

CONFIG_SYS_L2_PL310 is not converted to Kconfig yet. And there is no CONFIG_SPL_ usage for it so far. So I'd say no. Please correct me if I'm wrong.

#5 lore raw

On 8/4/22 11:19, Philip Oberfichtner wrote:

[...]

Quoted 8 lines
Quoted 8 lines

arch/arm/lib/Makefile else · line 48

Quoted 5 lines
arch/arm/lib/Makefile +1 -0
@@ -46,6 +45,7 @@ else
   obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o
   obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o
   endif
+obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o

Doesn't this need SPL/TPL Kconfig symbols and

Quoted 7 lines
Quoted 3 lines

obj-$(CONFIG_$(SPL_TPL_)SYS_L2_PL310) += cache-pl310.o

?

CONFIG_SYS_L2_PL310 is not converted to Kconfig yet. And there is no CONFIG_SPL_ usage for it so far. So I'd say no. Please correct me if I'm wrong.

I'm concerned whether applying this patch won't enable L2CC in SPL for boards where this could break things.

There is a script to do the conversion to Kconfig easily, see doc/develop/moveconfig.rst . It might make sense to run it first, convert this symbol to Kconfig, and then add this patch second, and then enable SPL_...PL310 for this board only.