July 2017 - U-Boot

[U-Boot] [PATCH v2 0/3] CMD_USB_MASS_STORAGE implies USB_FUNCTION_MASS_STORAGE
by Philipp Tomsich 26 Jul '17

26 Jul '17

Up to now, there's been some ugliness associated with the dependency from CMD_USB_MASS_STORAGE to USB_FUNCTION_MASS_STORAGE: if someone only defined CMD_USB_MASS_STORAGE, they'd meet a linker error due to missing symbols that came from USB_FUNCTION_MASS_STORAGE. Most platforms seem to have resorted to unconditionally enable USB_FUNCTION_MASS_STORAGE via their 'common' config-header... some tried to tie this to an #ifdef CMD_USB_MASS_STORAGE (in fact I had a patch for the RK3399 that did just that and rather decided to clean this up once and for all instead of contributing to the prolongation of the status quo). Neither is a good solution. So this series moves USB_FUNCTION_MASS_STORAGE to Kconfig and lets CMD_USB_MASS_STORAGE imply USB_FUNCTION_MASS_STORAGE. Finally, we run moveconfig to contain the damage. Changes in v2: - ran 'tabify' on newly added lines (in Kconfig) to fix a spaces vs. tabs issues Philipp Tomsich (3): usb: gadget: move USB_FUNCTION_MASS_STORAGE to Kconfig Kconfig: CMD_USB_MASS_STORAGE implies USB_FUNCTION_MASS_STORAGE config: move USB_FUNCTION_MASS_STORAGE cmd/Kconfig | 1 + configs/CHIP_pro_defconfig | 1 + configs/Nintendo_NES_Classic_Edition_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + configs/miqi-rk3288_defconfig | 1 + configs/parrot_r16_defconfig | 1 + configs/phycore-rk3288_defconfig | 2 +- configs/popmetal-rk3288_defconfig | 1 + configs/smdkv310_defconfig | 1 + configs/tinker-rk3288_defconfig | 1 + drivers/usb/gadget/Kconfig | 9 +++++++++ include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/bav335x.h | 4 ---- include/configs/cgtqmx6eval.h | 2 -- include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 2 -- include/configs/colibri_vf.h | 1 - include/configs/exynos4-common.h | 2 -- include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mx6sabre_common.h | 2 -- include/configs/mx7dsabresd.h | 2 -- include/configs/nitrogen6x.h | 2 -- include/configs/odroid_xu3.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 2 -- include/configs/rk3036_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 4 ---- include/configs/s5p_goni.h | 1 - include/configs/socfpga_common.h | 2 -- include/configs/sunxi-common.h | 1 - include/configs/tbs2910.h | 1 - include/configs/tegra-common-usb-gadget.h | 1 - include/configs/warp.h | 2 -- include/configs/warp7.h | 2 -- scripts/config_whitelist.txt | 1 - 44 files changed, 22 insertions(+), 47 deletions(-) -- 2.1.4

5 11

Re: [U-Boot] [PATCHv4 0/2] ARM: sunxi: Add support for OLinuXino Lime2 eMMC
by Diego 26 Jul '17

26 Jul '17

> On Mon, Jul 10, 2017 at 03:44:17PM +0200, Olliver Schinagl wrote: > > Ping, > > > > any reason this hasn't been merged yet? :) > > I don't know. Jagan? > > Maxime It looks like Jagan isn't responding. Anybody else that can approve this? Bests, Diego

1 0

[U-Boot] [PATCH v12 0/8] Add Intel Arria 10 SoC FPGA driver
by tien.fong.chee＠intel.com 26 Jul '17

26 Jul '17

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This is the 12th version of patchset to adds support for Intel Arria 10 SoC FPGA driver. This version mainly resolved comments from Marek in [v11]. This series is working on top of u-boot-socfpga.git - http://git.denx.de/u-boot-socfpga.git [v11]: https://www.mail-archive.com/u-boot@lists.denx.de/msg255643.html v11 -> v12 changes: ----------------- - Changed the commit messages of patch 5. - Separate patch for defconfig, header changes and minor code clean up. Patchset history ---------------- [v1]: https://www.mail-archive.com/u-boot@lists.denx.de/msg247788.html [v2]: https://www.mail-archive.com/u-boot@lists.denx.de/msg248541.html [v3]: https://www.mail-archive.com/u-boot@lists.denx.de/msg249160.html [v4]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250149.html [v5]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250517.html [v6]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250687.html [v7]: https://www.mail-archive.com/u-boot@lists.denx.de/msg251213.html [v8]: https://www.mail-archive.com/u-boot@lists.denx.de/msg252196.html [v9]: https://www.mail-archive.com/u-boot@lists.denx.de/msg252422.html [v10]: https://www.mail-archive.com/u-boot@lists.denx.de/msg252583.html Reviewed-by: Ley Foon Tan <ley.foon.tan(a)intel.com> Reviewed-by: Dinh Nguyen <dinguyen(a)kernel.org> Tien Fong Chee (8): arm: socfpga: Remove unused passing parameter of socfpga_bridges_reset arm: socfpga: Restructure FPGA driver in the preparation to support A10 kconfig: Convert FPGA and FPGA_ALTERA configuration to Kconfig kconfig: Convert FPGA_SOCFPGA configuration to Kconfig drivers: Enable FPGA driver build on SPL configs: Add FPGA driver config for Arria 10 arm: socfpga: Add FPGA driver support for Arria 10 arm: socfpga: Enable all FPGA config support for Arria 10 arch/arm/mach-socfpga/Makefile | 2 +- arch/arm/mach-socfpga/include/mach/fpga_manager.h | 70 +-- .../include/mach/fpga_manager_arria10.h | 100 +++++ .../mach/{fpga_manager.h => fpga_manager_gen5.h} | 69 ++- .../include/mach/reset_manager_arria10.h | 2 +- arch/arm/mach-socfpga/reset_manager_arria10.c | 4 +- configs/astro_mcf5373l_defconfig | 1 + configs/socfpga_arria10_defconfig | 2 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + drivers/Makefile | 1 + drivers/fpga/Kconfig | 8 + drivers/fpga/Makefile | 2 + drivers/fpga/socfpga.c | 235 +--------- drivers/fpga/socfpga_arria10.c | 479 +++++++++++++++++++++ drivers/fpga/{socfpga.c => socfpga_gen5.c} | 54 +-- include/configs/astro_mcf5373l.h | 2 - include/configs/socfpga_common.h | 6 +- include/configs/theadorable.h | 2 - 30 files changed, 658 insertions(+), 394 deletions(-) create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h copy arch/arm/mach-socfpga/include/mach/{fpga_manager.h => fpga_manager_gen5.h} (57%) create mode 100644 drivers/fpga/socfpga_arria10.c copy drivers/fpga/{socfpga.c => socfpga_gen5.c} (83%) -- 2.2.0

4 13

[U-Boot] [PATCH] efi_loader: allow efi_loader code to call EFI interfaces
by Rob Clark 26 Jul '17

26 Jul '17

To implement efi_load_image() for the case of loading an image from a device path rather than image already loaded into source_buffer, it is convenient to be able to re-use simple-file-system and efi-file interfaces. But these are already using EFI_ENTER()/EFI_EXIT(). Allow entry into EFI interfaces to be recursive, since this greatly simplifies things. (And hypothetically this would be needed anyways to allow grub to call into interfaces installed by something outside of grub.) Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- lib/efi_loader/efi_boottime.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 8735b1f418..a113124708 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -47,6 +47,7 @@ static struct efi_configuration_table __efi_runtime_data efi_conf_table[2]; * EFI callback entry/exit. */ static volatile void *efi_gd, *app_gd; +static int entry_level = 0; #endif /* Called from do_bootefi_exec() */ @@ -61,6 +62,8 @@ void efi_save_gd(void) void efi_restore_gd(void) { #ifdef CONFIG_ARM + if (entry_level++) + return; /* Only restore if we're already in EFI context */ if (!efi_gd) return; @@ -75,6 +78,8 @@ void efi_restore_gd(void) efi_status_t efi_exit_func(efi_status_t ret) { #ifdef CONFIG_ARM + if (--entry_level) + return ret; gd = app_gd; #endif -- 2.13.0

3 19

[U-Boot] [PATCH v2 0/9] spl: dm: Make it possible for the SPL to pick its own DTB from a FIT
by Jean-Jacques Hiblot 25 Jul '17

25 Jul '17

Following the RFC, here is the series implementing the mechanism in a cleaner way. The idea is that the SPL may take advantage of selecting its DTB from a pool of available DTBs. To do that several DTBs are embedded in a compressed FIT image appended at the end of the SPL. The patch is done in such way that this mechanism can easily be extended to other ways of loading the DTBs. Here are some numbers: +----------------------------------------+ | Size |delta |boot-time| delta | | (bytes) |(bytes) |(ms) | (ms) | +---------------------------------------------------------------+ | reference | 120185 | | 1331 | | +---------------------------------------------------------------+ | feature | | | | | | deactiVated | 120185 | 0 | 1330 | -1 | +---------------------------------------------------------------+ | 1 DTB LZO | 120208 | 2 | 1331 | 0 | +---------------------------------------------------------------+ | 4 DTB LZO | 120810 | 625 | 1336 | 5 | +---------------------------------------------------------------+ | 4 DTB LZO | | | | | | no malloc | 120746 | 561 | 1343 | 12 | +---------------------------------------------------------------+ | 4 DTB GZIP | 128552 | 8367 | 1353 | 22 | +---------------------------------------------------------------+ | 4 DTB No comp | 132352 | 12167 | 1351 | 20 | +----------------------+----------+----------+---------+--------+ changes since v1: - improved help in Kconfig for the SPL_MULTI_DTB_FIT option - Added "reviewed-by" tags changes since RFC: - split the RFC patch in several patches. - leverage work from Cooper Jr., Franklin (CONFIG_FIT_EMBED) as a big part of the code is similar. Rename CONFIG_FIT_EMBED as CONFIG_MULTI_DTB_FIT to prevent confusion with CONFIG_OF_EMBED. - use the default configuration if no match is provided by board_fit_config_name_match(). note that this is generic not just for this feature. - provide an option to not use dynamic memory allocation. - added a patch related to board detection on omap that's required to take advantage of this feature. Jean-Jacques Hiblot (9): dts: renamed FIT_EMBED to MULTI_DTB_FIT and moved it to the dts Kconfig fit: use 'const' for the input of fdt_offset() and locate_dtb_in_fit() fit: fixed bug in locate_dtb_in_fit() fit: If no matching config is found in fit_find_config_node(), use the default one lzo: add a function to check the validity of the header gzip: add a function to parse the header lib: allow building lzo and gunzip for the SPL spl: dm: Make it possible for the SPL to pick its own DTB from a FIT omap: detect board before spl_early_init() Makefile | 2 +- arch/arm/mach-omap2/hwinit-common.c | 4 +- board/ti/ks2_evm/board_k2e.c | 2 +- board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/ks2_evm/board_k2hk.c | 2 +- board/ti/ks2_evm/board_k2l.c | 2 +- common/Kconfig | 16 ------ common/Makefile | 2 +- common/boot_fit.c | 6 +-- common/common_fit.c | 20 +++++++ configs/k2e_evm_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/k2hk_evm_defconfig | 2 +- configs/k2l_evm_defconfig | 2 +- dts/Kconfig | 103 +++++++++++++++++++++++++++++++++++- include/boot_fit.h | 4 +- include/common.h | 1 + include/linux/lzo.h | 3 ++ lib/Kconfig | 11 ++++ lib/Makefile | 6 +-- lib/fdtdec.c | 85 +++++++++++++++++++++++++---- lib/gunzip.c | 15 ++++-- lib/lzo/lzo1x_decompress.c | 21 ++++++-- scripts/Makefile.spl | 35 +++++++++++- 24 files changed, 297 insertions(+), 53 deletions(-) -- 1.9.1

2 10

[U-Boot] [RFC] efi: variable support
by Rob Clark 25 Jul '17

25 Jul '17

Mapping from EFI variables to grub variables. Still almost as many TODOs as lines of code, but just figured I'd send out an early version for comments. I was thinking of it as a useful way for u-boot to pass values to grub (although grub is still missing a way for grub scripts to retrieve UEFI variables). The rough idea is to encode GUID + variable name plus "efi_" prefix (to avoid unintended u-boot variables leaking into the UEFI world). And then encode the type (and attributes?) in the string value of the variable. Ie. something like: setenv efi_8be4df6193ca11d2aa0d00e098032b8c_OsIndicationsSupported (u64)0 --- cmd/bootefi.c | 3 + include/efi.h | 19 ++++ include/efi_loader.h | 10 ++ lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_runtime.c | 17 ++- lib/efi_loader/efi_util.h | 79 ++++++++++++++ lib/efi_loader/efi_variable.c | 235 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 lib/efi_loader/efi_util.h create mode 100644 lib/efi_loader/efi_variable.c diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 4f11682..56f6bc4 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -300,6 +300,9 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt) efi_reset_system_init(); efi_get_time_init(); + /* we don't support much: */ + setenv("efi_61dfe48bca93d211aa0d00e098032b8c_OsIndicationsSupported", "(u64)0"); + /* Call our payload! */ debug("%s:%d Jumping to 0x%lx\n", __func__, __LINE__, (long)entry); diff --git a/include/efi.h b/include/efi.h index 3d58780..f819c5b 100644 --- a/include/efi.h +++ b/include/efi.h @@ -294,6 +294,25 @@ extern char image_base[]; /* Start and end of U-Boot image (for payload) */ extern char _binary_u_boot_bin_start[], _binary_u_boot_bin_end[]; +/* + * Variable Attributes + */ +#define EFI_VARIABLE_NON_VOLATILE 0x0000000000000001 +#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002 +#define EFI_VARIABLE_RUNTIME_ACCESS 0x0000000000000004 +#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x0000000000000008 +#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x0000000000000010 +#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x0000000000000020 +#define EFI_VARIABLE_APPEND_WRITE 0x0000000000000040 + +#define EFI_VARIABLE_MASK (EFI_VARIABLE_NON_VOLATILE | \ + EFI_VARIABLE_BOOTSERVICE_ACCESS | \ + EFI_VARIABLE_RUNTIME_ACCESS | \ + EFI_VARIABLE_HARDWARE_ERROR_RECORD | \ + EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS | \ + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS | \ + EFI_VARIABLE_APPEND_WRITE) + /** * efi_get_sys_table() - Get access to the main EFI system table * diff --git a/include/efi_loader.h b/include/efi_loader.h index 99619f5..812ec10 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -176,6 +176,16 @@ efi_status_t __efi_runtime EFIAPI efi_get_time( struct efi_time_cap *capabilities); void efi_get_time_init(void); +efi_status_t EFIAPI efi_get_variable(s16 *variable_name, + efi_guid_t *vendor, u32 *attributes, + unsigned long *data_size, void *data); +efi_status_t EFIAPI efi_get_next_variable( + unsigned long *variable_name_size, + s16 *variable_name, efi_guid_t *vendor); +efi_status_t EFIAPI efi_set_variable(s16 *variable_name, + efi_guid_t *vendor, u32 attributes, + unsigned long data_size, void *data); + #else /* defined(EFI_LOADER) && !defined(CONFIG_SPL_BUILD) */ /* Without CONFIG_EFI_LOADER we don't have a runtime section, stub it out */ diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 3c230ac..9c67367 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -16,6 +16,7 @@ always := $(efiprogs-y) obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o obj-y += efi_image_loader.o efi_boottime.o efi_runtime.o efi_console.o obj-y += efi_memory.o +obj-y += efi_variable.o obj-$(CONFIG_LCD) += efi_gop.o obj-$(CONFIG_DM_VIDEO) += efi_gop.o obj-$(CONFIG_PARTITIONS) += efi_disk.o diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index dd52755..7615090 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -184,7 +184,16 @@ static const struct efi_runtime_detach_list_struct efi_runtime_detach_list[] = { /* Clean up system table */ .ptr = &systab.boottime, .patchto = NULL, - }, + }, { + .ptr = &efi_runtime_services.get_variable, + .patchto = &efi_device_error, + }, { + .ptr = &efi_runtime_services.get_next_variable, + .patchto = &efi_device_error, + }, { + .ptr = &efi_runtime_services.set_variable, + .patchto = &efi_device_error, + } }; static bool efi_runtime_tobedetached(void *p) @@ -382,9 +391,9 @@ struct efi_runtime_services __efi_runtime_data efi_runtime_services = { .set_wakeup_time = (void *)&efi_unimplemented, .set_virtual_address_map = &efi_set_virtual_address_map, .convert_pointer = (void *)&efi_invalid_parameter, - .get_variable = (void *)&efi_device_error, - .get_next_variable = (void *)&efi_device_error, - .set_variable = (void *)&efi_device_error, + .get_variable = efi_get_variable, + .get_next_variable = efi_get_next_variable, + .set_variable = efi_set_variable, .get_next_high_mono_count = (void *)&efi_device_error, .reset_system = &efi_reset_system_boottime, }; diff --git a/lib/efi_loader/efi_util.h b/lib/efi_loader/efi_util.h new file mode 100644 index 0000000..a566e81 --- /dev/null +++ b/lib/efi_loader/efi_util.h @@ -0,0 +1,79 @@ +/* + * EFI utils + * + * Copyright (c) 2017 Rob Clark + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __EFI_UTIL_H_ +#define __EFI_UTIL_H_ + +/* + * utf8/utf16 conversion lifted from grub + */ + +static inline int +utf16_strlen(uint16_t *in) +{ + int i; + for (i = 0; in[i]; i++); + return i; +} + +/* Convert UTF-16 to UTF-8. */ +static inline uint8_t * +utf16_to_utf8(uint8_t *dest, const uint16_t *src, size_t size) +{ + uint32_t code_high = 0; + + while (size--) { + uint32_t code = *src++; + + if (code_high) { + if (code >= 0xDC00 && code <= 0xDFFF) { + /* Surrogate pair. */ + code = ((code_high - 0xD800) << 10) + (code - 0xDC00) + 0x10000; + + *dest++ = (code >> 18) | 0xF0; + *dest++ = ((code >> 12) & 0x3F) | 0x80; + *dest++ = ((code >> 6) & 0x3F) | 0x80; + *dest++ = (code & 0x3F) | 0x80; + } else { + /* Error... */ + *dest++ = '?'; + /* *src may be valid. Don't eat it. */ + src--; + } + + code_high = 0; + } else { + if (code <= 0x007F) { + *dest++ = code; + } else if (code <= 0x07FF) { + *dest++ = (code >> 6) | 0xC0; + *dest++ = (code & 0x3F) | 0x80; + } else if (code >= 0xD800 && code <= 0xDBFF) { + code_high = code; + continue; + } else if (code >= 0xDC00 && code <= 0xDFFF) { + /* Error... */ + *dest++ = '?'; + } else if (code < 0x10000) { + *dest++ = (code >> 12) | 0xE0; + *dest++ = ((code >> 6) & 0x3F) | 0x80; + *dest++ = (code & 0x3F) | 0x80; + } else { + *dest++ = (code >> 18) | 0xF0; + *dest++ = ((code >> 12) & 0x3F) | 0x80; + *dest++ = ((code >> 6) & 0x3F) | 0x80; + *dest++ = (code & 0x3F) | 0x80; + } + } + } + + return dest; +} + + +#endif /* __EFI_UTIL_H_ */ diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c new file mode 100644 index 0000000..5343f49 --- /dev/null +++ b/lib/efi_loader/efi_variable.c @@ -0,0 +1,235 @@ +/* + * EFI utils + * + * Copyright (c) 2017 Rob Clark + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <efi_loader.h> +#include "efi_util.h" + + +/* Mapping between EFI variables and u-boot variables: + * + * efi_$guid_$varname = (type)value + * + * For example: + * + * efi_8be4df6193ca11d2aa0d00e098032b8c_OsIndicationsSupported= + * "(u64)0" + * efi_f3cc021b90a3486683fbe8b6461fc2f2_fdtpath= + * "(string)qcom/apq8016-sbc.dtb" + * + * Possible types: + * + * + string - raw string (TODO automatically converted to utf16?) + * + u64 - hex string encoding 64b value + * + * TODO add other types as needed. + * + * TODO we could include attributes in the value string, ie. something + * like "(ro,boot)(string)qcom/apq8016-sbc.dtb" + * + * TODO we could at least provide read-only access to ->get_variable() + * and friends by snapshot'ing the variables at detach time and having + * alternate versions of ->get_variable() and ->get_next_variable() + * in efi_runtime section. + */ + +#define MAX_VAR_NAME 31 +#define MAX_NATIVE_VAR_NAME (strlen("efi_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_") + MAX_VAR_NAME) + +static int hex(unsigned char ch) +{ + if (ch >= 'a' && ch <= 'f') + return ch-'a'+10; + if (ch >= '0' && ch <= '9') + return ch-'0'; + if (ch >= 'A' && ch <= 'F') + return ch-'A'+10; + return -1; +} + +static const char * hex2mem(u8 *mem, const char *hexstr, int count) +{ + memset(mem, 0, count/2); + + do { + int nibble; + + *mem = 0; + + if (!count || !*hexstr) + break; + + nibble = hex(*hexstr); + if (nibble < 0) + break; + + *mem = nibble; + count--; + hexstr++; + + if (!count || !*hexstr) + break; + + nibble = hex(*hexstr); + if (nibble < 0) + break; + + *mem = (*mem << 4) | nibble; + count--; + hexstr++; + mem++; + + } while (1); + + if (*hexstr) + return hexstr; + + return NULL; +} + +static char * mem2hex(char *hexstr, const u8 *mem, int count) +{ + static const char hexchars[] = "0123456789abcdef"; + + while (count-- > 0) { + u8 ch = *mem++; + *hexstr++ = hexchars[ch >> 4]; + *hexstr++ = hexchars[ch & 0xf]; + } + + return hexstr; +} + +/* TODO this ends up byte-swapping the GUID compared to what one might + * expect, so: + * + * efi_61dfe48bca93d211aa0d00e098032b8c_OsIndicationsSupported + * + * instead of + * + * efi_8be4df6193ca11d2aa0d00e098032b8c_OsIndicationsSupported + * + * possibly make logic smarter in converting efi<->native + */ + +static efi_status_t efi_to_native(char *native, s16 *variable_name, + efi_guid_t *vendor) +{ + size_t len; + + len = utf16_strlen((u16 *)variable_name); + if (len >= MAX_VAR_NAME) + return EFI_DEVICE_ERROR; + + native += sprintf(native, "efi_"); + native = mem2hex(native, vendor->b, sizeof(vendor->b)); + native += sprintf(native, "_"); + native = (char *)utf16_to_utf8((u8 *)native, (u16 *)variable_name, len); + *native = '\0'; + + return EFI_SUCCESS; +} + + +static const char * prefix(const char *str, const char *prefix) +{ + while (*str && *prefix) { + if (*str != *prefix) + break; + str++; + prefix++; + } + + if (*prefix) + return NULL; + + return str; +} + + +/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetVariable.28.… */ +efi_status_t EFIAPI efi_get_variable(s16 *variable_name, + efi_guid_t *vendor, u32 *attributes, + unsigned long *data_size, void *data) +{ + char native_name[MAX_NATIVE_VAR_NAME + 1]; + efi_status_t ret; + unsigned long in_size; + const char *val, *s; + + EFI_ENTRY("%p %p %p %p %p", variable_name, vendor, attributes, + data_size, data); + + if (!variable_name || !vendor || !data_size) + return EFI_EXIT(EFI_INVALID_PARAMETER); + + ret = efi_to_native(native_name, variable_name, vendor); + if (ret) + return EFI_EXIT(ret); + + debug("%s: get '%s'\n", __func__, native_name); + + val = getenv(native_name); + if (!val) + return EFI_EXIT(EFI_NOT_FOUND); + + in_size = *data_size; + + if ((s = prefix(val, "(u64)"))) { + *data_size = sizeof(u64); + + if (in_size < sizeof(u64)) + return EFI_EXIT(EFI_BUFFER_TOO_SMALL); + + if (!data) + return EFI_EXIT(EFI_INVALID_PARAMETER); + + if (hex2mem(data, s, 16)) + return EFI_EXIT(EFI_DEVICE_ERROR); + + debug("%s: got value: %llu\n", __func__, *(u64 *)data); + } else if ((s = prefix(val, "(string)"))) { + /* TODO should string's be converted to utf16? Or maybe if + * string isn't really a thing in efi, this should be (utf8) + * (and (utf16)?) and (raw%d), with the former being (in the + * land of u-boot) ascii strings converted to utf8/utf16 and + * the latter just being an arbitrary hex encoded value?? + */ + return EFI_EXIT(EFI_DEVICE_ERROR); + } else { + debug("%s: invalid value: '%s'\n", __func__, val); + return EFI_EXIT(EFI_DEVICE_ERROR); + } + // TODO other types? + + // TODO support attributes + if (attributes) + *attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS; + + return EFI_EXIT(EFI_SUCCESS); +} + +/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariable… */ +efi_status_t EFIAPI efi_get_next_variable( + unsigned long *variable_name_size, + s16 *variable_name, efi_guid_t *vendor) +{ + EFI_ENTRY("%p %p %p", variable_name_size, variable_name, vendor); + + return EFI_EXIT(EFI_DEVICE_ERROR); +} + +/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.… */ +efi_status_t EFIAPI efi_set_variable(s16 *variable_name, + efi_guid_t *vendor, u32 attributes, + unsigned long data_size, void *data) +{ + EFI_ENTRY("%p %p %x %lu %p", variable_name, vendor, attributes, + data_size, data); + + return EFI_EXIT(EFI_DEVICE_ERROR); +} -- 2.9.4

3 17

[U-Boot] [PATCH] efi_loader: add back optional efi_handler::open()
by Rob Clark 25 Jul '17

25 Jul '17

In some cases it is useful to defer creation of the protocol interface object. So add back an optional ->open() hook that is used if protcol_interface is NULL. I've slightly simplified the fxn ptr signature to remove unneeded args, and so compiler will complain if patches that used the "old way" are, and which do not need this extra complexity, are rebased. Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- v2: also handle this properly in locate_protocol as agraf pointed out Note that I might be misunderstanding what the EFI application expects when looking up device-path on a file handle.. if this is only expected to be the device path up to the partition object (and not including the file-path part of the path), then maybe ->open() isn't *as* important as I thought it would be. OTOH I think it would be cleaner to use for loaded_image_info_obj and bootefi_device_obj.. currently I have to patch in the real boot device-path in efi_set_bootdev(), which is messy and fragile. I don't fully understand Heinrich's concerns, especially since the EFI_OPEN_PROTOCOL_INFORMATION_ENTRY stuff looks like it only cares about already opened protocols, which should already have their open() called. (And either way, since open() is optional maybe it is enough to just not use it for any efiobj's where it would be problematic?) So tl;dr, if this is really going to be a problem for some things that Heinrich has got in the pipeline, maybe (pending clarification of a file handle's device-path) we can get by without this. But if it is not a problem, then it certainly seems useful in a few places. include/efi_loader.h | 9 ++++++++- lib/efi_loader/efi_boottime.c | 30 ++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 48eeb4cdd8..a9888afb04 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -41,10 +41,17 @@ extern unsigned int __efi_runtime_rel_start, __efi_runtime_rel_stop; /* * When the UEFI payload wants to open a protocol on an object to get its * interface (usually a struct with callback functions), this struct maps the - * protocol GUID to the respective protocol interface */ + * protocol GUID to the respective protocol interface. + * + * The optional ->open() fxn can be used for cases where the protocol + * interface is constructed on-demand, and is called if protocol_interface + * is NULL. + */ struct efi_handler { const efi_guid_t *guid; void *protocol_interface; + efi_status_t (EFIAPI *open)(void *handle, const efi_guid_t *protocol, + void **protocol_interface); }; /* diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 7d45c18ff7..80d9024a53 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -903,6 +903,23 @@ out: return EFI_EXIT(r); } +static efi_status_t open_protocol(struct efi_object *efiobj, + struct efi_handler *handler, + void **protocol_interface) +{ + efi_status_t ret = EFI_SUCCESS; + + if (!handler->protocol_interface) { + ret = handler->open(efiobj->handle, + handler->guid, + &handler->protocol_interface); + } + *protocol_interface = + handler->protocol_interface; + + return ret; +} + static efi_status_t EFIAPI efi_locate_protocol(efi_guid_t *protocol, void *registration, void **protocol_interface) @@ -925,9 +942,10 @@ static efi_status_t EFIAPI efi_locate_protocol(efi_guid_t *protocol, if (!handler->guid) continue; if (!guidcmp(handler->guid, protocol)) { - *protocol_interface = - handler->protocol_interface; - return EFI_EXIT(EFI_SUCCESS); + efi_status_t ret; + ret = open_protocol(efiobj, handler, + protocol_interface); + return EFI_EXIT(ret); } } } @@ -1061,12 +1079,12 @@ static efi_status_t EFIAPI efi_open_protocol( if (!hprotocol) continue; if (!guidcmp(hprotocol, protocol)) { + r = EFI_SUCCESS; if (attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL) { - *protocol_interface = - handler->protocol_interface; + r = open_protocol(efiobj, handler, + protocol_interface); } - r = EFI_SUCCESS; goto out; } } -- 2.13.0

2 2

[U-Boot] [PATCH 0/4] efi_loader: fix disk objects + device-paths
by Rob Clark 25 Jul '17

25 Jul '17

Currently u-boot completely gets block-io objects (and their associated device-paths) wrong, which prevents grub2 from figuring out the boot device+partition, which prevents it from automatically finding it's grub.cfg. Currently efi_loader creates a block-io object per disk, for example on a board with 3 partitions on an sd-card and 4 partitions on a usb disk: /File(sdhci(a)07864000.blk)/EndEntire /File(usb_mass_storage.lun0)/EndEntire at least grub manages to match up the loaded_image device-path, but it cannot figure out which partition it was on. So you end up with prefix=(hd1)/EFI/fedora instead of prefix=(hd1,msdos1)/EFI/fedora. With this patchset, you end up with: /ACPI(133741d0,0)/UnknownMessaging(1d)/EndEntire /ACPI(133741d0,0)/UnknownMessaging(1d)/HD(0,800,64000,0000000000000000,1,0)/EndEntire /ACPI(133741d0,0)/UnknownMessaging(1d)/HD(1,64800,200000,0000000000000000,1,0)/EndEntire /ACPI(133741d0,0)/UnknownMessaging(1d)/HD(2,264800,19a000,0000000000000000,1,0)/EndEntire /ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/EndEntire /ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(0,800,60000,0000000000000000,1,0)/EndEntire /ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(1,61000,155000,0000000000000000,1,0)/EndEntire /ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(2,20fa800,1bbf8800,0000000000000000,1,0)/EndEntire /ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(3,1b6800,1f44000,0000000000000000,1,0)/EndEntire (Note that "UnknownMessaging(1d)" is actually the MMC node in the device- path, but grub wasn't updated to print out some of the newer device-path sub-types.) Since we use DM to generate the device-paths from u-boot's device hierarchy, legacy devices will still be broken. I kept them working as they did previously and tried to minimize the ifdeffery, but things will get much cleaner when legacy support is removed. Peter Jones (1): efi: add some more device path structures Rob Clark (3): efi_loader: add udevice to EFI device-path mapping efi_loader: make disk objects for partitions efi_loader: use efi_devpath to get correct boot device-path cmd/bootefi.c | 31 ++++++-- include/efi_api.h | 49 +++++++++++- include/efi_loader.h | 9 +++ lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_devpath.c | 175 +++++++++++++++++++++++++++++++++++++++++++ lib/efi_loader/efi_disk.c | 73 +++++++++++++----- 6 files changed, 311 insertions(+), 27 deletions(-) create mode 100644 lib/efi_loader/efi_devpath.c -- 2.13.0

3 9

[U-Boot] [PATCH v4 00/20] dm: tegra: Move nyan-big, jetson-tk1, beaver to livetree
by Simon Glass 25 Jul '17

25 Jul '17

This moves four entire boards to use a live device tree as an example of the impact. Nyan-big was chosen because I can easily and boot U-Boot without any media swapping, etc. Beaver is enabled as well since it failed to boot with serial v1 due to a disabled console node. Jetson-TK1 is chosen because I found some USB problems in the v2 patches. Jetson-TX1 is added because Stephen Warren found some problems with PCI. Total code size impact on this board is approximately 9KB on U-Boot and 64 bytes on SPL: 27: dm: tegra: nyan-big: Move to livetree arm: (for 1/1 boards) all +9264.0 bss -16.0 data +44.0 rodata +92.0 spl/u-boot-spl:all +326.0 spl/u-boot-spl:rodata +262.0 spl/u-boot-spl:text +64.0 text +9144.0 Tegra does not use Thumb2, which would likely reduce the code size by about 25%, indicating a code-size impact of perhaps 7KB. Boot time is affected slightly. For nyan-big the times with flat tree are: 2,108 dm_r 7,924 dm_spl 120,724 dm_f 171,816 lcd With the livetree: 721 dm_r 3,764 of_live 7,990 dm_spl 120,736 dm_f 168,215 lcd As expected the spl and pre-relocation times are not affected. In the post-relocation case, the live tree must be built, which here takes about 3.8ms. Driver-model device creation takes a bit of 1ms less time with the livetree, so all up the cost is about 2.4ms. After DM init there appears to be a slight reduction in the time taken to set up devices (from 327ms to 319ms) so overall the live tree does not appear to be any slower. This is because pre-parsing the device tree makes reading it later faster. The use of livetree is controlled by a the CONFIG_OF_LIVE option. When enabled, U-Boot builds a livetree immediately after relocation and uses it from then on. This series is available at u-boot-dm/livet-working Changes in v4: - Add new patch to add ofnode_read_resource() - Add new patch to fix up ofnode_get_addr_index() for 64-bit values - Update to use ofnode_read_resource() - Drop fdtdec.h header - Update to deal with rename of ofnode_read_prop() - Rebase to master - Drop changes already applied - Fix PCI and i2c init problems on jetson-tx1 Changes in v3: - Update commit message, enable for all tegra124 boards not just nyan-big - Add new patch to convert tegra PCI to device tree - Enable livetree for jetson-tk1 also Changes in v2: - Enable livetree for beaver also - Add timing information Simon Glass (20): dm: core: Add ofnode_read_resource() dm: core: Fix up ofnode_get_addr_index() for 64-bit values tegra: spl: Enable debug UART tegra: tegra124: Add a PMC syscon driver dm: tegra: Convert USB setup to livetree dm: tegra: Convert clock_decode_periph_id() to support livetree dm: video: tegra124: Convert to livetree tegra: dts: Move stdout-path to /chosen dm: tegra: gpio: Convert to support livetree dm: tegra: usb: Convert to livetree dm: tegra: spi: Convert to livetree dm: tegra: i2c: Convert to livetree dm: tegra: pwm: Convert to livetree dm: tegra: mmc: Convert to livetree dm: tegra: pci: Convert to livetree power: Add a regulator driver for the as3722 PMIC power: Add a GPIO driver for the as3722 PMIC dm: power: Convert as3722 to driver model fdtdec: Drop old compatible values dm: tegra: Move nyan-big, jetson-tk1/tx1, beaver to livetree arch/arm/dts/tegra124-nyan-big.dts | 5 +- arch/arm/include/asm/arch-tegra/clock.h | 2 +- arch/arm/include/asm/arch-tegra/tegra.h | 5 + arch/arm/include/asm/arch-tegra/xusb-padctl.h | 2 +- arch/arm/mach-tegra/Kconfig | 2 + arch/arm/mach-tegra/board2.c | 8 +- arch/arm/mach-tegra/clock.c | 5 +- arch/arm/mach-tegra/spl.c | 4 + arch/arm/mach-tegra/tegra124/Makefile | 1 + arch/arm/mach-tegra/tegra124/pmc.c | 19 ++ arch/arm/mach-tegra/tegra124/xusb-padctl.c | 36 +++- arch/arm/mach-tegra/tegra210/xusb-padctl.c | 42 +++- arch/arm/mach-tegra/xusb-padctl-common.c | 60 +++--- arch/arm/mach-tegra/xusb-padctl-common.h | 8 +- arch/arm/mach-tegra/xusb-padctl-dummy.c | 2 +- board/cei/cei-tk1-som/cei-tk1-som.c | 2 + board/nvidia/jetson-tk1/jetson-tk1.c | 2 + board/nvidia/nyan-big/nyan-big.c | 22 +- board/toradex/apalis-tk1/apalis-tk1.c | 6 + configs/apalis-tk1_defconfig | 3 + configs/beaver_defconfig | 1 + configs/cei-tk1-som_defconfig | 3 + configs/jetson-tk1_defconfig | 4 + configs/nyan-big_defconfig | 2 + configs/p2371-2180_defconfig | 1 + drivers/core/ofnode.c | 30 ++- drivers/core/read.c | 5 + drivers/core/read_extra.c | 25 +-- drivers/gpio/tegra_gpio.c | 10 +- drivers/i2c/tegra_i2c.c | 7 +- drivers/mmc/tegra_mmc.c | 17 +- drivers/pci/pci_tegra.c | 53 +++-- drivers/power/pmic/Makefile | 2 +- drivers/power/pmic/as3722.c | 292 +++++++++----------------- drivers/power/pmic/as3722_gpio.c | 120 +++++++++++ drivers/power/regulator/Kconfig | 9 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/as3722_regulator.c | 149 +++++++++++++ drivers/pwm/tegra_pwm.c | 2 +- drivers/spi/tegra114_spi.c | 15 +- drivers/spi/tegra20_sflash.c | 2 +- drivers/spi/tegra20_slink.c | 2 +- drivers/spi/tegra210_qspi.c | 2 +- drivers/usb/host/ehci-tegra.c | 36 ++-- drivers/video/tegra124/display.c | 8 +- drivers/video/tegra124/dp.c | 3 +- drivers/video/tegra124/sor.c | 25 +-- include/dm/ofnode.h | 4 + include/dm/read.h | 26 ++- include/fdtdec.h | 6 - include/power/as3722.h | 27 ++- lib/fdtdec.c | 6 - 52 files changed, 698 insertions(+), 433 deletions(-) create mode 100644 arch/arm/mach-tegra/tegra124/pmc.c create mode 100644 drivers/power/pmic/as3722_gpio.c create mode 100644 drivers/power/regulator/as3722_regulator.c -- 2.13.2.932.g7449e964c-goog

2 26

[U-Boot] [PATCH v5 0/3] rockchip: firefly: Enabled the USB keyboard in the uboot
by Leo Wen 25 Jul '17

25 Jul '17

These three patches enable usbkeyboard drivers(usb_kbd.c) and set some environment variables to auto-start USB device. You can use the usbkeyboard instead of the serial input command in uboot. Leo Wen (3): rockchip: firefly: Add some macros to enable the usb keyboard rockchip: firefly: Set the environment variable 'usbkbd' to the stdin rockchip: firefly: Add "usb start" to auto-start USB device include/configs/firefly-rk3288.h | 5 +++-- include/configs/rk3288_common.h | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.7.4

4 6