June 2019 - U-Boot

[U-Boot] [PATCH 1/1] trace: make call depth limit customizable
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

Up to now we had hard coded values for the call depth up to which trace records are created: 200 for early tracing, 15 thereafter. UEFI applications reach a call depth of 80 or above. Provide customizing settings for the call trace depth limit and the early call trace depth limit. Use the old values as defaults. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/Kconfig | 15 +++++++++++++++ lib/trace.c | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/Kconfig b/lib/Kconfig index 416e63c1c7..e717eb3de5 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -192,6 +192,13 @@ config TRACE_BUFFER_SIZE the size is too small then 'trace stats' will show a message saying how many records were dropped due to buffer overflow. +config TRACE_CALL_DEPTH_LIMIT + int "Trace call depth limit" + depends on TRACE + default 15 + help + Sets the maximum call depth up to which function calls are recorded. + config TRACE_EARLY bool "Enable tracing before relocation" depends on TRACE @@ -209,6 +216,14 @@ config TRACE_EARLY_SIZE Sets the size of the early trace buffer in bytes. This is used to hold tracing information before relocation. +config TRACE_EARLY_CALL_DEPTH_LIMIT + int "Early trace call depth limit" + depends on TRACE_EARLY + default 200 + help + Sets the maximum call depth up to which function calls are recorded + during early tracing. + config TRACE_EARLY_ADDR hex "Address of early trace buffer in U-Boot" depends on TRACE_EARLY diff --git a/lib/trace.c b/lib/trace.c index a13e5bf228..04780f59d3 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -376,7 +376,7 @@ int __attribute__((no_instrument_function)) trace_init(void *buff, add_textbase(); puts("trace: enabled\n"); - hdr->depth_limit = 15; + hdr->depth_limit = CONFIG_TRACE_CALL_DEPTH_LIMIT; trace_enabled = 1; trace_inited = 1; @@ -410,7 +410,7 @@ int __attribute__((no_instrument_function)) trace_early_init(void) hdr->ftrace = (struct trace_call *)((char *)hdr + needed); hdr->ftrace_size = (buff_size - needed) / sizeof(*hdr->ftrace); add_textbase(); - hdr->depth_limit = 200; + hdr->depth_limit = CONFIG_TRACE_EARLY_CALL_DEPTH_LIMIT; printf("trace: early enable at %08x\n", CONFIG_TRACE_EARLY_ADDR); trace_enabled = 1; -- 2.20.1

2 2

[U-Boot] [PATCH 1/1] trace: conserve gd register
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

An UEFI application may change the value of the register that gd lives in. But some of our functions like get_ticks() access this register. So we have to set the gd register to the U-Boot value when entering a trace point and set it back to the application value when exiting the trace point. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/trace.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/lib/trace.c b/lib/trace.c index 9956442fef..a13e5bf228 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -56,6 +56,49 @@ static inline uintptr_t __attribute__((no_instrument_function)) return offset / FUNC_SITE_SIZE; } +#ifdef CONFIG_EFI_LOADER + +/** + * trace_gd - the value of the gd register + */ +static volatile void *trace_gd; + +/** + * trace_save_gd() - save the value of the gd register + */ +static void __attribute__((no_instrument_function)) trace_save_gd(void) +{ + trace_gd = gd; +} + +/** + * trace_swap_gd() - swap between U-Boot and application gd register value + * + * An UEFI application may change the value of the register that gd lives in. + * But some of our functions like get_ticks() access this register. So we + * have to set the gd register to the U-Boot value when entering a trace + * point and set it back to the application value when exiting the trace point. + */ +static void __attribute__((no_instrument_function)) trace_swap_gd(void) +{ + volatile void *temp_gd = trace_gd; + + trace_gd = gd; + gd = temp_gd; +} + +#else + +static void __attribute__((no_instrument_function)) trace_save_gd(void) +{ +} + +static void __attribute__((no_instrument_function)) trace_swap_gd(void) +{ +} + +#endif + static void __attribute__((no_instrument_function)) add_ftrace(void *func_ptr, void *caller, ulong flags) { @@ -100,6 +143,7 @@ void __attribute__((no_instrument_function)) __cyg_profile_func_enter( if (trace_enabled) { int func; + trace_swap_gd(); add_ftrace(func_ptr, caller, FUNCF_ENTRY); func = func_ptr_to_num(func_ptr); if (func < hdr->func_count) { @@ -111,6 +155,7 @@ void __attribute__((no_instrument_function)) __cyg_profile_func_enter( hdr->depth++; if (hdr->depth > hdr->depth_limit) hdr->max_depth = hdr->depth; + trace_swap_gd(); } } @@ -126,8 +171,10 @@ void __attribute__((no_instrument_function)) __cyg_profile_func_exit( void *func_ptr, void *caller) { if (trace_enabled) { + trace_swap_gd(); add_ftrace(func_ptr, caller, FUNCF_EXIT); hdr->depth--; + trace_swap_gd(); } } @@ -284,6 +331,8 @@ int __attribute__((no_instrument_function)) trace_init(void *buff, size_t needed; int was_disabled = !trace_enabled; + trace_save_gd(); + if (!was_disabled) { #ifdef CONFIG_TRACE_EARLY char *end; -- 2.20.1

2 2

[U-Boot] [PATCH 1/1] trace: undefined reference to `trace_early_init'
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

Compiling with TRACE but without TRACE_EARLY results in an error aarch64-linux-gnu-ld.bfd: common/built-in.o:(.rodata.init_sequence_f+0x10): undefined reference to `trace_early_init' trace_early_init() should not be called if CONFIG_TRACE_EARLY is not defined. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_f.c b/common/board_f.c index c25eb188fb..0fc938dc87 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -839,7 +839,7 @@ static const init_fnc_t init_sequence_f[] = { #ifdef CONFIG_OF_CONTROL fdtdec_setup, #endif -#ifdef CONFIG_TRACE +#ifdef CONFIG_TRACE_EARLY trace_early_init, #endif initf_malloc, -- 2.20.1

2 2

[U-Boot] [PATCH v3 0/3] fdt: Allow indicating a node is for U-Boot proper only
by Patrick Delaunay 28 Jun '19

28 Jun '19

Hi, I create this serie with: 1/ documentation update for previous patch [U-Boot,v2] dm: remove pre reloc properties in SPL and TPL device tree http://patchwork.ozlabs.org/patch/1081155/ PS: Code is already merged in commit commit c7a88dae997f ("dm: remove pre reloc properties in SPL and TPL device tree") but not the documentation. 2/ missing part for v1 serie (patch 1/2) http://patchwork.ozlabs.org/project/uboot/list/?series=89846 => http://patchwork.ozlabs.org/patch/1035797 3/ new tests for pre-reloc propertie in SPL as suggested by Simon (http://patchwork.ozlabs.org/patch/1081155/#2156621) Regards Patrick Changes in v3: - simplify test after Simon remarks by using fdtgrep on spl dtb - rebase on u-boot-dm/sandbox-working Changes in v2: - rebase on master Patrick Delaunay (3): test: check u-boot properties in SPL device tree fdt: Allow indicating a node is for U-Boot proper only dm: doc: add documentation for pre-reloc properties in SPL and TPL arch/sandbox/dts/sandbox.dtsi | 18 ++++++++++++++++++ doc/README.SPL | 16 ++++++++++++++++ doc/README.TPL | 4 ++++ doc/driver-model/README.txt | 4 ++++ drivers/core/util.c | 2 ++ drivers/video/video-uclass.c | 4 +++- include/dm/ofnode.h | 6 ++++-- include/dm/util.h | 6 ++++-- test/py/tests/test_ofplatdata.py | 28 ++++++++++++++++++++++++++++ 9 files changed, 83 insertions(+), 5 deletions(-) -- 2.7.4

3 9

[U-Boot] [PATCH 1/2] fdtdec: test: Fix memory leak
by Thierry Reding 28 Jun '19

28 Jun '19

From: Thierry Reding <treding(a)nvidia.com> Free the memory allocated to store the test FDT upon test completion to avoid leaking the memory. We don't bother cleaning up on test failure since the code is broken in that case and should be fixed, in which case the leak would also go away. Reported-by: Tom Rini <tom.rini(a)gmail.com> Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- lib/fdtdec_test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c index f6defe16c5a6..54efcc3d46ac 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -138,6 +138,7 @@ static int run_test(const char *aliases, const char *nodes, const char *expect) } printf("pass\n"); + free(blob); return 0; } @@ -288,6 +289,7 @@ static int check_carveout(void) CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 2, 2), 0); CHECKOK(check_fdt_carveout(fdt, 2, 2)); + free(fdt); return 0; } -- 2.21.0

2 6

[U-Boot] [PATCH 00/17] sandbox: Various bug fixes
by Simon Glass 28 Jun '19

28 Jun '19

This series collects together a lot of fixes for sandbox (mostly) that were discovered in the last release. Most of them are minor. Simon Glass (17): spl: misc: Allow misc drivers in SPL and TPL Add an empty stdint.h file sandbox: Sync up sandbox64.dts with main DT sandbox: Create a common sandbox DT sandbox: Add an alias for SPI sandbox: Exit when SYSRESET_POWER_OFF is requested sandbox: Quit when hang() is called sandbox: spl: Lower priority of standard loader sandbox: Add a comment to board_init_f() sandbox: Allo sdl-config to be overridden sandbox: Add a memory {} node sandbox: Correct spi flash operation sandbox: Add documentation on how to run valgrind x86: Add a forward struct declaration in coreboot_tables.h bootstage: Add support for TPL record count blk: Allow control of the block cache in TPL spi: Avoid using malloc() in a critical function arch/sandbox/config.mk | 5 +- arch/sandbox/cpu/spl.c | 3 +- arch/sandbox/cpu/state.c | 1 + arch/sandbox/dts/sandbox.dts | 336 +----------------------- arch/sandbox/dts/sandbox.dtsi | 346 +++++++++++++++++++++++++ arch/sandbox/dts/sandbox64.dts | 275 +------------------- arch/x86/include/asm/coreboot_tables.h | 2 + board/sandbox/README.sandbox | 21 ++ common/Kconfig | 7 + drivers/block/Kconfig | 7 + drivers/misc/Kconfig | 72 +++++ drivers/misc/Makefile | 8 +- drivers/spi/Kconfig | 2 +- drivers/spi/spi-mem.c | 15 +- drivers/sysreset/sysreset_sandbox.c | 1 + include/configs/sandbox.h | 4 + include/stdint.h | 7 + lib/hang.c | 3 + 18 files changed, 508 insertions(+), 607 deletions(-) create mode 100644 arch/sandbox/dts/sandbox.dtsi create mode 100644 include/stdint.h -- 2.21.0.1020.gf2820cf01a-goog

3 24

[U-Boot] [PATCH] usb: dwc3: Fix default dr_mode setting
by Jean-Jacques Hiblot 28 Jun '19

28 Jun '19

The IS_ENABLED() macro requires the complete CONFIG option including the 'CONFIG_' prefix. Signed-off-by: Jean-Jacques Hiblot <jjhiblot(a)ti.com> --- To be applied on top of usb/next drivers/usb/dwc3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 9f7f053265..10b3f837f2 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -707,7 +707,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) return -ENOMEM; } - if (!IS_ENABLED(USB_DWC3_GADGET)) + if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET)) dwc->dr_mode = USB_DR_MODE_HOST; else if (!IS_ENABLED(CONFIG_USB_HOST)) dwc->dr_mode = USB_DR_MODE_PERIPHERAL; -- 2.17.1

2 5

[U-Boot] [PATCH v2 0/6] efi_loader: clean up runtime detaching
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

This patch series moves the detaching of variable services from SetVirtualAddressMap() to ExitBootServices(). The return value of unimplemented runtime services is changed to EFI_UNSUPPORTED. A unit test for variable services at runtime is implmented. In the current version it expects EFI_UNSUPPORTED. v2 Do not add 'NULL' implementation for UEFI variables. Separate efi_relocate_runtime_table() and efi_runtime_detach(). Heinrich Schuchardt (6): efi_loader: move efi_query_variable_info() efi_loader: initialization of variable services efi_loader: clean up runtime detaching efi_loader: let the variable driver patch out the runtime efi_loader: unimplemented runtime services efi_selftest: test variable services at runtime include/efi_loader.h | 9 ++ lib/efi_loader/efi_boottime.c | 3 +- lib/efi_loader/efi_runtime.c | 148 +++++++----------- lib/efi_loader/efi_setup.c | 5 + lib/efi_loader/efi_variable.c | 81 ++++++++++ lib/efi_selftest/Makefile | 1 + .../efi_selftest_variables_runtime.c | 94 +++++++++++ 7 files changed, 249 insertions(+), 92 deletions(-) create mode 100644 lib/efi_selftest/efi_selftest_variables_runtime.c -- 2.20.1

1 6

[U-Boot] [PATCH v2 1/2] xilinx_xiic: Fix fill tx fifo loop
by Melin Tomas 28 Jun '19

28 Jun '19

Comparison should be against the actual message length, not loop index. len is used for stopping while loop, pos is position in message. stop should be sent when entire message is sent, not when len and pos meet. Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- Changes in v2: - Added reasoning to commit message drivers/i2c/xilinx_xiic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c index 83114ed510..e4ca0ab936 100644 --- a/drivers/i2c/xilinx_xiic.c +++ b/drivers/i2c/xilinx_xiic.c @@ -149,7 +149,7 @@ static void xiic_fill_tx_fifo(struct xilinx_xiic_priv *priv, while (len--) { u16 data = msg->buf[pos++]; - if (pos == len && nmsgs == 1) { + if ((msg->len - pos == 0) && nmsgs == 1) { /* last message in transfer -> STOP */ data |= XIIC_TX_DYN_STOP_MASK; } -- 2.17.2

3 24

[U-Boot] [PATCH] fastboot: mmc: add support for flashing boot partitions
by Fabien Parent 28 Jun '19

28 Jun '19

MMC storage supports 4 hardware partitions: * User partition * 2 boot partitions * RPMB partition Flashing to the User partition is already supported, and this commit adds support for flashing to the 2 boot partitions. User can run the following commands to flash to the boot partitions: fastboot flash mmcboot0 myfile fastboot flash mmcboot1 myfile "mmcboot" is the default name of the partition and can be changed via a Kconfig option. Signed-off-by: Fabien Parent <fparent(a)baylibre.com> --- drivers/fastboot/Kconfig | 17 +++++++++++++++++ drivers/fastboot/fb_mmc.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index d63ecdd27e..f481d7596c 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -126,6 +126,23 @@ config FASTBOOT_MBR_NAME specified on the "fastboot flash" command line matches the value defined here. The default target name for updating MBR is "mbr". +config FASTBOOT_MMC_BOOT_PART_NAME + string "Target name for updating MMC's boot partitions" + depends on FASTBOOT_FLASH_MMC + default "mmcboot" + help + The fastboot "flash" command supports writing the downloaded + image to the MMC's boot partitions. + This occurs when the specified "partition name" on the + "fastboot flash" command line is starts with the value defined here, + and ends with '0' or '1' to specify which boot partition is being + targeted. + The default name for updating the boot partitions is "mmcboot". + For example the two partitions can be flashed using the following + commands if the default name is used: + - "fastboot flash mmcboot0 myfile", + - "fastboot flash mmcboot1 myfile". + config FASTBOOT_CMD_OEM_FORMAT bool "Enable the 'oem format' command" depends on FASTBOOT_FLASH_MMC && CMD_GPT diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 90ca81da9b..c2451200f7 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -46,6 +46,28 @@ static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, return ret; } +static int part_get_mmc_boot_info(int hwpart, disk_partition_t *info) +{ + struct mmc *mmc; + int ret; + + mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); + if (!mmc) + return -EINVAL; + + ret = blk_select_hwpart_devnum(IF_TYPE_MMC, + CONFIG_FASTBOOT_FLASH_MMC_DEV, hwpart); + if (ret < 0) + return ret; + + memset(info, 0, sizeof(*info)); + info->start = 0; + info->size = mmc->capacity_boot; + info->blksz = mmc->write_bl_len; + + return 0; +} + /** * fb_mmc_blk_write() - Write/erase MMC in chunks of FASTBOOT_MAX_BLK_WRITE * @@ -394,7 +416,19 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, } #endif - if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { + if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT_PART_NAME "0") == 0) { + if (part_get_mmc_boot_info(1, &info) < 0) { + pr_err("cannot find partition: '%s'\n", cmd); + fastboot_fail("cannot find partition", response); + return; + } + } else if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT_PART_NAME "1") == 0) { + if (part_get_mmc_boot_info(2, &info) < 0) { + pr_err("cannot find partition: '%s'\n", cmd); + fastboot_fail("cannot find partition", response); + return; + } + } else if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { pr_err("cannot find partition: '%s'\n", cmd); fastboot_fail("cannot find partition", response); return; -- 2.20.1

2 1