May 2018 - U-Boot

[U-Boot] [PATCH v2 0/7] arm: Introduce v7R support
by Lokesh Vutla 08 May '18

08 May '18

The Cortex-R* processors are a mid-range CPUs for use in deeply-embedded, real-time systems. It implements the ARMv7-R architecture, and includes Thumb-2 technology for optimum code density and processing throughput. Except for MPU(Memory Protection Unit) and few CP15 registers, most of the features are compatible with v7 architecture. This series adds minimal support for v7-R architecture by reusing the v7 support. Also adding support for MPU. Travis-ci build report: https://travis-ci.org/lokeshvutla/u-boot/builds/371442638 Changes since v1: - Renamed file armv7m_mpu.h to armv7_mpu.h - Removed an unnecessary guard for an include Changes since RFC: - Renamed CPUV7 as CPU_V7A - Renamed MMU as SYS_ARM_MMU - Added SYS_ARM_CACHE_CP15 Lokesh Vutla (6): arm: v7: Update VBAR only if available arm: v7: Kconfig: Rename CPU_V7 as CPU_V7A arm: v7: Kconfig: Add entry for MMU arm: v7: Kconfig: Introduce SYS_ARM_CACHE_CP15 arm: v7R: Add support for MPU arm: v7R: Add support for enabling caches Michal Simek (1): arm: v7R: Add initial support arch/arm/Kconfig | 95 ++++++++++++++++------ arch/arm/Makefile | 8 +- arch/arm/cpu/armv7/Kconfig | 4 +- arch/arm/cpu/armv7/Makefile | 2 + arch/arm/cpu/armv7/mpu_v7r.c | 120 +++++++++++++++++++++++++++ arch/arm/cpu/armv7/start.S | 4 + arch/arm/cpu/armv7m/Makefile | 3 +- arch/arm/cpu/armv7m/mpu.c | 43 +--------- arch/arm/include/asm/armv7_mpu.h | 131 ++++++++++++++++++++++++++++++ arch/arm/include/asm/armv7m_mpu.h | 67 --------------- arch/arm/include/asm/system.h | 4 +- arch/arm/lib/Makefile | 6 +- arch/arm/lib/cache-cp15.c | 14 +++- arch/arm/mach-at91/Kconfig | 12 +-- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/config.mk | 2 +- arch/arm/mach-bcm283x/Kconfig | 4 +- arch/arm/mach-exynos/Kconfig | 4 +- arch/arm/mach-exynos/Makefile | 2 +- arch/arm/mach-exynos/soc.c | 2 +- arch/arm/mach-mvebu/Kconfig | 2 +- arch/arm/mach-qemu/Kconfig | 2 +- arch/arm/mach-rmobile/Kconfig | 2 +- arch/arm/mach-rockchip/Kconfig | 12 +-- arch/arm/mach-stm32/soc.c | 2 +- arch/arm/mach-stm32mp/Kconfig | 2 +- arch/arm/mach-sunxi/Kconfig | 22 ++--- arch/arm/mach-tegra/Kconfig | 2 +- arch/arm/mach-uniphier/Kconfig | 2 +- arch/arm/mach-uniphier/Makefile | 2 +- cmd/Kconfig | 2 +- drivers/serial/arm_dcc.c | 2 +- 32 files changed, 392 insertions(+), 191 deletions(-) create mode 100644 arch/arm/cpu/armv7/mpu_v7r.c create mode 100644 arch/arm/include/asm/armv7_mpu.h delete mode 100644 arch/arm/include/asm/armv7m_mpu.h -- 2.17.0

3 17

[U-Boot] [PATCH] test: ofnode: test ofnode_device_is_compatible()
by Masahiro Yamada 08 May '18

08 May '18

Test ofnode_device_is_compatible(), and also ofnode_path(). Requested-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- test/dm/Makefile | 1 + test/dm/ofnode.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 test/dm/ofnode.c diff --git a/test/dm/Makefile b/test/dm/Makefile index 513c456..97c978a 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_DM_I2C) += i2c.o obj-$(CONFIG_LED) += led.o obj-$(CONFIG_DM_MAILBOX) += mailbox.o obj-$(CONFIG_DM_MMC) += mmc.o +obj-y += ofnode.o obj-$(CONFIG_DM_PCI) += pci.o obj-$(CONFIG_PHY) += phy.o obj-$(CONFIG_POWER_DOMAIN) += power-domain.o diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c new file mode 100644 index 0000000..7dd6d88 --- /dev/null +++ b/test/dm/ofnode.c @@ -0,0 +1,19 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <dm.h> +#include <dm/test.h> +#include <test/ut.h> + +static int dm_test_ofnode_compatible(struct unit_test_state *uts) +{ + ofnode root_node = ofnode_path("/"); + + ut_assert(ofnode_valid(root_node)); + ut_assert(ofnode_device_is_compatible(root_node, "sandbox")); + + return 0; +} +DM_TEST(dm_test_ofnode_compatible, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); -- 2.7.4

3 2

[U-Boot] [PATCH] test: regmap: test Linux-compatible syscon_node_to_regmap()
by Masahiro Yamada 08 May '18

08 May '18

Like Linux, syscon_node_to_regmap() allows a node to work as a syscon provider without binding it to a syscon driver. Test this. Requested-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/sandbox/dts/test.dts | 8 ++++++++ test/dm/regmap.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 06d0e8c..3c25cb7 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -393,6 +393,14 @@ 0x38 8>; }; + syscon@2 { + compatible = "simple-mfd", "syscon"; + reg = <0x40 5 + 0x48 6 + 0x50 7 + 0x58 8>; + }; + timer { compatible = "sandbox,timer"; clock-frequency = <1000000>; diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 8125345..698a013 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -20,6 +20,7 @@ static int dm_test_regmap_base(struct unit_test_state *uts) { struct udevice *dev; struct regmap *map; + ofnode node; int i; ut_assertok(uclass_get_device(UCLASS_SYSCON, 0, &dev)); @@ -48,6 +49,22 @@ static int dm_test_regmap_base(struct unit_test_state *uts) map = syscon_get_regmap(dev); ut_asserteq_ptr(ERR_PTR(-ENOEXEC), map); + /* A different device can be a syscon by using Linux-compat API */ + node = ofnode_path("/syscon@2"); + ut_assert(ofnode_valid(node)); + + map = syscon_node_to_regmap(node); + ut_assertok_ptr(map); + ut_asserteq(4, map->range_count); + ut_asserteq(0x40, map->ranges[0].start); + for (i = 0; i < 4; i++) { + const unsigned long addr = 0x40 + 8 * i; + + ut_asserteq(addr, map->ranges[i].start); + ut_asserteq(5 + i, map->ranges[i].size); + ut_asserteq(addr, map_to_sysmem(regmap_get_range(map, i))); + } + return 0; } DM_TEST(dm_test_regmap_base, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); -- 2.7.4

3 2

[U-Boot] [PATCH v2 0/4] Add Linux-compatible syscon_to_regmap API
by Masahiro Yamada 08 May '18

08 May '18

The current syscon in U-Boot works differently from Linux. Therefore, DT files imported from Linux do not work for U-Boot. The current usage of syscon in U-Boot should be discouraged because using different DT-binding across projects is a significant problem. Masahiro Yamada (4): regmap: clean up regmap allocation dm: ofnode: add ofnode_device_is_compatible() helper regmap: change regmap_init_mem() to take ofnode instead udevice syscon: add Linux-compatible syscon API arch/arm/mach-aspeed/ast2500/sdram_ast2500.c | 2 +- drivers/core/device.c | 8 +--- drivers/core/ofnode.c | 11 +++++ drivers/core/regmap.c | 42 ++++++------------ drivers/core/syscon-uclass.c | 66 +++++++++++++++++++++++++++- drivers/phy/meson-gxl-usb2.c | 2 +- drivers/phy/meson-gxl-usb3.c | 2 +- drivers/phy/sti_usb_phy.c | 4 +- drivers/pinctrl/pinctrl-sti.c | 4 +- drivers/ram/rockchip/dmc-rk3368.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk322x.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/ram/stm32mp1/stm32mp1_ram.c | 2 +- drivers/reset/reset-meson.c | 2 +- drivers/reset/sti-reset.c | 2 +- drivers/sysreset/sysreset_sti.c | 2 +- drivers/usb/host/dwc3-sti-glue.c | 2 +- include/dm/ofnode.h | 11 +++++ include/regmap.h | 11 ++--- include/syscon.h | 8 ++++ test/dm/regmap.c | 13 +++--- 23 files changed, 136 insertions(+), 68 deletions(-) -- 2.7.4

3 13

[U-Boot] [PATCH 1/6] ls102xa: psci: save context id in cpu_on command
by Patrick Delaunay 08 May '18

08 May '18

Replace the psci_save_target_pc call by the new function psci_save(cpu, pc,context_id) Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- arch/arm/cpu/armv7/ls102xa/psci.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index e1dc5f3..a355c88 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -125,7 +125,8 @@ psci_cpu_on: mov r0, r4 mov r1, r2 - bl psci_save_target_pc + mov r2, r3 + bl psci_save mov r1, r4 @ Get DCFG base address -- 2.7.4

5 17

[U-Boot] [PATCH v2 1/3] arm: psci: save context id for cpu_on PSCI command
by Patrick Delaunay 08 May '18

08 May '18

Save and use the 3rd parameter of PSCI CPU_ON request: context_id. The context_id parameter is only meaningful to the caller. U-Boot PSCI preserves a copy of the value passed in this parameter. Following wakeup from a powerdown state, U-BOOT PSCI places this value in R0 when it first enters the OS. NB: this context id is not (yet?) used by Linux but it is mandatory to be PSCI compliant. update armv7 psci functions: - psci_save_target_pc(): keep for backward compatibility with current platform (only save PC and force context id to 0) => should be removed when all platform migrate to the new API - psci_save(): new API to use by ARMv7 platform with PSCI, save pc (= entry_point_address) and context_id Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- Changes in v2: None arch/arm/cpu/armv7/psci-common.c | 14 ++++++++++++++ arch/arm/cpu/armv7/psci.S | 4 ++++ arch/arm/include/asm/psci.h | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/psci-common.c b/arch/arm/cpu/armv7/psci-common.c index 8cb4107..73f986b 100644 --- a/arch/arm/cpu/armv7/psci-common.c +++ b/arch/arm/cpu/armv7/psci-common.c @@ -25,10 +25,19 @@ #include <linux/linkage.h> static u32 psci_target_pc[CONFIG_ARMV7_PSCI_NR_CPUS] __secure_data = { 0 }; +static u32 psci_context_id[CONFIG_ARMV7_PSCI_NR_CPUS] __secure_data = { 0 }; void __secure psci_save_target_pc(int cpu, u32 pc) { psci_target_pc[cpu] = pc; + psci_context_id[cpu] = 0; + dsb(); +} + +void __secure psci_save(int cpu, u32 pc, u32 context_id) +{ + psci_target_pc[cpu] = pc; + psci_context_id[cpu] = context_id; dsb(); } @@ -37,3 +46,8 @@ u32 __secure psci_get_target_pc(int cpu) return psci_target_pc[cpu]; } +u32 __secure psci_get_context_id(int cpu) +{ + return psci_context_id[cpu]; +} + diff --git a/arch/arm/cpu/armv7/psci.S b/arch/arm/cpu/armv7/psci.S index 95b962d..35fd955 100644 --- a/arch/arm/cpu/armv7/psci.S +++ b/arch/arm/cpu/armv7/psci.S @@ -327,6 +327,10 @@ ENTRY(psci_cpu_entry) bl _nonsec_init bl psci_get_cpu_id @ CPU ID => r0 + mov r2, r0 @ CPU ID => r2 + bl psci_get_context_id @ context id => r0 + mov r1, r0 @ context id => r1 + mov r0, r2 @ CPU ID => r0 bl psci_get_target_pc @ target PC => r0 b _do_nonsec_entry ENDPROC(psci_cpu_entry) diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index ac8b00d..b415241 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -93,9 +93,11 @@ #ifndef __ASSEMBLY__ #include <asm/types.h> -/* These 2 helper functions assume cpu < CONFIG_ARMV7_PSCI_NR_CPUS */ +/* These 4 helper functions assume cpu < CONFIG_ARMV7_PSCI_NR_CPUS */ u32 psci_get_target_pc(int cpu); +u32 psci_get_context_id(int cpu); void psci_save_target_pc(int cpu, u32 pc); +void psci_save(int cpu, u32 pc, u32 context_id); void psci_cpu_entry(void); u32 psci_get_cpu_id(void); -- 2.7.4

4 7

[U-Boot] [PATCH v2 0/3] tegra nand mtd, ubi, driver model and live tree enablement
by Marcel Ziswiler 07 May '18

07 May '18

This series addresses recent Tegra NAND driver breakage caused by ongoing driver model resp. live tree migration work and enables it on Harmony as well. This series is available at http://git.toradex.com/cgit/u-boot-toradex.git/log/?h=for-next Changes in v2: - Use UCLASS_MTD rather than MISC as suggested by Stefan. - Enable CONFIG_MTD as well to make sure UCLASS_MTD is available. - New commit required due to using UCLASS_MTD. Marcel Ziswiler (3): mtd: nand: tegra: convert to driver model and live tree configs: harmony: enable live tree, mtd and ubi configs: colibri_t20: enable mtd configs/colibri_t20_defconfig | 1 + configs/harmony_defconfig | 6 +++ drivers/mtd/nand/tegra_nand.c | 98 ++++++++++++++++++++++++------------------- include/configs/harmony.h | 4 ++ 4 files changed, 66 insertions(+), 43 deletions(-) -- 2.14.3

1 3

[U-Boot] [PATCH v2 0/3] drivers: Add reset ctrl to drivers
by Ley Foon Tan 07 May '18

07 May '18

Add reset ctrl to dwmmc socfpga, designware Ethernet and ns16550 serial drivers. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present. If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset. This is preparation to upstream Intel Stratix 10 SoC support in [1]. v2 change: - remove 'return' in designware emac driver - keep reset control in socfpga_dw_mmc.c because it didn't call to common dwmmc probe function when in SPL. - add reviewed-by in ns16550 patch History: v1: https://patchwork.ozlabs.org/cover/905519/ [1]: https://patchwork.ozlabs.org/cover/900499/ Ley Foon Tan (3): mmc: dwmmc: socfpga: Add reset ctrl to driver serial: ns16550: Add reset ctrl to driver net: designware: Add reset ctrl to driver drivers/mmc/socfpga_dw_mmc.c | 19 +++++++++++++++++++ drivers/net/designware.c | 11 +++++++++++ drivers/serial/ns16550.c | 12 ++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-)

4 7

[U-Boot] [PATCH 1/5] ARM: mxs: make lowlevel_init() weak
by Mans Rullgard 07 May '18

07 May '18

With the full SPL framework enabled, lowlevel_init() is required. Make the empty stub weak so boards can override it. Signed-off-by: Mans Rullgard <mans(a)mansr.com> --- arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index 7a68a8f3ca74..5c7817074fd6 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; /* Lowlevel init isn't used on i.MX28, so just have a dummy here */ -void lowlevel_init(void) {} +__weak void lowlevel_init(void) {} void reset_cpu(ulong ignored) __attribute__((noreturn)); -- 2.17.0

5 14

[U-Boot] No support for "standalone" applications in FIT image?
by Brett Stahlman 07 May '18

07 May '18

I've built a standalone application that uses exported u-boot functions. It worked fine when I was loading the binary with "go", but when I attempted to package the binary in a FIT image, to be loaded with bootm, I ran into trouble... Specifically, although the header seems to be parsed correctly, u-boot eventually fails (in bootm_find_os) with the following message: ERROR: can't get kernel image! I'm packaging with the following mkimage parameters: type = standalone os = u-boot arch = arm64 The problem appears to arise in fit_image_load, which doesn't consider "standalone" a valid type for a FIT image. I was able to get my standalone app to load properly by changing type from "standalone" to "firmware". But why is this necessary? "Standalone" seems a more appropriate choice than "firmware" for an application built using u-boot's standalone template. Is there a reason I shouldn't be attempting to package a u-boot standalone app in a FIT image? Note: The reason I decided to switch from flat binary image to FIT image is that I'm loading from flash memory (not a file system); thus, I wanted to add a header that encoded the size of the binary so I'd know how much to copy from flash to RAM. I've since discovered that the u-boot shell doesn't provide any utilities for extracting size from a FIT header in flash, so if I want to copy only the bytes in the image, I'd need to read the size from a hard-coded offset in the FIT header, which seems a bit ugly... Bottom line: Perhaps there's no reason to prefer bootm/FIT over go/binary after all... But I'd still like to understand why packaging as type = "standalone" doesn't work. I can't imagine mkimage would support the standalone type if there were never a reason to use it... Thanks, Brett S.

1 0