November 2023 - U-Boot

[PATCH] x86: coreboot: Show a coreboot logo if booted from coreboot
by Simon Glass 29 Nov '23

29 Nov '23

U-Boot shows its own logo when starting up, if a display is active. Add a coreboot logo too, for when U-Boot is booted from coreboot. Note that the logo's license applies: https://coreboot.org/Logo#coreboot_Logo_License Signed-off-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- drivers/video/Kconfig | 10 ++++++++++ drivers/video/Makefile | 2 ++ drivers/video/coreboot_logo.bmp | Bin 0 -> 5724 bytes drivers/video/video-uclass.c | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 drivers/video/coreboot_logo.bmp diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6f319ba0d54..f9c289e042c 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -55,6 +55,16 @@ config VIDEO_LOGO tools/logos/u-boot_logo.bmp and looks best when the display has a black background. +config VIDEO_LOGO_COREBOOT + bool "Show the coreboot logo on the display" + depends on VIDEO_LOGO && (SYS_COREBOOT || SANDBOX) + default y if SYS_COREBOOT + help + This enables showing the coreboot logo on the display when a video + device is probed. It appears at the top right, just below the U-Boot + logo. The appearance of this logo indicates that coreboot provided + the first-stage system setup. + config BACKLIGHT bool "Enable panel backlight uclass support" default y diff --git a/drivers/video/Makefile b/drivers/video/Makefile index fdc29376324..f7ea7fa7fa0 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -25,6 +25,8 @@ obj-$(CONFIG_PANEL_HX8238D) += hx8238d.o obj-$(CONFIG_$(SPL_TPL_)SIMPLE_PANEL) += simple_panel.o obj-$(CONFIG_VIDEO_LOGO) += u_boot_logo.o +obj-$(CONFIG_VIDEO_LOGO_COREBOOT) += coreboot_logo.o + obj-$(CONFIG_$(SPL_TPL_)BMP) += bmp.o endif diff --git a/drivers/video/coreboot_logo.bmp b/drivers/video/coreboot_logo.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ed74ce1de0b09a6b6a9c0d06d3f435621b82950e GIT binary patch literal 5724 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 literal 0 HcmV?d00001 diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f743ed74c81..a0d2627e429 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -508,6 +508,17 @@ void *video_get_u_boot_logo(void) return SPLASH_START(u_boot_logo); } +#ifdef CONFIG_VIDEO_LOGO_COREBOOT +SPLASH_DECL(coreboot_logo); + +void *video_get_coreboot_logo(void) +{ + return SPLASH_START(coreboot_logo); +} +#else +static inline void *video_get_coreboot_logo(void) { return NULL; } +#endif + static int show_splash(struct udevice *dev) { u8 *data = SPLASH_START(u_boot_logo); @@ -515,6 +526,13 @@ static int show_splash(struct udevice *dev) ret = video_bmp_display(dev, map_to_sysmem(data), -4, 4, true); + if (IS_ENABLED(CONFIG_VIDEO_LOGO_COREBOOT)) { + void *data_cb = video_get_coreboot_logo(); + + ret = video_bmp_display(dev, map_to_sysmem(data_cb), -4, 200, + true); + } + return 0; } -- 2.43.0.rc2.451.g8631bc7472-goog

1 0

[PATCH v2] pci: Enable dm_pci_map_bar() for 64-bit BARs
by Moritz Fischer 29 Nov '23

29 Nov '23

Allow dm_pci_map_bar() usage on systems with CONFIG_SYS_PCI_64BIT. Reviewed-by: Philip Oberfichtner <pro(a)denx.de> Signed-off-by: Moritz Fischer <moritzf(a)google.com> --- Changes from v1: - Fixed commit message --- drivers/pci/pci-uclass.c | 11 +++++++++++ include/pci.h | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index e0d01f6a85..82308c7477 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1611,6 +1611,17 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len, dm_pci_read_config32(udev, bar, &bar_response); pci_bus_addr = (pci_addr_t)(bar_response & ~0xf); + /* + * This assumes that dm_pciauto_setup_device() will allocate + * a 64-bit address if CONFIG_SYS_PCI_64BIT is enabled and + * the device advertises that it supports it. + */ + if (IS_ENABLED(CONFIG_SYS_PCI_64BIT) && + (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_64)) { + dm_pci_read_config32(udev, bar + 4, &bar_response); + pci_bus_addr |= (pci_addr_t)bar_response << 32; + } + if (~((pci_addr_t)0) - pci_bus_addr < offset) return NULL; diff --git a/include/pci.h b/include/pci.h index 2f5eb30b83..0d1ac7b015 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1350,8 +1350,8 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len, * * Looks up a base address register and finds the physical memory address * that corresponds to it. - * Can be used for 32b BARs 0-5 on type 0 functions and for 32b BARs 0-1 on - * type 1 functions. + * Can be used for 32b/64b BARs 0-5 on type 0 functions and for 32b BARs 0-1 + * on type 1 functions. * Can also be used on type 0 functions that support Enhanced Allocation for * 32b/64b BARs. Note that duplicate BEI entries are not supported. * -- 2.43.0.rc1.413.gea7ed67945-goog

2 1

[PATCH] xen: pvblock: fix the maximum io size in one operation
by AKASHI Takahiro 29 Nov '23

29 Nov '23

The current implementation may cause BUG_ON() in blkfront_aio() BUG_ON(n > BLKIF_MAX_SEGMENTS_PER_REQUEST); In pvblock_iop(), a read/write operation will be split into smaller chunks of data so that the size in one access (aio_nbytes) is limited to, at the maximum, BLKIF_MAX_SEGMENTS_PER_REQUEST * PAGE_SIZE But this works only if when the *buffer* passed in to pvblock_io() is page-aligned. If not, the given data region may stand across (BLKIF_MAX_SEGMENTS_PER_REQUEST + 1) pages. See the logic in blkfront_aio(): start = (uintptr_t)aiocbp->aio_buf & PAGE_MASK; end = ((uintptr_t)aiocbp->aio_buf + aiocbp->aio_nbytes + PAGE_SIZE - 1) & PAGE_MASK; Then this will lead to BUG_ON() above. This can be fixed by decreasing the maximum size of aio_nbytes. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Fixes: commit 3a739cc6c948 ("xen: pvblock: Implement front-back protocol and do IO") --- drivers/xen/pvblock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 4ad548d599d5..1df04e239ad0 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -632,7 +632,8 @@ static ulong pvblock_iop(struct udevice *udev, lbaint_t blknr, memcpy(blk_dev->bounce_buffer, buffer, desc->blksz); aiocb.aio_nbytes = unaligned ? desc->blksz : - min((size_t)(BLKIF_MAX_SEGMENTS_PER_REQUEST * PAGE_SIZE), + min((size_t)((BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) + * PAGE_SIZE), (size_t)(blocks_todo * desc->blksz)); blkfront_io(&aiocb, write); -- 2.34.1

3 2

[PATCH] timer-uclass: Always use "clock-frequency" property as fallback
by Alex Bee 29 Nov '23

29 Nov '23

Currently the "clock-frequency" DT property is only being considered as an fallback if either there is no clock driver, the clock driver implements the request-op correctly or there is no clock defined for the timer at all. This patch makes "clock-frequency" also being picked as a fallback if getting the clock-rate fails, since clk_get(_by_index) will return no error, if a clock driver does not implement the request-op and does also not support getting the rate of the clock in question. timer_post_probe will take care if the property does not exist in the DT or is defined as 0. Signed-off-by: Alex Bee <knaerzche(a)gmail.com> --- This is currently an issue for Rockchip RK3188 and potentially also for RK3368: The clock driver does not implement the request-op. Even if we would add it: timer-uclass always picks the first clock and the DT bindings for Rockchip timer requires us to place the pclk first and and the timer source clock second. drivers/timer/timer-uclass.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 0c2018bfe3..60ff65529a 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -66,13 +66,13 @@ static int timer_pre_probe(struct udevice *dev) err = clk_get_by_index(dev, 0, &timer_clk); if (!err) { ret = clk_get_rate(&timer_clk); - if (IS_ERR_VALUE(ret)) - return ret; - uc_priv->clock_rate = ret; - } else { - uc_priv->clock_rate = - dev_read_u32_default(dev, "clock-frequency", 0); + if (!IS_ERR_VALUE(ret)) { + uc_priv->clock_rate = ret; + return 0; + } } + + uc_priv->clock_rate = dev_read_u32_default(dev, "clock-frequency", 0); } return 0; -- 2.42.0

2 1

[PATCH] lib/slre: Fix memory leak if regex compilation fails
by Francois Berder 29 Nov '23

29 Nov '23

Signed-off-by: Francois Berder <fberder(a)outlook.fr> --- lib/slre.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/slre.c b/lib/slre.c index e82a9e7635..e1a50443e0 100644 --- a/lib/slre.c +++ b/lib/slre.c @@ -686,6 +686,7 @@ int main(int argc, char *argv[]) } if (!slre_compile(&slre, argv[1])) { + (void) fclose(fp); fprintf(stderr, "Error compiling slre: %s\n", slre.err_str); return 1; } -- 2.34.1

2 1

[PATCH] Fix stack-protector for powerpc
by Christophe Leroy 29 Nov '23

29 Nov '23

On powerpc, stack protector expects a function called __stack_chk_fail_local() instead of __stack_chk_fail() And some versions of GCC for powerpc default to TLS canary instead of global canary, so always force GCC to use global canary with -mstack-protector-guard=global Cc: Joel Peshkin <joel.peshkin(a)broadcom.com> Fixes: 4e9bce12432 ("Add support for stack-protector") Signed-off-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> --- Makefile | 1 + common/stackprot.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Makefile b/Makefile index ac65605a26..bddccc94e6 100644 --- a/Makefile +++ b/Makefile @@ -741,6 +741,7 @@ endif ifeq ($(CONFIG_STACKPROTECTOR),y) KBUILD_CFLAGS += $(call cc-option,-fstack-protector-strong) +KBUILD_CFLAGS += $(call cc-option,-mstack-protector-guard=global) CFLAGS_EFI += $(call cc-option,-fno-stack-protector) else KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) diff --git a/common/stackprot.c b/common/stackprot.c index d5b7061665..6495951a77 100644 --- a/common/stackprot.c +++ b/common/stackprot.c @@ -18,3 +18,8 @@ void __stack_chk_fail(void) panic("Stack smashing detected in function:\n%p relocated from %p", ra, ra - gd->reloc_off); } + +void __stack_chk_fail_local(void) +{ + __stack_chk_fail(); +} -- 2.41.0

2 1

[PATCH 1/3] configs: keystone2: Remove unused SPL_MALLOC_F_SIZE and KEYSTONE_SPL_STACK_SIZE
by Andrew Davis 29 Nov '23

29 Nov '23

These are leftover definitions. While here cleanup some leftover comments. Signed-off-by: Andrew Davis <afd(a)ti.com> --- include/configs/ti_armv7_keystone2.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 72c04d8a994..637e9e4369e 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -9,23 +9,10 @@ #ifndef __CONFIG_KS2_EVM_H #define __CONFIG_KS2_EVM_H -/* U-Boot Build Configuration */ - -/* SoC Configuration */ - /* Memory Configuration */ #define CFG_SYS_LPAE_SDRAM_BASE 0x800000000 #define CFG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */ -#ifdef CONFIG_SYS_MALLOC_F_LEN -#define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN -#else -#define SPL_MALLOC_F_SIZE 0 -#endif - -/* SPL SPI Loader Configuration */ -#define KEYSTONE_SPL_STACK_SIZE (8 * 1024) - /* SRAM scratch space entries */ #define SRAM_SCRATCH_SPACE_ADDR 0xc0c23fc @@ -53,8 +40,6 @@ #define CFG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES -/* EEPROM definitions */ - /* NAND Configuration */ #define CFG_SYS_NAND_MASK_CLE 0x4000 #define CFG_SYS_NAND_MASK_ALE 0x2000 @@ -63,13 +48,6 @@ #define CFG_SYS_NAND_LARGEPAGE #define CFG_SYS_NAND_BASE_LIST { 0x30000000, } - - -/* U-Boot general configuration */ - -/* EDMA3 */ - - /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> -- 2.39.2

3 12

[UBOOT PATCH v3] test/py: net: Add a TFTP put test
by Love Kumar 29 Nov '23

29 Nov '23

Execute tftpput command for uploading files to a server and validate its size & CRC32. Signed-off-by: Love Kumar <love.kumar(a)amd.com> --- Changes in v2: - Add marking for cmd_tftpput config Chnages in v3: - Add filename to upload as part of env file --- test/py/tests/test_net.py | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index b2241ae6a482..2495608786de 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -7,6 +7,7 @@ import pytest import u_boot_utils import uuid +import datetime """ Note: This test relies on boardenv_* containing configuration values to define @@ -51,6 +52,8 @@ env__net_tftp_readable_file = { 'addr': 0x10000000, 'size': 5058624, 'crc32': 'c2244b26', + 'timeout': 50000, + 'fnu': 'ubtest-upload.bin', } # Details regarding a file that may be read from a NFS server. This variable @@ -326,3 +329,71 @@ def test_net_pxe_get(u_boot_console): assert expected_text_default in output assert "Config file 'default.boot' found" in output + +(a)pytest.mark.buildconfigspec("cmd_crc32") +(a)pytest.mark.buildconfigspec("cmd_net") +(a)pytest.mark.buildconfigspec("cmd_tftpput") +def test_net_tftpput(u_boot_console): + """Test the tftpput command. + + A file is downloaded from the TFTP server and then uploaded to the TFTP + server, its size and its CRC32 are validated. + + The details of the file to download are provided by the boardenv_* file; + see the comment at the beginning of this file. + """ + + if not net_set_up: + pytest.skip("Network not initialized") + + f = u_boot_console.config.env.get("env__net_tftp_readable_file", None) + if not f: + pytest.skip("No TFTP readable file to read") + + addr = f.get("addr", None) + if not addr: + addr = u_boot_utils.find_ram_base(u_boot_console) + + sz = f.get("size", None) + timeout = f.get("timeout", u_boot_console.p.timeout) + fn = f["fn"] + fnu = f.get("fnu", "_".join([datetime.datetime.now().strftime("%y%m%d%H%M%S"), fn])) + expected_text = "Bytes transferred = " + if sz: + expected_text += "%d" % sz + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command("tftpboot %x %s" % (addr, fn)) + + assert "TIMEOUT" not in output + assert expected_text in output + + expected_tftpb_crc = f.get("crc32", None) + + output = u_boot_console.run_command("crc32 $fileaddr $filesize") + assert expected_tftpb_crc in output + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command( + "tftpput $fileaddr $filesize $serverip:%s" % (fnu) + ) + + expected_text = "Bytes transferred = " + if sz: + expected_text += "%d" % sz + addr = addr + sz + assert "TIMEOUT" not in output + assert "Access violation" not in output + assert expected_text in output + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command("tftpboot %x %s" % (addr, fnu)) + + expected_text = "Bytes transferred = " + if sz: + expected_text += "%d" % sz + assert "TIMEOUT" not in output + assert expected_text in output + + output = u_boot_console.run_command("crc32 $fileaddr $filesize") + assert expected_tftpb_crc in output -- 2.25.1

2 2

Intermitten Azure CI failures
by Tom Rini 29 Nov '23

29 Nov '23

Hey all, If you see a failure in CI that looks like the one in: filenamehttps://dev.azure.com/u-boot/u-boot/_build/results?buildId=7436&vie… Which is: "FAT: illegal filename (.)" being printed instead of "Unable to write", just hit the re-run job until it passes. I guess Azure changed something under the hood that's causing something to go wrong somewhere else as it's neither consistently failing nor is the test itself failing (we continue to not write an illegal file). -- Tom

1 0

[PATCH v5 0/8] ATF and OP-TEE Firewalling for K3 devices.
by Manorit Chawdhry 29 Nov '23

29 Nov '23

K3 devices have firewalls that are used to prevent illegal accesses to memory regions that are deemed secure. The series prevents the illegal accesses to ATF and OP-TEE regions that are present in different K3 devices. AM62X, AM62AX and AM64X are currently in hold due to some firewall configurations that our System Controller (TIFS) needs to handle. The devices that are not configured with the firewalling nodes will not be affected and can continue to work fine until the firewall nodes are added so will be a non-blocking merge. Test Logs: https://gist.github.com/manorit2001/c929e6ccab03f55b3828896fbd04184b CICD Run: https://github.com/u-boot/u-boot/pull/442 Signed-off-by: Manorit Chawdhry <m-chawdhry(a)ti.com> --- Changes in v5: * Simon - Change and improve the error message - Fix the test case, wasn't working properly previously - Rebase on top of master - Link to v4: https://lore.kernel.org/r/20231011-binman-firewalling-v4-0-a08085d300e9@ti.… --- Manorit Chawdhry (8): binman: ti-secure: Add support for firewalling entities binman: ftest: Add test for ti-secure firewall node binman: k3: Add k3-security.h and include it in k3-binman.dtsi binman: j721e: Add firewall configurations binman: j721s2: Add firewall configurations binman: j7200: Add firewall configurations docs: k3: Cleanup FIT signature documentation docs: k3: Add secure booting documentation arch/arm/dts/k3-binman.dtsi | 2 + arch/arm/dts/k3-j7200-binman.dtsi | 143 ++++++++++ arch/arm/dts/k3-j721e-binman.dtsi | 187 ++++++++++++ arch/arm/dts/k3-j721s2-binman.dtsi | 208 ++++++++++++++ arch/arm/dts/k3-security.h | 58 ++++ doc/board/ti/k3.rst | 315 ++++++++++++++------- tools/binman/btool/openssl.py | 16 +- tools/binman/etype/ti_secure.py | 95 +++++++ tools/binman/etype/x509_cert.py | 4 +- tools/binman/ftest.py | 23 ++ tools/binman/test/319_ti_secure_firewall.dts | 28 ++ .../320_ti_secure_firewall_missing_property.dts | 28 ++ 12 files changed, 1005 insertions(+), 102 deletions(-) --- base-commit: 17e9db18f17b6cad278694d4a61df95e96bdf4f5 change-id: 20230724-binman-firewalling-65ecdb23ec0a Best regards, -- Manorit Chawdhry <m-chawdhry(a)ti.com>

2 9