May 2018 - U-Boot

[U-Boot] [PATCH v2] Remove CONFIG_MVGBE from config_whitelist.txt
by Chris Packham 27 May '18

27 May '18

Now that there are no more boards defining this it can be removed from the whitelist. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- Changes in v2: - fix typo (s/more/no more/) in commit message. scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c5cb23dbf170..705ed89a659f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1333,7 +1333,6 @@ CONFIG_MTD_UBI_MODULE CONFIG_MULTI_CS CONFIG_MUSB_HOST CONFIG_MVEBU_MMC -CONFIG_MVGBE CONFIG_MVGBE_PORTS CONFIG_MVMFP_V2 CONFIG_MVS -- 2.17.0

2 1

[U-Boot] [PATCH v1 1/2] buildman: Extract environment as part of each build
by Alex Kiernan 27 May '18

27 May '18

As we're building the boards, extract the default U-Boot environment to uboot.env so we can interrogate it later. Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- tools/buildman/builderthread.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 0efe80d945..688322ced2 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -351,6 +351,16 @@ class BuilderThread(threading.Thread): lines.append(size_result.stdout.splitlines()[1] + ' ' + rodata_size) + # Extract the environment from U-Boot and dump it out + cmd = ['%sobjcopy' % self.toolchain.cross, '-O', 'binary', + '-j', '.rodata.default_environment', + 'env/built-in.o', 'uboot.env'] + command.RunPipe([cmd], capture=False, + capture_stderr=False, cwd=result.out_dir, + raise_on_error=False, env=env) + ubootenv = os.path.join(result.out_dir, 'uboot.env') + self.CopyFiles(result.out_dir, build_dir, '', ['uboot.env']) + # Write out the image sizes file. This is similar to the output # of binutil's 'size' utility, but it omits the header line and # adds an additional hex value at the end of each line for the -- 2.17.0

3 8

[U-Boot] [PATCH v2 3/6] common: iotrace: add timestamp to iotrace records
by Ramon Fried 27 May '18

27 May '18

Add timestamp to each iotrace record to aid in debugging of IO timing access bugs. Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- v2: replace get_ticks() with timer_get_us() common/iotrace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/iotrace.c b/common/iotrace.c index f39885663a..2f03a6082e 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -27,11 +27,13 @@ enum iotrace_flags { * struct iotrace_record - Holds a single I/O trace record * * @flags: I/O access type + * @timestamp: Timestamp of access * @addr: Address of access * @value: Value written or read */ struct iotrace_record { enum iotrace_flags flags; + u64 timestamp; phys_addr_t addr; iovalue_t value; }; @@ -81,7 +83,7 @@ static void add_record(int flags, const void *ptr, ulong value) iotrace.start + iotrace.offset, sizeof(value)); } - + rec->timestamp = timer_get_us(); rec->flags = flags; rec->addr = map_to_sysmem(ptr); rec->value = value; -- 2.17.0

2 1

[U-Boot] [PATCH v5] tpm2: tis_spi: add the possibility to reset the chip with a gpio
by Miquel Raynal 26 May '18

26 May '18

On some designs, the reset line could not be connected to the SoC reset line, in this case, request the GPIO and ensure the chip gets reset. Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- Changes since v4: ================= * This patch was part of a bigger series, sending it alone as other files seems to be in an acceptable state now. * Changed the commit title with the prefix "tpm2: tis_spi:" to refer to the right file ("tpm:" is too generic now). * Removed the #ifdef CONFIG_DM_GPIO/#endif couple around the <.../gpio.h> include. * Changed the #ifdef CONFIG_DM_GPIO/#endif couple in the code by a if (IS_ENABLED(CONFIG_DM_GPIO)). Changes since v3: ================= * Removed useless reset of rx_buf[0] in tpm_tis_spi_xfer(). * Changed the way spi_xfer return code is checked: error out on any value != 0 instead of just negative ones. * Removed unused functions flagged __maybe_unused as well as well as the __maybe_unused flags themselves when not needed. * Simplified the validity check of the GPIO as suggested. * Updated the compatible property for the SPI modules (as well as the bindings docuementation) to be simply "tis,tpm2-spi" which should work with most compliant chips. Data is linked to this generic compatible in the TPM driver, other values may be added if needed in the future to fit other chips that would use different values than the current ones (used by Infineon SLB 9670 and ST ST33TPHF20 modules, for instance). drivers/tpm/tpm2_tis_spi.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index 6a4d5284c9..2c4d714e01 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -24,6 +24,7 @@ #include <linux/compiler.h> #include <linux/types.h> #include <linux/unaligned/be_byteshift.h> +#include <asm-generic/gpio.h> #include "tpm_tis.h" #include "tpm_internal.h" @@ -575,6 +576,21 @@ static int tpm_tis_spi_probe(struct udevice *dev) struct tpm_chip *chip = dev_get_priv(dev); int ret; + if (IS_ENABLED(CONFIG_DM_GPIO)) { + struct gpio_desc reset_gpio; + + ret = gpio_request_by_name(dev, "gpio-reset", 0, + &reset_gpio, GPIOD_IS_OUT); + if (ret) { + log(LOGC_NONE, LOGL_NOTICE, "%s: missing reset GPIO\n", + __func__); + } else { + dm_gpio_set_value(&reset_gpio, 0); + mdelay(1); + dm_gpio_set_value(&reset_gpio, 1); + } + } + /* Ensure a minimum amount of time elapsed since reset of the TPM */ mdelay(drv_data->time_before_first_cmd_ms); -- 2.14.1

3 2

[U-Boot] [PATCH 0/2] Allow building EFI binaries on x86_64
by Heinrich Schuchardt 26 May '18

26 May '18

With the patch series EFI binaries needed for the EFI selftests can be built on x86_64. But we still lack setjmp support so we cannot activate the StartImage selftest. We should handle this series via Alex's efi-next tree. Heinrich Schuchardt (2): efi_selftest: allow building relocation code on x86_64 efi_loader: build CRT0 and RELOC on x86_64 arch/x86/config.mk | 20 ++++++++++++++++---- arch/x86/lib/Makefile | 12 +++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) -- 2.17.0

3 5

[U-Boot] [PATCH] Remove CONFIG_MVGBE from config_whitelist.txt
by Chris Packham 26 May '18

26 May '18

Now that there are more boards defining this it can be removed from the whitelist. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c5cb23dbf170..705ed89a659f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1333,7 +1333,6 @@ CONFIG_MTD_UBI_MODULE CONFIG_MULTI_CS CONFIG_MUSB_HOST CONFIG_MVEBU_MMC -CONFIG_MVGBE CONFIG_MVGBE_PORTS CONFIG_MVMFP_V2 CONFIG_MVS -- 2.17.0

2 1

[U-Boot] [BUG] efi_loader: efi_add_memory_map() removes mapping even on failure
by Heinrich Schuchardt 26 May '18

26 May '18

Hello Alex, when I read through efi_add_memory_map() it seems that the function will delete mappings even if it later decides to return an error (e.g. EFI_CARVE_OVERLAPS_NONRAM or overlap with non-RAM). Shouldn't existing mappings remain untouched if an error occurs? Best regards Heinrich

1 0

[U-Boot] U-Boot thumb interlink patches
by Tom Rini 26 May '18

26 May '18

Hey guys, So, I want to be sure that I get all of the patches that we need in order to fix the thumb interlink problems on older ARM cores applied. I believe that we have: https://patchwork.ozlabs.org/patch/905299/ Which could still apply, but I'm wondering if the kernel needs this as well then (in arch/arm/lib/copy_template.S) ? And then: https://patchwork.ozlabs.org/patch/909652/ has been reviewed and could be applied. Is there anything else I'm missing? Thanks! -- Tom

4 4

[U-Boot] [PATCH 1/1] efi_loader: avoid anonymous constants for AllocatePages
by Heinrich Schuchardt 26 May '18

26 May '18

Do not use anonymous constants when calling efi_allocage_pages. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 6 ++++-- lib/efi_loader/efi_memory.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 806339823ff..707d159baca 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -143,11 +143,13 @@ static void *copy_fdt(void *fdt) /* Safe fdt location is at 128MB */ new_fdt_addr = fdt_ram_start + (128 * 1024 * 1024) + fdt_size; - if (efi_allocate_pages(1, EFI_RUNTIME_SERVICES_DATA, fdt_pages, + if (efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, + EFI_RUNTIME_SERVICES_DATA, fdt_pages, &new_fdt_addr) != EFI_SUCCESS) { /* If we can't put it there, put it somewhere */ new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size); - if (efi_allocate_pages(1, EFI_RUNTIME_SERVICES_DATA, fdt_pages, + if (efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, + EFI_RUNTIME_SERVICES_DATA, fdt_pages, &new_fdt_addr) != EFI_SUCCESS) { printf("ERROR: Failed to reserve space for FDT\n"); return NULL; diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 502a15f96e5..4ea25c03053 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -337,7 +337,8 @@ void *efi_alloc(uint64_t len, int memory_type) uint64_t pages = (len + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; efi_status_t r; - r = efi_allocate_pages(0, memory_type, pages, &ret); + r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, memory_type, pages, + &ret); if (r == EFI_SUCCESS) return (void*)(uintptr_t)ret; @@ -384,7 +385,8 @@ efi_status_t efi_allocate_pool(int pool_type, efi_uintn_t size, void **buffer) return EFI_SUCCESS; } - r = efi_allocate_pages(0, pool_type, num_pages, &t); + r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, pool_type, num_pages, + &t); if (r == EFI_SUCCESS) { struct efi_pool_allocation *alloc = (void *)(uintptr_t)t; @@ -515,7 +517,7 @@ int efi_memory_init(void) /* Request a 32bit 64MB bounce buffer region */ uint64_t efi_bounce_buffer_addr = 0xffffffff; - if (efi_allocate_pages(1, EFI_LOADER_DATA, + if (efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, EFI_LOADER_DATA, (64 * 1024 * 1024) >> EFI_PAGE_SHIFT, &efi_bounce_buffer_addr) != EFI_SUCCESS) return -1; -- 2.17.0

1 0

[U-Boot] [PATCH] x86: use EFI calling convention for efi_main on x86_64
by Ivan Gorinov 26 May '18

26 May '18

Save the arguments passed in %rcx and %rdx for efi_main() on x86_64; consistently use EFI calling convention for efi_main(). Signed-off-by: Ivan Gorinov <ivan.gorinov(a)intel.com> --- arch/x86/lib/crt0_x86_64_efi.S | 8 ++++---- lib/efi/efi_app.c | 3 ++- lib/efi/efi_stub.c | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/lib/crt0_x86_64_efi.S b/arch/x86/lib/crt0_x86_64_efi.S index 989799f..2d53d1b 100644 --- a/arch/x86/lib/crt0_x86_64_efi.S +++ b/arch/x86/lib/crt0_x86_64_efi.S @@ -16,19 +16,19 @@ _start: subq $8, %rsp pushq %rcx pushq %rdx + pushq %rsi + pushq %rdi 0: lea image_base(%rip), %rdi lea _DYNAMIC(%rip), %rsi - popq %rcx - popq %rdx - pushq %rcx - pushq %rdx call _relocate popq %rdi popq %rsi + popq %rdx + popq %rcx call efi_main addq $8, %rsp diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c index c828093..3eb8eeb 100644 --- a/lib/efi/efi_app.c +++ b/lib/efi/efi_app.c @@ -96,7 +96,8 @@ static void free_memory(struct efi_priv *priv) * U-Boot. If it returns, EFI will continue. Another way to get back to EFI * is via reset_cpu(). */ -efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) +efi_status_t EFIAPI efi_main(efi_handle_t image, + struct efi_system_table *sys_table) { struct efi_priv local_priv, *priv = &local_priv; efi_status_t ret; diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 3138739..399d16b 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -268,7 +268,8 @@ static void add_entry_addr(struct efi_priv *priv, enum efi_entry_t type, * This function is called by our EFI start-up code. It handles running * U-Boot. If it returns, EFI will continue. */ -efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) +efi_status_t EFIAPI efi_main(efi_handle_t image, + struct efi_system_table *sys_table) { struct efi_priv local_priv, *priv = &local_priv; struct efi_boot_services *boot = sys_table->boottime; -- 2.7.4

2 1