June 2018 - U-Boot

[U-Boot] [PULL] efi patch queue 2018-06-14
by Alexander Graf 16 Jun '18

16 Jun '18

Hi Tom, This is my current patch queue for efi. Please pull. Alex The following changes since commit acaee30608ce203289a180d664b7f0abb2e64ee7: ARM: DTS: resync a3517.dtsi with Linux 4.17 (2018-06-13 07:49:14 -0400) are available in the git repository at: git://github.com/agraf/u-boot.git tags/signed-efi-next for you to fetch changes up to 58bc69d20aaf2e32e93e977d708fe6a1af0ad6d1: efi_loader: Allocate memory handle for mem dp (2018-06-14 10:53:37 +0200) ---------------------------------------------------------------- Patch queue for efi - 2018-06-14 A few minor fixes for the release: - Compile fixes - HI20 relocations for RISC-V - Fix bootefi without load path - Fix Runtime Services with certain compilers ---------------------------------------------------------------- Alexander Graf (3): riscv: Add support for HI20 PE relocations efi_loader: Convert runtime reset from switch to if statements efi_loader: Allocate memory handle for mem dp Heinrich Schuchardt (2): efi_loader: avoid initializer element is not constant efi_loader: avoid make race condition Simon Glass (1): efi: Add a comment about duplicated ELF constants arch/arm/cpu/armv8/fwcall.c | 11 ++++------- arch/arm/mach-bcm283x/reset.c | 11 ++++------- cmd/bootefi.c | 9 +++++++++ disk/part_efi.c | 9 +++++++-- include/efi.h | 3 +-- include/pe.h | 3 +++ lib/efi_loader/efi_image_loader.c | 14 ++++++++++++++ lib/efi_loader/efi_runtime.c | 4 ++++ scripts/Makefile.lib | 10 ++++++++-- 9 files changed, 54 insertions(+), 20 deletions(-)

2 1

[U-Boot] [PATCH] ARM: rmobile: Disable 4k SF sectors on V3M Eagle
by Marek Vasut 16 Jun '18

16 Jun '18

The V3M Eagle uses flash with 128 kiB or 256 kiB sectors, disable the 4k sector support. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- configs/r8a77970_eagle_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index f1e2ecaa0e..889fc6e83b 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -50,6 +50,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y -- 2.17.1

1 0

[U-Boot] [PATCH 1/4] ARM: dts: rmobile: Add AVB pinmux on V3M Eagle
by Marek Vasut 16 Jun '18

16 Jun '18

Add EtherAVB pinmux node on V3M Eagle to set the pinmux configuration. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- arch/arm/dts/r8a77970-eagle.dts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/dts/r8a77970-eagle.dts b/arch/arm/dts/r8a77970-eagle.dts index b75f38581c..0c555b8dde 100644 --- a/arch/arm/dts/r8a77970-eagle.dts +++ b/arch/arm/dts/r8a77970-eagle.dts @@ -32,6 +32,8 @@ }; &avb { + pinctrl-0 = <&avb0_pins>; + pinctrl-names = "default"; renesas,no-ether-link; phy-handle = <&phy0>; phy-mode = "rgmii-id"; @@ -69,6 +71,13 @@ }; &pfc { + avb0_pins: avb { + mux { + groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk"; + function = "avb0"; + }; + }; + i2c0_pins: i2c0 { groups = "i2c0"; function = "i2c0"; -- 2.17.1

1 3

[U-Boot] [PATCH v2] usb: sunxi: access ahb_reset0_cfg in CCM using its offset
by Vasily Khoruzhick 16 Jun '18

16 Jun '18

struct sunxi_ccm_reg doesn't have ahb_reset0_cfg on sun4i and sun5i, thus compilation fails with: drivers/usb/host/ohci-sunxi.c:96:26: error: 'struct sunxi_ccm_reg' has no member named 'ahb_reset0_cfg' Access this reg using its offset to fix this issue. Fixes commit 1ed9c1118 ("usb: sunxi: ehci: get rid of ifdefs") and commit 56830cee3 ("usb: sunxi: ohci: get rid of ifdefs") Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- drivers/usb/host/ehci-sunxi.c | 21 ++++++++++++++++++--- drivers/usb/host/ohci-sunxi.c | 22 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c index 35fbe03331..97d06d5975 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -22,14 +22,19 @@ #define AHB_CLK_DIST 1 #endif +#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0 +#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0 + struct ehci_sunxi_cfg { bool has_reset; u32 extra_ahb_gate_mask; + u32 reset0_cfg_offset; }; struct ehci_sunxi_priv { struct ehci_ctrl ehci; struct sunxi_ccm_reg *ccm; + u32 *reset0_cfg; int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ struct phy phy; const struct ehci_sunxi_cfg *cfg; @@ -49,6 +54,9 @@ static int ehci_usb_probe(struct udevice *dev) if (IS_ERR(priv->ccm)) return PTR_ERR(priv->ccm); + priv->reset0_cfg = (void *)priv->ccm + + priv->cfg->reset0_cfg_offset; + phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells"); if (phys < 0) { phys = 0; @@ -86,7 +94,7 @@ no_phy: setbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask | extra_ahb_gate_mask); if (priv->cfg->has_reset) - setbits_le32(&priv->ccm->ahb_reset0_cfg, + setbits_le32(priv->reset0_cfg, priv->ahb_gate_mask | extra_ahb_gate_mask); hcor = (struct ehci_hcor *)((uintptr_t)hccr + @@ -113,7 +121,7 @@ static int ehci_usb_remove(struct udevice *dev) return ret; if (priv->cfg->has_reset) - clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); + clrbits_le32(priv->reset0_cfg, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); return 0; @@ -125,11 +133,18 @@ static const struct ehci_sunxi_cfg sun4i_a10_cfg = { static const struct ehci_sunxi_cfg sun6i_a31_cfg = { .has_reset = true, + .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET, }; static const struct ehci_sunxi_cfg sun8i_h3_cfg = { .has_reset = true, .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0, + .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET, +}; + +static const struct ehci_sunxi_cfg sun9i_a80_cfg = { + .has_reset = true, + .reset0_cfg_offset = SUN9I_AHB_RESET0_CFG_OFFSET, }; static const struct udevice_id ehci_usb_ids[] = { @@ -163,7 +178,7 @@ static const struct udevice_id ehci_usb_ids[] = { }, { .compatible = "allwinner,sun9i-a80-ehci", - .data = (ulong)&sun6i_a31_cfg, + .data = (ulong)&sun9i_a80_cfg, }, { .compatible = "allwinner,sun50i-a64-ehci", diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c index 2b99169da6..e13f6ec9a4 100644 --- a/drivers/usb/host/ohci-sunxi.c +++ b/drivers/usb/host/ohci-sunxi.c @@ -22,14 +22,19 @@ #define AHB_CLK_DIST 1 #endif +#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0 +#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0 + struct ohci_sunxi_cfg { bool has_reset; u32 extra_ahb_gate_mask; u32 extra_usb_gate_mask; + u32 reset0_cfg_offset; }; struct ohci_sunxi_priv { struct sunxi_ccm_reg *ccm; + u32 *reset0_cfg; ohci_t ohci; int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ int usb_gate_mask; /* Mask of usb_clk_cfg clk gate bits for this hcd */ @@ -50,6 +55,9 @@ static int ohci_usb_probe(struct udevice *dev) if (IS_ERR(priv->ccm)) return PTR_ERR(priv->ccm); + priv->reset0_cfg = (void *)priv->ccm + + priv->cfg->reset0_cfg_offset; + phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells"); if (phys < 0) { phys = 0; @@ -93,7 +101,7 @@ no_phy: setbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask); if (priv->cfg->has_reset) - setbits_le32(&priv->ccm->ahb_reset0_cfg, + setbits_le32(priv->reset0_cfg, priv->ahb_gate_mask | extra_ahb_gate_mask); return ohci_register(dev, regs); @@ -117,7 +125,7 @@ static int ohci_usb_remove(struct udevice *dev) return ret; if (priv->cfg->has_reset) - clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); + clrbits_le32(priv->reset0_cfg, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); @@ -130,17 +138,25 @@ static const struct ohci_sunxi_cfg sun4i_a10_cfg = { static const struct ohci_sunxi_cfg sun6i_a31_cfg = { .has_reset = true, + .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET, }; static const struct ohci_sunxi_cfg sun8i_h3_cfg = { .has_reset = true, .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0, + .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET, +}; + +static const struct ohci_sunxi_cfg sun9i_a80_cfg = { + .has_reset = true, + .reset0_cfg_offset = SUN9I_AHB_RESET0_CFG_OFFSET, }; static const struct ohci_sunxi_cfg sun50i_a64_cfg = { .has_reset = true, .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0, .extra_usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK, + .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET, }; static const struct udevice_id ohci_usb_ids[] = { @@ -174,7 +190,7 @@ static const struct udevice_id ohci_usb_ids[] = { }, { .compatible = "allwinner,sun9i-a80-ohci", - .data = (ulong)&sun6i_a31_cfg, + .data = (ulong)&sun9i_a80_cfg, }, { .compatible = "allwinner,sun50i-a64-ohci", -- 2.17.1

2 2

[U-Boot] u-boot 2016.012 hangs periodically during ping/tftp
by Matthew Dahl 15 Jun '18

15 Jun '18

Hello, I am working on a custom board, that is based on the NXP T2080 processor. We have been experiencing issues with our loading process which utilizes tftp to retrieve images for loading into NAND. The vast majority of the attempts result in "Loading: *" or "Loading: #" with no further output, and u-boot does not respond to ctrl-c and appears to have hung someplace. Using Wireshark I can confirm the following packet transfers are taking place: ARP request for our external machine ARP reply from external machine to u-boot with correct MAC address TFTP read request from u-boot to external machine TFTP Option ACK from external machine to u-boot TFTP ACK block 0 (OACK) from u-boot to external TFTP data packet 1 from external machine to u-boot (and then the further retries of packet 1) Thanks, Matt

1 0

[U-Boot] [PATCH v2 0/3] net: Sanitize DHCP variable override
by Alexander Graf 15 Jun '18

15 Jun '18

While trying to boot from network on a RISC-V AX25 platform, I saw that the DHCP IP address did not get populated from the DHCP server IP address. The reason for that was simple: CONFIG_BOOTP_SERVERIP was set. I don't know the history of that option, but it seems to decrease intuitivity levels of the dhcp command rather than improve it. What I usually would expect is that explicitly set values populate through all layers. So if I set a TFTP file name, it populates. If I set a target IP address, it populates. If I don't set anything, the values get filled in automatically. This patch set is trying to move us into that direction without breaking people that rely on the existing behavior. With this patch set applied, boards have the option to prefer the 'serverip' environment variable (ax25-ae350 gets moved to it) over the DHCP given address and any value explicitly set on the command line is always preferred. This hopefully makes the command line a bit more intuitive. v1 -> v2: - new patch: net: Prefer command line arguments - remove README entry - improve Kconfig help texts Alexander Graf (3): net: Prefer command line arguments net: Add option to prefer bootp/dhcp serverip ax25: Switch to CONFIG_BOOTP_PREFER_SERVERIP cmd/Kconfig | 11 +++++++++++ cmd/net.c | 10 ++++++++-- configs/ax25-ae350_defconfig | 1 + include/configs/ax25-ae350.h | 1 - include/net.h | 2 ++ net/bootp.c | 10 ++++++++-- net/net.c | 2 ++ 7 files changed, 32 insertions(+), 5 deletions(-) -- 2.12.3

2 11

[U-Boot] [PATCH v4 00/16] efi: Enable basic sandbox support for EFI loader
by Simon Glass 15 Jun '18

15 Jun '18

A limitation of the EFI loader at present is that it does not build with sandbox. This makes it hard to write tests, since sandbox is used for most testing in U-Boot. This series enables the EFI loader feature. It allows sandbox to build and run a trivial function which calls the EFI API to output a message. This series is at u-boot-dm/efi-working Changes in v4: - Fix up the sizeof() operations on jmp_buf - Move the fix to query_console_serial() - Rebase to master - Remove code already applied - Update SPDX tags - Update subject Changes in v3: - Add comments on aligment - Add new patch to init the 'rows' and 'cols' variables - Add new patch to rename bootefi_test_finish() to bootefi_run_finish() - Add new patch to split out test init/uninit into functions - Add patch to create a function to set up for running EFI code - Drop incorrect map_sysmem() in write_smbios_table() - Init the 'rows' and 'cols' vars to avoid a compiler error (gcc 4.8.4) - Rebase to master - Return error value of efi_allocate_pages() - Update function comment for write_smbios_table() Changes in v2: - Rebase to master - Update return type of efi_smbios_register() to efi_status_t - Update to use mapmem instead of a cast - Use return value of efi_install_configuration_table Simon Glass (16): efi: Init the 'rows' and 'cols' variables efi: Update some comments related to smbios tables efi: sandbox: Adjust memory usage for sandbox sandbox: smbios: Update to support sandbox sandbox: Add a setjmp() implementation efi: sandbox: Add required linker sections efi: sandbox: Add distroboot support Define board_quiesce_devices() in a shared location Add a comment for board_quiesce_devices() efi: sandbox: Add relocation constants efi: Add a comment about duplicated ELF constants efi: sandbox: Enable EFI loader builder for sandbox efi: Split out test init/uninit into functions efi: sandbox: Add a simple 'bootefi test' command efi: Create a function to set up for running EFI code efi: Rename bootefi_test_finish() to bootefi_run_finish() arch/arm/include/asm/u-boot-arm.h | 1 - arch/sandbox/cpu/cpu.c | 13 +++ arch/sandbox/cpu/os.c | 23 +++++ arch/sandbox/cpu/u-boot.lds | 29 ++++++ arch/sandbox/include/asm/setjmp.h | 30 ++++++ arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/sections.c | 12 +++ arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/bootm.c | 4 - cmd/bootefi.c | 158 +++++++++++++++++++++--------- common/bootm.c | 4 + include/bootm.h | 8 ++ include/config_distro_bootcmd.h | 2 +- include/efi_loader.h | 10 ++ include/os.h | 21 ++++ include/smbios.h | 5 +- lib/efi_loader/Kconfig | 12 ++- lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_console.c | 5 +- lib/efi_loader/efi_memory.c | 31 +++--- lib/efi_loader/efi_runtime.c | 7 ++ lib/efi_loader/efi_smbios.c | 7 +- lib/efi_loader/efi_test.c | 16 +++ lib/smbios.c | 32 ++++-- 24 files changed, 351 insertions(+), 83 deletions(-) create mode 100644 arch/sandbox/include/asm/setjmp.h create mode 100644 arch/sandbox/lib/sections.c create mode 100644 lib/efi_loader/efi_test.c -- 2.17.0.441.gb46fe60e1d-goog

3 51

[U-Boot] make Menuconfig Error
by DH＠synoia.com 15 Jun '18

15 Jun '18

Cloned most recent u-boot 2018.06.14 make clean works make menuconfig fails: /bin/sh: 1: bison: not found scripts/kconfig/Makefile:229: recipe for target 'scripts/kconfig/dochecklxdialog' failed make[1]: *** [scripts/kconfig/dochecklxdialog] Error 1 Makefile:491: recipe for target 'menuconfig' failed make: *** [menuconfig] Error 2 I've checked for bison, visually and with apt-cache search but I have found none. Will try rebuild based on u-boot from 2018.05.14 on SPDX errors, That version did build.

2 2

[U-Boot] [PATCH v3 00/17] sandbox: efi_loader support
by Alexander Graf 15 Jun '18

15 Jun '18

This patch set augments Simon's patch set for efi_loader support in sandbox[1], but follows a different memory allocation scheme. Instead of keeping U-Boot addresses in the EFI memory map, this patch set makes the EFI memory map contain host virtual addresses. That way most logic "just works" and all EFI interfaces automatically gain sandbox awareness. We also change the memory map of sandbox to hard code RAM to always live at address 0x80000000. This patch is completely optional. With this patch set in place, I can successfully run the selftest suite as well as an aarch64 grub.efi binary. X86_64 grub.efi doesn't work because that one requires inl instructions to work. Alex [1] https://patchwork.ozlabs.org/project/uboot/list/?series=49832 v1 -> v2: - only compile efi_add_known_memory if efi_loader is enabled - clarify address vs pointer in fs_read patch - include mapmem.h v2 -> v3: - removed: efi_loader: Pass address to fs_read() - new: fs: Convert fs_read/write to take buffer instead of address - new: efi_loader: Introduce ms abi vararg helpers - new: sandbox: Enable 1:1 map - new: distro: Move to compiler based target architecture determination - new: efi_loader: Move to compiler based target architecture determination - new: sandbox: Allow to execute from RAM - new: sandbox: Fix setjmp/longjmp Alexander Graf (13): efi_loader: Use compiler constants for image loader efi_loader: Use map_sysmem() in bootefi command efi.h: Do not use config options efi_loader: Allow SMBIOS tables in highmem sandbox: Map host memory for efi_loader efi_loader: Disable miniapps on sandbox fs: Convert fs_read/write to take buffer instead of address efi_loader: Introduce ms abi vararg helpers sandbox: Enable 1:1 map distro: Move to compiler based target architecture determination efi_loader: Move to compiler based target architecture determination sandbox: Allow to execute from RAM sandbox: Fix setjmp/longjmp Heinrich Schuchardt (1): efi_loader: efi_allocate_pages is too restrictive Simon Glass (3): efi: sandbox: Add distroboot support efi: sandbox: Add relocation constants efi: sandbox: Enable EFI loader for sandbox Makefile | 2 +- arch/sandbox/cpu/cpu.c | 30 ++++++++---------------- arch/sandbox/cpu/os.c | 43 ++++++++++++++++++++--------------- arch/sandbox/cpu/state.c | 4 ++-- arch/sandbox/cpu/u-boot.lds | 9 ++++++++ arch/sandbox/include/asm/io.h | 17 ++++---------- arch/sandbox/include/asm/setjmp.h | 4 +++- board/BuR/common/common.c | 2 +- board/gdsys/p1022/controlcenterd-id.c | 10 ++++---- cmd/bootefi.c | 13 +++++++---- cmd/mvebu/bubt.c | 4 ++-- common/board_f.c | 4 +++- common/splash_source.c | 4 +++- configs/sandbox64_defconfig | 6 ++--- configs/sandbox_defconfig | 6 ++--- configs/sandbox_flattree_defconfig | 4 ++-- configs/sandbox_noblk_defconfig | 4 ++-- configs/sandbox_spl_defconfig | 4 ++-- drivers/bootcount/bootcount_ext.c | 12 +++++----- drivers/fpga/zynqpl.c | 8 ++++--- fs/fs.c | 20 ++++++++-------- include/config_distro_bootcmd.h | 14 +++++++----- include/configs/sandbox.h | 32 +++++++++++++------------- include/efi.h | 25 ++++++++++---------- include/fs.h | 12 +++++----- include/os.h | 19 ++++++++++++++++ lib/efi/Makefile | 4 ++-- lib/efi_loader/Kconfig | 2 +- lib/efi_loader/efi_boottime.c | 36 ++++++++++++++--------------- lib/efi_loader/efi_file.c | 6 ++--- lib/efi_loader/efi_image_loader.c | 12 +++++----- lib/efi_loader/efi_memory.c | 2 +- lib/efi_loader/efi_runtime.c | 14 +++++++----- lib/efi_loader/efi_smbios.c | 11 +++++++-- lib/efi_selftest/Makefile | 2 +- 35 files changed, 219 insertions(+), 182 deletions(-) -- 2.12.3

2 20

[U-Boot] SquashFS patch
by Frank Hunleth 15 Jun '18

15 Jun '18

I attempted to integrate SquashFS with U-boot based on the SquashFS support in Barebox. It works in that loads the Linux kernel and device tree files from a SquashFS-formatted root filesystem reliably. Unfortunately, it’s slow (much slower than Linux SquashFS even though they share most of the code), only zlib compression works, and the code needs to be cleaned up (this was my first time spending time in the U-boot codebase). It would be nice to push this the rest of the way so that it could be included in U-boot. It’s definitely not ready and I feel like I need help fixing the performance issue and getting it the rest of the way there. Is there any interest? The patch can be found at https://github.com/fhunleth/u-boot-squashfs <https://github.com/fhunleth/u-boot-squashfs>. If/when it gets into an upstream-able state, I’ll definitely submit properly to this list. Thanks, Frank

1 0