January 2021 - U-Boot

[PATCH] efi_loader: Avoid emitting efi_var_buf to .GOT
by Ilias Apalodimas 16 Jan '21

16 Jan '21

Atish reports than on RISC-V, accessing the EFI variables causes a kernel panic. An objdump of the file verifies that, since the global pointer for efi_var_buf ends up in .GOT section which is not mapped in virtual address space for Linux. <snip of efi_var_mem_find> 0000000000000084 <efi_var_mem_find>: 84: 715d addi sp,sp,-80 * objdump -dr 0000000000000086 <.LCFI2>: 86: e0a2 sd s0,64(sp) 88: fc26 sd s1,56(sp) 8a: e486 sd ra,72(sp) 8c: f84a sd s2,48(sp) 8e: f44e sd s3,40(sp) 90: f052 sd s4,32(sp) 92: ec56 sd s5,24(sp) 94: 00000497 auipc s1,0x0 94: R_RISCV_GOT_HI20 efi_var_buf 98: 0004b483 ld s1,0(s1) # 94 <.LCFI2+0xe> 98: R_RISCV_PCREL_LO12_I .L0 98: R_RISCV_RELAX *ABS* * objdump -t 0000000000000084 g F .text.efi_runtime 00000000000000b8 efi_var_mem_find With the patch applied: * objdump -dr 0000000000000086 <.LCFI2>: 86: e0a2 sd s0,64(sp) 88: fc26 sd s1,56(sp) 8a: e486 sd ra,72(sp) 8c: f84a sd s2,48(sp) 8e: f44e sd s3,40(sp) 90: f052 sd s4,32(sp) 92: ec56 sd s5,24(sp) 94: 00000497 auipc s1,0x0 94: R_RISCV_PCREL_HI20 .LANCHOR0 94: R_RISCV_RELAX *ABS* 98: 00048493 mv s1,s1 98: R_RISCV_PCREL_LO12_I .L0 98: R_RISCV_RELAX *ABS* * objdump -t 0000000000000008 l O .data.efi_runtime 0000000000000008 efi_var_buf On arm64 this works, because there's no .GOT entries for this and everything is converted to relative references. * objdump -dr (identical pre-post patch, only the new function shows up) 00000000000000b4 <efi_var_mem_find>: b4: aa0003ee mov x14, x0 b8: 9000000a adrp x10, 0 <efi_var_mem_compare> b8: R_AARCH64_ADR_PREL_PG_HI21 .data.efi_runtime bc: 91000140 add x0, x10, #0x0 bc: R_AARCH64_ADD_ABS_LO12_NC .data.efi_runtime c0: aa0103ed mov x13, x1 c4: 79400021 ldrh w1, [x1] c8: aa0203eb mov x11, x2 cc: f9400400 ldr x0, [x0, #8] d0: b940100c ldr w12, [x0, #16] d4: 8b0c000c add x12, x0, x12 So let's switch efi_var_buf to static and create a helper function for anyone that needs to update it. Fixes: e01aed47d6a0 ("efi_loader: Enable run-time variable support for tee based variables") Reported-by: Atish Patra <atishp(a)atishpatra.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Atish can you give it a spin and let me know if this fixes the issue for you? The objdump seems to be correct now, but I am not familiar with RISC-V. No regressions on Arm with TEE or memory backed variables. include/efi_variable.h | 12 ++++++++++++ lib/efi_loader/efi_var_mem.c | 12 +++++++++++- lib/efi_loader/efi_variable_tee.c | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/include/efi_variable.h b/include/efi_variable.h index 4704a3c16e65..b2317eb7bf1c 100644 --- a/include/efi_variable.h +++ b/include/efi_variable.h @@ -306,4 +306,16 @@ efi_status_t __efi_runtime EFIAPI efi_get_next_variable_name_runtime(efi_uintn_t *variable_name_size, u16 *variable_name, efi_guid_t *guid); +/** + * efi_var_buf_update() - Update the value of efi_var_buf in efi_var_mem.c + * + * @var_buf: Source buffer + * + * efi_var_buf is special since we use it on Runtime Services. We need + * to keep it static in efi_var_mem.c and avoid having it pulled into + * .GOT. Since it has to be static this function must be used to update + * it + */ +void efi_var_buf_update(struct efi_var_file *var_buf); + #endif diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c index d155f25f60e6..fcf0043b5d3b 100644 --- a/lib/efi_loader/efi_var_mem.c +++ b/lib/efi_loader/efi_var_mem.c @@ -10,7 +10,12 @@ #include <efi_variable.h> #include <u-boot/crc.h> -struct efi_var_file __efi_runtime_data *efi_var_buf; +/* + * keep efi_var_buf as static , moving it out might move it to .got + * which is not mapped in virtual address for Linux. Whenever + * we try to invoke get_variable service, it will panic. + */ +static struct efi_var_file __efi_runtime_data *efi_var_buf; static struct efi_var_entry __efi_runtime_data *efi_current_var; /** @@ -339,3 +344,8 @@ efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, return EFI_SUCCESS; } + +void efi_var_buf_update(struct efi_var_file *var_buf) +{ + memcpy(efi_var_buf, var_buf, EFI_VAR_BUF_SIZE); +} diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c index be6f3dfad469..c69330443801 100644 --- a/lib/efi_loader/efi_variable_tee.c +++ b/lib/efi_loader/efi_variable_tee.c @@ -692,7 +692,7 @@ void efi_variables_boot_exit_notify(void) if (ret != EFI_SUCCESS) log_err("Can't populate EFI variables. No runtime variables will be available\n"); else - memcpy(efi_var_buf, var_buf, len); + efi_var_buf_update(var_buf); free(var_buf); /* Update runtime service table */ -- 2.30.0.rc2

3 5

[PATCH v7 0/4] Add CPU identification support for RZ/G2 SoC's
by Biju Das 16 Jan '21

16 Jan '21

This patch series aims to add CPU identification support for RZ/G2 SoC's and adding SDHI quirks using SoC identification driver. This patch series depend on SoC identification driver[1] [1] https://patchwork.ozlabs.org/project/uboot/list/?series=214706 Biju Das (4): arm: rmobile: Add RZ/G2[HMNE] SoC support mmc: renesas-sdhi: Add SDHI quirks for R-Car M3-W and RZ/G2M mmc: renesas-sdhi: Add SDHI quirks for R-Car M3-N and RZ/G2N mmc: renesas-sdhi: Add SDHI quirks for R-Car H3 and RZ/G2H arch/arm/mach-rmobile/cpu_info-rcar.c | 22 ++- arch/arm/mach-rmobile/cpu_info.c | 10 +- arch/arm/mach-rmobile/include/mach/rmobile.h | 60 +++++-- drivers/mmc/renesas-sdhi.c | 160 +++++++++++++++++++ 4 files changed, 233 insertions(+), 19 deletions(-) -- 2.17.1

3 11

[PATCH v4 0/4] Add Renesas SoC identification driver support
by Biju Das 16 Jan '21

16 Jan '21

This patch series aims to support Renesas SoC identification driver. Added a helper function of_match_node to find the matching of_match structure. This helper function can be used to replace the following code in u-boot [1] and [2] [1] https://elixir.bootlin.com/u-boot/latest/source/drivers/serial/serial_uniph… [2] https://elixir.bootlin.com/u-boot/latest/source/drivers/usb/phy/rockchip_us… Also added soc_id attribute support in UCLASS_SOC which is required for Renesas SoC identification driver similar to mainline linux. v3->v4 * Added Simon's Rb tag * Updated patch description for SoC identification using soc_id * Updated probe function of Renesas SoC identification driver. Biju Das (4): dm: core: Add of_match_node helper function soc: Fix comments from SOC to SoC dm: soc: Add SoC id for attribute matching dm: soc: SoC identification driver for Renesas SoC's drivers/core/device.c | 21 ++++ drivers/soc/Kconfig | 7 ++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 19 ++- drivers/soc/soc_renesas.c | 244 ++++++++++++++++++++++++++++++++++++++ drivers/soc/soc_sandbox.c | 8 ++ include/dm/device.h | 13 ++ include/soc.h | 39 +++++- test/dm/core.c | 31 +++++ test/dm/soc.c | 8 ++ 10 files changed, 384 insertions(+), 7 deletions(-) create mode 100644 drivers/soc/soc_renesas.c -- 2.17.1

2 8

[PATCH 1/1] efi_loader: remove EFI_UNICODE_COLLATION_PROTOCOL
by Heinrich Schuchardt 16 Jan '21

16 Jan '21

In EFI 1.10 a version of the Unicode collation protocol using ISO 639-2 language codes existed. This protocol is not part of the UEFI specification any longer. It was however required to run the UEFI Self Certification Test (SCT) II, version 2.6, 2017. So we implemented it for the sole purpose of running the SCT. As the SCT does not need the protocol anymore it is time for removal. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_api.h | 4 --- include/efi_loader.h | 3 -- lib/efi_loader/Kconfig | 11 -------- lib/efi_loader/efi_root_node.c | 6 ---- lib/efi_loader/efi_unicode_collation.c | 39 ++++---------------------- 5 files changed, 6 insertions(+), 57 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h index df9bee2ae4..48e48a6263 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -1693,10 +1693,6 @@ struct efi_driver_binding_protocol { efi_handle_t driver_binding_handle; }; -/* Deprecated version of the Unicode collation protocol */ -#define EFI_UNICODE_COLLATION_PROTOCOL_GUID \ - EFI_GUID(0x1d85cd7f, 0xf43d, 0x11d2, \ - 0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) /* Current version of the Unicode collation protocol */ #define EFI_UNICODE_COLLATION_PROTOCOL2_GUID \ EFI_GUID(0xa4c751fc, 0x23ae, 0x4c3e, \ diff --git a/include/efi_loader.h b/include/efi_loader.h index e53d286b9d..f759cfe287 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -147,9 +147,6 @@ extern const struct efi_device_path_to_text_protocol efi_device_path_to_text; /* implementation of the EFI_DEVICE_PATH_UTILITIES_PROTOCOL */ extern const struct efi_device_path_utilities_protocol efi_device_path_utilities; -/* deprecated version of the EFI_UNICODE_COLLATION_PROTOCOL */ -extern const struct efi_unicode_collation_protocol - efi_unicode_collation_protocol; /* current version of the EFI_UNICODE_COLLATION_PROTOCOL */ extern const struct efi_unicode_collation_protocol efi_unicode_collation_protocol2; diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 038cdc9b6e..e729f727df 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -252,17 +252,6 @@ config EFI_UNICODE_CAPITALIZATION set, only the the correct handling of the letters of the codepage used by the FAT file system is ensured. -config EFI_UNICODE_COLLATION_PROTOCOL - bool "Deprecated version of the Unicode collation protocol" - default n - help - In EFI 1.10 a version of the Unicode collation protocol using ISO - 639-2 language codes existed. This protocol is not part of the UEFI - specification any longer. Unfortunately it is required to run the - UEFI Self Certification Test (SCT) II, version 2.6, 2017. - - Choose this option for testing only. It is bound to be removed. - endif config EFI_LOADER_BOUNCE_BUFFER diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index 4d59890a7e..c217d06298 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -69,12 +69,6 @@ efi_status_t efi_root_node_register(void) (void *)&efi_dt_fixup_prot, #endif #if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) -#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL) - /* Deprecated Unicode collation protocol */ - &efi_guid_unicode_collation_protocol, - (void *)&efi_unicode_collation_protocol, -#endif - /* Current Unicode collation protocol */ &efi_guid_unicode_collation_protocol2, (void *)&efi_unicode_collation_protocol2, #endif diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c index 6655c68092..f6c875bc33 100644 --- a/lib/efi_loader/efi_unicode_collation.c +++ b/lib/efi_loader/efi_unicode_collation.c @@ -38,7 +38,7 @@ const efi_guid_t efi_guid_unicode_collation_protocol2 = * @s2: second string * * This function implements the StriColl() service of the - * EFI_UNICODE_COLLATION_PROTOCOL. + * EFI_UNICODE_COLLATION_PROTOCOL2. * * See the Unified Extensible Firmware Interface (UEFI) specification for * details. @@ -179,7 +179,7 @@ static bool metai_match(const u16 *string, const u16 *pattern) * - [<char1>-<char2>] matches any character in the range * * This function implements the MetaMatch() service of the - * EFI_UNICODE_COLLATION_PROTOCOL. + * EFI_UNICODE_COLLATION_PROTOCOL2. * * Return: true if the string is matched. */ @@ -204,7 +204,7 @@ static bool EFIAPI efi_metai_match(struct efi_unicode_collation_protocol *this, * same number of words this does not pose a problem. * * This function implements the StrLwr() service of the - * EFI_UNICODE_COLLATION_PROTOCOL. + * EFI_UNICODE_COLLATION_PROTOCOL2. */ static void EFIAPI efi_str_lwr(struct efi_unicode_collation_protocol *this, u16 *string) @@ -225,7 +225,7 @@ static void EFIAPI efi_str_lwr(struct efi_unicode_collation_protocol *this, * same number of words this does not pose a problem. * * This function implements the StrUpr() service of the - * EFI_UNICODE_COLLATION_PROTOCOL. + * EFI_UNICODE_COLLATION_PROTOCOL2. */ static void EFIAPI efi_str_upr(struct efi_unicode_collation_protocol *this, u16 *string) @@ -245,7 +245,7 @@ static void EFIAPI efi_str_upr(struct efi_unicode_collation_protocol *this, * @string: converted string * * This function implements the FatToStr() service of the - * EFI_UNICODE_COLLATION_PROTOCOL. + * EFI_UNICODE_COLLATION_PROTOCOL2. */ static void EFIAPI efi_fat_to_str(struct efi_unicode_collation_protocol *this, efi_uintn_t fat_size, char *fat, u16 *string) @@ -276,7 +276,7 @@ static void EFIAPI efi_fat_to_str(struct efi_unicode_collation_protocol *this, * @fat: converted string * * This function implements the StrToFat() service of the - * EFI_UNICODE_COLLATION_PROTOCOL. + * EFI_UNICODE_COLLATION_PROTOCOL2. * * Return: true if an illegal character was substituted by '_'. */ @@ -337,30 +337,3 @@ const struct efi_unicode_collation_protocol efi_unicode_collation_protocol2 = { .str_to_fat = efi_str_to_fat, .supported_languages = "en", }; - -/* - * In EFI 1.10 a version of the Unicode collation protocol using ISO 639-2 - * language codes existed. This protocol is not part of the UEFI specification - * any longer. Unfortunately it is required to run the UEFI Self Certification - * Test (SCT) II, version 2.6, 2017. So we implement it here for the sole - * purpose of running the SCT. It can be removed when a compliant SCT is - * available. - */ -#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL) - -/* GUID of the EFI_UNICODE_COLLATION_PROTOCOL */ -const efi_guid_t efi_guid_unicode_collation_protocol = - EFI_UNICODE_COLLATION_PROTOCOL_GUID; - -const struct efi_unicode_collation_protocol efi_unicode_collation_protocol = { - .stri_coll = efi_stri_coll, - .metai_match = efi_metai_match, - .str_lwr = efi_str_lwr, - .str_upr = efi_str_upr, - .fat_to_str = efi_fat_to_str, - .str_to_fat = efi_str_to_fat, - /* ISO 639-2 language code */ - .supported_languages = "eng", -}; - -#endif -- 2.29.2

1 0

[PATCH 0/3] efi_loader: make protocols configurable
by Heinrich Schuchardt 16 Jan '21

16 Jan '21

On systems that are very tight on memory we may only want to keep those UEFI features that are required to start Linux or GRUB. Make the EFI_DT_FIXUP_PROTOCOL and the EFI_DEVICE_PATH_UTILITIES_PROTOCOL configurable. Heinrich Schuchardt (3): efi_loader: fixup protocol, avoid forward declaration efi_loader: make EFI_DT_FIXUP_PROTOCOL configurable efi_loader: EFI_DEVICE_PATH_UTILITIES_PROTOCOL configurable lib/efi_loader/Kconfig | 15 +++++++++++++++ lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_dt_fixup.c | 34 ++++++++++++++++++++-------------- lib/efi_loader/efi_root_node.c | 4 +++- 4 files changed, 39 insertions(+), 16 deletions(-) -- 2.29.2

1 3

[GIT PULL] TI changes for v2021.04 next
by Lokesh Vutla 16 Jan '21

16 Jan '21

Hi Tom, Please find the PR for next branch targeted for v2021.04 release. Details about the PR are updated in the tag message. Gitlab build report: https://gitlab.denx.de/u-boot/custodians/u-boot-ti/-/pipelines/5778 The following changes since commit c15f44acf9d473f4682bfdc63b8aebd313492b15: Prepare v2021.01-rc4 (2020-12-21 15:03:24 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2021.04-next for you to fetch changes up to feff9fd0d893067bdc2e08969b5c916d10e9fc12: remoteproc: ti_k3_arm64: Program CNTFID0 register in GTC (2021-01-07 09:55:34 +0530) ---------------------------------------------------------------- - DM support for OMAP PWM backlight - USB host mode support for AM654 - Nokia-rx51 convert to DM_MMC - Minor SPI fixes - Add support k2g ice board with 1GHz silicon - Fix GTC programming for K3 devices ---------------------------------------------------------------- Aswath Govindraju (4): board: ti: am65x: Set SERDES0 mux to PCIe to use USB 2.0 interface arm: dts: am654-base-board-uboot: Set USB0 dr_mode to host arm: dts: am654-base-board-uboot: Add aliases for USB subsystems configs: am65x_evm: Define the maximum file size for DFU Dario Binacchi (28): clk: export generic routines dt-bindings: bus: ti-sysc: resync with Linux 5.9-rc7 bus: ti: add minimal sysc interconnect target driver arm: dts: sync am33xx with Linux 5.9-rc7 clk: add clk_round_rate() clk: ti: add mux clock driver arm: ti: am33xx: add DPLL_EN_FAST_RELOCK_BYPASS macro clk: ti: am33xx: add DPLL clock drivers clk: ti: add divider clock driver clk: ti: add gate clock driver arm: dts: am335x: include am33xx-u-boot.dtsi ti: am33xx: fix do_enable_clocks() to accept NULL parameters clk: ti: add support for clkctrl clocks clk: ti: omap4: add clock manager driver arm: dts: am335x: enable prcm_clocks auto binding clk: move clk-ti-sci driver to 'ti' directory fdt: translate address if #size-cells = <0> omap: timer: fix the rate setting arm: dts: am335x: enable scm_clocks auto binding pwm: ti: am33xx: add enhanced pwm driver bus: ti: am33xx: add pwm subsystem driver dm: core: add a function to decode display timings video: omap: add panel driver video: omap: drop domain clock enabling by SOC api video: omap: set LCD clock rate through DM API video: omap: split the legacy code from the DM code video: omap: move drivers to 'ti' directory board: ti: am335x-ice: get CDCE913 clock device Felix Brack (1): arm:pdu001: Use pseudo partition UUID for LINUX kernel boot paramter root Lokesh Vutla (1): board: ti: k2g: Add support for K2G ICE with 1GHz Silicon Nishanth Menon (2): arm: dts: k3-*-r5-*-board: Add GTC clock remoteproc: ti_k3_arm64: Program CNTFID0 register in GTC Ovidiu Panait (1): spi: ti_qspi: Fix "spi-max-frequency" error path in ti_qspi_ofdata_to_platdata Pali Rohár (3): Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Praneeth Bajjuri (1): arm: dts: k3-j721e: ddr: Update to 0.5.0 version of DDR config tool Tomas Novotny (1): gpio: tca642x: fix input subcommand for gpio banks > 0 Vignesh Raghavendra (1): spi: omap3_spi: Fix speed and mode selection arch/arm/Kconfig | 1 + arch/arm/dts/am335x-brppt1-mmc.dts | 17 +- arch/arm/dts/am335x-brppt1-nand.dts | 17 +- arch/arm/dts/am335x-brppt1-spi.dts | 17 +- arch/arm/dts/am335x-brsmarc1.dts | 20 +- arch/arm/dts/am335x-brxre1.dts | 21 +- arch/arm/dts/am335x-chiliboard-u-boot.dtsi | 2 + arch/arm/dts/am335x-draco.dtsi | 11 +- arch/arm/dts/am335x-evm-u-boot.dtsi | 17 +- arch/arm/dts/am335x-evm.dts | 2 +- arch/arm/dts/am335x-evmsk-u-boot.dtsi | 16 +- arch/arm/dts/am335x-evmsk.dts | 2 +- arch/arm/dts/am335x-guardian-u-boot.dtsi | 25 +- arch/arm/dts/am335x-icev2-u-boot.dtsi | 3 + arch/arm/dts/am335x-pdu001-u-boot.dtsi | 20 +- arch/arm/dts/am335x-pxm2.dtsi | 2 +- arch/arm/dts/am335x-pxm50-u-boot.dtsi | 16 +- arch/arm/dts/am335x-regor-rdk-u-boot.dtsi | 2 + arch/arm/dts/am335x-rut-u-boot.dtsi | 16 +- arch/arm/dts/am335x-rut.dts | 2 +- arch/arm/dts/am335x-shc-u-boot.dtsi | 2 + arch/arm/dts/am335x-shc.dts | 2 +- arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 2 + arch/arm/dts/am33xx-clocks.dtsi | 106 +- arch/arm/dts/am33xx-l4.dtsi | 1962 ++++++++++++++++++++ arch/arm/dts/am33xx-u-boot.dtsi | 8 + arch/arm/dts/am33xx.dtsi | 721 +++---- arch/arm/dts/dm8168-evm-u-boot.dtsi | 12 + arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 4 +- arch/arm/dts/k3-am654-r5-base-board.dts | 1 + arch/arm/dts/k3-j7200-r5-common-proc-board.dts | 1 + ...p4-3733.dtsi => k3-j721e-ddr-evm-lp4-4266.dtsi} | 436 ++--- arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 3 +- arch/arm/include/asm/arch-am33xx/clock.h | 1 + arch/arm/mach-omap2/am33xx/clock.c | 10 +- arch/arm/mach-omap2/am33xx/clock_am33xx.c | 2 +- arch/sandbox/dts/test.dts | 67 + arch/sandbox/include/asm/clk.h | 9 + board/BuR/common/bur_common.h | 2 +- board/BuR/common/common.c | 2 +- board/nokia/rx51/rx51.c | 32 +- board/ti/am335x/board.c | 2 +- board/ti/am43xx/board.c | 2 +- board/ti/am65x/evm.c | 16 + board/ti/ks2_evm/board.c | 4 +- board/ti/ks2_evm/board.h | 8 + board/ti/ks2_evm/board_k2g.c | 7 +- board/ti/ks2_evm/ddr3_k2g.c | 2 +- board/ti/ks2_evm/mux-k2g.h | 2 +- common/fdt_support.c | 6 +- configs/nokia_rx51_defconfig | 6 + drivers/bus/Kconfig | 13 + drivers/bus/Makefile | 2 + drivers/bus/ti-pwmss.c | 21 + drivers/bus/ti-sysc.c | 166 ++ drivers/clk/Kconfig | 9 +- drivers/clk/Makefile | 2 +- drivers/clk/clk-divider.c | 24 +- drivers/clk/clk-uclass.c | 15 + drivers/clk/clk_sandbox.c | 17 + drivers/clk/clk_sandbox_test.c | 10 + drivers/clk/ti/Kconfig | 43 + drivers/clk/ti/Makefile | 13 + drivers/clk/ti/clk-am3-dpll-x2.c | 79 + drivers/clk/ti/clk-am3-dpll.c | 268 +++ drivers/clk/ti/clk-ctrl.c | 154 ++ drivers/clk/ti/clk-divider.c | 381 ++++ drivers/clk/ti/clk-gate.c | 93 + drivers/clk/ti/clk-mux.c | 253 +++ drivers/clk/{clk-ti-sci.c => ti/clk-sci.c} | 0 drivers/clk/ti/clk.c | 34 + drivers/clk/ti/clk.h | 13 + drivers/clk/ti/omap4-cm.c | 22 + drivers/core/Kconfig | 12 + drivers/core/fdtaddr.c | 2 +- drivers/core/of_addr.c | 13 +- drivers/core/ofnode.c | 7 +- drivers/core/read.c | 6 + drivers/core/root.c | 3 + drivers/gpio/tca642x.c | 49 +- drivers/pwm/Kconfig | 7 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-ti-ehrpwm.c | 468 +++++ drivers/remoteproc/ti_k3_arm64_rproc.c | 15 + drivers/spi/omap3_spi.c | 17 +- drivers/spi/ti_qspi.c | 4 +- drivers/timer/omap-timer.c | 6 +- drivers/video/Kconfig | 5 +- drivers/video/Makefile | 2 +- drivers/video/ti/Kconfig | 8 + drivers/video/ti/Makefile | 10 + drivers/video/{ => ti}/am335x-fb.c | 341 +--- drivers/video/{ => ti}/am335x-fb.h | 4 - drivers/video/ti/tilcdc-panel.c | 172 ++ drivers/video/ti/tilcdc-panel.h | 14 + drivers/video/ti/tilcdc.c | 425 +++++ drivers/video/ti/tilcdc.h | 38 + include/asm-generic/global_data.h | 24 + include/clk-uclass.h | 8 + include/clk.h | 28 + include/configs/am65x_evm.h | 6 + include/configs/k2g_evm.h | 2 + include/configs/nokia_rx51.h | 17 +- include/configs/pdu001.h | 3 +- include/dm/read.h | 24 + include/dt-bindings/bus/ti-sysc.h | 6 + include/linux/clk-provider.h | 57 + test/dm/clk.c | 22 + test/dm/test-fdt.c | 149 +- test/nokia_rx51_test.sh | 33 +- 110 files changed, 6066 insertions(+), 1243 deletions(-) create mode 100644 arch/arm/dts/am33xx-l4.dtsi create mode 100644 arch/arm/dts/dm8168-evm-u-boot.dtsi rename arch/arm/dts/{k3-j721e-ddr-evm-lp4-3733.dtsi => k3-j721e-ddr-evm-lp4-4266.dtsi} (90%) create mode 100644 drivers/bus/ti-pwmss.c create mode 100644 drivers/bus/ti-sysc.c create mode 100644 drivers/clk/ti/Kconfig create mode 100644 drivers/clk/ti/Makefile create mode 100644 drivers/clk/ti/clk-am3-dpll-x2.c create mode 100644 drivers/clk/ti/clk-am3-dpll.c create mode 100644 drivers/clk/ti/clk-ctrl.c create mode 100644 drivers/clk/ti/clk-divider.c create mode 100644 drivers/clk/ti/clk-gate.c create mode 100644 drivers/clk/ti/clk-mux.c rename drivers/clk/{clk-ti-sci.c => ti/clk-sci.c} (100%) create mode 100644 drivers/clk/ti/clk.c create mode 100644 drivers/clk/ti/clk.h create mode 100644 drivers/clk/ti/omap4-cm.c create mode 100644 drivers/pwm/pwm-ti-ehrpwm.c create mode 100644 drivers/video/ti/Kconfig create mode 100644 drivers/video/ti/Makefile rename drivers/video/{ => ti}/am335x-fb.c (54%) rename drivers/video/{ => ti}/am335x-fb.h (97%) create mode 100644 drivers/video/ti/tilcdc-panel.c create mode 100644 drivers/video/ti/tilcdc-panel.h create mode 100644 drivers/video/ti/tilcdc.c create mode 100644 drivers/video/ti/tilcdc.h -- 2.30.0

3 8

[PATCH] dm: fix build errors generated by last merges
by Dario Binacchi 15 Jan '21

15 Jan '21

Something was wrong in the merge process into the mainline. Some added patches access driver structure fields and functions that have been modified by previous patches. The patch renames: - dev_get_platdata to dev_get_plat - dev_get_uclass_platdata to dev_get_uclass_plat - ofdata_to_platdata to of_to_plat - plat_data_alloc_size to plat_auto - priv_auto_alloc_size to priv_auto - video_uc_platdata to video_uc_plat Signed-off-by: Dario Binacchi <dariobin(a)libero.it> --- drivers/clk/ti/clk-am3-dpll.c | 2 +- drivers/clk/ti/clk-ctrl.c | 2 +- drivers/clk/ti/clk-divider.c | 2 +- drivers/clk/ti/clk-gate.c | 2 +- drivers/clk/ti/clk-mux.c | 2 +- drivers/pwm/pwm-ti-ehrpwm.c | 2 +- drivers/spi/ca_sflash.c | 2 +- drivers/video/seps525.c | 6 +++--- drivers/video/tdo-tl070wsh30.c | 12 ++++++------ drivers/video/ti/tilcdc-panel.c | 2 +- drivers/video/ti/tilcdc.c | 8 ++++---- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/clk/ti/clk-am3-dpll.c b/drivers/clk/ti/clk-am3-dpll.c index 7916a24538..90b4cc69ef 100644 --- a/drivers/clk/ti/clk-am3-dpll.c +++ b/drivers/clk/ti/clk-am3-dpll.c @@ -260,7 +260,7 @@ U_BOOT_DRIVER(clk_ti_am3_dpll) = { .name = "ti_am3_dpll_clock", .id = UCLASS_CLK, .of_match = clk_ti_am3_dpll_of_match, - .ofdata_to_platdata = clk_ti_am3_dpll_of_to_plat, + .of_to_plat = clk_ti_am3_dpll_of_to_plat, .probe = clk_ti_am3_dpll_probe, .remove = clk_ti_am3_dpll_remove, .priv_auto = sizeof(struct clk_ti_am3_dpll_priv), diff --git a/drivers/clk/ti/clk-ctrl.c b/drivers/clk/ti/clk-ctrl.c index 940e8d6caf..3c6195b208 100644 --- a/drivers/clk/ti/clk-ctrl.c +++ b/drivers/clk/ti/clk-ctrl.c @@ -148,7 +148,7 @@ U_BOOT_DRIVER(clk_ti_ctrl) = { .name = "ti_ctrl_clk", .id = UCLASS_CLK, .of_match = clk_ti_ctrl_ids, - .ofdata_to_platdata = clk_ti_ctrl_of_to_plat, + .of_to_plat = clk_ti_ctrl_of_to_plat, .ops = &clk_ti_ctrl_ops, .priv_auto = sizeof(struct clk_ti_ctrl_priv), }; diff --git a/drivers/clk/ti/clk-divider.c b/drivers/clk/ti/clk-divider.c index a862637785..270f2fbdf0 100644 --- a/drivers/clk/ti/clk-divider.c +++ b/drivers/clk/ti/clk-divider.c @@ -373,7 +373,7 @@ U_BOOT_DRIVER(clk_ti_divider) = { .name = "ti_divider_clock", .id = UCLASS_CLK, .of_match = clk_ti_divider_of_match, - .ofdata_to_platdata = clk_ti_divider_of_to_plat, + .of_to_plat = clk_ti_divider_of_to_plat, .probe = clk_ti_divider_probe, .remove = clk_ti_divider_remove, .priv_auto = sizeof(struct clk_ti_divider_priv), diff --git a/drivers/clk/ti/clk-gate.c b/drivers/clk/ti/clk-gate.c index 236eaed6df..0ca453c8de 100644 --- a/drivers/clk/ti/clk-gate.c +++ b/drivers/clk/ti/clk-gate.c @@ -87,7 +87,7 @@ U_BOOT_DRIVER(clk_ti_gate) = { .name = "ti_gate_clock", .id = UCLASS_CLK, .of_match = clk_ti_gate_of_match, - .ofdata_to_platdata = clk_ti_gate_of_to_plat, + .of_to_plat = clk_ti_gate_of_to_plat, .priv_auto = sizeof(struct clk_ti_gate_priv), .ops = &clk_ti_gate_ops, }; diff --git a/drivers/clk/ti/clk-mux.c b/drivers/clk/ti/clk-mux.c index 419502c389..bb5e49e114 100644 --- a/drivers/clk/ti/clk-mux.c +++ b/drivers/clk/ti/clk-mux.c @@ -245,7 +245,7 @@ U_BOOT_DRIVER(clk_ti_mux) = { .name = "ti_mux_clock", .id = UCLASS_CLK, .of_match = clk_ti_mux_of_match, - .ofdata_to_platdata = clk_ti_mux_of_to_plat, + .of_to_plat = clk_ti_mux_of_to_plat, .probe = clk_ti_mux_probe, .remove = clk_ti_mux_remove, .priv_auto = sizeof(struct clk_ti_mux_priv), diff --git a/drivers/pwm/pwm-ti-ehrpwm.c b/drivers/pwm/pwm-ti-ehrpwm.c index ac3d731d22..f09914519b 100644 --- a/drivers/pwm/pwm-ti-ehrpwm.c +++ b/drivers/pwm/pwm-ti-ehrpwm.c @@ -461,7 +461,7 @@ U_BOOT_DRIVER(ti_ehrpwm) = { .id = UCLASS_PWM, .of_match = ti_ehrpwm_ids, .ops = &ti_ehrpwm_ops, - .ofdata_to_platdata = ti_ehrpwm_of_to_plat, + .of_to_plat = ti_ehrpwm_of_to_plat, .probe = ti_ehrpwm_probe, .remove = ti_ehrpwm_remove, .priv_auto = sizeof(struct ti_ehrpwm_priv), diff --git a/drivers/spi/ca_sflash.c b/drivers/spi/ca_sflash.c index 00af6bffa6..84569845b7 100644 --- a/drivers/spi/ca_sflash.c +++ b/drivers/spi/ca_sflash.c @@ -571,6 +571,6 @@ U_BOOT_DRIVER(ca_sflash) = { .id = UCLASS_SPI, .of_match = ca_sflash_ids, .ops = &ca_sflash_ops, - .priv_auto_alloc_size = sizeof(struct ca_sflash_priv), + .priv_auto = sizeof(struct ca_sflash_priv), .probe = ca_sflash_probe, }; diff --git a/drivers/video/seps525.c b/drivers/video/seps525.c index 369e5e6afc..74c8721e1e 100644 --- a/drivers/video/seps525.c +++ b/drivers/video/seps525.c @@ -299,7 +299,7 @@ static int seps525_probe(struct udevice *dev) static int seps525_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = WIDTH * HEIGHT * 16; @@ -320,8 +320,8 @@ U_BOOT_DRIVER(seps525_video) = { .id = UCLASS_VIDEO, .of_match = seps525_ids, .ops = &seps525_ops, - .platdata_auto_alloc_size = sizeof(struct video_uc_platdata), + .plat_auto = sizeof(struct video_uc_plat), .bind = seps525_bind, .probe = seps525_probe, - .priv_auto_alloc_size = sizeof(struct seps525_priv), + .priv_auto = sizeof(struct seps525_priv), }; diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c index ae9d11f475..813b87a681 100644 --- a/drivers/video/tdo-tl070wsh30.c +++ b/drivers/video/tdo-tl070wsh30.c @@ -34,7 +34,7 @@ static const struct display_timing default_timing = { static int tl070wsh30_panel_enable_backlight(struct udevice *dev) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device; struct tl070wsh30_panel_priv *priv = dev_get_priv(dev); int ret; @@ -70,7 +70,7 @@ static int tl070wsh30_panel_get_display_timing(struct udevice *dev, return 0; } -static int tl070wsh30_panel_ofdata_to_platdata(struct udevice *dev) +static int tl070wsh30_panel_of_to_plat(struct udevice *dev) { struct tl070wsh30_panel_priv *priv = dev_get_priv(dev); int ret; @@ -105,7 +105,7 @@ static int tl070wsh30_panel_ofdata_to_platdata(struct udevice *dev) static int tl070wsh30_panel_probe(struct udevice *dev) { struct tl070wsh30_panel_priv *priv = dev_get_priv(dev); - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); int ret; if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { @@ -148,8 +148,8 @@ U_BOOT_DRIVER(tl070wsh30_panel) = { .id = UCLASS_PANEL, .of_match = tl070wsh30_panel_ids, .ops = &tl070wsh30_panel_ops, - .ofdata_to_platdata = tl070wsh30_panel_ofdata_to_platdata, + .of_to_plat = tl070wsh30_panel_of_to_plat, .probe = tl070wsh30_panel_probe, - .platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat), - .priv_auto_alloc_size = sizeof(struct tl070wsh30_panel_priv), + .plat_auto = sizeof(struct mipi_dsi_panel_plat), + .priv_auto = sizeof(struct tl070wsh30_panel_priv), }; diff --git a/drivers/video/ti/tilcdc-panel.c b/drivers/video/ti/tilcdc-panel.c index b90dfae4ae..df95086a51 100644 --- a/drivers/video/ti/tilcdc-panel.c +++ b/drivers/video/ti/tilcdc-panel.c @@ -165,7 +165,7 @@ U_BOOT_DRIVER(tilcdc_panel) = { .id = UCLASS_PANEL, .of_match = tilcdc_panel_ids, .ops = &tilcdc_panel_ops, - .ofdata_to_platdata = tilcdc_panel_of_to_plat, + .of_to_plat = tilcdc_panel_of_to_plat, .probe = tilcdc_panel_probe, .remove = tilcdc_panel_remove, .priv_auto = sizeof(struct tilcdc_panel_priv), diff --git a/drivers/video/ti/tilcdc.c b/drivers/video/ti/tilcdc.c index d13cc11801..814126af66 100644 --- a/drivers/video/ti/tilcdc.c +++ b/drivers/video/ti/tilcdc.c @@ -155,7 +155,7 @@ static ulong tilcdc_set_pixel_clk_rate(struct udevice *dev, ulong rate) static int tilcdc_remove(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct tilcdc_priv *priv = dev_get_priv(dev); uc_plat->base -= 0x20; @@ -167,7 +167,7 @@ static int tilcdc_remove(struct udevice *dev) static int tilcdc_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct tilcdc_priv *priv = dev_get_priv(dev); struct tilcdc_regs *regs = priv->regs; @@ -399,7 +399,7 @@ static int tilcdc_of_to_plat(struct udevice *dev) static int tilcdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = ((LCDC_MAX_WIDTH * LCDC_MAX_HEIGHT * (1 << LCDC_MAX_LOG2_BPP)) >> 3) + 0x20; @@ -418,7 +418,7 @@ U_BOOT_DRIVER(tilcdc) = { .id = UCLASS_VIDEO, .of_match = tilcdc_ids, .bind = tilcdc_bind, - .ofdata_to_platdata = tilcdc_of_to_plat, + .of_to_plat = tilcdc_of_to_plat, .probe = tilcdc_probe, .remove = tilcdc_remove, .priv_auto = sizeof(struct tilcdc_priv) -- 2.17.1

2 1

[PATCH] efi_loader: Enable run-time variable support for tee based variables
by Ilias Apalodimas 15 Jan '21

15 Jan '21

We recently added functions for storing/restoring variables from a file to a memory backed buffer marked as __efi_runtime_data commit f1f990a8c958 ("efi_loader: memory buffer for variables") commit 5f7dcf079de8 ("efi_loader: UEFI variable persistence") Using the same idea we now can support GetVariable() and GetNextVariable() on the OP-TEE based variables as well. So let's re-arrange the code a bit and move the commmon code for accessing variables out of efi_variable.c. Create common functions for reading variables from memory that both implementations can use on run-time. Then just use those functions in the run-time variants of the OP-TEE based EFI variable implementation and initialize the memory buffer on ExitBootServices() Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- include/efi_variable.h | 45 ++++++++++++++++++++ lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_var_file.c | 25 ++++------- lib/efi_loader/efi_var_mem.c | 70 ++++++++++++++++++++++++++++++- lib/efi_loader/efi_variable.c | 58 +------------------------ lib/efi_loader/efi_variable_tee.c | 55 ++++++++++++++++++++++-- 6 files changed, 175 insertions(+), 80 deletions(-) diff --git a/include/efi_variable.h b/include/efi_variable.h index 2c629e4dca92..6ef24cd05feb 100644 --- a/include/efi_variable.h +++ b/include/efi_variable.h @@ -142,6 +142,20 @@ struct efi_var_file { */ efi_status_t efi_var_to_file(void); +/** + * efi_var_collect() - collect non-volatile variables in buffer + * + * A buffer is allocated and filled with all non-volatile variables in a + * format ready to be written to disk. + * + * @bufp: pointer to pointer of buffer with collected variables + * @lenp: pointer to length of buffer + * @check_attr_mask: mask of variable attributes which will be included in the buffer + * Return: status code + */ +efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, loff_t *lenp, + u32 check_attr_mask); + /** * efi_var_restore() - restore EFI variables from buffer * @@ -233,4 +247,35 @@ efi_status_t efi_init_secure_state(void); */ enum efi_auth_var_type efi_auth_var_get_type(u16 *name, const efi_guid_t *guid); +/** + * efi_get_next_variable_name_mem() - Runtime common code across efi variable + * implementations for GetNextVariable() + * from the cached memory copy + * @variable_name_size: size of variable_name buffer in byte + * @variable_name: name of uefi variable's name in u16 + * @vendor: vendor's guid + * + * Return: status code + */ +efi_status_t __efi_runtime +efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, u16 *variable_name, + efi_guid_t *vendor); +/** + * efi_get_variable_mem() - Runtime common code across efi variable + * implementations for GetVariable() from + * the cached memory copy + * + * @variable_name: name of the variable + * @vendor: vendor GUID + * @attributes: attributes of the variable + * @data_size: size of the buffer to which the variable value is copied + * @data: buffer to which the variable value is copied + * @timep: authentication time (seconds since start of epoch) + * Return: status code + + */ +efi_status_t __efi_runtime +efi_get_variable_mem(u16 *variable_name, const efi_guid_t *vendor, u32 *attributes, + efi_uintn_t *data_size, void *data, u64 *timep); + #endif diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 441ac9432e99..9bad1d159b03 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -37,11 +37,11 @@ obj-y += efi_setup.o obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += efi_unicode_collation.o obj-y += efi_var_common.o obj-y += efi_var_mem.o +obj-y += efi_var_file.o ifeq ($(CONFIG_EFI_MM_COMM_TEE),y) obj-y += efi_variable_tee.o else obj-y += efi_variable.o -obj-y += efi_var_file.o obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o endif obj-y += efi_watchdog.o diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 6f9d76f2a2d5..b171d2d1a8f7 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -46,18 +46,8 @@ static efi_status_t __maybe_unused efi_set_blk_dev_to_system_partition(void) return EFI_SUCCESS; } -/** - * efi_var_collect() - collect non-volatile variables in buffer - * - * A buffer is allocated and filled with all non-volatile variables in a - * format ready to be written to disk. - * - * @bufp: pointer to pointer of buffer with collected variables - * @lenp: pointer to length of buffer - * Return: status code - */ -static efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, - loff_t *lenp) +efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, loff_t *lenp, + u32 check_attr_mask) { size_t len = EFI_VAR_BUF_SIZE; struct efi_var_file *buf; @@ -102,11 +92,10 @@ static efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, free(buf); return ret; } - if (!(var->attr & EFI_VARIABLE_NON_VOLATILE)) - continue; - var->length = data_length; - var = (struct efi_var_entry *) - ALIGN((uintptr_t)data + data_length, 8); + if ((var->attr & check_attr_mask) == check_attr_mask) { + var->length = data_length; + var = (struct efi_var_entry *)ALIGN((uintptr_t)data + data_length, 8); + } } buf->reserved = 0; @@ -137,7 +126,7 @@ efi_status_t efi_var_to_file(void) loff_t actlen; int r; - ret = efi_var_collect(&buf, &len); + ret = efi_var_collect(&buf, &len, EFI_VARIABLE_NON_VOLATILE); if (ret != EFI_SUCCESS) goto error; diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c index 7a2dba7dc263..fd97d5b56300 100644 --- a/lib/efi_loader/efi_var_mem.c +++ b/lib/efi_loader/efi_var_mem.c @@ -10,7 +10,7 @@ #include <efi_variable.h> #include <u-boot/crc.h> -static struct efi_var_file __efi_runtime_data *efi_var_buf; +struct efi_var_file __efi_runtime_data *efi_var_buf; static struct efi_var_entry __efi_runtime_data *efi_current_var; /** @@ -264,3 +264,71 @@ efi_status_t efi_var_mem_init(void) return ret; return ret; } + +efi_status_t __efi_runtime +efi_get_variable_mem(u16 *variable_name, const efi_guid_t *vendor, u32 *attributes, + efi_uintn_t *data_size, void *data, u64 *timep) +{ + efi_uintn_t old_size; + struct efi_var_entry *var; + u16 *pdata; + + if (!variable_name || !vendor || !data_size) + return EFI_INVALID_PARAMETER; + var = efi_var_mem_find(vendor, variable_name, NULL); + if (!var) + return EFI_NOT_FOUND; + + if (attributes) + *attributes = var->attr; + if (timep) + *timep = var->time; + + old_size = *data_size; + *data_size = var->length; + if (old_size < var->length) + return EFI_BUFFER_TOO_SMALL; + + if (!data) + return EFI_INVALID_PARAMETER; + + for (pdata = var->name; *pdata; ++pdata) + ; + ++pdata; + + efi_memcpy_runtime(data, pdata, var->length); + + return EFI_SUCCESS; +} + +efi_status_t __efi_runtime +efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, u16 *variable_name, + efi_guid_t *vendor) +{ + struct efi_var_entry *var; + efi_uintn_t old_size; + u16 *pdata; + + if (!variable_name_size || !variable_name || !vendor) + return EFI_INVALID_PARAMETER; + + efi_var_mem_find(vendor, variable_name, &var); + + if (!var) + return EFI_NOT_FOUND; + + for (pdata = var->name; *pdata; ++pdata) + ; + ++pdata; + + old_size = *variable_name_size; + *variable_name_size = (uintptr_t)pdata - (uintptr_t)var->name; + + if (old_size < *variable_name_size) + return EFI_BUFFER_TOO_SMALL; + + efi_memcpy_runtime(variable_name, var->name, *variable_name_size); + efi_memcpy_runtime(vendor, &var->guid, sizeof(efi_guid_t)); + + return EFI_SUCCESS; +} diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 39a848290380..e684623aec44 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -282,68 +282,14 @@ efi_get_variable_int(u16 *variable_name, const efi_guid_t *vendor, u32 *attributes, efi_uintn_t *data_size, void *data, u64 *timep) { - efi_uintn_t old_size; - struct efi_var_entry *var; - u16 *pdata; - - if (!variable_name || !vendor || !data_size) - return EFI_INVALID_PARAMETER; - var = efi_var_mem_find(vendor, variable_name, NULL); - if (!var) - return EFI_NOT_FOUND; - - if (attributes) - *attributes = var->attr; - if (timep) - *timep = var->time; - - old_size = *data_size; - *data_size = var->length; - if (old_size < var->length) - return EFI_BUFFER_TOO_SMALL; - - if (!data) - return EFI_INVALID_PARAMETER; - - for (pdata = var->name; *pdata; ++pdata) - ; - ++pdata; - - efi_memcpy_runtime(data, pdata, var->length); - - return EFI_SUCCESS; + return efi_get_variable_mem(variable_name, vendor, attributes, data_size, data, timep); } efi_status_t __efi_runtime efi_get_next_variable_name_int(efi_uintn_t *variable_name_size, u16 *variable_name, efi_guid_t *vendor) { - struct efi_var_entry *var; - efi_uintn_t old_size; - u16 *pdata; - - if (!variable_name_size || !variable_name || !vendor) - return EFI_INVALID_PARAMETER; - - efi_var_mem_find(vendor, variable_name, &var); - - if (!var) - return EFI_NOT_FOUND; - - for (pdata = var->name; *pdata; ++pdata) - ; - ++pdata; - - old_size = *variable_name_size; - *variable_name_size = (uintptr_t)pdata - (uintptr_t)var->name; - - if (old_size < *variable_name_size) - return EFI_BUFFER_TOO_SMALL; - - efi_memcpy_runtime(variable_name, var->name, *variable_name_size); - efi_memcpy_runtime(vendor, &var->guid, sizeof(efi_guid_t)); - - return EFI_SUCCESS; + return efi_get_next_variable_name_mem(variable_name_size, variable_name, vendor); } efi_status_t efi_set_variable_int(u16 *variable_name, const efi_guid_t *vendor, diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c index 9920351a403e..a699cf414647 100644 --- a/lib/efi_loader/efi_variable_tee.c +++ b/lib/efi_loader/efi_variable_tee.c @@ -15,6 +15,8 @@ #include <malloc.h> #include <mm_communication.h> +#define OPTEE_PAGE_SIZE BIT(12) +extern struct efi_var_file __efi_runtime_data *efi_var_buf; static efi_uintn_t max_buffer_size; /* comm + var + func + data */ static efi_uintn_t max_payload_size; /* func + data */ @@ -238,7 +240,25 @@ efi_status_t EFIAPI get_max_payload(efi_uintn_t *size) goto out; *size = var_payload->size; - + /* + * Although the max payload is configurable on StMM, we only share a single + * page from OP-TEE for the non-secure buffer used to communicate with StMM. + * Since OP-TEE will reject to map anything bigger than that, make sure we are + * in bounds. + */ + if (*size > OPTEE_PAGE_SIZE) + *size = OPTEE_PAGE_SIZE - MM_COMMUNICATE_HEADER_SIZE - + MM_VARIABLE_COMMUNICATE_SIZE; + /* + * There seems to be a bug in EDK2 miscalculating the boundaries and size + * checks, so deduct 2 more bytes to fulfill this requirement. Fix it up here + * to ensure backwards compatibility with older versions. + * Ref: StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c + * sizeof (EFI_MM_COMMUNICATE_HEADER) instead the size minus the flexible + * array member + */ + if (*size > 2) + *size -= 2; out: free(comm_buf); return ret; @@ -606,7 +626,15 @@ static efi_status_t __efi_runtime EFIAPI efi_get_variable_runtime(u16 *variable_name, const efi_guid_t *guid, u32 *attributes, efi_uintn_t *data_size, void *data) { - return EFI_UNSUPPORTED; + efi_status_t ret; + + ret = efi_get_variable_mem(variable_name, guid, attributes, data_size, data, NULL); + + /* Remove EFI_VARIABLE_READ_ONLY flag */ + if (attributes) + *attributes &= EFI_VARIABLE_MASK; + + return ret; } /** @@ -622,7 +650,7 @@ static efi_status_t __efi_runtime EFIAPI efi_get_next_variable_name_runtime(efi_uintn_t *variable_name_size, u16 *variable_name, efi_guid_t *guid) { - return EFI_UNSUPPORTED; + return efi_get_next_variable_name_mem(variable_name_size, variable_name, guid); } /** @@ -674,8 +702,10 @@ efi_set_variable_runtime(u16 *variable_name, const efi_guid_t *guid, */ void efi_variables_boot_exit_notify(void) { - u8 *comm_buf; efi_status_t ret; + u8 *comm_buf; + loff_t len; + struct efi_var_file *var_buf; comm_buf = setup_mm_hdr(NULL, 0, SMM_VARIABLE_FUNCTION_EXIT_BOOT_SERVICE, &ret); @@ -688,6 +718,18 @@ void efi_variables_boot_exit_notify(void) log_err("Unable to notify StMM for ExitBootServices\n"); free(comm_buf); + /* + * Populate the list for runtime variables. + * asking EFI_VARIABLE_RUNTIME_ACCESS is redundant, since + * efi_var_mem_notify_exit_boot_services will clean those, but that's fine + */ + ret = efi_var_collect(&var_buf, &len, EFI_VARIABLE_RUNTIME_ACCESS); + if (ret != EFI_SUCCESS) + log_err("Can't populate EFI variables. No runtime variables will be available\n"); + else + memcpy(efi_var_buf, var_buf, len); + free(var_buf); + /* Update runtime service table */ efi_runtime_services.query_variable_info = efi_query_variable_info_runtime; @@ -707,6 +749,11 @@ efi_status_t efi_init_variables(void) { efi_status_t ret; + /* Create a cached copy of the variables that will be enabled on EBS */ + ret = efi_var_mem_init(); + if (ret != EFI_SUCCESS) + return ret; + ret = get_max_payload(&max_payload_size); if (ret != EFI_SUCCESS) return ret; -- 2.28.0.rc1

5 7

Devicetree state of U-Boot vs kernel
by Bill Mills 15 Jan '21

15 Jan '21

All, On the Devicetree evolution call Wednesday I promised to finish my comparison of u-boot DT vs kernel DT. The script is not perfect but the results are still interesting. For each dts and dtsi file in the tip of the u-boot tree, it tries to correlate it to the kernel tip. It compares git SHA1 signatures or falls back to filenames. The results were surprising to me but perhaps they should not have been. I have checked in the script[1] and the full results here [2] The full file lists (with some diff stats) are in the root dir. Example [3] I also looked at the line count of the u-boot override files. Even though we don't expect these to correlate, we do expect reasonable usage to result in small files. Big files are an indication of possible abuse of the system. (I don't think the idea was to have wholesale new versions of the DTS as an override.) I plan to redo the script in python. It will be much easier to be more precise and to look deeper. (For example figure out how old the u-boot version is in number of change sets and number of days. Or if no content sync now were they ever synced?) Here is the scripts output: (from summary.txt) Devicetree sync status for u-boot v2021.01-rc5-7-gb8c725e736 Compared to kernel v5.11-rc2-156-g71c061d24438 14% (255) are completely synced 253 arm 2 riscv 0 mips 0 powerpc 0 x86 0 68k 0 microblaze 0 sh 0 arc 23% (416) content has appeared in the kernel but is not up to date 411 arm 0 riscv 1 mips 0 powerpc 1 x86 0 68k 0 microblaze 0 sh 1 arc 33% (584) filename appears in kernel but content never has 467 arm 1 riscv 12 mips 91 powerpc 0 x86 0 68k 0 microblaze 0 sh 8 arc 28% (510) neither filename nor content appears in kernel 305 arm 4 riscv 48 mips 35 powerpc 44 x86 0 68k 1 microblaze 1 sh 6 arc n/a (510) U-Boot specific, no correlation expected 7 sandbox 358 override 211 test histogram of override size (in raw lines) 10 61 20 53 30 38 40 33 50 23 60 14 70 12 80 7 90 5 100 4 110 4 120 5 130 6 140 4 150 0 160 2 170 0 180 0 190 4 200 0 210 2 220 2 230 1 240 2 250 1 260 1 270 1 280 0 290 0 300 0 310 0 320 1 [1] https://github.com/wmamills/devicetree-source/blob/master/scripts/correlate… [2] https://github.com/wmamills/devicetree-source [3] https://github.com/wmamills/devicetree-source/blob/master/dts-somewhere.txt -- Bill Mills Principal Technical Consultant, Linaro +1-240-643-0836 TZ: US Eastern Work Schedule: Tues/Wed/Thur

3 2

[PATCH 1/1] image: usage of value ~0UL for intrd_high
by Heinrich Schuchardt 15 Jan '21

15 Jan '21

The comment for initrd_high in the coding and in README were contradicting and neither fully described what the coding does. Clarify the usage of the special value ~0UL for the environment variable initrd_high. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- README | 3 ++- common/image.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README b/README index 7b73a1c973..fe58f1ab98 100644 --- a/README +++ b/README @@ -3310,7 +3310,8 @@ List of environment variables (most likely not complete): setenv initrd_high 00c00000 - If you set initrd_high to 0xFFFFFFFF, this is an + If you set initrd_high to 0xFFFFFFFF on a 32-bit systems + or 0xFFFFFFFFFFFFFFFF on a 64-bit systems, this is an indication to U-Boot that all addresses are legal for the Linux kernel, including addresses in flash memory. In this case U-Boot will NOT COPY the diff --git a/common/image.c b/common/image.c index 451fc689a8..007e4e987a 100644 --- a/common/image.c +++ b/common/image.c @@ -1362,8 +1362,10 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len, s = env_get("initrd_high"); if (s) { - /* a value of "no" or a similar string will act like 0, - * turning the "load high" feature off. This is intentional. + /* + * A value of 0xffffffffffffffff on 64-bit or 0xffffffff + * on 32-bit systems will disable the copying of the initial + * RAM disk to high memory. */ initrd_high = simple_strtoul(s, NULL, 16); if (initrd_high == ~0) -- 2.29.2

4 13