ARM: cache: Allow SPL to build cache-pl310.c
Subsystems (2)
PATCH v2 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()
---
(no changes since v1)
arch/arm/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/Makefile +1 -1
@@ -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
PATCH v2 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.
---
Changes in v2:
- Add comment to explain the relevance of dcache_disable()
board/dhelectronics/dh_imx6/dh_imx6_spl.c | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+)
board/dhelectronics/dh_imx6/dh_imx6_spl.c +28 -0
@@ -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,20 @@ 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. */ +dcache_disable (); +}
Signature · 1 line
2.37.1
Quoted 10 lines · Philip Oberfichtner
Before this commit, the SPL could enable the PL310 L2 cache [1], but the cache maintenance functions from
cache-pl310.cwere only useable for non-SPL builds.After enabling the cache one must be able to flush it, too. Thus this commit allows
cache-pl310.cto be included in the SPL build.[1] See for example
arch/arm/mach-imx/cache.c:v7_outer_cache_enable()Signed-off-by Philip Oberfichtner <[email protected]>
It should be rather direct to migrate this to Kconfig, please do that first, and introduce CONFIG_SPL_SYS_L2_PL310. Thanks!
Signature · 1 line
Tom
Quoted 12 lines · Tom Rini
Quoted 10 lines · Philip Oberfichtner
Before this commit, the SPL could enable the PL310 L2 cache [1], but the
cache maintenance functions fromcache-pl310.cwere only useable for
non-SPL builds.After enabling the cache one must be able to flush it, too. Thus this
commit allowscache-pl310.cto be included in the SPL build.
Quoted 8 lines
Quoted 4 lines
[1] See for example
arch/arm/mach-imx/cache.c:v7_outer_cache_enable()Signed-off-by Philip Oberfichtner <[email protected]>It should be rather direct to migrate this to
Kconfig, please do that first, and introduceCONFIG_SPL_SYS_L2_PL310. Thanks!
Hi,
converting CONFIG_SYS_L2_PL310 - no problem. For SYS_PL310_BASE the moveconfig tool just hangs indefinitely on every defconfig that needs conversion. Do you have any hints on this issue?
Below the Kconfig entry, that I used.
config SYS_PL310_BASE
depends on SYS_L2_PL310
hex "Base address of PL310"
help
Physical base address of PL310 controller register space
Quoted 30 lines · Philip Oberfichtner
Quoted 12 lines · Tom Rini
Quoted 10 lines · Philip Oberfichtner
Before this commit, the SPL could enable the PL310 L2 cache [1], but the
cache maintenance functions fromcache-pl310.cwere only useable for
non-SPL builds.After enabling the cache one must be able to flush it, too. Thus this
commit allowscache-pl310.cto be included in the SPL build.Quoted 8 lines
Quoted 4 lines
[1] See for example
arch/arm/mach-imx/cache.c:v7_outer_cache_enable()Signed-off-by Philip Oberfichtner <[email protected]>It should be rather direct to migrate this to
Kconfig, please do that first, and introduceCONFIG_SPL_SYS_L2_PL310. Thanks!Hi,
converting
CONFIG_SYS_L2_PL310- no problem. ForSYS_PL310_BASEthe moveconfig tool just hangs indefinitely on every defconfig that needs conversion. Do you have any hints on this issue?
Quoted 5 lines
Below the
Kconfigentry, that I used.config
SYS_PL310_BASE
depends onSYS_L2_PL310
hex "Base address of PL310"
Try adding default values for known architectures/socs (use git grep in include/configs/ and sort -u to find out) default 0x1234ab00 if ARCH_FOO
default 0x4321cd00 if ARCH_BAR
Quoted 2 lines
help
Physical base address of PL310 controller register space
Quoted 30 lines · Philip Oberfichtner
Quoted 12 lines · Tom Rini
Quoted 10 lines · Philip Oberfichtner
Before this commit, the SPL could enable the PL310 L2 cache [1], but the
cache maintenance functions fromcache-pl310.cwere only useable for
non-SPL builds.After enabling the cache one must be able to flush it, too. Thus this
commit allowscache-pl310.cto be included in the SPL build.Quoted 8 lines
Quoted 4 lines
[1] See for example
arch/arm/mach-imx/cache.c:v7_outer_cache_enable()Signed-off-by Philip Oberfichtner <[email protected]>It should be rather direct to migrate this to
Kconfig, please do that first, and introduceCONFIG_SPL_SYS_L2_PL310. Thanks!Hi,
converting
CONFIG_SYS_L2_PL310- no problem. ForSYS_PL310_BASEthe moveconfig tool just hangs indefinitely on every defconfig that needs conversion. Do you have any hints on this issue?
Quoted 7 lines
Below the
Kconfigentry, that I used.config
SYS_PL310_BASE
depends onSYS_L2_PL310
hex "Base address of PL310"
help
Physical base address of PL310 controller register space
We can just skip that one for the moment, it's a bit tricky. It shouldn't be asked for as it's not configurable, it needs to be a list of default X if ARCH_Y. Thanks for looking at this one too!
Signature · 1 line
Tom