February 2019 - U-Boot

Re: [U-Boot] [U-Boot, v3, 1/5] efi_loader: Initial HII database protocols
by Heinrich Schuchardt 12 Feb '19

12 Feb '19

On 1/23/19 2:01 PM, Alexander Graf wrote: >> From: Leif Lindholm <leif.lindholm(a)linaro.org> >> >> This patch provides enough implementation of the following protocols to >> run EDKII's Shell.efi and UEFI SCT: >> >> * EfiHiiDatabaseProtocol >> * EfiHiiStringProtocol >> >> Not implemented are: >> * ExportPackageLists() >> * RegisterPackageNotify()/UnregisterPackageNotify() >> * SetKeyboardLayout() (i.e. *current* keyboard layout) >> >> HII database protocol in this patch series can handle only: >> * GUID package >> * string package >> * keyboard layout package >> (The other packages, except Device path package, will be necessary >> for interactive and graphical UI.) >> >> Cc: Leif Lindholm <leif.lindholm(a)linaro.org> >> Signed-off-by: Rob Clark <robdclark(a)gmail.com> >> Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> > > Thanks, applied to efi-next > > Alex > > I have rebased the efi-next tree upon U-Boot master. My Odroid C2 crashes when booting via U-Boot -> iPXE -> GRUB -> Linux. Bisection points to this patch. The HII protocols are referenced by iPXE if available. An interesting comment in https://www.spinics.net/lists/arm-kernel/msg704238.html for a similar U-Boot related error is: "Looks like you're taking the SError as soon as we unmask them, so it could've been pending for ages. It would be interesting to see if it's actually caused by the kernel, or if the firmware triggers it beforehand." Booting via iPXE is described in doc/README.iscsi This patch and some follow up patches are included in the pull request for the EFI tree. I would prefer if we could remove the HII protocols from the pull request until the patches are thoroughly tested. Loading Linux 4.19.0-1-arm64 ... Loading initial ramdisk ... EFI stub: Booting Linux Kernel... EFI stub: EFI_RNG_PROTOCOL unavailable, no randomness supplied EFI stub: Using DTB from configuration table EFI stub: Exiting boot services and installing virtual address map... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 4.19.0-1-arm64 (debian-kernel(a)lists.debian.org) (gcc version 8.2.0 (Debian 8) [ 0.000000] Machine model: Hardkernel ODROID-C2 [ 0.000000] earlycon: meson0 at MMIO 0x00000000c81004c0 (options '115200n8') [ 0.000000] bootconsole [meson0] enabled [ 0.000000] SError Interrupt on CPU0, code 0xbf000000 -- SError [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 4.19.0-1-arm64 #1 Debian 4.19.12-1 [ 0.000000] Hardware name: Hardkernel ODROID-C2 (DT) [ 0.000000] pstate: 00000085 (nzcv daIf -PAN -UAO) [ 0.000000] pc : setup_arch+0x104/0x570 [ 0.000000] lr : setup_arch+0xfc/0x570 [ 0.000000] sp : ffff000009293f10 [ 0.000000] x29: ffff000009293f10 x28: 00000000023d0018 [ 0.000000] x27: 000000007c9b30c0 x26: 0000000000000000 [ 0.000000] x25: 0000000000000000 x24: 000000007ca7e000 [ 0.000000] x23: 0000000000000000 x22: ffff000009299708 [ 0.000000] x21: ffff7dfffe8000d4 x20: ffff0000092e3330 [ 0.000000] x19: ffff000008080000 x18: 0000000000000010 [ 0.000000] x17: 0000000000000000 x16: 0000000000000000 [ 0.000000] x15: ffffffffffffffff x14: ffff000009299708 [ 0.000000] x13: ffff00008943937f x12: 0000000000000028 [ 0.000000] x11: 0000000000000007 x10: 0101010101010101 [ 0.000000] x9 : fffffffffffffffb x8 : 0000000000000008 [ 0.000000] x7 : 0000000000000003 x6 : 0000000000800000 [ 0.000000] x5 : 0000800000000000 x4 : 0000000000000065 [ 0.000000] x3 : 0000000000000063 x2 : 0000000000000000 [ 0.000000] x1 : 0000000000000000 x0 : 0000000000000080 [ 0.000000] Kernel panic - not syncing: Asynchronous SError Interrupt [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 4.19.0-1-arm64 #1 Debian 4.19.12-1 [ 0.000000] Hardware name: Hardkernel ODROID-C2 (DT) [ 0.000000] Call trace: [ 0.000000] dump_backtrace+0x0/0x180 [ 0.000000] show_stack+0x24/0x30 [ 0.000000] dump_stack+0x90/0xb4 [ 0.000000] panic+0x128/0x290 [ 0.000000] nmi_panic+0x7c/0x80 [ 0.000000] arm64_serror_panic+0x80/0x8c [ 0.000000] is_valid_bugaddr+0x0/0x1c [ 0.000000] el1_error+0x7c/0xdc [ 0.000000] setup_arch+0x104/0x570 [ 0.000000] start_kernel+0x78/0x4c0 Best regards Heinrich

3 2

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 11 Feb '19

11 Feb '19

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit 97276a91db8e98f081a40ddf9dc8f81d4032a756: Prepare v2019.04-rc1 (2019-02-07 21:32:19 -0500) are available in the Git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to c4bd12a7dad43ed9de3070c7c5e8b690d8c03a79: i2c: mux: Generate longer i2c mux name (2019-02-11 09:38:23 +0100) ---------------------------------------------------------------- Michal Simek (7): dm: core: Add of_alias_get_highest_id() fdt: Introduce fdtdec_get_alias_highest_id() dm: core: Introduce dev_read_alias_highest_id() dm: core: Add tests for dev_read_alias_highest_id() i2c: dm: Record maximum id of devices before probing devices i2c: Fill req_seq in i2c_post_bind() i2c: mux: Generate longer i2c mux name drivers/core/of_access.c | 18 ++++++++++++++++++ drivers/core/read.c | 8 ++++++++ drivers/i2c/i2c-uclass.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- drivers/i2c/muxes/i2c-mux-uclass.c | 29 ++++++++++++++++++++++++++--- include/dm/of_access.h | 10 ++++++++++ include/dm/read.h | 16 ++++++++++++++++ include/fdtdec.h | 13 +++++++++++++ lib/fdtdec.c | 33 +++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 23 +++++++++++++++++++++++ 9 files changed, 198 insertions(+), 6 deletions(-) Travis builds fine: https://travis-ci.org/hsdenx/u-boot-i2c/builds/491562929 This patchseries is necessary for the other patchserie [1] from Michal which converts zynq platform to DM_I2C and removes old driver. bye, Heiko [1] https://lists.denx.de/pipermail/u-boot/2019-February/357811.html -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[U-Boot] Please pull u-boot-marvell/master
by Stefan Roese 11 Feb '19

11 Feb '19

Hi Tom, please pull the following Marvell related patches, mostly board specific changes and one platform build fix: ---------------------------------------------------------------- - Fix BUILD_TARGET for ARCH_MVEBU from Baruch - Fix MVEBU PCIe reset issues from Baruch - Increase DDR stability on x530 from Chris ---------------------------------------------------------------- Thanks, Stefan The following changes since commit dbe70c7d4e3d5c705a98d82952e05a591efd0683: Merge branch 'master' of git://git.denx.de/u-boot-sh (2019-02-10 08:11:53 -0500) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to a6ac775bae7fad1534ffe2b20244b7e7106b12b0: ARM: mvebu: x530: use MV_DDR_FREQ_SAR (2019-02-11 09:39:12 +0100) ---------------------------------------------------------------- Baruch Siach (4): arm: mvebu: mcbin: dts: fix PCIe reset polarity pcie: designware: mvebu: fix reset release polarity arm: mvebu: cf gt-8k: dts: add PCIe slot reset support Kconfig: fix BUILD_TARGET for ARCH_MVEBU Chris Packham (1): ARM: mvebu: x530: use MV_DDR_FREQ_SAR Kconfig | 2 +- arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 8 ++++++++ arch/arm/dts/armada-8040-mcbin.dts | 2 +- board/alliedtelesis/x530/x530.c | 2 +- drivers/pci/pcie_dw_mvebu.c | 4 +++- 5 files changed, 14 insertions(+), 4 deletions(-)

2 1

[U-Boot] [PATCH] test: call lmb tests vi 'ut lib'
by Simon Goldschmidt 11 Feb '19

11 Feb '19

The unit tests in test/lib/lmb.c are not related to the device tree. So they should be executed via `ut lib` and not via `ut dm`. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- test/lib/lmb.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/test/lib/lmb.c b/test/lib/lmb.c index ec68227bb6..88764293b9 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -5,7 +5,8 @@ #include <common.h> #include <lmb.h> -#include <dm/test.h> +#include <test/lib.h> +#include <test/test.h> #include <test/ut.h> static int check_lmb(struct unit_test_state *uts, struct lmb *lmb, @@ -197,7 +198,7 @@ static int lib_test_lmb_simple(struct unit_test_state *uts) return test_multi_alloc_512mb(uts, 0xE0000000); } -DM_TEST(lib_test_lmb_simple, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_simple, 0); /* Create two memory regions with one reserved region and allocate */ static int lib_test_lmb_simple_x2(struct unit_test_state *uts) @@ -213,7 +214,7 @@ static int lib_test_lmb_simple_x2(struct unit_test_state *uts) return test_multi_alloc_512mb_x2(uts, 0xE0000000, 0x40000000); } -DM_TEST(lib_test_lmb_simple_x2, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_simple_x2, 0); /* Simulate 512 MiB RAM, allocate some blocks that fit/don't fit */ static int test_bigblock(struct unit_test_state *uts, const phys_addr_t ram) @@ -280,7 +281,7 @@ static int lib_test_lmb_big(struct unit_test_state *uts) return test_bigblock(uts, 0xE0000000); } -DM_TEST(lib_test_lmb_big, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_big, 0); /* Simulate 512 MiB RAM, allocate a block without previous reservation */ static int test_noreserved(struct unit_test_state *uts, const phys_addr_t ram, @@ -355,7 +356,7 @@ static int lib_test_lmb_noreserved(struct unit_test_state *uts) return test_noreserved(uts, 0xE0000000, 4, 1); } -DM_TEST(lib_test_lmb_noreserved, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_noreserved, 0); static int lib_test_lmb_unaligned_size(struct unit_test_state *uts) { @@ -370,7 +371,7 @@ static int lib_test_lmb_unaligned_size(struct unit_test_state *uts) return test_noreserved(uts, 0xE0000000, 5, 8); } -DM_TEST(lib_test_lmb_unaligned_size, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_unaligned_size, 0); /* * Simulate a RAM that starts at 0 and allocate down to address 0, which must * fail as '0' means failure for the lmb_alloc functions. @@ -413,7 +414,7 @@ static int lib_test_lmb_at_0(struct unit_test_state *uts) return 0; } -DM_TEST(lib_test_lmb_at_0, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_at_0, 0); /* Check that calling lmb_reserve with overlapping regions fails. */ static int lib_test_lmb_overlapping_reserve(struct unit_test_state *uts) @@ -451,8 +452,7 @@ static int lib_test_lmb_overlapping_reserve(struct unit_test_state *uts) return 0; } -DM_TEST(lib_test_lmb_overlapping_reserve, - DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_overlapping_reserve, 0); /* * Simulate 512 MiB RAM, reserve 3 blocks, allocate addresses in between. @@ -582,7 +582,7 @@ static int lib_test_lmb_alloc_addr(struct unit_test_state *uts) return test_alloc_addr(uts, 0xE0000000); } -DM_TEST(lib_test_lmb_alloc_addr, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_alloc_addr, 0); /* Simulate 512 MiB RAM, reserve 3 blocks, check addresses in between */ static int test_get_unreserved_size(struct unit_test_state *uts, @@ -653,5 +653,4 @@ static int lib_test_lmb_get_free_size(struct unit_test_state *uts) return test_get_unreserved_size(uts, 0xE0000000); } -DM_TEST(lib_test_lmb_get_free_size, - DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +LIB_TEST(lib_test_lmb_get_free_size, 0); -- 2.17.1

2 2

[U-Boot] [PATCH 1/1] efi_loader: fix EFI entry counting
by Heinrich Schuchardt 11 Feb '19

11 Feb '19

`bootefi selftest` fails on qemu-x86_defconfig if efi_selftest() is not invoked using EFI_CALL(). Likewise we call the entry point of EFI payloads with EFI_CALL(efi_start_image()). entry_count indicates if we are in U-Boot (1) or in EFI payload code (0). As we start in U-Boot code the initial value has to be 1. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 2 +- lib/efi_loader/efi_boottime.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 9d9ccdd31a..3619a20e64 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -445,7 +445,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_FAILURE; /* Execute the test */ - r = efi_selftest(&image_obj->header, &systab); + r = EFI_CALL(efi_selftest(&image_obj->header, &systab)); bootefi_run_finish(image_obj, loaded_image_info); return r != EFI_SUCCESS; } else diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 0b13c79b76..ed0e926646 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -44,7 +44,8 @@ static bool efi_is_direct_boot = true; static volatile void *efi_gd, *app_gd; #endif -static int entry_count; +/* 1 if inside U-Boot code, 0 if inside EFI payload code */ +static int entry_count = 1; static int nesting_level; /* GUID of the device tree table */ const efi_guid_t efi_guid_fdt = EFI_FDT_GUID; -- 2.20.1

2 2

[U-Boot] [PATCH v2 00/13] Add Support for eMMC in AM65x-evm
by Faiz Abbas 11 Feb '19

11 Feb '19

Add Support for eMMC in TI's AM65x-evm. The series starts by syncing the sdhci0 node from the kernel. Then it adds APIs and changes to the driver required for handling the driver's integrated phy. The current maximum supported speed is DDR52. Higher speeds and tuning support will be added in a subsequent series. Support for booting from eMMC will also be added in subsequent patches. Tested on Lokesh's branch[1] as sysfw loading for AM65x is not yet upstream. [1] https://github.com/lokeshvutla/u-boot/tree/devel/am65x-evm-boot Changes in v2: Patch 9: Fixed return value Patch 12: Fixed spacing Faiz Abbas (13): arm64: dts: k3: Sync sdhci0 node from kernel mmc: am654_mmc: Change driver name mmc: am654_sdhci: Remove quirks regmap: Add API regmap_init_mem_index() regmap: Add support for polling on a register mmc: sdhci: Add support for sdhci-caps-mask mmc: sdhci: Make sdhci_set_clock() non static arm: dts: k3: Add phy specific properties to SD card node mmc: sdhci: Make set_ios_post() return int mmc: am654_sdhci: Add Support for PHY configs: am65x_evm: Enable CONFIG_REGMAP mmc: sdhci: Add support for HOST_CONTROL2 and setting UHS timings mmc: am654_sdhci: Add a platform specific set_control_reg() callback arch/arm/dts/k3-am65-main.dtsi | 22 ++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 40 +-- arch/arm/dts/k3-am654-base-board.dts | 28 ++ configs/am65x_evm_a53_defconfig | 4 +- configs/am65x_evm_r5_defconfig | 4 +- drivers/core/regmap.c | 42 +++ drivers/mmc/Kconfig | 9 +- drivers/mmc/Makefile | 2 +- drivers/mmc/am654_sdhci.c | 338 +++++++++++++++++++ drivers/mmc/k3_arsan_sdhci.c | 109 ------ drivers/mmc/sdhci.c | 53 ++- drivers/mmc/xenon_sdhci.c | 4 +- drivers/mmc/zynq_sdhci.c | 31 +- include/regmap.h | 36 ++ include/sdhci.h | 22 +- 15 files changed, 552 insertions(+), 192 deletions(-) create mode 100644 drivers/mmc/am654_sdhci.c delete mode 100644 drivers/mmc/k3_arsan_sdhci.c -- 2.19.2

3 16

[U-Boot] [PATCH v2 0/7] Align U-Boot I2C DM bus ID handling with Linux
by Michal Simek 11 Feb '19

11 Feb '19

U-Boot with I2C_DM enabled is not capable to list i2c busses connected to i2c mux. For getting this work there is a need to find out highest alias ID and use this uniq number for new buses connected to I2C mux. This series is making this happen. There is only one missing piece which is that also i2c controllers which are not listed in DT are not using this feature. Removing setting up aliases from i2c mux code and unifying it in the same code ensures that numbering schema is proper if no alias is specified. ZynqMP> i2c bus Bus 0: i2c@ff020000 20: gpio@20, offset len 1, flags 0 21: gpio@21, offset len 1, flags 0 75: i2c-mux@75, offset len 1, flags 0 Bus 1: i2c@ff020000->i2c-mux@75->i2c@0 Bus 2: i2c@ff020000->i2c-mux@75->i2c@1 Bus 3: i2c@ff020000->i2c-mux@75->i2c@2 Bus 4: i2c@ff030000 (active 4) 74: i2c-mux@74, offset len 1, flags 0 75: i2c-mux@75, offset len 1, flags 0 Bus 5: i2c@ff030000->i2c-mux@74->i2c@0 (active 5) 54: eeprom@54, offset len 1, flags 0 Bus 6: i2c@ff030000->i2c-mux@74->i2c@1 Bus 7: i2c@ff030000->i2c-mux@74->i2c@2 Bus 8: i2c@ff030000->i2c-mux@74->i2c@3 Bus 9: i2c@ff030000->i2c-mux@74->i2c@4 Bus 10: i2c@ff030000->i2c-mux@75->i2c@0 Bus 11: i2c@ff030000->i2c-mux@75->i2c@1 Bus 12: i2c@ff030000->i2c-mux@75->i2c@2 Bus 13: i2c@ff030000->i2c-mux@75->i2c@3 Bus 14: i2c@ff030000->i2c-mux@75->i2c@4 Bus 15: i2c@ff030000->i2c-mux@75->i2c@5 Bus 16: i2c@ff030000->i2c-mux@75->i2c@6 Bus 17: i2c@ff030000->i2c-mux@75->i2c@7 Thanks, Michal Changes in v2: - Update kernel-doc binding - Return -1 in case of error. -1 means that the next free alias is 0. - New patch - New patch - Use dev_read_alias_highest_id() - Use uclass private data - Use private uclass data - Fix headers - Change patch description to focus only on bus name Michal Simek (7): dm: core: Add of_alias_get_highest_id() fdt: Introduce fdtdec_get_alias_highest_id() dm: core: Introduce dev_read_alias_highest_id() dm: core: Add tests for dev_read_alias_highest_id() i2c: dm: Record maximum id of devices before probing devices i2c: Fill req_seq in i2c_post_bind() i2c: mux: Generate longer i2c mux name drivers/core/of_access.c | 18 ++++++++++++++ drivers/core/read.c | 8 ++++++ drivers/i2c/i2c-uclass.c | 50 +++++++++++++++++++++++++++++++++++--- drivers/i2c/muxes/i2c-mux-uclass.c | 29 +++++++++++++++++++--- include/dm/of_access.h | 10 ++++++++ include/dm/read.h | 16 ++++++++++++ include/fdtdec.h | 13 ++++++++++ lib/fdtdec.c | 33 +++++++++++++++++++++++++ test/dm/test-fdt.c | 23 ++++++++++++++++++ 9 files changed, 194 insertions(+), 6 deletions(-) -- 1.9.1

4 39

[U-Boot] [PATCH v3] efi_loader: Make HII a config option
by Alexander Graf 11 Feb '19

11 Feb '19

Heinrich ran into issues with HII and iPXE which lead to #SErrors on his Odroid-C2 system. We definitely do not want to regress just yet, so let's not expose the HII protocols by default. Instead, let's make it a config option that people can play with This way, we can stabilize the code in tree without breaking any users. Once someone figures out, why this breaks iPXE (probably a NULL dereference), we can enable it by default. Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- v1 -> v2: - Remove HII selftest as well v2 -> v3: - Make config option --- lib/efi_loader/Kconfig | 15 +++++++++++++++ lib/efi_loader/efi_boottime.c | 2 ++ lib/efi_selftest/Makefile | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index f5de005ff8..23487b8130 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -34,3 +34,18 @@ config EFI_LOADER_BOUNCE_BUFFER Some hardware does not support DMA to full 64bit addresses. For this hardware we can create a bounce buffer so that payloads don't have to worry about platform details. + +config EFI_LOADER_HII + bool "Expose HII protocols to EFI applications" + depends on EFI_LOADER + default n + help + The Human Interface Infrastructure is a complicated framework that + allows UEFI applications to draw fancy menus and hook strings using + a translation framework. + + U-Boot implements enough of its features to be able to run the UEFI + Shell, but not more than that. The code is experimental still, so + beware that your system might break with HII enabled. + + If unsure, say n. diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index fc26d6adc1..f74f989e0a 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1558,6 +1558,7 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path, if (ret != EFI_SUCCESS) goto failure; +#if CONFIG_IS_ENABLED(EFI_LOADER_HII) ret = efi_add_protocol(&obj->header, &efi_guid_hii_string_protocol, (void *)&efi_hii_string); @@ -1575,6 +1576,7 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path, (void *)&efi_hii_config_routing); if (ret != EFI_SUCCESS) goto failure; +#endif return ret; failure: diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index 779f549940..7f4eafb2fe 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -25,7 +25,6 @@ efi_selftest_exception.o \ efi_selftest_exitbootservices.o \ efi_selftest_fdt.o \ efi_selftest_gop.o \ -efi_selftest_hii.o \ efi_selftest_loaded_image.o \ efi_selftest_manageprotocols.o \ efi_selftest_memory.o \ @@ -41,6 +40,7 @@ efi_selftest_variables.o \ efi_selftest_watchdog.o obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o +obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) obj-y += efi_selftest_block_device.o -- 2.12.3

1 0

[U-Boot] [PATCH v2] efi_loader: Do not expose HII protocols yet
by Alexander Graf 11 Feb '19

11 Feb '19

Heinrich ran into issues with HII and iPXE which lead to #SErrors on his Odroid-C2 system. We definitely do not want to regress just yet, so let's not expose the HII protocols just yet. Once someone figures out, why this breaks iPXE (probably a NULL dereference), we can revert this patch again. Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- v1 -> v2: - Remove HII selftest as well --- lib/efi_loader/efi_boottime.c | 18 ------------------ lib/efi_selftest/Makefile | 1 - 2 files changed, 19 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index fc26d6adc1..dbf0d56c1d 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1558,24 +1558,6 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path, if (ret != EFI_SUCCESS) goto failure; - ret = efi_add_protocol(&obj->header, - &efi_guid_hii_string_protocol, - (void *)&efi_hii_string); - if (ret != EFI_SUCCESS) - goto failure; - - ret = efi_add_protocol(&obj->header, - &efi_guid_hii_database_protocol, - (void *)&efi_hii_database); - if (ret != EFI_SUCCESS) - goto failure; - - ret = efi_add_protocol(&obj->header, - &efi_guid_hii_config_routing_protocol, - (void *)&efi_hii_config_routing); - if (ret != EFI_SUCCESS) - goto failure; - return ret; failure: printf("ERROR: Failure to install protocols for loaded image\n"); diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index 779f549940..b3d3dadf59 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -25,7 +25,6 @@ efi_selftest_exception.o \ efi_selftest_exitbootservices.o \ efi_selftest_fdt.o \ efi_selftest_gop.o \ -efi_selftest_hii.o \ efi_selftest_loaded_image.o \ efi_selftest_manageprotocols.o \ efi_selftest_memory.o \ -- 2.12.3

1 0

[U-Boot] [PATCH] arm: Leave smccc calls in .text when efi_loader=n
by Alexander Graf 11 Feb '19

11 Feb '19

Commit 81ea00838c6 ("efi_loader: PSCI reset and shutdown") put the SMCCC assembly code into the efi specific code section. This is wrong when we do not have EFI_LOADER enabled, as that strips efi runtime sections from the output binary Reported-by: Michal Simek <monstr(a)monstr.eu> Fixes: 81ea00838c6 ("efi_loader: PSCI reset and shutdown") Signed-off-by: Alexander Graf <agraf(a)suse.de> --- arch/arm/cpu/armv7/smccc-call.S | 2 ++ arch/arm/cpu/armv8/smccc-call.S | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv7/smccc-call.S b/arch/arm/cpu/armv7/smccc-call.S index eae69e36c3..f70728f2c4 100644 --- a/arch/arm/cpu/armv7/smccc-call.S +++ b/arch/arm/cpu/armv7/smccc-call.S @@ -7,7 +7,9 @@ #include <asm/opcodes-sec.h> #include <asm/opcodes-virt.h> +#ifdef CONFIG_EFI_LOADER .section .text.efi_runtime +#endif #define UNWIND(x...) /* diff --git a/arch/arm/cpu/armv8/smccc-call.S b/arch/arm/cpu/armv8/smccc-call.S index 86de4b4089..dc92b28777 100644 --- a/arch/arm/cpu/armv8/smccc-call.S +++ b/arch/arm/cpu/armv8/smccc-call.S @@ -6,7 +6,9 @@ #include <linux/arm-smccc.h> #include <generated/asm-offsets.h> +#ifdef CONFIG_EFI_LOADER .section .text.efi_runtime +#endif .macro SMCCC instr .cfi_startproc -- 2.12.3

2 1