August 2020 - U-Boot

[PATCH 0/2] efi_loader: set load options in boot manager
by Heinrich Schuchardt 07 Aug '20

07 Aug '20

Up to now we have been using environment variable 'bootargs' in the boot manager to set the load options of the loaded image protocol. Instead we should use the optional data. Heinrich Schuchardt (2): efi_loader: factor out efi_set_load_options() efi_loader: set load options in boot manager cmd/bootefi.c | 75 +++++++++++++++--------------------- cmd/efidebug.c | 4 +- include/efi_loader.h | 5 ++- lib/efi_loader/efi_bootmgr.c | 70 +++++++++++++++++++++++++++------ 4 files changed, 96 insertions(+), 58 deletions(-) -- 2.28.0

1 2

[PATCH 0/3] Misc fixes/cleanup
by Sean Anderson 07 Aug '20

07 Aug '20

These are some miscelleneous fixes which can be applied separately from each other. I have grouped them in the same series, but they do not depend on one another. Sean Anderson (3): doc: Fix typo in FIT documentation spi: Remove uses of #ifdef __U_BOOT__ from spi-mem.c spi: Fix typo in header doc/uImage.FIT/source_file_format.txt | 2 +- drivers/spi/spi-mem.c | 283 -------------------------- include/spi.h | 2 +- 3 files changed, 2 insertions(+), 285 deletions(-) -- 2.28.0

2 5

Re: U-Boot Fails w/ Memory Test
by Brownlie, Lewis 07 Aug '20

07 Aug '20

Thank you for your response Heinrich. I tried running the memory test after relocation instead of before and it seems to have worked. I'm going to debug more to make sure it really did, but in the meantime a couple questions: You wrote: > Have a look at arch_memory_test_prepare(). The function blindly asks to test and thereby overwrite up to 256 MiB from CONFIG_SYS_SDRAM_BASE to gd->bd. > > The test must run *after* relocation. Otherwise we will overwrite U-Boot. > > The end of the memory range tested should be ((uintptr_t)map_sysmem(gd->start_addr_sp, 0) - CONFIG_STACK_SIZE. > > All memory areas marked as reserved in the device tree have to be excluded. 1. Why does the test run after relocation? Everything I've seen has said to do it before, unless I'm completely misunderstanding. For example, in README.post it states (emphasis added by me): Also, all tests will be discriminated by the moment they run at. Specifically, the following groups will be singled out: 1) Tests running before relocating to RAM These tests will run immediately after initializing RAM as to enable modifying it without taking care of its contents. Basically, this group will contain memory tests only. 2) Tests running after relocating to RAM These tests will run immediately before entering the main loop as to guarantee full hardware initialization. 1. Are you suggesting that I need to make any changes to arch_memory_test_prepare()? Or are you just pointing out that function to show that I need to run the test after relocation? The test seems to be working fine now without changing arch_memory_test_prepare(), but I want to make sure. Thank you again for your time, -Lewis

1 0

[PATCH v2 1/7] wdt: dw: Switch to using fls for log2
by Sean Anderson 07 Aug '20

07 Aug '20

log_2_n_round_up is only found in arm. fls performs the same job and is generic. Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- Changes in v2: - Fix fls being off-by-one when compared to log_2_n_round_up drivers/watchdog/designware_wdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 12f09a7a39..f25c8d9ab3 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -9,7 +9,6 @@ #include <reset.h> #include <wdt.h> #include <asm/io.h> -#include <asm/utils.h> #include <linux/bitops.h> #define DW_WDT_CR 0x00 @@ -35,7 +34,7 @@ static int designware_wdt_settimeout(void __iomem *base, unsigned int clk_khz, signed int i; /* calculate the timeout range value */ - i = log_2_n_round_up(timeout * clk_khz) - 16; + i = fls(timeout * clk_khz - 1) - 16; i = clamp(i, 0, 15); writel(i | (i << 4), base + DW_WDT_TORR); -- 2.28.0

1 6

[ANN] U-Boot v2020.10-rc1 released
by Tom Rini 07 Aug '20

07 Aug '20

Hey all, It's the day after release day, and here is v2020.10-rc1. There's a few more PRs I expect to see soon and a few more changes to bring in from my own queue. In terms of a changelog, git log --merges v2020.07..v2020.10-rc1 contains what I've pulled but as always, better PR messages and tags will provide better results here. I'm planning on doing the standard every other Monday -rc releases from here on out and with a release on October 5th. Thanks all! -- Tom

2 3

[PULL] u-boot-usb/master
by Marek Vasut 07 Aug '20

07 Aug '20

The following changes since commit f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1: Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2020-08-04 11:11:02 -0400) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to b5152a653d36c67a34b54c4c1e9eb182e7e5b9d6: usb: xhci: Add virt_to_phys() to support mapped platforms (2020-08-05 09:30:46 +0200) ---------------------------------------------------------------- Stefan Roese (4): usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu) usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq() usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped usb: xhci: Add virt_to_phys() to support mapped platforms drivers/usb/host/usb-uclass.c | 8 ++++---- drivers/usb/host/xhci-mem.c | 30 +++++++++++++++--------------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 4 files changed, 24 insertions(+), 25 deletions(-)

2 1

[PATCH 1/2] IPQ40xx: Add DRAM detection & FDT fixup
by Robert Marko 07 Aug '20

07 Aug '20

Fixup the Linux FDT with the detection of onboard DRAM as provided by SBL (Secondary boot loader) by reading the shared-memory region. Imported from Snapdragon target. Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> Cc: Luka Perkov <luka.perkov(a)sartura.hr> --- arch/arm/mach-ipq40xx/Makefile | 1 + arch/arm/mach-ipq40xx/dram.c | 99 +++++++++++++++++++++++ arch/arm/mach-ipq40xx/include/mach/dram.h | 12 +++ 3 files changed, 112 insertions(+) create mode 100644 arch/arm/mach-ipq40xx/dram.c create mode 100644 arch/arm/mach-ipq40xx/include/mach/dram.h diff --git a/arch/arm/mach-ipq40xx/Makefile b/arch/arm/mach-ipq40xx/Makefile index 08a65b8854..97d72b1723 100644 --- a/arch/arm/mach-ipq40xx/Makefile +++ b/arch/arm/mach-ipq40xx/Makefile @@ -5,5 +5,6 @@ # Author: Robert Marko <robert.marko(a)sartura.hr> obj-y += clock-ipq4019.o +obj-y += dram.o obj-y += pinctrl-snapdragon.o obj-y += pinctrl-ipq4019.o diff --git a/arch/arm/mach-ipq40xx/dram.c b/arch/arm/mach-ipq40xx/dram.c new file mode 100644 index 0000000000..a0dadad85f --- /dev/null +++ b/arch/arm/mach-ipq40xx/dram.c @@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Onboard memory detection for Snapdragon boards + * + * (C) Copyright 2018 Ramon Fried <ramon.fried(a)gmail.com> + * + */ + +#include <common.h> +#include <dm.h> +#include <smem.h> +#include <fdt_support.h> +#include <log.h> +#include <asm/arch/dram.h> + +#define SMEM_USABLE_RAM_PARTITION_TABLE 402 +#define RAM_PART_NAME_LENGTH 16 +#define RAM_NUM_PART_ENTRIES 32 +#define CATEGORY_SDRAM 0x0E +#define TYPE_SYSMEM 0x01 + +struct smem_ram_ptable_hdr { + u32 magic[2]; + u32 version; + u32 reserved; + u32 len; +} __attribute__ ((__packed__)); + +struct smem_ram_ptn { + char name[RAM_PART_NAME_LENGTH]; + u64 start; + u64 size; + u32 attr; + u32 category; + u32 domain; + u32 type; + u32 num_partitions; + u32 reserved[3]; +} __attribute__ ((__packed__)); + +struct smem_ram_ptable { + struct smem_ram_ptable_hdr hdr; + u32 reserved; /* Added for 8 bytes alignment of header */ + struct smem_ram_ptn parts[RAM_NUM_PART_ENTRIES]; +} __attribute__ ((__packed__)); + +#ifndef MEMORY_BANKS_MAX +#define MEMORY_BANKS_MAX 4 +#endif + +int msm_fixup_memory(void *blob) +{ + u64 bank_start[MEMORY_BANKS_MAX]; + u64 bank_size[MEMORY_BANKS_MAX]; + size_t size; + int i; + int count = 0; + struct udevice *smem; + int ret; + struct smem_ram_ptable *ram_ptable; + struct smem_ram_ptn *p; + + ret = uclass_get_device_by_name(UCLASS_SMEM, "smem", &smem); + if (ret < 0) { + printf("Failed to find SMEM node. Check device tree\n"); + return 0; + } + + ram_ptable = smem_get(smem, -1, SMEM_USABLE_RAM_PARTITION_TABLE, &size); + + if (!ram_ptable) { + printf("Failed to find SMEM partition.\n"); + return -ENODEV; + } + + /* Check validy of RAM */ + for (i = 0; i < RAM_NUM_PART_ENTRIES; i++) { + p = &ram_ptable->parts[i]; + if (p->category == CATEGORY_SDRAM && p->type == TYPE_SYSMEM) { + bank_start[count] = p->start; + bank_size[count] = p->size; + debug("Detected memory bank %u: start: 0x%llx size: 0x%llx\n", + count, p->start, p->size); + count++; + } + } + + if (!count) { + printf("Failed to detect any memory bank\n"); + return -ENODEV; + } + + ret = fdt_fixup_memory_banks(blob, bank_start, bank_size, count); + if (ret) + return ret; + + return 0; +} + diff --git a/arch/arm/mach-ipq40xx/include/mach/dram.h b/arch/arm/mach-ipq40xx/include/mach/dram.h new file mode 100644 index 0000000000..0a9eedda41 --- /dev/null +++ b/arch/arm/mach-ipq40xx/include/mach/dram.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Snapdragon DRAM + * Copyright (C) 2018 Ramon Fried <ramon.fried(a)gmail.com> + */ + +#ifndef DRAM_H +#define DRAM_H + +int msm_fixup_memory(void *blob); + +#endif -- 2.26.2

2 5

Re: RISC-V: crash in riscv_get_time()
by Rick Chen 07 Aug '20

07 Aug '20

Hi Heinrich > From: Heinrich Schuchardt [mailto:xypron.glpk@gmx.de] > Sent: Thursday, August 06, 2020 6:45 PM > To: Bin Meng; Rick Jian-Zhi Chen(陳建志) > Cc: U-Boot Mailing List > Subject: RISC-V: crash in riscv_get_time() > > Hello Rick, hello Bin, > > when I run qemu-riscv64_defconfig using > > qemu-system-riscv64 -machine virt -m 1G -nographic \ > -bios u-boot \ > -device virtio-net-device,netdev=net0 \ > -netdev user,id=net0,tftp=tftp > > a crash occurs in riscv_get_time() when executing readq(). > > $ qemu-system-riscv64 --version > QEMU emulator version 5.0.0 (Debian 1:5.0-13) > > Looking at doc/board/emulation/qemu-riscv.rst this should work. > > Is there something missing in the documentation? > You can try this ./qemu-system-riscv64 -nographic -machine virt -bios u-boot -device virtio-net-device,netdev=net0 -netdev user,id=net0,tftp=tftp It can work as below: U-Boot 2020.10-rc1-00299-g89150a9 (Aug 06 2020 - 19:14:01 +0800) CPU: rv64imafdcsu Model: riscv-virtio,qemu DRAM: 128 MiB In: uart@10000000 Out: uart@10000000 Err: uart@10000000 Net: eth0: virtio-net#0 Hit any key to stop autoboot: 0 => help ? - alias for 'help' base - print or set address offset bdinfo - print Board Info structure blkcache - block cache diagnostics and control boot - boot default, i.e., run 'bootcmd' bootd - boot default, i.e., run 'bootcmd' bootefi - Boots an EFI payload from memory bootelf - Boot from an ELF image in memory booti - boot Linux kernel 'Image' format from memory bootm - boot application image from memory bootp - boot image via network using BOOTP/TFTP protocol bootvx - Boot vxWorks from an ELF image cmp - memory compare coninfo - print console devices and information cp - memory copy cpu - display information about CPUs crc32 - checksum calculation dhcp - boot image via network using DHCP/TFTP protocol dm - Driver model low level access echo - echo args to console editenv - edit environment variable env - environment handling commands erase - erase FLASH memory exit - exit script ext2load - load binary file from a Ext2 filesystem ext2ls - list files in a directory (default /) ext4load - load binary file from a Ext4 filesystem ext4ls - list files in a directory (default /) ext4size - determine a file's size false - do nothing, unsuccessfully fatinfo - print information about filesystem fatload - load binary file from a dos filesystem fatls - list files in a directory (default /) fatmkdir - create a directory fatrm - delete a file fatsize - determine a file's size fatwrite - write file into a dos filesystem fdt - flattened device tree utility commands flinfo - print FLASH memory information fstype - Look up a filesystem type fstypes - List supported filesystem types go - start application at address 'addr' gzwrite - unzip and write memory to block device help - print command description/usage iminfo - print header information for application image imxtract - extract a part of a multi-image itest - return true/false on integer compare ln - Create a symbolic link load - load binary file from a filesystem loadb - load binary file over serial line (kermit mode) loads - load S-Record file over serial line loadx - load binary file over serial line (xmodem mode) loady - load binary file over serial line (ymodem mode) loop - infinite loop on address range ls - list files in a directory (default /) lzmadec - lzma uncompress a memory region md - memory display mm - memory modify (auto-incrementing address) mw - memory write (fill) nfs - boot image via network using NFS protocol nm - memory modify (constant address) nvme - NVM Express sub-system panic - Panic with optional message part - disk partition related commands pci - list and access PCI Configuration Space ping - send ICMP ECHO_REQUEST to network host poweroff - Perform POWEROFF of the device printenv - print environment variables protect - enable or disable FLASH write protection pxe - commands to get and boot from pxe files reset - Perform RESET of the CPU run - run commands in an environment variable save - save file to a filesystem setenv - set environment variables setexpr - set environment variable as the result of eval expression showvar - print local hushshell variables size - determine a file's size sleep - delay execution for some time source - run script from memory sysboot - command to get and boot from syslinux files test - minimal test like /bin/sh tftpboot - boot image via network using TFTP protocol true - do nothing, successfully unlz4 - lz4 uncompress a memory region unzip - unzip a memory region version - print monitor, compiler and linker version virtio - virtio block devices sub-system => Thanks, Rick > Best regards > > Heinrich

3 5

Re: [PATCH v2] cmd: exception: unaligned data access on RISC-V
by Rick Chen 07 Aug '20

07 Aug '20

> From: Heinrich Schuchardt [mailto:xypron.glpk@gmx.de] > Sent: Thursday, August 06, 2020 6:35 PM > To: Rick Jian-Zhi Chen(陳建志) > Cc: u-boot(a)lists.denx.de; Leo Yu-Chi Liang(梁育齊); Heinrich Schuchardt > Subject: [PATCH v2] cmd: exception: unaligned data access on RISC-V > > The command 'exception' can be used to test the handling of exceptions. > > Currently the exception command only allows to create an illegal instruction exception on RISC-V. > > Provide a sub-command 'exception unaligned' to cause a misaligned load address exception. > > Adjust the online help for 'exception undefined'. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > --- > v2: > If unaligned access is support, print success message. > --- > cmd/riscv/exception.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > WARNING: Possible new command - make sure you add a test #142: FILE: cmd/riscv/exception.c:11: Other than that, Reviewed-by: Rick Chen <rick(a)andestech.com> > diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index 3c8dbbec0e..9687cec812 100644 > --- a/cmd/riscv/exception.c > +++ b/cmd/riscv/exception.c > @@ -8,6 +8,18 @@ > #include <common.h> > #include <command.h> > > +static int do_unaligned(struct cmd_tbl *cmdtp, int flag, int argc, > + char *const argv[]) > +{ > + asm volatile ( > + "auipc a1, 0\n" > + "ori a1, a1, 3\n" > + "lw a2, (0)(a1)\n" > + ); > + printf("The system supports unaligned access.\n"); > + return CMD_RET_SUCCESS; > +} > + > static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc, > char *const argv[]) > { > @@ -16,6 +28,8 @@ static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc, } > > static struct cmd_tbl cmd_sub[] = { > + U_BOOT_CMD_MKENT(unaligned, CONFIG_SYS_MAXARGS, 1, do_unaligned, > + "", ""), > U_BOOT_CMD_MKENT(undefined, CONFIG_SYS_MAXARGS, 1, do_undefined, > "", ""), > }; > @@ -23,7 +37,8 @@ static struct cmd_tbl cmd_sub[] = { static char exception_help_text[] = > "<ex>\n" > " The following exceptions are available:\n" > - " undefined - undefined instruction\n" > + " undefined - illegal instruction\n" > + " unaligned - load address misaligned\n" > ; > > #include <exception.h> > -- > 2.27.0

2 2

U-Boot Fails w/ Memory Test
by Brownlie, Lewis 07 Aug '20

07 Aug '20

Hello all, I am trying to enable memory POST test for my ARM-based processor. I have reached the point where the U-Boot runs the test and it passes. However, U-Boot later hangs after the following lines: DDR 31.9 GiB (DDR4, 64-bit, CL=22, ECC on) DDR Controller Interleaving Mode: 256B DDR Chip-Select Interleaving Mode: CS0+CS1 My guess is that the memory test is somehow messing something up, even though it passes, but I don't know how. My attempts to debug and figure out the issue have led me to discover that the issue occurs in the relocate_code function. Other than that, I have not been able to figure anything out. If I build and run U-Boot without the memory test, it works fine, so I know the issue has something to do with the test. (The test is called from the board_init_f function.) Does anyone have any ideas what may be wrong and/or what I could do to find the issue? Thank you -Lewis

2 1