September 2017 - U-Boot

[U-Boot] [PATCH 0/3] rockchip: back-to-bootrom: replace assembly-implementation with C-code
by Philipp Tomsich 25 Sep '17

25 Sep '17

Recent discussions confirmed (what the code always assumed): the Rockchip BROM always enters U-Boot with the stack-pointer valid (i.e. the U-Boot startup code is running off the BROM stack). We can thus replace the back-to-bootrom code (i.e. both the save_boot_params and back_to_bootrom implementations) using C-code based on setjmp/longjmp. The new implementation is already structured to allow an easy drop-in of Andy's changes to enter download-mode when returning to the BROM. This entails one minor tweak to asm/system.h, which only exported the save_boot_params_ret prototype for ARMv7, but not for AArch64. Philipp Tomsich (3): arm: make save_boot_params_ret prototype visible for AArch64 rockchip: back-to-bootrom: replace assembly-implementation with C-code rockchip: back-to-bootrom: allow passing a cmd to the bootrom arch/arm/include/asm/arch-rockchip/bootrom.h | 30 +++++++++--- arch/arm/include/asm/system.h | 62 ++++++++++++------------- arch/arm/mach-rockchip/Makefile | 4 +- arch/arm/mach-rockchip/bootrom.c | 54 +++++++++++++++++++++- arch/arm/mach-rockchip/rk3036-board-spl.c | 2 +- arch/arm/mach-rockchip/rk3188-board-tpl.c | 2 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 4 +- arch/arm/mach-rockchip/rk3368-board-tpl.c | 2 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 2 +- arch/arm/mach-rockchip/save_boot_param.S | 69 ---------------------------- 11 files changed, 115 insertions(+), 118 deletions(-) delete mode 100644 arch/arm/mach-rockchip/save_boot_param.S -- 2.1.4

4 8

[U-Boot] [PATCH 00/23] efi_loader implement missing functions
by Heinrich Schuchardt 25 Sep '17

25 Sep '17

This patch sequence contains all patches needed to load iPXE and use it for downloading and executing images via https or http or to mount iSCSI volumes. Network speed on an Odroid C2 reached 30 MB/s which should be enough for most use cases. I have tested the following iPXE commands successfully * dhcp * route * ntp * sanhook iSCSI-target * chain http-target * kernel http-target * boot (after calling kernel) * exit * reboot The only adjustment in iPXE was adding file src/config/local/nap.h with #undef NAP_EFIX86 #undef NAP_EFIARM #define NAP_NULL and src/config/local/myscript.ipxe with #!ipxe shell before building iPXE with make bin-arm64-efi/snp.efi EMBED=config/local/myscript.ipxe The next task will be to put iXPE binaries on a server and to create Travis CI test cases. Heinrich Schuchardt (23): efi_loader: allow return value in EFI_CALL efi_loader: notify when ExitBootServices is invoked efi_loader: support 16 protocols per efi_object efi_loader: rework efi_locate_handle efi_loader: rework efi_search_obj efi_loader: new function efi_search_protocol efi_loader: simplify efi_install_protocol_interface efi_loader: allow creating new handles efi_loader: simplify efi_uninstall_protocol_interface efi_loader: open_info in OpenProtocol efi_loader: open_info in CloseProtocol efi_loader: implement OpenProtocolInformation efi_loader: non-static efi_open_protocol, efi_close_protocol efi_loader: pass GUIDs as const efi_guid_t * efi_loader: implement ConnectController efi_loader: implement DisconnectController efi_loader: efi_net: hwaddr_size = 6 efi_net: return EFI_UNSUPPORTED where appropriate efi_loader: correct bits of receive_filters bit mask efi_loader: use events for efi_net_receive efi_loader: fix efi_net_get_status efi_loader: set parent handle in efi_load_image efi_loader: implement SetWatchdogTimer cmd/bootefi.c | 1 + include/efi_api.h | 83 +++-- include/efi_loader.h | 38 ++- lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_boottime.c | 729 ++++++++++++++++++++++++++++++++---------- lib/efi_loader/efi_net.c | 57 +++- lib/efi_loader/efi_watchdog.c | 58 ++++ 7 files changed, 763 insertions(+), 205 deletions(-) create mode 100644 lib/efi_loader/efi_watchdog.c -- 2.14.1

6 88

[U-Boot] [PATCH 1/3] fs-test: Add FAT16 support
by Tuomas Tynkkynen 25 Sep '17

25 Sep '17

Currently we can only test FAT32 which is the default FAT version that mkfs.vfat creates by default. Instead make it explicitly create either a FAT16 or a FAT32 volume. This allows us to exercise more code, for instance the root directory handling is done differently in FAT32 than the older FATs. Adding FAT12 support is a much bigger job since the test creates a 2.5GB file and the FAT12 maximum partition size is way smaller than that. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> --- test/fs/fs-test.sh | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index b19486419e..2ddac50f90 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -41,7 +41,7 @@ SMALL_FILE="1MB.file" BIG_FILE="2.5GB.file" # $MD5_FILE will have the expected md5s when we do the test -# They shall have a suffix which represents their file system (ext4/fat) +# They shall have a suffix which represents their file system (ext4/fat16/...) MD5_FILE="${OUT_DIR}/md5s.list" # $OUT shall be the prefix of the test output. Their suffix will be .out @@ -104,15 +104,25 @@ function prepare_env() { } # 1st parameter is the name of the image file to be created -# 2nd parameter is the filesystem - fat ext4 etc +# 2nd parameter is the filesystem - fat16 ext4 etc # -F cant be used with fat as it means something else. function create_image() { # Create image if not already present - saves time, while debugging - if [ "$2" = "ext4" ]; then + case "$2" in + fat16) + MKFS_OPTION="-F 16" + FS_TYPE="fat" + ;; + fat32) + MKFS_OPTION="-F 32" + FS_TYPE="fat" + ;; + ext4) MKFS_OPTION="-F" - else - MKFS_OPTION="" - fi + FS_TYPE="ext4" + ;; + esac + if [ ! -f "$1" ]; then fallocate -l 3G "$1" &> /dev/null if [ $? -ne 0 ]; then @@ -123,8 +133,8 @@ function create_image() { exit $? fi fi - mkfs -t "$2" $MKFS_OPTION "$1" &> /dev/null - if [ $? -ne 0 -a "$2" = "fat" ]; then + mkfs -t "$FS_TYPE" $MKFS_OPTION "$1" &> /dev/null + if [ $? -ne 0 -a "$FS_TYPE" = "fat" ]; then # If we fail and we did fat, try vfat. mkfs -t vfat $MKFS_OPTION "$1" &> /dev/null fi @@ -136,7 +146,7 @@ function create_image() { } # 1st parameter is image file -# 2nd parameter is file system type - fat/ext4 +# 2nd parameter is file system type - fat16/ext4/... # 3rd parameter is name of small file # 4th parameter is name of big file # 5th parameter is fs/nonfs/sb - to dictate generic fs commands or @@ -149,7 +159,7 @@ function test_image() { length="0x00100000" case "$2" in - fat) + fat*) FPATH="" PREFIX="fat" WRITE="write" @@ -550,7 +560,7 @@ TOTAL_PASS=0 # In each loop, for a given file system image, we test both the # fs command, like load/size/write, the file system specific command # like: ext4load/ext4size/ext4write and the sb load/ls/save commands. -for fs in ext4 fat; do +for fs in ext4 fat16 fat32; do echo "Creating $fs image if not already present." IMAGE=${IMG}.${fs}.img @@ -563,11 +573,14 @@ for fs in ext4 fat; do # Lets mount the image and test sb hostfs commands mkdir -p "$MOUNT_DIR" - if [ "$fs" = "fat" ]; then + case "$fs" in + fat*) uid="uid=`id -u`" - else + ;; + *) uid="" - fi + ;; + esac sudo mount -o loop,rw,$uid "$IMAGE" "$MOUNT_DIR" sudo chmod 777 "$MOUNT_DIR" -- 2.13.0

3 8

[U-Boot] FAT filesystems and mtools-created filesystems
by Tuomas Tynkkynen 24 Sep '17

24 Sep '17

Hi, FAT file systems created by GNU mtools have a problem that mtools doesn't initialize the first cluster field of the '.' and '..' directory entries. That is, with the following script: mkdir fattmp cd fattmp mkdir -p foo/bar/baz touch foo/bar/baz/biff truncate -s 16M ../fattest.img mkfs.vfat ../fattest.img mcopy -bpsvm -i ../fattest.img ./* :: ... `fsck.vfat ../fattest.img` outputs: /FOO/BAR/. Start (0) does not point to parent (3) /FOO/BAR/.. Start (0) does not point to .. (4) /FOO/BAR/BAZ/. Start (0) does not point to parent (2) /FOO/BAR/BAZ/.. Start (0) does not point to .. (3) Now that's of course a bug in mtools, but the tricky thing is that Linux is fine with that (and probably Windows as well, or they would have drowned in complaints), presumably due to both OSes resolving '.' and ''..' in their VFS layers. I'm not sure if this problem has always been there but I've started to see "Invalid FAT entry" prints lately, presumably since the "fat/fs: convert to directory iterators" change. In my case it accidentally works anyway, since I have an entry like 'LINUX ../foo/bar' in extlinux/extlinux.conf and an invalid FAT entry somehow makes it back to the root directory. So should we 1) Ignore the problem and call mtools broken 2) Hack around this in the FAT driver 3) Special-case '.' and '..' in the common directory traversal code?

3 3

[U-Boot] [PATCH 00/17] efi_loader: Simple Network Protocol
by Heinrich Schuchardt 24 Sep '17

24 Sep '17

This patch series focuses on * correction of parameter types for boot services * fixes for the SetMem and CopyMem boot services * fixes for the simple network protocol implementation (SNP) * a unit test for SetMem, CopyMem and the simple network protocol The unit test broadcasts a DHCPDISCOVER messager over the network and receives the reply. This patch series is based on * efi-next tree https://github.com/agraf/u-boot/tree/efi-next * [PATCH 1/1] efi_selftest: enable CONFIG_CMD_BOOTEFI_SELFTEST https://patchwork.ozlabs.org/patch/816412/ This patch enables the unit test on qemu-x86_defconfig * [PATCH 1/1] efi_loader: provide function comments for boot services https://patchwork.ozlabs.org/patch/817010/ Successfully tested on Travis CI: https://travis-ci.org/xypron2/u-boot/builds/279231511 Heinrich Schuchardt (17): efi_loader: call EFI_EXIT in efi_copy_mem, efi_set_mem efi_loader: parameters of CopyMem and SetMem efi_loader: pass GUIDs as const efi_guid_t * efi_loader: wrong type in wait_for_event efi_loader: incorrect definition of EFI_SIMPLE_NETWORK_PROTOCOL efi_loader: correct bits of receive_filters bit mask efi_loader: fill simple network protocol revision efi_loader: efi_net: hwaddr_size = 6 efi_net: return EFI_UNSUPPORTED where appropriate efi_loader: use events for efi_net_receive efi_loader: implement WaitForPacket event efi_loader: fix efi_net_get_status efi_loader: size fields in SimpleNetworkProtocol efi_loader: fill return values in SimpleNetworkProtocol efi_selftest: correct definition of efi_st_error efi_selftest: allow printing MAC addresses efi_loader: supply EFI network test include/efi_api.h | 62 +++-- include/efi_selftest.h | 4 +- lib/efi_loader/efi_boottime.c | 54 ++-- lib/efi_loader/efi_net.c | 144 +++++++++-- lib/efi_selftest/Makefile | 3 + lib/efi_selftest/efi_selftest_console.c | 41 ++- lib/efi_selftest/efi_selftest_events.c | 2 +- lib/efi_selftest/efi_selftest_snp.c | 442 ++++++++++++++++++++++++++++++++ lib/efi_selftest/efi_selftest_tpl.c | 2 +- 9 files changed, 680 insertions(+), 74 deletions(-) create mode 100644 lib/efi_selftest/efi_selftest_snp.c -- 2.14.1

1 17

[U-Boot] [PATCH 1/1] efi_loader: fix bug in efi_add_known_memory
by Heinrich Schuchardt 24 Sep '17

24 Sep '17

In efi_add_known_memory the start address is correctly rounded up to a mulitple of EFI_PAGE_SIZE. By this rounding we may loose up to EFI_PAGE_MASK bytes. The current code does not take this loss of available memory into account when calculating the number of pages. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_memory.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index c1a080e2e9..38b0e1d808 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -444,8 +444,14 @@ __weak void efi_add_known_memory(void) u64 ram_start = gd->bd->bi_dram[i].start; u64 ram_size = gd->bd->bi_dram[i].size; u64 start = (ram_start + EFI_PAGE_MASK) & ~EFI_PAGE_MASK; - u64 pages = (ram_size + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; + u64 pages; + if (ram_size <= EFI_PAGE_MASK) + continue; + pages = (ram_start + ram_size - start + EFI_PAGE_MASK) >> + EFI_PAGE_SHIFT; + if (pages == 0) + continue; efi_add_memory_map(start, pages, EFI_CONVENTIONAL_MEMORY, false); } -- 2.11.0

2 2

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 24 Sep '17

24 Sep '17

The following changes since commit 91ebf300934461e450f5ef8f386ea9e55d2636c5: Travis-CI: Checkout only v1.4.3 of dtc (2017-09-22 07:40:06 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to a7d5b6c6686f6f51a750781ff12a360dc64d1076: arm: socfpga: Configuration for EFI boot on DE0-nano-SoC (2017-09-23 15:13:20 +0200) ---------------------------------------------------------------- Frank Kunz (1): arm: socfpga: Configuration for EFI boot on DE0-nano-SoC Masahiro Yamada (2): ARM: socfpga: remove unneeded NAND config options ARM: socfpga: fix duplicate const specifier warning arch/arm/mach-socfpga/misc_gen5.c | 2 +- configs/socfpga_de0_nano_soc_defconfig | 3 +++ include/configs/socfpga_common.h | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-)

2 1

[U-Boot] Please pull u-boot-fsl-qoriq master
by York Sun 24 Sep '17

24 Sep '17

Tom, The following changes since commit 91ebf300934461e450f5ef8f386ea9e55d2636c5: Travis-CI: Checkout only v1.4.3 of dtc (2017-09-22 07:40:06 -0400) are available in the git repository at: git://git.denx.de/u-boot-fsl-qoriq.git for you to fetch changes up to 09c6778d9f5c85c40d8a81722c98142975c2a01e: armv8: ls1046ardb: disable PPA loading during SPL stage for SD boot (2017-09-22 12:49:51 -0700) ---------------------------------------------------------------- Ashish Kumar (1): armv8: fsl-layerscape: Put SATA code under SATA configs Bharat Bhushan (1): pci: layerscape: Fixup iommu-map for LS208xA Priyanka Jain (2): board/ls2080ardb: Add mcmemsize variable in default env board/ls2080ardb: Update board env based on SoC Santan Kumar (2): board/ls2080ardb: Remove CONFIG_DISPLAY_BOARDINFO_LATE board/ls2081ardb: Update QSPI flash type from n25q512a to s25fs512s Sriram Dash (2): armv8: fsl: ifc: Put IFC related code under CONFIG_FSL_IFC armv8: fsl: i2c: Put I2C related code under CONFIG_SYS_I2C Yangbo Lu (3): armv8: ls1043a: disable IFC in SPL only when QSPI is used armv8: ls1043ardb: disable PPA loading during SPL stage for SD boot armv8: ls1046ardb: disable PPA loading during SPL stage for SD boot York Sun (1): armv7: ls1021a: Fix marco CONFIG_LS102XA arch/arm/cpu/armv8/fsl-layerscape/soc.c | 8 +++++++- arch/arm/dts/fsl-ls2081a-rdb.dts | 4 ++-- arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 10 ++++++++++ board/freescale/ls2080ardb/ls2080ardb.c | 12 ++++++++++++ configs/ls1043ardb_sdcard_defconfig | 1 - configs/ls1046ardb_sdcard_defconfig | 1 - drivers/pci/pcie_layerscape_fixup.c | 19 ++++++++++++++----- include/configs/ls1043a_common.h | 2 +- include/configs/ls2080ardb.h | 8 ++------ include/usb/ehci-ci.h | 2 +- 10 files changed, 49 insertions(+), 18 deletions(-) Thanks. York

2 1

[U-Boot] [PATCH] serial: serial_sh: take into account port->clk_mode for SH7785/7786
by Thomas Petazzoni 24 Sep '17

24 Sep '17

In the SH7785/SH7786 case, the SCSCR value is harcoded to be 0x3a, which means bits CKE1/CKE0 have the value 10b. This tells the SCIF that the "External clock/SCIF_SCK pin functions as clock input". However, this is not the case in all designs, and it's the purpose of the clk_mode = EXT_CLK to indicate such a setting. In order for the serial_sh driver to work on a SH7786 platform that does not use SCIF_SCK as a clock input, we have to adjust the SCSCR_INIT value, to have CKE1/CKE0 set to 00b. This is similar to what is done for other SH platforms. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> --- drivers/serial/serial_sh.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index 4d27122..d7bbd1a 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -184,7 +184,8 @@ struct uart_port { # define SCSPTR4 0xffee0024 /* 16 bit SCIF */ # define SCSPTR5 0xffef0024 /* 16 bit SCIF */ # define SCIF_ORER 0x0001 /* Overrun error bit */ -# define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ +# define SCSCR_INIT(port) (port->clk_mode == EXT_CLK ? 0x3a : 0x38) + /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ #elif defined(CONFIG_CPU_SH7201) || \ defined(CONFIG_CPU_SH7203) || \ defined(CONFIG_CPU_SH7206) || \ -- 2.9.4

2 3

[U-Boot] [PATCH 1/2] arm: mvebu: fix boot from UART on ClearFog Base
by Baruch Siach 24 Sep '17

24 Sep '17

The ClearFog Base boot from UART when setting the DIP switches to 01001. Unfortunately, the SPL code sometimes fails to detect the UART boot method at run-time. Add an alternative SAR UART boot value to fix this. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- arch/arm/mach-mvebu/include/mach/soc.h | 1 + arch/arm/mach-mvebu/spl.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 0900e4008c12..44bac63b4447 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -139,6 +139,7 @@ #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) #define BOOT_FROM_UART 0x28 +#define BOOT_FROM_UART_ALT 0x3f #define BOOT_FROM_SPI 0x32 #define BOOT_FROM_MMC 0x30 #define BOOT_FROM_MMC_ALT 0x31 diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 3cf02a54cea2..4b9c41360589 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -42,6 +42,7 @@ static u32 get_boot_device(void) return BOOT_DEVICE_MMC1; #endif case BOOT_FROM_UART: + case BOOT_FROM_UART_ALT: return BOOT_DEVICE_UART; case BOOT_FROM_SPI: default: -- 2.14.1

2 5