October 2018 - U-Boot

[U-Boot] [PATCH 1/2] mmc: tmio: Pass full address to tmio_sd_addr_is_dmaable()
by Marek Vasut 10 Oct '18

10 Oct '18

Pass the entire source data pointer to tmio_sd_addr_is_dmaable() so we don't have to apply casts throughout the code. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mmc/tmio-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index b311b80be8..6b21941991 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -372,8 +372,10 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) } /* check if the address is DMA'able */ -static bool tmio_sd_addr_is_dmaable(unsigned long addr) +static bool tmio_sd_addr_is_dmaable(const char *src) { + uintptr_t addr = (uintptr_t)src; + if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN)) return false; @@ -486,7 +488,7 @@ int tmio_sd_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, if (data) { /* use DMA if the HW supports it and the buffer is aligned */ if (priv->caps & TMIO_SD_CAP_DMA_INTERNAL && - tmio_sd_addr_is_dmaable((long)data->src)) + tmio_sd_addr_is_dmaable(data->src)) ret = tmio_sd_dma_xfer(dev, data); else ret = tmio_sd_pio_xfer(dev, data); -- 2.18.0

2 6

[U-Boot] [PATCH 1/1] efi_loader: set image_base and image_size to correct values
by Heinrich Schuchardt 10 Oct '18

10 Oct '18

From: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Currently, image's image_base points to an address where the image was temporarily uploaded for further loading. Since efi_loader relocates the image to final destination, image_base and image_size should reflect that. This bug was detected in UEFI SCT, "Loaded Image Protocol Test - test 2," which shows that 'Unload' function doesn't fit into a range suggested by image_base and image_size. TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/ LoadedImageBBTestMain.c:1002 This patch also reverts a patch, "efi_loader: save image relocation address and size" since newly added fields are no longer needed. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Rebase the patch. Keep the relocation address in struct efi_image_object. We will use the address to free the image in UnloadImage. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_image_loader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index a18ce0a5705..39902152f3c 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -212,7 +212,6 @@ void *efi_load_pe(struct efi_loaded_image_obj *handle, void *efi, int rel_idx = IMAGE_DIRECTORY_ENTRY_BASERELOC; void *entry; uint64_t image_base; - uint64_t image_size; unsigned long virt_size = 0; int supported = 0; @@ -256,7 +255,6 @@ void *efi_load_pe(struct efi_loaded_image_obj *handle, void *efi, IMAGE_NT_HEADERS64 *nt64 = (void *)nt; IMAGE_OPTIONAL_HEADER64 *opt = &nt64->OptionalHeader; image_base = opt->ImageBase; - image_size = opt->SizeOfImage; efi_set_code_and_data_type(loaded_image_info, opt->Subsystem); efi_reloc = efi_alloc(virt_size, loaded_image_info->image_code_type); @@ -272,7 +270,6 @@ void *efi_load_pe(struct efi_loaded_image_obj *handle, void *efi, } else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader; image_base = opt->ImageBase; - image_size = opt->SizeOfImage; efi_set_code_and_data_type(loaded_image_info, opt->Subsystem); efi_reloc = efi_alloc(virt_size, loaded_image_info->image_code_type); @@ -315,10 +312,10 @@ void *efi_load_pe(struct efi_loaded_image_obj *handle, void *efi, invalidate_icache_all(); /* Populate the loaded image interface bits */ - loaded_image_info->image_base = efi; - loaded_image_info->image_size = image_size; handle->reloc_base = efi_reloc; handle->reloc_size = virt_size; + loaded_image_info->image_base = efi_reloc; + loaded_image_info->image_size = virt_size; return entry; } -- 2.19.0

2 5

[U-Boot] [PATCH 00/11] efi_loader: patches for Shell.efi
by Rob Clark 10 Oct '18

10 Oct '18

Re-send of the patch series to get Shell.efi working, and almost get SCT.efi (the UEFI test suite) working. Since last time, I've updated to Heinrich's latest SetWatchdogTimer patch (as of yesterday evening), and adressed review comments on the three new sets of protocols added. Part of that, to avoid moving changes from my later patch that added implementation on top of Leif's initial stubs was done by simply squashing the patches together. Heinrich Schuchardt (1): efi_loader: implement SetWatchdogTimer Leif Lindholm (3): efi_loader: Initial EFI_DEVICE_PATH_UTILITIES_PROTOCOL efi_loader: Initial HII protocols efi_loader: Initial EFI_UNICODE_COLLATION_PROTOCOL Rob Clark (7): efi_loader: SIMPLE_TEXT_INPUT_EX plus wire up objects properly efi_loader: console support for color attributes efi_loader: Decouple EFI input/output from stdin/stdout efi_loader: fix events efi_loader: Fix disk dp's for pre-DM/legacy devices efi_loader: Add mem-mapped for fallback efi_loader: exclude openrd devices cmd/bootefi.c | 24 ++ include/efi_api.h | 438 ++++++++++++++++++++++++- include/efi_loader.h | 29 +- lib/efi_loader/Kconfig | 2 +- lib/efi_loader/Makefile | 3 +- lib/efi_loader/efi_boottime.c | 256 ++++++++------- lib/efi_loader/efi_console.c | 398 +++++++++++++++++++--- lib/efi_loader/efi_device_path.c | 24 ++ lib/efi_loader/efi_device_path_to_text.c | 9 + lib/efi_loader/efi_device_path_utilities.c | 88 +++++ lib/efi_loader/efi_disk.c | 11 + lib/efi_loader/efi_hii.c | 507 +++++++++++++++++++++++++++++ lib/efi_loader/efi_unicode.c | 170 ++++++++++ lib/efi_loader/efi_watchdog.c | 86 +++++ 14 files changed, 1861 insertions(+), 184 deletions(-) create mode 100644 lib/efi_loader/efi_device_path_utilities.c create mode 100644 lib/efi_loader/efi_hii.c create mode 100644 lib/efi_loader/efi_unicode.c create mode 100644 lib/efi_loader/efi_watchdog.c -- 2.13.6

7 74

[U-Boot] bootefi selftest on qemu-x86_64
by Bin Meng 10 Oct '18

10 Oct '18

Hi Heinrich, Did you ever get 'bootefi selftest' pass on qemu-x86_64? I got: => bootefi selftest WARNING: booting without device tree lib/efi_selftest/efi_selftest.c(242): ERROR: Cannot open loaded image protocol Regards, Bin

2 3

[U-Boot] [PATCH v2 00/17] test: Various test refinements and improvements
by Simon Glass 10 Oct '18

10 Oct '18

This series includes a number of small changes designed to make tests run more smoothly. The overall goal is that 'make check' runs cleanly without unnecessary output and all temporary files aare cleaned up. Changes in v2: - Quote @$ correctly so that quoted arguments can be passed to run_test - Add new patch to reduce the number of tests run with sandbox_flattree - Add a patch to run binman tests concurrently Simon Glass (16): sandbox: Unprotect DATA regions in bus tests patman: Handle unicode in _ProjectConfigParser tests test/py: Fix unicode handling for log filtering buildman: Make the toolchain test more forgiving Makefile: Add a 'check' target for make test: Simplify the PATH setup test: Print the name of each test before running it test: Tidy up comments and variable name binman: Add a default path to libfdt.py binman: Fix up removal of temporary directories binman: Separate out testSplBssPad() buildman: dtoc: Suppress unwanted output from test tools: Set an initial value for indir patman: Don't clear progress in tout unless it was used test: Reduce the number of tests run with sandbox_flattree binman: Run tests concurrently Stephen Warren (1): test/py: ignore console read exceptions after test failure .travis.yml | 1 + Makefile | 6 +- arch/sandbox/cpu/os.c | 11 ++ include/os.h | 12 ++ test/dm/bus.c | 12 ++ test/py/README.md | 1 + test/py/multiplexed_log.py | 7 +- test/py/u_boot_console_base.py | 12 +- test/run | 57 +++++---- tools/binman/binman.py | 28 ++++- tools/binman/cmdline.py | 2 + tools/binman/elf_test.py | 5 + tools/binman/entry_test.py | 15 ++- tools/binman/fdt_test.py | 4 + tools/binman/ftest.py | 46 ++++---- tools/buildman/test.py | 8 +- tools/concurrencytest/.gitignore | 1 + tools/concurrencytest/README.md | 74 ++++++++++++ tools/concurrencytest/concurrencytest.py | 144 +++++++++++++++++++++++ tools/dtoc/dtoc.py | 7 ++ tools/dtoc/test_dtoc.py | 6 +- tools/dtoc/test_fdt.py | 12 +- tools/patman/settings.py | 27 +++-- tools/patman/test_util.py | 2 +- tools/patman/tools.py | 3 + tools/patman/tout.py | 8 +- 26 files changed, 439 insertions(+), 72 deletions(-) create mode 100644 tools/concurrencytest/.gitignore create mode 100644 tools/concurrencytest/README.md create mode 100644 tools/concurrencytest/concurrencytest.py -- 2.19.0.605.g01d371f741-goog

4 37

[U-Boot] [PATCH 00/15] sandbox: Add support for TPL and other improvements
by Simon Glass 10 Oct '18

10 Oct '18

This series adds TPL support to sandbox and tidies up various other things along the way: - Fix for console being left in non-blocking mode on exit - Add debug UART (just for build coverage) - Support for serial output without DT (intended for TPL) - Enhancements to the sandbox TPM driver - Command-line flag to set the logging level So far there is not actually a separate TPL build. I am going to leave this until I have a full Chromium OS config for U-Boot. Simon Glass (15): log: Add helpers for common log levels sandbox: Support file truncation with os_open() sandbox: Add a way to write data to the host filesystem sandbox: spi: Drop command-line SPI option sandbox: Support booting from TPL to SPL sandbox: Add a flag to set the default log level sandbox: Remove the old memory file later sandbox: spi: Add more logging sandbox: video: Speed up video output sandbox: Add a debug UART serial: sandbox: Allow serial output without device tree sandbox: tpm: Tidy up enums and return values sandbox: tpm: Enhance to support the latest Chromium OS dm: spi: Clean up detection of sandbox SPI emulator sandbox: Restore blocking I/O on exit arch/sandbox/cpu/os.c | 74 ++++++++++-- arch/sandbox/cpu/start.c | 19 ++- arch/sandbox/cpu/state.c | 6 +- arch/sandbox/include/asm/state.h | 2 +- common/log.c | 3 +- configs/sandbox_defconfig | 2 + drivers/mtd/spi/sandbox.c | 194 +++++++----------------------- drivers/serial/Kconfig | 11 ++ drivers/serial/sandbox.c | 24 +++- drivers/spi/sandbox_spi.c | 38 ++---- drivers/tpm/tpm_tis_sandbox.c | 115 ++++++++++++++---- drivers/video/vidconsole-uclass.c | 12 +- drivers/video/video-uclass.c | 6 +- drivers/video/video_bmp.c | 2 +- include/log.h | 15 +++ include/os.h | 24 ++-- include/tpm-v1.h | 48 ++++++++ include/tpm-v2.h | 1 + include/video.h | 4 +- test/dm/video.c | 2 +- test/log/log_test.c | 13 ++ test/py/tests/test_log.py | 6 + 22 files changed, 379 insertions(+), 242 deletions(-) -- 2.19.0.605.g01d371f741-goog

3 31

[U-Boot] [PATCH V2 1/2] ofnode: Replace of_n_addr_cells with of_n_size_cells
by Marek Vasut 10 Oct '18

10 Oct '18

The size should be decoded using of_n_size_cells(), make it so. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- V2: New patch --- drivers/core/ofnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index a7e1927723..2e68f8e873 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -541,7 +541,7 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property, if (!prop) return FDT_ADDR_T_NONE; na = of_n_addr_cells(np); - ns = of_n_addr_cells(np); + ns = of_n_size_cells(np); *sizep = of_read_number(prop + na, ns); return of_read_number(prop, na); } else { -- 2.18.0

3 5

[U-Boot] [PATCH v2 0/7] Support for the Faraday ftgmac100 controller
by Cédric Le Goater 09 Oct '18

09 Oct '18

Hello, This series re-adds a driver for the Faraday ftgmac100 controller and its Aspeed variant as as one can find on the OpenPOWER platforms. I have choosen to remove and re-add the driver to ease review of the changes, which are numerous, but we can proceed differently if you prefer. It was tested on the AST2500 evb. Git tree available here: https://github.com/legoater/u-boot/commits/aspeed Thanks, C. Changes since v1 : - improved comments in the code - changed the type of 'iobase' to 'struct ftgmac100 *' to remove the casts in other routines. - replaced the loop in the mdio methods by a call to readl_poll_timeout() and fixed the returned value. - added a flush cache on the arrays of TX and RX descriptors in ftgmac100_start() - fixed returned value of - added a timer loop to catch transmit timeouts - introduced a clk_bulk - improved Kconfig description - introduced a udevice_id .data model - dropped is_aspeed bool - dropped MDIO interface setting for Aspeed SoC. The default is correct. - removed the clcoks which are now handled automatically in the ftgmac100 driver - introduced a fix for the D2-PLL clock setting Cédric Le Goater (7): net: Remove the Faraday ftgmac100 controller driver net: Re-add support for the Faraday ftgmac100 controller aspeed: ast2500: fix missing break in D2PLL clock enablement net: ftgmac100: Add support for the Aspeed SoC aspeed: Update ast2500 SoC DTS file to Linux v4.17-rc6 level aspeed: Activate ethernet devices on the ast2500 Eval Board aspeed: ast2500: fix D2-PLL clock setting in RGMII mode drivers/net/ftgmac100.h | 158 +-- include/netdev.h | 1 - drivers/clk/aspeed/clk_ast2500.c | 39 + drivers/net/ftgmac100.c | 761 ++++++------ arch/arm/dts/ast2500-evb.dts | 23 + arch/arm/dts/ast2500.dtsi | 1995 ++++++++++++++++++------------ configs/evb-ast2500_defconfig | 8 + drivers/net/Kconfig | 26 + 8 files changed, 1747 insertions(+), 1264 deletions(-) -- 2.17.1

3 17

[U-Boot] [PATCH v3] arm: socfpga: fix SPL booting from fpga OnChip RAM
by Simon Goldschmidt 09 Oct '18

09 Oct '18

This patch prevents disabling the FPGA bridges when SPL or U-Boot is executed from FPGA onchip RAM. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- Changes in v3: - use __image_copy_start to check if we are executing from FPGA Changes in v2: - use less ifdefs and more C code for address checks (but this gives a checkpatch warning because of comparing two upper case constants) - changed comments arch/arm/mach-socfpga/include/mach/base_addr_ac5.h | 4 ++++ arch/arm/mach-socfpga/misc_gen5.c | 10 +++++++++- arch/arm/mach-socfpga/spl_gen5.c | 10 +++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h index bb9e3faa29..dacb258020 100644 --- a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h +++ b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h @@ -6,6 +6,10 @@ #ifndef _SOCFPGA_BASE_ADDRS_H_ #define _SOCFPGA_BASE_ADDRS_H_ +#define SOCFPGA_FPGA_SLAVES_ADDRESS 0xc0000000 +#define IS_SOCFPGA_FPGA_SLAVES_ADDRESS(addr) \ + (((addr) >= SOCFPGA_FPGA_SLAVES_ADDRESS) && \ + ((addr) < SOCFPGA_STM_ADDRESS)) #define SOCFPGA_STM_ADDRESS 0xfc000000 #define SOCFPGA_DAP_ADDRESS 0xff000000 #define SOCFPGA_EMAC0_ADDRESS 0xff700000 diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c index 429c3d6cd5..fdac994106 100644 --- a/arch/arm/mach-socfpga/misc_gen5.c +++ b/arch/arm/mach-socfpga/misc_gen5.c @@ -20,6 +20,7 @@ #include <asm/arch/nic301.h> #include <asm/arch/scu.h> #include <asm/pl310.h> +#include <asm/sections.h> #include <dt-bindings/reset/altr,rst-mgr.h> @@ -177,6 +178,8 @@ static void socfpga_nic301_slave_ns(void) void socfpga_sdram_remap_zero(void) { + u32 remap; + socfpga_nic301_slave_ns(); /* @@ -187,7 +190,12 @@ void socfpga_sdram_remap_zero(void) setbits_le32(&scu_regs->sacr, 0xfff); /* Configure the L2 controller to make SDRAM start at 0 */ - writel(0x1, &nic301_regs->remap); /* remap.mpuzero */ + remap = 0x1; /* remap.mpuzero */ + /* Keep fpga bridge enabled when running from FPGA onchip RAM */ + if (IS_SOCFPGA_FPGA_SLAVES_ADDRESS((ulong)__image_copy_start)) + remap |= 0x8; /* remap.hps2fpga */ + writel(remap, &nic301_regs->remap); + writel(0x1, &pl310->pl310_addr_filter_start); } diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c index be318cc0d9..7c445309f7 100644 --- a/arch/arm/mach-socfpga/spl_gen5.c +++ b/arch/arm/mach-socfpga/spl_gen5.c @@ -92,8 +92,11 @@ void board_init_f(ulong dummy) /* Put everything into reset but L4WD0. */ socfpga_per_reset_all(); - /* Put FPGA bridges into reset too. */ - socfpga_bridges_reset(1); + + if (!IS_SOCFPGA_FPGA_SLAVES_ADDRESS((ulong)__image_copy_start)) { + /* Put FPGA bridges into reset (unless booting from FPGA). */ + socfpga_bridges_reset(1); + } socfpga_per_reset(SOCFPGA_RESET(SDR), 0); socfpga_per_reset(SOCFPGA_RESET(UART0), 0); @@ -163,5 +166,6 @@ void board_init_f(ulong dummy) hang(); } - socfpga_bridges_reset(1); + if (!IS_SOCFPGA_FPGA_SLAVES_ADDRESS((ulong)__image_copy_start)) + socfpga_bridges_reset(1); } -- 2.17.1

2 1

[U-Boot] [PATCH 00/10] net: fec: Code Improvement/cleanups
by Jagan Teki 09 Oct '18

09 Oct '18

2 20