January 2021 - U-Boot

[PATCH] vexpress_aemv8a: allow overriding BOOTCOMMAND
by Stanislav Pinchuk 30 Jan '21

30 Jan '21

Re-send because of line-wraps. This patch fixes the behaviour of the menuconfig's BOOTCOMMAND setting. Which is just ignored without that patch on vexpress_aemv8a platform. Signed-off-by: Stanislav.Pinchuk(a)kaspersky.com --- include/configs/vexpress_aemv8a.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index e63c335f85..2f574fc119 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -137,6 +137,7 @@ "fdt_alt_name=juno\0" \ "fdt_addr_r=0x80000000\0" \ +#ifndef CONFIG_BOOTCOMMAND /* Copy the kernel and FDT to DRAM memory and boot */ #define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr_r} ;"\ "if test $? -eq 1; then "\ @@ -157,7 +158,7 @@ " else setenv ramdisk_param -; "\ "fi ; " \ "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}" - +#endif #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -170,6 +171,7 @@ "boot_name=boot.img\0" \ "boot_addr=0x8007f800\0" +#ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \ " set bootargs; " \ " abootimg addr ${boot_addr}; " \ @@ -187,7 +189,7 @@ " fdt chosen ${initrd_addr} ${initrd_end}; " \ " booti $kernel_addr - $fdt_addr; " \ "fi" - +#endif #endif -- 2.25.1

2 1

[PATCH 0/2] *** Add support for Mediatek mt762x SoC ***
by SkyLake Huang 30 Jan '21

30 Jan '21

From: "SkyLake.Huang" <skylake.huang(a)mediatek.com> This patch adds support MTK's SPI NOR controller on mt7622 & mt7629. With this controller, you can access SPI NOR with better performance on mt762x platform. SkyLake.Huang (2): spi: mtk_snor: add support for MTK SPI NOR controller arm: dts: enable MTK SPI NOR controller driver arch/arm/dts/mt7622-rfb.dts | 16 +- arch/arm/dts/mt7622.dtsi | 11 + arch/arm/dts/mt7629-rfb.dts | 16 +- arch/arm/dts/mt7629.dtsi | 11 + configs/mt7622_rfb_defconfig | 3 +- configs/mt7629_rfb_defconfig | 3 +- drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/mtk_snor.c | 563 +++++++++++++++++++++++++++++++++++ 9 files changed, 627 insertions(+), 4 deletions(-) create mode 100644 drivers/spi/mtk_snor.c -- 2.18.0

2 4

[PATCH 1/1] cmd: add more implementation IDs to sbi command
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

Additional SBI implementation IDs have been added to the upcoming next version of the SBI specification. https://github.com/riscv/riscv-sbi-doc/blob/master/riscv-sbi.adoc Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/riscv/sbi.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c index 9897483eb6..90c0811e14 100644 --- a/cmd/riscv/sbi.c +++ b/cmd/riscv/sbi.c @@ -9,11 +9,25 @@ #include <command.h> #include <asm/sbi.h> +struct sbi_imp { + const long id; + const char *name; +}; + struct sbi_ext { const u32 id; const char *name; }; +static struct sbi_imp implementations[] = { + { 0, "Berkeley Boot Loader (BBL)" }, + { 1, "OpenSBI" }, + { 2, "Xvisor" }, + { 3, "KVM" }, + { 4, "RustSBI" }, + { 5, "Diosix" }, +}; + static struct sbi_ext extensions[] = { { 0x00000000, "sbi_set_timer" }, { 0x00000001, "sbi_console_putchar" }, @@ -43,23 +57,14 @@ static int do_sbi(struct cmd_tbl *cmdtp, int flag, int argc, printf("SBI %ld.%ld\n", ret >> 24, ret & 0xffffff); ret = sbi_get_impl_id(); if (ret >= 0) { - switch (ret) { - case 0: - printf("Berkeley Boot Loader (BBL)\n"); - break; - case 1: - printf("OpenSBI\n"); - break; - case 2: - printf("Xvisor\n"); - break; - case 3: - printf("KVM\n"); - break; - default: - printf("Unknown implementation\n"); - break; + for (i = 0; i < ARRAY_SIZE(implementations); ++i) { + if (ret == implementations[i].id) { + printf("%s\n", implementations[i].name); + break; + } } + if (i == ARRAY_SIZE(implementations)) + printf("Unknown implementation ID %ld\n", ret); } printf("Extensions:\n"); for (i = 0; i < ARRAY_SIZE(extensions); ++i) { -- 2.28.0

2 1

[PATCH] test: test_ofplatdata: Mark as sandbox specific
by Tom Rini 30 Jan '21

30 Jan '21

This test checks for output specific to the sandbox device tree, mark it as sandbox specific. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- test/py/tests/test_ofplatdata.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index d55338e37e6f..92d09b7aa198 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -4,6 +4,7 @@ import pytest import u_boot_utils as util +(a)pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('spl_of_platdata') def test_spl_devicetree(u_boot_console): """Test content of spl device-tree""" -- 2.17.1

1 1

[PATCH 1/3] test: inconsistent bootm tests
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

Excluding ut bootm in test/cmd_ut.c but compiling test/bootm.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig: FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nop] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nospace] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent_var] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_both] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_var] Only compile test/bootm.c on the sandbox. Fixes: f158ba15ee0f ("bootm: Add tests for fixup_silent_linux()") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index d4323f9963..7d3fc29493 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,8 +4,8 @@ ifneq ($(CONFIG_SANDBOX),) obj-$(CONFIG_$(SPL_)CMDLINE) += bloblist.o -endif obj-$(CONFIG_$(SPL_)CMDLINE) += bootm.o +endif obj-$(CONFIG_$(SPL_)CMDLINE) += cmd/ obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_ut.o obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o -- 2.29.2

3 7

[PATCH] env: sf: cosmetic: remove unnecessary space
by Patrick Delaunay 30 Jan '21

30 Jan '21

Remove the unnecessary space before the 2 "done:" labels in env_sf_save(). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- env/sf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env/sf.c b/env/sf.c index 91ed2860ed..42d762714e 100644 --- a/env/sf.c +++ b/env/sf.c @@ -139,7 +139,7 @@ static int env_sf_save(void) printf("Valid environment: %d\n", (int)gd->env_valid); - done: +done: if (saved_buffer) free(saved_buffer); @@ -236,7 +236,7 @@ static int env_sf_save(void) ret = 0; puts("done\n"); - done: +done: if (saved_buffer) free(saved_buffer); -- 2.17.1

2 1

[PATCH 1/2] callback: Implement support for registering main loop callbacks
by Marek Vasut 30 Jan '21

30 Jan '21

Add initial code for registering callbacks into the main loop. These callbacks should be quick asynchronous functions executed in the background, useful e.g. for polling SD card detect line or for running USB state machine. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> --- common/cli_readline.c | 6 ++++++ common/main.c | 21 +++++++++++++++++++++ include/init.h | 10 ++++++++++ 3 files changed, 37 insertions(+) diff --git a/common/cli_readline.c b/common/cli_readline.c index 5c158d03b4..5ace4724d2 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -266,6 +266,7 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len, uint64_t etime = endtick(timeout); while (!tstc()) { /* while no incoming data */ + callback_run(); if (get_ticks() >= etime) return -2; /* timed out */ WATCHDOG_RESET(); @@ -273,6 +274,11 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len, first = 0; } + do { + callback_run(); + WATCHDOG_RESET(); + } while (!tstc()); + ichar = getcmd_getch(); /* ichar=0x0 when error occurs in U-Boot getc */ diff --git a/common/main.c b/common/main.c index ae5bcdb32f..b408e82696 100644 --- a/common/main.c +++ b/common/main.c @@ -18,6 +18,27 @@ #include <version.h> #include <efi_loader.h> +static LIST_HEAD(callbacks); + +void callback_register(struct callback *cb) +{ + INIT_LIST_HEAD(&cb->list); + list_add_tail(&cb->list, &callbacks); +} + +void callback_unregister(struct callback *cb) +{ + list_del(&cb->list); +} + +void callback_run(void) +{ + struct callback *cb, *pos; + + list_for_each_entry_safe(cb, pos, &callbacks, list) + cb->callback_func(cb); +} + static void run_preboot_environment_command(void) { char *p; diff --git a/include/init.h b/include/init.h index 980be27993..dcc4177316 100644 --- a/include/init.h +++ b/include/init.h @@ -334,6 +334,16 @@ void bdinfo_print_mhz(const char *name, unsigned long hz); /* Show arch-specific information for the 'bd' command */ void arch_print_bdinfo(void); +struct callback { + struct list_head list; + void (*callback_func)(struct callback *); + void *callback_arg; +}; + +void callback_register(struct callback *cb); +void callback_unregister(struct callback *cb); +void callback_run(void); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ -- 2.29.2

1 1

[PATCH 1/5] pci: renesas: Add root bus handling on Gen3
by Marek Vasut 30 Jan '21

30 Jan '21

Add code to access the PCIe root bus space and configure it. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- drivers/pci/pci-rcar-gen3.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 0d5b01f9f8..cd116a536e 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -151,6 +151,16 @@ static int rcar_pcie_config_access(const struct udevice *udev, struct rcar_gen3_pcie_priv *priv = dev_get_plat(udev); u32 reg = where & ~3; + /* Root bus */ + if (PCI_DEV(bdf) == 0) { + if (access_type == RCAR_PCI_ACCESS_READ) + *data = readl(priv->regs + PCICONF(where / 4)); + else + writel(*data, priv->regs + PCICONF(where / 4)); + + return 0; + } + /* Clear errors */ clrbits_le32(priv->regs + PCIEERRFR, 0); @@ -187,11 +197,14 @@ static int rcar_gen3_pcie_addr_valid(pci_dev_t d, uint where) { u32 slot; + if (PCI_BUS(d)) + return -EINVAL; + if (PCI_FUNC(d)) return -EINVAL; slot = PCI_DEV(d); - if (slot != 1) + if (slot > 1) return -EINVAL; return 0; -- 2.29.2

1 4

[PATCH] armv8: Handle EL2 Host mode
by Mark Kettenis 30 Jan '21

30 Jan '21

On implementations that support VHE, the layout of the CPTR_EL2 register depends on whether HCR_EL2.E2H is set. Check this bit and and set the aprropriate bits to enable access to the FP/SIMD registers. This allows U-Boot to run on systems that pass control to U-Boot in EL2 with EL2 Host mode enabled such as machine with Apple's M1 SoC. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- arch/arm/cpu/armv8/start.S | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 662449156b..a259717e67 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -133,9 +133,15 @@ pie_fixup_done: #endif b 0f 2: set_vbar vbar_el2, x0 + mrs x0, hcr_el2 + tbnz x0, #34, el2_host /* HCR_EL2.E2H */ mov x0, #0x33ff msr cptr_el2, x0 /* Enable FP/SIMD */ b 0f +el2_host: + mov x0, #3 << 20 + msr cptr_el2, x0 /* Enable FP/SIMD */ + b 0f 1: set_vbar vbar_el1, x0 mov x0, #3 << 20 msr cpacr_el1, x0 /* Enable FP/SIMD */ -- 2.30.0

3 2

Python tests with pytest 6
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

Hello Stephen, with pytest 6 U-Boot's Python test output is messed up. The module names are not printed anymore. This seems not to be a problem of pytest. When running text book examples the module names are printed. So it must be in our code. Looking multiplexed_log.py it seems that you have highly customized the logging. Maybe you want to have look at it. Best regards Heinrich make tests ./test/run sandbox: +make O=/build-sandbox -s sandbox_defconfig +make O=build-sandbox -s -j8 ================================================ test session starts ================================================= platform linux -- Python 3.9.1+, pytest-6.0.2, py-1.10.0, pluggy-0.13.0 rootdir: /home/zfsdt/workspace/u-boot-build/denx/test/py, configfile: pytest.ini collected 792 items .....s.....sss.ssssss................ssssssssssssssssssssssssssss.........s.............................................................................sssss.ssssss.............s.ssss....ss...........s.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................ss..s.....................F............F................................................................................ ====================================================== FAILURES ====================================================== ____________________________________________ TestFsBasic.test_fs1[fat16] _____________________________________________

1 0