Skip to contentSkip to conversation

ARM: imx6: dh-imx6: Enable d-cache early in SPL

PATCH Superseded Philip Oberfichtner 2 participants 7 messages Aug 17, 2022

Subsystems (6)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v4 cover ARM: imx6: dh-imx6: Enable d-cache early in SPL

This patch series enables d-cache in SPL for i.MX6 based boards from DH in order to improve boot time.

This can only be achieved after migrating the corresponding symbols to Kconfig, which is done in patch 1/3 and 2/3.

Changes in v4:
- Reduce diffstat by using 'select' statements for omap2, mvebu and mx6 based boards
- Elaborate on dcache_disable() comment

Changes in v3:
- Introduce CONFIG_SPL_SYS_L2_PL310
- Convert CONFIG_SYS_L2_PL310 to Kconfig
- Use newly introduced Kconfig symbol for dh_imx6_defconfig

Changes in v2:
- Add comment to explain the relevance of dcache_disable()

Marek Vasut (1):
ARM: imx6: dh-imx6: Enable d-cache early in SPL

Philip Oberfichtner (2):
Convert CONFIG_SYS_L2_PL310 to Kconfig
ARM: cache: Allow SPL to build cache-pl310.c

 README                                    |  2 --
 arch/arm/Kconfig                          | 10 +++++++
 arch/arm/lib/Makefile                     |  2 +-
 arch/arm/mach-mvebu/Kconfig               |  1 +
 arch/arm/mach-mvebu/include/mach/config.h |  2 --
 arch/arm/mach-omap2/Kconfig               |  1 +
 board/dhelectronics/dh_imx6/dh_imx6_spl.c | 32 +++++++++++++++++++++++
 configs/dh_imx6_defconfig                 |  1 +
 configs/omap4_panda_defconfig             |  1 +
 configs/omap4_sdp4430_defconfig           |  1 +
 configs/poleg_evb_defconfig               |  1 +
 configs/socfpga_arria10_defconfig         |  1 +
 configs/socfpga_arria5_defconfig          |  1 +
 configs/socfpga_chameleonv3_defconfig     |  1 +
 configs/socfpga_cyclone5_defconfig        |  1 +
 configs/socfpga_dbm_soc1_defconfig        |  1 +
 configs/socfpga_de0_nano_soc_defconfig    |  1 +
 configs/socfpga_de10_nano_defconfig       |  1 +
 configs/socfpga_de10_standard_defconfig   |  1 +
 configs/socfpga_de1_soc_defconfig         |  1 +
 configs/socfpga_is1_defconfig             |  1 +
 configs/socfpga_mcvevk_defconfig          |  1 +
 configs/socfpga_secu1_defconfig           |  1 +
 configs/socfpga_sockit_defconfig          |  1 +
 configs/socfpga_socrates_defconfig        |  1 +
 configs/socfpga_sr1500_defconfig          |  1 +
 configs/socfpga_vining_fpga_defconfig     |  1 +
 configs/stemmy_defconfig                  |  1 +
 include/configs/am43xx_evm.h              |  1 -
 include/configs/brppt2.h                  |  1 -
 include/configs/cm_t43.h                  |  1 -
 include/configs/mx6_common.h              |  1 -
 include/configs/odroid.h                  |  1 -
 include/configs/poleg.h                   |  1 -
 include/configs/socfpga_common.h          |  1 -
 include/configs/stemmy.h                  |  1 -
 include/configs/ti_omap4_common.h         |  1 -
 include/configs/trats.h                   |  1 -
 include/configs/trats2.h                  |  1 -
 include/configs/zynq-common.h             |  1 -
 scripts/config_whitelist.txt              |  1 -
 41 files changed, 66 insertions(+), 18 deletions(-)
Signature · 1 line
2.37.1
#1 lore raw

PATCH v4 1/3 Convert CONFIG_SYS_L2_PL310 to Kconfig

This converts CONFIG_SYS_L2_PL310 to Kconfig.

For omap2 and mvebu the 'select SYS_L2_PL310' locations were determined using ./tools/moveconfig -i CONFIG_SYS_L2_PL310.

For mx6 I manually chose ARCH_MX6 as 'select' location. The correctness has been verified using

	$ ./tools/moveconfig.py -f ARCH_MX6 ~SYS_L2_PL310 ~SYS_L2CACHE_OFF
	0 matches

That means whenever an ARCH_MX6 board had SYS_L2_PL310 disabled, this was correctly reflected in SYS_L2CACHE_OFF. Thus it's safe to insert the 'select' statement under ARCH_MX6.

---
I wonder if we could further reduce the diffstat by using 'select' for all the socfpga boards. I did not find an appropriate way - I'm open for suggestions, though.

Changes in v4:
- Reduce diffstat by using 'select' statements for omap2, mvebu and mx6 based boards

Changes in v3:
new

 README                                    | 2 --
 arch/arm/Kconfig                          | 5 +++++
 arch/arm/mach-mvebu/Kconfig               | 1 +
 arch/arm/mach-mvebu/include/mach/config.h | 2 --
 arch/arm/mach-omap2/Kconfig               | 1 +
 configs/omap4_panda_defconfig             | 1 +
 configs/omap4_sdp4430_defconfig           | 1 +
 configs/poleg_evb_defconfig               | 1 +
 configs/socfpga_arria10_defconfig         | 1 +
 configs/socfpga_arria5_defconfig          | 1 +
 configs/socfpga_chameleonv3_defconfig     | 1 +
 configs/socfpga_cyclone5_defconfig        | 1 +
 configs/socfpga_dbm_soc1_defconfig        | 1 +
 configs/socfpga_de0_nano_soc_defconfig    | 1 +
 configs/socfpga_de10_nano_defconfig       | 1 +
 configs/socfpga_de10_standard_defconfig   | 1 +
 configs/socfpga_de1_soc_defconfig         | 1 +
 configs/socfpga_is1_defconfig             | 1 +
 configs/socfpga_mcvevk_defconfig          | 1 +
 configs/socfpga_secu1_defconfig           | 1 +
 configs/socfpga_sockit_defconfig          | 1 +
 configs/socfpga_socrates_defconfig        | 1 +
 configs/socfpga_sr1500_defconfig          | 1 +
 configs/socfpga_vining_fpga_defconfig     | 1 +
 configs/stemmy_defconfig                  | 1 +
 include/configs/am43xx_evm.h              | 1 -
 include/configs/brppt2.h                  | 1 -
 include/configs/cm_t43.h                  | 1 -
 include/configs/mx6_common.h              | 1 -
 include/configs/odroid.h                  | 1 -
 include/configs/poleg.h                   | 1 -
 include/configs/socfpga_common.h          | 1 -
 include/configs/stemmy.h                  | 1 -
 include/configs/ti_omap4_common.h         | 1 -
 include/configs/trats.h                   | 1 -
 include/configs/trats2.h                  | 1 -
 include/configs/zynq-common.h             | 1 -
 scripts/config_whitelist.txt              | 1 -
 38 files changed, 27 insertions(+), 17 deletions(-)
README +0 -2
index 6b6f722733..595f007aaf 100644
@@ -496,8 +496,6 @@ The following options need to be configured:
 		the defaults discussed just above.
 
 - Cache Configuration for ARM:
-		CONFIG_SYS_L2_PL310 - Enable support for ARM PL310 L2 cache
-				      controller
 		CONFIG_SYS_PL310_BASE - Physical base address of PL310
 					controller register space
 
arch/arm/Kconfig +5 -0
index 949ebb46ba..b094d2d51f 100644
@@ -488,6 +488,10 @@ config TPL_SYS_THUMB_BUILD
 	   density. For ARM architectures that support Thumb2 this flag will
 	   result in Thumb2 code generated by GCC.
 
+config SYS_L2_PL310
+	bool "ARM PL310 L2 cache controller"
+	help
+	  Enable support for ARM PL310 L2 cache controller in U-Boot
 
 config SYS_L2CACHE_OFF
 	bool "L2cache off"
@@ -989,6 +993,7 @@ config ARCH_MX6
 	select SYS_FSL_HAS_SEC
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
+	select SYS_L2_PL310 if !SYS_L2CACHE_OFF
 	imply MXC_GPIO
 	imply SYS_THUMB_BUILD
 	imply SPL_SEPARATE_BSS
arch/arm/mach-mvebu/Kconfig +1 -0
index a81b8e2b0d..2ebe341ed1 100644
@@ -14,6 +14,7 @@ config ARMADA_32BIT
 	select SPL_SKIP_LOWLEVEL_INIT if SPL
 	select SPL_SIMPLE_BUS if SPL
 	select SUPPORT_SPL
+	select SYS_L2_PL310 if !SYS_L2CACHE_OFF
 	select TRANSLATION_OFFSET
 	select SPL_SYS_NO_VECTOR_TABLE if SPL
 	select ARCH_VERY_EARLY_INIT
arch/arm/mach-mvebu/include/mach/config.h +0 -2
index 4add0d9e10..0bba0a4cf9 100644
@@ -25,8 +25,6 @@
 #define MV88F78X60 /* for the DDR training bin_hdr code */
 #endif
 
-#define CONFIG_SYS_L2_PL310
-
 #define MV_UART_CONSOLE_BASE		MVEBU_UART0_BASE
 
 /* Needed for SPI NOR booting in SPL */
arch/arm/mach-omap2/Kconfig +1 -0
index fa41047476..fee437c4dc 100644
@@ -96,6 +96,7 @@ config TI816X
 config AM43XX
 	bool "AM43XX SoC"
 	select SPECIFY_CONSOLE_INDEX
+	select SYS_L2_PL310 if !SYS_L2CACHE_OFF
 	imply NAND_OMAP_ELM
 	imply NAND_OMAP_GPMC
 	imply SPL_DM
configs/omap4_panda_defconfig +1 -0
index bd6c2ce4ca..899ba50a16 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_DEFAULT_DEVICE_TREE="omap4-panda"
configs/omap4_sdp4430_defconfig +1 -0
index 62eb75d1f9..82cfc4ab1a 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_OMAP2PLUS=y
configs/poleg_evb_defconfig +1 -0
index 16f6215148..4669c7fe86 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_NPCM=y
 CONFIG_SYS_TEXT_BASE=0x8200
 CONFIG_SYS_MALLOC_LEN=0x240000
configs/socfpga_arria10_defconfig +1 -0
index c98c106851..716a68a67b 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_arria5_defconfig +1 -0
index 24c21090b1..810604ec03 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_chameleonv3_defconfig +1 -0
index e78d3b51de..80a965c7e2 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x4400
configs/socfpga_cyclone5_defconfig +1 -0
index d010b54240..7383fa1d3e 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_dbm_soc1_defconfig +1 -0
index a1574b6a5d..9f1bed2b75 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_de0_nano_soc_defconfig +1 -0
index ec7355d2cc..8e4154f46c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_de10_nano_defconfig +1 -0
index b62f029962..713048ab3a 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_de10_standard_defconfig +1 -0
index b8bc9da4d0..67b2bafbe8 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_de1_soc_defconfig +1 -0
index 749ec540b4..8bae98e130 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_is1_defconfig +1 -0
index 958adfe25a..b7735689bc 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_mcvevk_defconfig +1 -0
index 18e125f5bd..0e47bcd4e7 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_secu1_defconfig +1 -0
index 83e24402a8..89df845ad7 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x800
configs/socfpga_sockit_defconfig +1 -0
index 2a02f1dbfa..c16b3e4820 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_socrates_defconfig +1 -0
index 3d0c48d766..7bcea6726b 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x2000
configs/socfpga_sr1500_defconfig +1 -0
index def2ee8dbc..55388da88c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x4000
configs/socfpga_vining_fpga_defconfig +1 -0
index d0c87416ef..9c89d631f5 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
 CONFIG_ENV_SIZE=0x4000
configs/stemmy_defconfig +1 -0
index 7fc0a39872..f1d3ef5b12 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_SYS_L2_PL310=y
 CONFIG_ARCH_U8500=y
 CONFIG_SUPPORT_PASSING_ATAGS=y
 # CONFIG_SETUP_MEMORY_TAGS is not set
include/configs/am43xx_evm.h +0 -1
index 87d3a27099..fc82a8c003 100644
@@ -29,7 +29,6 @@
 /* SPL defines. */
 
 /* Enabling L2 Cache */
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE	0x48242000
 
 /*
include/configs/brppt2.h +0 -1
index adaba410ce..0c7fe5f3ab 100644
@@ -13,7 +13,6 @@
 
 /* -- i.mx6 specifica -- */
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE		L2_PL310_BASE
 #endif /* !CONFIG_SYS_L2CACHE_OFF */
 
include/configs/cm_t43.h +0 -1
index 07c5cb8ded..50cb2a4718 100644
@@ -36,7 +36,6 @@
 #define CONFIG_POWER_TPS65218
 
 /* Enabling L2 Cache */
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE		0x48242000
 
 /*
include/configs/mx6_common.h +0 -1
index e416f81e43..4314556754 100644
@@ -12,7 +12,6 @@
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #else
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE	L2_PL310_BASE
 #endif
 
include/configs/odroid.h +0 -1
index 7448cc9520..babd3ca963 100644
@@ -14,7 +14,6 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE	0x10502000
 #endif
 
include/configs/poleg.h +0 -1
index f1c259f476..05253d59ef 100644
@@ -7,7 +7,6 @@
 #define __CONFIG_POLEG_H
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310		1
 #define CONFIG_SYS_PL310_BASE	0xF03FC000       /* L2 - Cache Regs Base (4k Space)*/
 #endif
 
include/configs/socfpga_common.h +0 -1
index 4a7da76e51..c3f30afe2b 100644
@@ -48,7 +48,6 @@
 /*
  * Cache
  */
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE		SOCFPGA_MPUL2_ADDRESS
 
 /*
include/configs/stemmy.h +0 -1
index 71b25c23b1..3c70856fc7 100644
@@ -15,7 +15,6 @@
  */
 
 /* FIXME: This should be loaded from device tree... */
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE		0xa0412000
 
 /* Linux does not boot if FDT / initrd is loaded to end of RAM */
include/configs/ti_omap4_common.h +0 -1
index 3d78972bfe..0568946fc8 100644
@@ -12,7 +12,6 @@
 #define __CONFIG_TI_OMAP4_COMMON_H
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310		1
 #define CONFIG_SYS_PL310_BASE	0x48242000
 #endif
 
include/configs/trats.h +0 -1
index 53f5a6996b..530b413d5b 100644
@@ -12,7 +12,6 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE	0x10502000
 #endif
 
include/configs/trats2.h +0 -1
index b7449dab8b..06c1fcd23e 100644
@@ -13,7 +13,6 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE	0x10502000
 #endif
 
include/configs/zynq-common.h +0 -1
index 75ae68766f..dc0cba0010 100644
@@ -11,7 +11,6 @@
 
 /* Cache options */
 #ifndef CONFIG_SYS_L2CACHE_OFF
-# define CONFIG_SYS_L2_PL310
 # define CONFIG_SYS_PL310_BASE		0xf8f02000
 #endif
 
scripts/config_whitelist.txt +0 -1
index 4f628e0f10..d9d24c0ae0 100644
@@ -908,7 +908,6 @@ CONFIG_SYS_JFFS2_FIRST_SECTOR
 CONFIG_SYS_JFFS2_NUM_BANKS
 CONFIG_SYS_KMBEC_FPGA_BASE
 CONFIG_SYS_KMBEC_FPGA_SIZE
-CONFIG_SYS_L2_PL310
 CONFIG_SYS_L2_SIZE
 CONFIG_SYS_L3_SIZE
 CONFIG_SYS_LATCH_ADDR
Signature · 1 line
2.37.1
#2 lore raw

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

In reply to Philip Oberfichtner

Introduce the new Kconfig symbol CONFIG_SPL_SYS_L2_PL310 to allow the 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()

---

(no changes since v3)

Changes in v3:
- Introduce CONFIG_SPL_SYS_L2_PL310

 arch/arm/Kconfig      | 5 +++++
 arch/arm/lib/Makefile | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/Kconfig +5 -0
index b094d2d51f..318e5e82ea 100644
@@ -493,6 +493,11 @@ config SYS_L2_PL310
 	help
 	  Enable support for ARM PL310 L2 cache controller in U-Boot
 
+config SPL_SYS_L2_PL310
+	bool "ARM PL310 L2 cache controller in SPL"
+	help
+	  Enable support for ARM PL310 L2 cache controller in SPL
+
 config SYS_L2CACHE_OFF
 	bool "L2cache off"
 	help
arch/arm/lib/Makefile +1 -1
index c603fe61bc..d137b4bf0f 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_$(SPL_TPL_)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
#3 lore raw

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

In reply to 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.

---

Changes in v4:
- Elaborate on dcache_disable() comment

Changes in v3:
- Use newly introduced Kconfig symbol for dh_imx6_defconfig

Changes in v2:
- Add comment to explain the relevance of dcache_disable()

 board/dhelectronics/dh_imx6/dh_imx6_spl.c | 32 +++++++++++++++++++++++
 configs/dh_imx6_defconfig                 |  1 +
 2 files changed, 33 insertions(+)
board/dhelectronics/dh_imx6/dh_imx6_spl.c +32 -0
index e49e97724a..580b98811c 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,24 @@ 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)
+{
+	/*
+	 * Flush dcache. Without it U-Boot proper would hang at random locations. Presumably this is
+	 * due to dirty cache lines remaining after SPL passes control. When U-Boot proper later on
+	 * calls invalidate_dcache_all(), those dirty cache lines will get lost.
+	 */
+	dcache_disable();
+}
configs/dh_imx6_defconfig +1 -0
index 051816f719..1be6ae62ce 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SPL_SYS_L2_PL310=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
Signature · 1 line
2.37.1
#4 lore raw

On 8/17/22 11:06, Philip Oberfichtner wrote:

[...]

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

Quoted 4 lines
board/dhelectronics/dh_imx6/dh_imx6_spl.c +4 -0
+void spl_board_prepare_for_boot(void)
+{
+	/*
+	 * Flush dcache.

The dcache_disable() does not do any cache flushing, it just disables the Dcache enable C-bit.

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

Quoted 4 lines

Without it U-Boot proper would hang at random locations. Presumably this is

board/dhelectronics/dh_imx6/dh_imx6_spl.c +3 -0
+	 * due to dirty cache lines remaining after SPL passes control. When U-Boot proper later on
+	 * calls invalidate_dcache_all(), those dirty cache lines will get lost.
+	 */

What about falcon boot mode starting Linux from SPL, could it fail the same way ?

Quoted 2 lines
board/dhelectronics/dh_imx6/dh_imx6_spl.c +2 -0
+	dcache_disable();
+}

[...]

#5 lore raw

Hi,

thanks for the feedback.

Quoted 11 lines · Marek Vasut

On 8/17/22 11:06, Philip Oberfichtner wrote:

[...]

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

Quoted 4 lines
board/dhelectronics/dh_imx6/dh_imx6_spl.c +4 -0
+void spl_board_prepare_for_boot(void)
+{
+       /*
+        * Flush dcache.

The dcache_disable() does not do any cache flushing, it just disables the Dcache enable C-bit.

See the following objdump jumping to flush_dcache_all(). The implementation of dcache_disable() is in arch/arm/lib/cache-cp15.c.

$ ${CROSS_COMPILE}objdump spl/u-boot-spl --disassemble=dcache_disable

spl/u-boot-spl: file format elf32-littlearm

Disassembly of section .text:

0090b498 <dcache_disable>:

  90b498:       b510            push    {r4, lr}                      
  90b49a:       ee11 3f10       mrc     15, 0, r3, cr1, cr0, {0}      
  90b49e:       075b            lsls    r3, r3, #29                   
  90b4a0:       d509            bpl.n   90b4b6 <dcache_disable+0x1e>  
  90b4a2:       ee11 4f10       mrc     15, 0, r4, cr1, cr0, {0}      
  90b4a6:       f7ff fbfb       bl      90aca0 <flush_dcache_all>     
  90b4aa:       f024 0405       bic.w   r4, r4, #5                    
  90b4ae:       ee01 4f10       mcr     15, 0, r4, cr1, cr0, {0}      
  90b4b2:       f3bf 8f6f       isb     sy                            
  90b4b6:       bd10            pop     {r4, pc}                      

$

I'll add a note to the comment about flush_dcache_all() being called.

Quoted 9 lines
Quoted 8 lines

Without it U-Boot proper would hang at random locations. Presumably this is
+        * due to dirty cache lines remaining after SPL passes control. When U-Boot proper later on
+        * calls invalidate_dcache_all(), those dirty cache lines will get lost.
+        */

Quoted 3 lines

What about falcon boot mode starting Linux from SPL, could it fail the
same way ?

Yes, assuming my dirty-cache-line hypothesis is correct. I'll generalize the comment in V5.

Quoted 5 lines
Quoted 3 lines

+       dcache_disable();
+}

[...]

#6 lore raw
Quoted 38 lines · Philip Oberfichtner

Hi,

thanks for the feedback.

Quoted 11 lines · Marek Vasut

On 8/17/22 11:06, Philip Oberfichtner wrote:

[...]

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

Quoted 4 lines
board/dhelectronics/dh_imx6/dh_imx6_spl.c +4 -0
+void spl_board_prepare_for_boot(void)
+{
+       /*
+        * Flush dcache.

The dcache_disable() does not do any cache flushing, it just disables the Dcache enable C-bit.

See the following objdump jumping to flush_dcache_all(). The implementation of dcache_disable() is in arch/arm/lib/cache-cp15.c.

$ ${CROSS_COMPILE}objdump spl/u-boot-spl --disassemble=dcache_disable

spl/u-boot-spl: file format elf32-littlearm

Disassembly of section .text:

0090b498 <dcache_disable>:

   90b498:       b510            push    {r4, lr}
   90b49a:       ee11 3f10       mrc     15, 0, r3, cr1, cr0, {0}
   90b49e:       075b            lsls    r3, r3, #29
   90b4a0:       d509            bpl.n   90b4b6 <dcache_disable+0x1e>
   90b4a2:       ee11 4f10       mrc     15, 0, r4, cr1, cr0, {0}
   90b4a6:       f7ff fbfb       bl      90aca0 <flush_dcache_all>
   90b4aa:       f024 0405       bic.w   r4, r4, #5
   90b4ae:       ee01 4f10       mcr     15, 0, r4, cr1, cr0, {0}
   90b4b2:       f3bf 8f6f       isb     sy
   90b4b6:       bd10            pop     {r4, pc}
Quoted 3 lines

$

I'll add a note to the comment about flush_dcache_all() being called.

Doh, now I see it in there too, among the wall of ifdeffery in cache_disable() . Thanks

[...]