rockchip: fixup board choice in Kconfig
Subsystems (3)
PATCH 1/3 rockchip: fixup board choice in Kconfig
Kconfig for board target select is choice option, fixup for rk3036, rk3288 and rv1108.
---
arch/arm/mach-rockchip/rk3036/Kconfig | 5 +++++ arch/arm/mach-rockchip/rk3288/Kconfig | 5 +++++ arch/arm/mach-rockchip/rv1108/Kconfig | 5 +++++ 3 files changed, 15 insertions(+)
arch/arm/mach-rockchip/rk3036/Kconfig +5 -0
@@ -1,5 +1,8 @@ if ROCKCHIP_RK3036 +choice + prompt "RK3036 board select" + config TARGET_EVB_RK3036 bool "EVB_RK3036" select BOARD_LATE_INIT
@@ -8,6 +11,8 @@ config TARGET_KYLIN_RK3036 bool "KYLIN_RK3036" select BOARD_LATE_INIT +endchoice + config SYS_SOC default "rk3036"
arch/arm/mach-rockchip/rk3288/Kconfig +5 -0
@@ -1,5 +1,8 @@ if ROCKCHIP_RK3288 +choice + prompt "RK3288 board select" + config TARGET_CHROMEBOOK_JERRY bool "Google/Rockchip Veyron-Jerry Chromebook" select BOARD_LATE_INIT
@@ -138,6 +141,8 @@ config TARGET_TINKER_RK3288 8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to I2C, SPI, UART, GPIOs. +endchoice + config ROCKCHIP_FAST_SPL bool "Change the CPU to full speed in SPL" depends on TARGET_CHROMEBOOK_JERRY
arch/arm/mach-rockchip/rv1108/Kconfig +5 -0
@@ -1,5 +1,8 @@ if ROCKCHIP_RV1108 +choice + prompt "RV1108 board select" + config TARGET_EVB_RV1108 bool "EVB_RV1108" help
@@ -22,6 +25,8 @@ config TARGET_ELGIN_RV1108 help RV1108 ELGIN is a board based on the Rockchip RV1108. +endchoice + config SYS_SOC default "rv1108"
Signature · 1 line
2.20.1
PATCH 2/3 rockchip: introduce ROCKCHIP_IRAM_BASE
Rockchip SoCs have internal sram for bootrom data area and for sdram init program space. Introduce the base address in case we need to use it.
---
arch/arm/mach-rockchip/Kconfig | 5 +++++ arch/arm/mach-rockchip/rk3036/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3128/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3188/Kconfig | 3 +++ arch/arm/mach-rockchip/rk322x/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3288/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3328/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3368/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3399/Kconfig | 3 +++ arch/arm/mach-rockchip/rv1108/Kconfig | 3 +++ 10 files changed, 32 insertions(+)
arch/arm/mach-rockchip/Kconfig +5 -0
@@ -250,6 +250,11 @@ config ROCKCHIP_BOOT_MODE_REG The Soc will enter to different boot mode(defined in asm/arch-rockchip/boot_mode.h) according to the value from this register. +config ROCKCHIP_IRAM_BASE + hex "Rockchip Internal sRAM base address" + help + Rockchip SoCs has internal sram, U-Boot may need to use it. + config ROCKCHIP_SPL_RESERVE_IRAM hex "Size of IRAM reserved in SPL" default 0
arch/arm/mach-rockchip/rk3036/Kconfig +3 -0
@@ -13,6 +13,9 @@ config TARGET_KYLIN_RK3036 endchoice +config ROCKCHIP_IRAM_BASE + default 0x10080000 + config SYS_SOC default "rk3036"
arch/arm/mach-rockchip/rk3128/Kconfig +3 -0
@@ -13,6 +13,9 @@ config TARGET_EVB_RK3128 endchoice +config ROCKCHIP_IRAM_BASE + default 0x10080000 + config SYS_SOC default "rk3128"
arch/arm/mach-rockchip/rk3188/Kconfig +3 -0
@@ -9,6 +9,9 @@ config TARGET_ROCK Expansion connectors provide access to display pins, I2C, SPI, UART and GPIOs. +config ROCKCHIP_IRAM_BASE + default 0x10080000 + config SYS_SOC default "rk3188"
arch/arm/mach-rockchip/rk322x/Kconfig +3 -0
@@ -4,6 +4,9 @@ config TARGET_EVB_RK3229 bool "EVB_RK3229" select BOARD_LATE_INIT +config ROCKCHIP_IRAM_BASE + default 0x10080000 + config SYS_SOC default "rk322x"
arch/arm/mach-rockchip/rk3288/Kconfig +3 -0
@@ -152,6 +152,9 @@ config ROCKCHIP_FAST_SPL voltage. This option is only available on boards which support it and have the required PMIC code. +config ROCKCHIP_IRAM_BASE + default 0xff700000 + config SYS_SOC default "rk3288"
arch/arm/mach-rockchip/rk3328/Kconfig +3 -0
@@ -12,6 +12,9 @@ config TARGET_EVB_RK3328 endchoice +config ROCKCHIP_IRAM_BASE + default 0xff090000 + config SYS_SOC default "rk3328"
arch/arm/mach-rockchip/rk3368/Kconfig +3 -0
@@ -42,6 +42,9 @@ config TARGET_EVB_PX5 sensor STK3410. endchoice +config ROCKCHIP_IRAM_BASE + default 0xff8c0000 + config SYS_SOC default "rk3368"
arch/arm/mach-rockchip/rk3399/Kconfig +3 -0
@@ -64,6 +64,9 @@ config TARGET_CHROMEBOOK_BOB endchoice +config ROCKCHIP_IRAM_BASE + default 0xff8c0000 + config SYS_SOC default "rk3399"
arch/arm/mach-rockchip/rv1108/Kconfig +3 -0
@@ -27,6 +27,9 @@ config TARGET_ELGIN_RV1108 endchoice +config ROCKCHIP_IRAM_BASE + default 0x10080000 + config SYS_SOC default "rv1108"
Signature · 1 line
2.20.1
PATCH 3/3 common: bouncebuf: handle address in sram for rockchip platform
In reply to Kever YangRockchip SOC's mmc controller does not support read data from mmc to sram, we need a bounce buffer(in sdram), and then copy to sram.
---
common/bouncebuf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
common/bouncebuf.c +12 -0
@@ -26,6 +26,18 @@ static int addr_aligned(struct bounce_buffer *state)return 0 ; } +#ifdef CONFIG_ARCH_ROCKCHIP +/* +* Rockchip SOC's mmc controller does not support read data +* from mmc to sram, we need a bounce buffer(in sdram), and then +* copy to sram. +*/ +if (((ulong )state->user_buffer &0xfff80000 ) == +CONFIG_ROCKCHIP_IRAM_BASE ) { +debug ("Unsupport IRAM space %p\n" , state->user_buffer); +return 0 ; + } +#endif /* Aligned */ return 1 ; }
Signature · 1 line
2.20.1
Heiko Stübner
maintainerPATCH 3/3 common: bouncebuf: handle address in sram for rockchip platform
Hi Kever,
Am Dienstag, 2. April 2019, 10:46:54 CEST schrieb Kever Yang:
Quoted 19 lines
Rockchip SOC's mmc controller does not support read data from mmc to sram, we need a bounce buffer(in sdram), and then copy to sram.
Signed-off-by Kever Yang <[email protected]>---
common/bouncebuf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)common/bouncebuf.c +1
-0@@ -26,6 +26,18 @@ static int addr_aligned(struct bounce_buffer *state)return 0 ; } +#ifdef CONFIG_ARCH_ROCKCHIP
common/bouncebuf.c static int addr_aligned(struct bounce_buffer *state) · line 39
Quoted 10 lines
common/bouncebuf.c +10
-0+/* +* Rockchip SOC's mmc controller does not support read data +* from mmc to sram, we need a bounce buffer(in sdram), and then +* copy to sram. +*/ +if (((ulong )state->user_buffer &0xfff80000 ) == +CONFIG_ROCKCHIP_IRAM_BASE ) { +debug ("Unsupport IRAM space %p\n" , state->user_buffer); +return 0 ; + }
wouldn't it be easier to just check for "in-ddr-region"? Rockchip SoCs may have multiple sram areas one might want to use.
Also I get the feeling this should not live in an ARCH_ROCKCHIP ifdef. Instead maybe define some sort of kconfig settings to describe the directly usable memory areas, that the bounce_buffer then could use?
Heiko
Quoted 5 lines
common/bouncebuf.c +1
-0+#endif /* Aligned */ return 1 ; }
PATCH 3/3 common: bouncebuf: handle address in sram for rockchip platform
Quoted 37 lines · Heiko Stübner
Hi Kever,
Am Dienstag, 2. April 2019, 10:46:54 CEST schrieb Kever Yang:
Quoted 19 lines
Rockchip SOC's mmc controller does not support read data from mmc to sram, we need a bounce buffer(in sdram), and then copy to sram.
Signed-off-by Kever Yang <[email protected]>---
common/bouncebuf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)common/bouncebuf.c +1
-0@@ -26,6 +26,18 @@ static int addr_aligned(struct bounce_buffer *state)return 0 ; } +#ifdef CONFIG_ARCH_ROCKCHIP common/bouncebuf.c static int addr_aligned(struct bounce_buffer *state) · line 39
Quoted 10 lines
common/bouncebuf.c +10
-0+/* +* Rockchip SOC's mmc controller does not support read data +* from mmc to sram, we need a bounce buffer(in sdram), and then +* copy to sram. +*/ +if (((ulong )state->user_buffer &0xfff80000 ) == +CONFIG_ROCKCHIP_IRAM_BASE ) { +debug ("Unsupport IRAM space %p\n" , state->user_buffer); +return 0 ; + }wouldn't it be easier to just check for "in-ddr-region"? Rockchip SoCs may have multiple sram areas one might want to use.
Quoted 3 lines
Also I get the feeling this should not live in an
ARCH_ROCKCHIPifdef. Instead maybe define some sort of kconfig settings to describe the directly usable memory areas, that thebounce_bufferthen could use?
Indeed this still looks like a hack and should not be applied. My comments to [1] still apply to this patch: arch-specific defines should not be located in generic files if we can avoid it.
[1] https://patchwork.ozlabs.org/patch/1069730/
Regards,
Simon
Quoted 17 lines
Heiko
common/bouncebuf.c static int addr_aligned(struct bounce_buffer *state) · line 43
Quoted 5 lines
common/bouncebuf.c +1
-0+#endif /* Aligned */ return 1 ; }_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 3/3 common: bouncebuf: handle address in sram for rockchip platform
In reply to Kever YangHi Kever,
Quoted 3 lines · Kever Yang
Rockchip SOC's mmc controller does not support read data from mmc to sram, we need a bounce buffer(in sdram), and then copy to sram.
what exactly is the limitation here?
I mean a DMA engine does not care where it is copying to.
Additionally I was observing recently, that copying from SD card to SRAM works on RK3399 boards with 4 GB of RAM.
I see a data error in dwmci_data_transfer() only on 2 GB boards.
Therefore my question:
Is this maybe just a problem of the memory area not being mapped in SPL?
Thanks,
Christoph
Quoted 31 lines
Signed-off-by Kever Yang <[email protected]>---
common/bouncebuf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)common/bouncebuf.c +12
-0@@ -26,6 +26,18 @@ static int addr_aligned(struct bounce_buffer *state)return 0 ; } +#ifdef CONFIG_ARCH_ROCKCHIP +/* +* Rockchip SOC's mmc controller does not support read data +* from mmc to sram, we need a bounce buffer(in sdram), and then +* copy to sram. +*/ +if (((ulong )state->user_buffer &0xfff80000 ) == +CONFIG_ROCKCHIP_IRAM_BASE ) { +debug ("Unsupport IRAM space %p\n" , state->user_buffer); +return 0 ; + } +#endif /* Aligned */ return 1 ; }