April 2022 - U-Boot

[PATCH v3 0/6] meson: add clk and adc support for JetHub D1 (j100)
by Vyacheslav Bocharov 25 Apr '22

25 Apr '22

Prepare to use ADC channel 1 in JetHub D1 (j100) to check the hardware revision of the board. - add support for AXG in saradc driver - add simple clk-ao driver for AXG (base is taken from g12a) - enable saradc in dts and board config file - fix typo in the g12a-clk-ao driver name - move clk->id check to .request function for g12a-clk-ao driver - remove unnecessary check (gate->reg == 0) in g12a-clk-ao driver - enable saradc in dts/board config for JetHub D1 (j100) >From v2: - remove unnecessary check (gate->reg == 0) in axg/g12a clk-ao drivers - move j100 dts changes to -u-boot.dtsi >From v1: - move clk-id check to .request function for axg/g12a-ao clk driver Vyacheslav Bocharov (6): clk: meson: add minimal driver for axg-ao clocks clk: meson: fix driver name for g12a-ao clocks clk: meson: update driver for g12a-ao clocks adc: meson-saradc: add AXG variant board: amlogic: jethub j100: enable saradc in dts board: amlogic: jethub j100: enable saradc in config .../meson-axg-jethome-jethub-j100-u-boot.dtsi | 10 +++ configs/jethub_j100_defconfig | 5 ++ drivers/adc/meson-saradc.c | 2 + drivers/clk/meson/Makefile | 1 + drivers/clk/meson/axg-ao.c | 86 +++++++++++++++++++ drivers/clk/meson/g12a-ao.c | 17 ++-- 6 files changed, 114 insertions(+), 7 deletions(-) create mode 100644 arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi create mode 100644 drivers/clk/meson/axg-ao.c -- 2.30.2

3 12

[PATCH] usb: dwc3: Fix non-usb3 configurations
by Jan Kiszka 25 Apr '22

25 Apr '22

From: Jan Kiszka <jan.kiszka(a)siemens.com> Missing nodes may also be signaled via -ENODATA. We need to check for that to prevent failing in non-usb3 setups. Furthermore, dev.phy must be NULL'ed in case usb3-phy was not found. Fixes: 142d50fbce7c ("usb: dwc3: Add support for usb3-phy PHY configuration") Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- drivers/usb/dwc3/dwc3-generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 6e1a1d066b4..c5310e465cb 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -468,9 +468,11 @@ static int dwc3_glue_probe(struct udevice *dev) ret = generic_phy_init(&phy); if (ret) return ret; - } else if (ret != -ENOENT) { + } else if (ret != -ENOENT && ret != -ENODATA) { debug("could not get phy (err %d)\n", ret); return ret; + } else { + phy.dev = NULL; } glue->regs = dev_read_addr(dev); -- 2.34.1

2 1

[PATCH] crypto/fsl: fsl_rsa: Fix dcache issue in the driver
by Gaurav Jain 25 Apr '22

25 Apr '22

From: Ye Li <ye.li(a)nxp.com> issue: CAAM fails with key error when perform Modular Exponentiation using PKHA Block in CAAM Fix: add flush and invalidate dcache for keys, signature and output decrypted data processed by CAAM. Fixes: 34276478f7 (DM: crypto/fsl - Add Freescale rsa DM driver) Signed-off-by: Ye Li <ye.li(a)nxp.com> Reviewed-by: Gaurav Jain <gaurav.jain(a)nxp.com> Acked-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/crypto/fsl/fsl_rsa.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c index 897ee855ea..7ea0c193f9 100644 --- a/drivers/crypto/fsl/fsl_rsa.c +++ b/drivers/crypto/fsl/fsl_rsa.c @@ -36,12 +36,21 @@ int fsl_mod_exp(struct udevice *dev, const uint8_t *sig, uint32_t sig_len, inline_cnstr_jobdesc_pkha_rsaexp(desc, &pkin, out, sig_len); + flush_dcache_range((ulong)sig, (ulong)(sig + sig_len)); + flush_dcache_range((ulong)prop->modulus, (ulong)(prop->modulus) + keylen); + flush_dcache_range((ulong)prop->public_exponent, + (ulong)(prop->public_exponent) + prop->exp_len); + flush_dcache_range((ulong)desc, (ulong)desc + (sizeof(uint32_t) * MAX_CAAM_DESCSIZE)); + flush_dcache_range((ulong)out, (ulong)out + sig_len); + ret = run_descriptor_jr(desc); if (ret) { debug("%s: RSA failed to verify: %d\n", __func__, ret); return -EFAULT; } + invalidate_dcache_range((ulong)out, (ulong)sig_len); + return 0; } -- 2.25.1

1 0

[PATCH v3 0/2] usb: dwc3: Enable PHY support
by Michal Simek 25 Apr '22

25 Apr '22

Hi, I am sending two patches for adding PHY support for DWC3 driver. For getting this work one header patch is required to fix issue with am57xx_hs_evm_usb_defconfig which enabled CONFIG_PHY and DWC3 drivers for U-Boot proper but doesn't enable CONFIG_SPL_PHY support. That's why there is a need to use CONFIG_IS_ENABLED macro to also properly handle SPL builds. Marek: Please take both of these patches via your usb tree. Thanks, Michal Changes in v3: - Add cover letter Changes in v2: - based on bug reported by Marek https://lore.kernel.org/all/d7adc9a4-f505-eaab-8cd9-45f778bc3b4a@denx.de/ - Add missing header Michal Simek (2): generic-phy: s/CONFIG_PHY/CONFIG_IS_ENABLED(PHY)/ usb: dwc3: Add support for usb3-phy PHY configuration drivers/usb/dwc3/dwc3-generic.c | 18 ++++++++++++++++++ include/generic-phy.h | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) -- 2.35.1

3 10

[PATCH] env: Couple networking-related variable flags to CONFIG_NET
by Jan Kiszka 25 Apr '22

25 Apr '22

From: Jan Kiszka <jan.kiszka(a)siemens.com> Boards may set networking variables programmatically, thus may have CONFIG_NET on but CONFIG_CMD_NET off. The IOT2050 is an example. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- env/flags.c | 10 +++++----- include/env_flags.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/env/flags.c b/env/flags.c index e3e833c4333..e2866361dfe 100644 --- a/env/flags.c +++ b/env/flags.c @@ -22,7 +22,7 @@ #include <env_internal.h> #endif -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET #define ENV_FLAGS_NET_VARTYPE_REPS "im" #else #define ENV_FLAGS_NET_VARTYPE_REPS "" @@ -57,7 +57,7 @@ static const char * const env_flags_vartype_names[] = { "decimal", "hexadecimal", "boolean", -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET "IP address", "MAC address", #endif @@ -211,7 +211,7 @@ static void skip_num(int hex, const char *value, const char **end, *end = value; } -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET int eth_validate_ethaddr_str(const char *addr) { const char *end; @@ -244,7 +244,7 @@ static int _env_flags_validate_type(const char *value, enum env_flags_vartype type) { const char *end; -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET const char *cur; int i; #endif @@ -273,7 +273,7 @@ static int _env_flags_validate_type(const char *value, if (value[1] != '\0') return -1; break; -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET case env_flags_vartype_ipaddr: cur = value; for (i = 0; i < 4; i++) { diff --git a/include/env_flags.h b/include/env_flags.h index 313cb8c49a6..b49ec8e80f1 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -12,7 +12,7 @@ enum env_flags_vartype { env_flags_vartype_decimal, env_flags_vartype_hex, env_flags_vartype_bool, -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET env_flags_vartype_ipaddr, env_flags_vartype_macaddr, #endif @@ -111,7 +111,7 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags); */ enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags); -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET /* * Check if a string has the format of an Ethernet MAC address */ -- 2.34.1

1 0

Re: [PATCH] nds32: Remove the architecture
by Rick Chen 25 Apr '22

25 Apr '22

Hi, Tom, > From: Tom Rini <trini(a)konsulko.com> > Sent: Wednesday, April 20, 2022 2:43 AM > To: u-boot(a)lists.denx.de; Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com> > Subject: Re: [PATCH] nds32: Remove the architecture > > On Wed, Apr 06, 2022 at 09:21:25AM -0400, Tom Rini wrote: > > > As removal of nds32 has been ack'd for the Linux kernel, remove > > support here as well. > > > > Cc: Rick Chen <rick(a)andestech.com> > > Signed-off-by: Tom Rini <trini(a)konsulko.com> > > Ping? Sorry for the late responses. Thanks for the information. Thanks, Rick > > -- > Tom

2 2

[PATCH] arm: sunxi: dram: restore previous value in DRAM
by Andrei Lalaev 24 Apr '22

24 Apr '22

It's better to restore previous value at offset because otherwise the function can corrupt memory reserved by Linux (e.g. ramoops). Signed-off-by: Andrei Lalaev <andrei.lalaev(a)emlid.com> --- arch/arm/mach-sunxi/dram_helpers.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c index 2c873192e6..ed6db14f3c 100644 --- a/arch/arm/mach-sunxi/dram_helpers.c +++ b/arch/arm/mach-sunxi/dram_helpers.c @@ -32,12 +32,20 @@ void mctl_await_completion(u32 *reg, u32 mask, u32 val) #ifndef CONFIG_MACH_SUNIV bool mctl_mem_matches(u32 offset) { + ulong addr = CONFIG_SYS_SDRAM_BASE + offset; + u32 prev_val = readl(addr); + bool ret = false; + /* Try to write different values to RAM at two addresses */ writel(0, CONFIG_SYS_SDRAM_BASE); - writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset); + writel(0xaa55aa55, addr); dsb(); /* Check if the same value is actually observed when reading back */ - return readl(CONFIG_SYS_SDRAM_BASE) == - readl((ulong)CONFIG_SYS_SDRAM_BASE + offset); + ret = readl(CONFIG_SYS_SDRAM_BASE) == readl(addr); + + /* Restore previous value */ + writel(prev_val, addr); + + return ret; } #endif -- 2.25.1

2 1

[PATCH 0/7] disk: don't compile in partition support for spl/tpl if not really necessary
by AKASHI Takahiro 23 Apr '22

23 Apr '22

This is a reworked version of my RFC[1]. When my patch[2] is applied, the size of SPL code on some platform might exceed the limit of ROM size due to partition support code (disk/*) being built in even if none of partition table types (CONFIG_*_PARTITION) is enabled on that particular platform. This is generally inconvenient and should be fixed. The patch#7 is a core part to fix the issue and the rest of patches are to fix related build errors revealed/caused by this change. [1] https://lists.denx.de/pipermail/u-boot/2022-April/481531.html [2] https://lists.denx.de/pipermail/u-boot/2022-April/481532.html Test: ===== * Azure CI passed[3] [3] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=4092&view=results Change history: =============== v1 (Apr, 18, 2022) * split the original RFC into a set of patches * remove hunks against CMD_PART and cortina_presidio-asic-emmc_defconfig which are no longer needed. * use 'imply' rather than 'select' for dependency of PARTITION_UUIDS at EFI_LOADER, dropping DOS_PARTITON (patch#5) * compile efi_disk.c even if BLK without PARTITION (patch#6) RFC (Apr 15, 2021) * initial RFC AKASHI Takahiro (7): disk: include errno.h explicitly in part.h disk: enable function prototypes in part.h for SPL/TPL disk: define nullified functions for !PARTITIONS sandbox: move a function prototype efi_loader: PARTITION_UUIDS should be optional efi_loader: disk: compile efi_disk when CONFIG_BLK disk: don't compile in partition support for spl/tpl if not really necessary disk/Kconfig | 37 ++++++++++++++++---------------- include/part.h | 15 ++++++++++--- include/sandboxblockdev.h | 2 ++ lib/efi_loader/Kconfig | 2 +- lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_device_path.c | 11 +++++++++- 6 files changed, 45 insertions(+), 24 deletions(-) -- 2.33.0

3 18

[PATCH 0/7] binman: Fix replacing FIT subentries
by Alper Nebi Yasak 23 Apr '22

23 Apr '22

Converting the binman FIT entry type to a section ended up breaking the ability to replace these in images. The conversion to section partially enables extracting and replacing the subentries, but that also doesn't work as intended. This series gets binman to a point where it can extract FIT subentries and replace their non-section leaf entries correctly. Replacing sections of any kind doesn't really work right now, so the final patch disables that by raising an error. Initially, I had managed to replace sections by propagating changes in ProcessContentsUpdate() to the child entries, but writing arbitrary data into entries representing data in a certain format quickly gets into weird (maybe even undecidable?) edge cases. Just recently I had a better idea. Instead of writing incompatible data into a section, we can replace the section entry/node with for example a blob-ext entry/node for the input file. I've got this working as a proof of concept, but I need to experiment more to see what works best. Alper Nebi Yasak (7): binman: Fix unique names having '/.' for images read from files binman: Collect bintools for images when replacing entries binman: Don't reset offset/size if image doesn't allow repacking binman: Remove '/images/' fragment from FIT subentry paths binman: Create FIT subentries in the FIT section, not its parent binman: Test replacing non-section entries in FIT subsections binman: Refuse to replace sections for now tools/binman/control.py | 3 +- tools/binman/entry.py | 2 +- tools/binman/etype/_testing.py | 36 ++++ tools/binman/etype/fit.py | 15 +- tools/binman/etype/section.py | 3 + tools/binman/ftest.py | 179 ++++++++++++++++++ tools/binman/test/230_unique_names.dts | 34 ++++ tools/binman/test/231_unique_names_multi.dts | 38 ++++ .../binman/test/232_replace_with_bintool.dts | 39 ++++ tools/binman/test/233_fit_extract_replace.dts | 74 ++++++++ .../test/234_replace_section_simple.dts | 23 +++ 11 files changed, 438 insertions(+), 8 deletions(-) create mode 100644 tools/binman/test/230_unique_names.dts create mode 100644 tools/binman/test/231_unique_names_multi.dts create mode 100644 tools/binman/test/232_replace_with_bintool.dts create mode 100644 tools/binman/test/233_fit_extract_replace.dts create mode 100644 tools/binman/test/234_replace_section_simple.dts -- 2.35.1

2 14

[PATCH] arm: apple: Point stdout-path to framebuffer when keyboard present
by Mark Kettenis 23 Apr '22

23 Apr '22

Unless you have a spare Apple Silicon machine, getting access to the serial port on Apple Silicon machines requires special hardware. Given that most machines come with a built-in screen the framebuffer is likely to be the most convenient output device for most users. While U-Boot will output to both serial and framebuffer, OSes might not. Therefore set stdout-path to point at /chosen/framebuffer when a keyboard is connected to the machine. This behaviour can be overridden by setting the "stdout" variable in the U-Boot environment. I addition to that keep the serial console as the default when running under the m1n1 hypervisor. The m1n1 hypervisor virtualizes the serial port such that it can be easily accessed from any other machine with a USB port. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> Reviewed-by: Janne Grunau <j(a)jannau.net> Tested-by: Janne Grunau <j(a)jannau.net> --- arch/arm/Kconfig | 1 + arch/arm/mach-apple/board.c | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index efe33a58e1..138ba1b073 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -994,6 +994,7 @@ config ARCH_APPLE select DM_VIDEO select IOMMU select LINUX_KERNEL_IMAGE_HEADER + select OF_BOARD_SETUP select OF_CONTROL select PINCTRL select POSITION_INDEPENDENT diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index ffc1301cf5..1525a9edee 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <dm/uclass-internal.h> #include <efi_loader.h> #include <lmb.h> @@ -461,3 +462,42 @@ int board_late_init(void) return 0; } + +int ft_board_setup(void *blob, struct bd_info *bd) +{ + struct udevice *dev; + const char *stdoutname; + int node, ret; + + /* + * Modify the "stdout-path" property under "/chosen" to point + * at "/chosen/framebuffer if a keyboard is available and + * we're not running under the m1n1 hypervisor. + * Developers can override this behaviour by dropping + * "vidconsole" from the "stdout" environment variable. + */ + + /* EL1 means we're running under the m1n1 hypervisor. */ + if (current_el() == 1) + return 0; + + ret = uclass_find_device(UCLASS_KEYBOARD, 0, &dev); + if (ret < 0) + return 0; + + stdoutname = env_get("stdout"); + if (!stdoutname || !strstr(stdoutname, "vidconsole")) + return 0; + + /* Make sure we actually have a framebuffer. */ + node = fdt_path_offset(blob, "/chosen/framebuffer"); + if (node < 0 || !fdtdec_get_is_enabled(blob, node)) + return 0; + + node = fdt_path_offset(blob, "/chosen"); + if (node < 0) + return 0; + fdt_setprop_string(blob, node, "stdout-path", "/chosen/framebuffer"); + + return 0; +} -- 2.35.1

2 1