September 2019 - U-Boot

[U-Boot] [BUG] net: nfs: -Werror=address-of-packed-member
by Heinrich Schuchardt 04 Sep '19

04 Sep '19

Hello Joe, GCC 9.2.1 (of Debian Bullseye) produces the warnings below when building pine64-lts_defconfig. Is it really necessary to define struct rpc_t as packed? The structure is composed out of uint32_t only. So shouldn't it be naturally packed without the attribute? net/nfs.c: In function ‘rpc_req’: net/nfs.c:199:18: error: taking address of packed member of ‘struct rpc_t’ may result in an unaligned pointer value [-Werror=address-of-packed-member] 199 | p = (uint32_t *)&(rpc_pkt.u.call.data); | ^~~~~~~~~~~~~~~~~~~~~~ net/nfs.c: In function ‘nfs_readlink_reply’: net/nfs.c:631:46: error: taking address of packed member of ‘struct rpc_t’ may result in an unaligned pointer value [-Werror=address-of-packed-member] 631 | nfs3_get_attributes_offset(rpc_pkt.u.reply.data); | ~~~~~~~~~~~~~~~^~~~~ LD drivers/block/built-in.o net/nfs.c: In function ‘nfs_read_reply’: net/nfs.c:692:46: error: taking address of packed member of ‘struct rpc_t’ may result in an unaligned pointer value [-Werror=address-of-packed-member] 692 | nfs3_get_attributes_offset(rpc_pkt.u.reply.data); | ~~~~~~~~~~~~~~~^~~~~ Best regards Heinrich

2 2

[U-Boot] [PATCH 0/4] env: fix build error for envtools
by Pierre-Jean Texier 04 Sep '19

04 Sep '19

Here is a set of patches that fixes envtools breakage introduced after v2019.10-rc2. This serie also adds envtools to travis CI and gitlab-ci. This was tested on WaRP7. Before this serie: - https://travis-ci.com/texierp/u-boot/jobs/227669967 After this serie: - https://travis-ci.com/texierp/u-boot/jobs/227761236 Pierre-Jean Texier (4): fw_env: remove duplicated definitions fw_env: fix build error env: add missing <compiler.h> header file ci: add envtools support .gitlab-ci.yml | 7 +++++++ .travis.yml | 4 ++++ include/env.h | 1 + tools/env/fw_env.c | 9 +-------- 4 files changed, 13 insertions(+), 8 deletions(-) -- 2.7.4

4 14

[U-Boot] [PATCH v3 1/2] efi_loader: Extract adding a conventional memory in separate routine
by Park, Aiden 03 Sep '19

03 Sep '19

Adding a conventional memory region to the memory map may require ram_top limitation and it can be also commonly used. Extract adding a conventional memory to the memory map in a separate routine for generic use. Signed-off-by: Aiden Park <aiden.park(a)intel.com> --- Changes in v3: * Split a single commit to two relevant commits Changes in v2: * Add efi_add_conventional_memory_map() for common code re-use include/efi_loader.h | 4 ++ lib/efi_loader/efi_memory.c | 82 ++++++++++++++++++++++--------------- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 5298ea7997..00eba8afa4 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -478,6 +478,10 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, /* Adds a range into the EFI memory map */ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, bool overlap_only_ram); +/* Adds a conventional range into the EFI memory map */ +efi_status_t efi_add_conventional_memory_map(u64 ram_start, u64 ram_end, + u64 ram_top); + /* Called by board init to initialize the EFI drivers */ efi_status_t efi_driver_init(void); /* Called by board init to initialize the EFI memory map */ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index b5775e0399..83cbc9154f 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -655,6 +655,54 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, return EFI_SUCCESS; } +/** + * efi_add_conventional_memory_map() - add a RAM memory area to the map + * + * @ram_start: start address of a RAM memory area + * @ram_end: end address of a RAM memory area + * @ram_top: max address to be used as conventional memory + * Return: status code + */ +efi_status_t efi_add_conventional_memory_map(u64 ram_start, u64 ram_end, + u64 ram_top) +{ + u64 pages; + + /* Remove partial pages */ + ram_end &= ~EFI_PAGE_MASK; + ram_start = (ram_start + EFI_PAGE_MASK) & ~EFI_PAGE_MASK; + + if (ram_end <= ram_start) { + /* Invalid mapping */ + return EFI_INVALID_PARAMETER; + } + + pages = (ram_end - ram_start) >> EFI_PAGE_SHIFT; + + efi_add_memory_map(ram_start, pages, + EFI_CONVENTIONAL_MEMORY, false); + + /* + * Boards may indicate to the U-Boot memory core that they + * can not support memory above ram_top. Let's honor this + * in the efi_loader subsystem too by declaring any memory + * above ram_top as "already occupied by firmware". + */ + if (ram_top < ram_start) { + /* ram_top is before this region, reserve all */ + efi_add_memory_map(ram_start, pages, + EFI_BOOT_SERVICES_DATA, true); + } else if ((ram_top >= ram_start) && (ram_top < ram_end)) { + /* ram_top is inside this region, reserve parts */ + pages = (ram_end - ram_top) >> EFI_PAGE_SHIFT; + + efi_add_memory_map(ram_top, pages, + EFI_BOOT_SERVICES_DATA, true); + } + + return EFI_SUCCESS; +} + __weak void efi_add_known_memory(void) { u64 ram_top = board_get_usable_ram_top(0) & ~EFI_PAGE_MASK; @@ -672,42 +720,12 @@ __weak void efi_add_known_memory(void) /* Add RAM */ for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { - u64 ram_end, ram_start, pages; + u64 ram_end, ram_start; ram_start = (uintptr_t)map_sysmem(gd->bd->bi_dram[i].start, 0); ram_end = ram_start + gd->bd->bi_dram[i].size; - /* Remove partial pages */ - ram_end &= ~EFI_PAGE_MASK; - ram_start = (ram_start + EFI_PAGE_MASK) & ~EFI_PAGE_MASK; - - if (ram_end <= ram_start) { - /* Invalid mapping, keep going. */ - continue; - } - - pages = (ram_end - ram_start) >> EFI_PAGE_SHIFT; - - efi_add_memory_map(ram_start, pages, - EFI_CONVENTIONAL_MEMORY, false); - - /* - * Boards may indicate to the U-Boot memory core that they - * can not support memory above ram_top. Let's honor this - * in the efi_loader subsystem too by declaring any memory - * above ram_top as "already occupied by firmware". - */ - if (ram_top < ram_start) { - /* ram_top is before this region, reserve all */ - efi_add_memory_map(ram_start, pages, - EFI_BOOT_SERVICES_DATA, true); - } else if ((ram_top >= ram_start) && (ram_top < ram_end)) { - /* ram_top is inside this region, reserve parts */ - pages = (ram_end - ram_top) >> EFI_PAGE_SHIFT; - - efi_add_memory_map(ram_top, pages, - EFI_BOOT_SERVICES_DATA, true); - } + efi_add_conventional_memory_map(ram_start, ram_end, ram_top); } } -- 2.20.1

2 1

[U-Boot] Pull request for UEFI sub-system for v2019.10-rc4 (2)
by Heinrich Schuchardt 03 Sep '19

03 Sep '19

The following changes since commit d22c8be964a870f59d2fdab6c67cefa0c4799364: Merge branch 'master' of git://git.denx.de/u-boot-sh (2019-09-01 13:33:12 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2019-10-rc4-2 for you to fetch changes up to cd41d618d3a99ba5d1c01317c89d56285c03a981: efi_loader: implement MCastIPtoMAC (2019-09-03 00:07:18 +0200) Gitlab CI and Travis CI showed no problem: https://travis-ci.org/xypron2/u-boot/builds/579993939 https://gitlab.denx.de/u-boot/custodians/u-boot-efi/pipelines/597 ---------------------------------------------------------------- Pull request for UEFI sub-system for v2019.10-rc4 (2) Fix UEFI specification compliance issues in the simple network protocol: * Correctly set and reset the interrupt status. * Support filling the header in the Transmit() service. * Correct the checking and setting of the network state. * Implement the MCastIPtoMAC() service. * Adjust the simple network protocol unit test. Enable unit testing of the UEFI sub-system on QEMU RISC-V. ---------------------------------------------------------------- Heinrich Schuchardt (6): riscv: qemu: enable CONFIG_CMD_BOOTEFI_SELFTEST efi_loader: interrupts in simple network protocol efi_selftest: check EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT efi_loader: EFI_SIMPLE_NETWORK.Transmit() fill header efi_loader: fix status management in network stack efi_loader: implement MCastIPtoMAC configs/qemu-riscv32_defconfig | 1 + configs/qemu-riscv32_smode_defconfig | 1 + configs/qemu-riscv64_defconfig | 1 + configs/qemu-riscv64_smode_defconfig | 1 + include/efi_api.h | 2 + lib/efi_loader/efi_net.c | 184 +++++++++++++++++++++++++++++------ lib/efi_selftest/efi_selftest_snp.c | 64 ++++++++++-- 7 files changed, 216 insertions(+), 38 deletions(-)

1 0

[U-Boot] [BUG] include/net.h: warning: 'eth_is_on_demand_init' defined but not used
by Heinrich Schuchardt 03 Sep '19

03 Sep '19

Hello Joe, compiling U-Boot creates dozens of warnings for include/net.h: CC arch/arm/lib/asm-offsets.s In file included from include/common.h:342, from lib/asm-offsets.c:14: include/net.h:689:28: warning: always_inline function might not be inlinable [-Wattributes] 689 | static __always_inline int eth_is_on_demand_init(void) | ^~~~~~~~~~~~~~~~~~~~~ include/net.h:689:28: warning: 'eth_is_on_demand_init' defined but not used [-Wunused-function] HOSTCC scripts/dtc/srcpos.o In file included from include/common.h:342, from arch/arm/lib/asm-offsets.c:14: include/net.h:689:28: warning: always_inline function might not be inlinable [-Wattributes] 689 | static __always_inline int eth_is_on_demand_init(void) | ^~~~~~~~~~~~~~~~~~~~~ include/net.h:689:28: warning: 'eth_is_on_demand_init' defined but not used [-Wunused-function] Software used for building U-Boot: U-Boot HEAD, rpi_3_b_plus_defconfig gcc (FreeBSD Ports Collection) 9.1.0 FreeBSD generic 13.0-CURRENT FreeBSD 13.0-CURRENT r351591 GENERIC arm64 Why should we create this function in every file that by chance includes net.h? The function is only used in drivers/net/netconsole.c and net/net.c. One solution would be to create a dedicated include that is only referenced in these two files. Best regards Heinrich

2 1

[U-Boot] [PATCH v3 0/2] x86: efi_loader: Fix invalid address return from efi_alloc()
by Park, Aiden 03 Sep '19

03 Sep '19

This issue can be seen on 32bit operation when one of E820_RAM type entries is greater than 4GB memory space. The efi_alloc() finds a free memory in the conventional memory which is greater than 4GB. But, it does type cast to 32bit address space and eventually returns invalid address. Changes in v3: * Split a single commit to two relevant commits Changes in v2: * Add efi_add_conventional_memory_map() for common code re-use Aiden Park (2): efi_loader: Extract adding a conventional memory in separate routine x86: efi_loader: Use efi_add_conventional_memory_map() arch/x86/lib/e820.c | 17 ++++++-- include/efi_loader.h | 4 ++ lib/efi_loader/efi_memory.c | 82 ++++++++++++++++++++++--------------- 3 files changed, 68 insertions(+), 35 deletions(-) -- 2.20.1

1 0

[U-Boot] [PATCH] mmc: dw_mmc: fix timeout calculate method
by Kever Yang 03 Sep '19

03 Sep '19

There are two cases not been considered: - use uint for timeout, it will overflow when size bigger than 512KB for it *8*1000 at the beginning, but we may use size up to 32MB; - The timeout is using clock speed for data rate, but the device may not have such high speed, eg. clock is 52MHz while the device write speed may be less than 10MB/s. Fix them in this patch, the max timeout is about 6500 when size is 32MB after fix. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- drivers/mmc/dw_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 22f6c7eefd..2cb61ba184 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -117,10 +117,10 @@ static int dwmci_fifo_ready(struct dwmci_host *host, u32 bit, u32 *len) static unsigned int dwmci_get_timeout(struct mmc *mmc, const unsigned int size) { - unsigned int timeout; + u64 timeout; - timeout = size * 8 * 1000; /* counting in bits and msec */ - timeout *= 2; /* wait twice as long */ + timeout = (u64)size * 8 * 1000; /* counting in bits and msec */ + timeout *= 10; /* wait 10 times as long */ timeout /= mmc->clock; timeout /= mmc->bus_width; timeout /= mmc->ddr_mode ? 2 : 1; -- 2.17.1

4 10

[U-Boot] [PATCH] colibri_imx6: fix broken fsl_esdhc_imx conversion
by Ricardo Salveti 03 Sep '19

03 Sep '19

Commit e37ac71 converted FSL_ESDHC to FSL_ESDHC_IMX, but the config check for colibri_imx6 wasn't updated accordantly. Signed-off-by: Ricardo Salveti <ricardo(a)foundries.io> --- board/toradex/colibri_imx6/colibri_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b589c1..44173dde1f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD) /* Colibri MMC */ iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port) } #endif -#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD) /* use the following sequence: eMMC, MMC */ struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC3_BASE_ADDR}, -- 2.23.0

2 1

[U-Boot] [PATCH] apalis_imx6: allocate specific region of memory to OP-TEE
by Ricardo Salveti 03 Sep '19

03 Sep '19

OP-TEE uses the memory region defined by the maximum DRAM address minus CONFIG_OPTEE_TZDRAM_SIZE, so subtract CONFIG_OPTEE_TZDRAM_SIZE from the available DRAM size to avoid conflicts. Signed-off-by: Ricardo Salveti <ricardo(a)foundries.io> --- board/toradex/apalis_imx6/apalis_imx6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 6421a22c25..fa7fcc8d46 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -75,6 +75,11 @@ int dram_init(void) gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, (ulong)imx_ddr_size()); + /* Subtract the defined OPTEE runtime firmware length */ +#ifdef CONFIG_OPTEE_TZDRAM_SIZE + gd->ram_size -= CONFIG_OPTEE_TZDRAM_SIZE; +#endif + return 0; } -- 2.23.0

4 5

[U-Boot] [PATCH v2 00/14] DM: display5: Convert display5 board to DM/DTS (including 'factory' setup)
by Lukasz Majewski 03 Sep '19

03 Sep '19

This patch series converts display5 to use DM/DTS. The SPL conversion to DM/DTS has been omitted. The previous series due to some Kconfig issues was applied partially. Following patches were NOT applied: https://patchwork.ozlabs.org/patch/1112757/ https://patchwork.ozlabs.org/patch/1112755/ https://patchwork.ozlabs.org/patch/1112756/ This series supersedes conversion from above patches by: - Fixing issues after porting to newest mainline (FSL_MMC_IMX conversion) - Converts usage of gpio* legacy API to dm_gpio* - Cleans up the display5_{factory_}defconfig Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/580153865 Applied on top of u-boot/master branch SHA1: 877294b56a52f1cb60bbfa7e4722fcc33451f7b2 Buildman: ./tools/buildman/buildman.py --branch=HEAD mx6 --show_errors --force-build --count=14 --output-dir=../BUILD/ Changes in v2: - Use dm_gpio* functions instead of gpio_* ones - Use dm_gpio_* instead of legacy gpio_* functions Lukasz Majewski (14): fix: defconfig: Enable OF_CONTROL for display5_factory ARM: imx: defconfig: Enable CONFIG_PINCTRL{_IMX6} on display5's defconfig DM: I2C: Switch display5 board to use DM_I2C ARM: imx: defconfig: Enable 'regulator' and 'pmic' commands on display5 DM: mmc: Switch display5 board to use DM_MMC and BLK (USDHC) DM: eth: Switch display5 board to use DM_ETH DM: SPI: Convert display5 to use SPI with DM/DTS (but no in SPL) ARM: display5: Remove UART initialization code after DM/DTS conversion (non-console) DM: WDT: Convert WDT driver to use DM/DTS (including SYSRESET) ARM: display5: Remove common.c file (after DM/DTS U-Boot proper conversion) ARM: Update display5_factory_defconfig after switch to DM/DTS and uuu utility cosmetic: Cleanup display5_defconfig with make savedefconfig imx: Convert emergency pad of display5 to use dm_gpio* functions imx: Rewrite display5 get_board_id() function to use dm_gpio_* API arch/arm/dts/imx6q-display5-u-boot.dtsi | 5 + arch/arm/mach-imx/mx6/Kconfig | 5 + board/liebherr/display5/Makefile | 4 +- board/liebherr/display5/common.c | 120 ------------- board/liebherr/display5/common.h | 8 - board/liebherr/display5/display5.c | 302 +++++++------------------------- board/liebherr/display5/spl.c | 74 ++++++++ configs/display5_defconfig | 31 +++- configs/display5_factory_defconfig | 44 ++++- include/configs/display5.h | 29 ++- 10 files changed, 232 insertions(+), 390 deletions(-) delete mode 100644 board/liebherr/display5/common.c -- 2.11.0

1 14