December 2018 - U-Boot

[U-Boot] [PATCH] arm64: lx2160ardb: enable DM support for sata
by Peng Ma 27 Dec '18

27 Dec '18

Enable related configs to support sata DM feature. Signed-off-by: Peng Ma <peng.ma(a)nxp.com> --- Depends on: - https://patchwork.ozlabs.org/patch/1013298/ configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index b7e3967..1267206 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -60,7 +60,6 @@ CONFIG_E1000=y CONFIG_NET=y CONFIG_DM_MMC=y CONFIG_DM_MMC_OPS=n -CONFIG_BLK=n CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y @@ -84,3 +83,6 @@ CONFIG_EMC2305=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_AHCI=y -- 1.7.1

1 0

[U-Boot] [PATCH] arm64: lx2160ardb: enable DM support for sata
by Peng Ma 27 Dec '18

27 Dec '18

Enable related configs to support sata DM feature. Signed-off-by: Peng Ma <peng.ma(a)nxp.com> --- configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index b7e3967..1267206 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -60,7 +60,6 @@ CONFIG_E1000=y CONFIG_NET=y CONFIG_DM_MMC=y CONFIG_DM_MMC_OPS=n -CONFIG_BLK=n CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y @@ -84,3 +83,6 @@ CONFIG_EMC2305=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_AHCI=y -- 1.7.1

1 0

[U-Boot] [PATCH] exynos5: allow bigger BL2 (u-boot.bin)
by Guillaume GARDET 27 Dec '18

27 Dec '18

This patch allows SPL to load a bigger BL2 (u-boot.bin). This is needed for and has been tested on Arndale board, as u-boot.bin is now bigger than 512K with GCC8. Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Minkyu Kang <mk7.kang(a)samsung.com> Cc: Tom Rini <trini(a)konsulko.com> --- include/configs/exynos5-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index cd2a9046af..7da4be5ca8 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -89,7 +89,7 @@ /* Configuration of BL1, BL2, ENV Blocks on mmc */ #define CONFIG_RES_BLOCK_SIZE (512) #define CONFIG_BL1_SIZE (16 << 10) /*16 K reserved for BL1*/ -#define CONFIG_BL2_SIZE (512UL << 10UL) /* 512 KB */ +#define CONFIG_BL2_SIZE (512UL << 11UL) /* 1 MB */ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */ #define CONFIG_BL1_OFFSET (CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE) -- 2.19.1

5 14

[U-Boot] U-Boot 2018.09 imx6ull mass storage issue
by Michał Wołowik 27 Dec '18

27 Dec '18

Hello, I try to load some images from USB flash drive. When issuing/usb start/with the flash drive on to the first USB I get some following information: U-Boot 2018.09-36904-gae57ffc-dirty (Dec 18 2018 - 23:00:37 +0100) CPU: Freescale i.MX6ULL rev1.1 792 MHz (running at 396 MHz) CPU: Industrial temperature grade (-40C to 105C) at 49C Reset cause: POR Model: SomLabs i.MX6 ULL Visionsom Board: SomLabs visionsom 6ull DRAM: 512 MiB NAND: 512 MiB Loading Environment from NAND... *** Warning - bad CRC, using default environmet Video: 800x480x24 In: serial Out: serial Err: serial Net: FEC0 [PRIME] Warning: FEC0 (eth0) using random MAC address - 46:79:2e:d4:3f:03 Somlabs iMX6ULL # usb start starting USB... USB0: USB EHCI 1.00 USB1: USB EHCI 1.00 scanning bus 0 for devices... 1 USB Device(s) found scanning bus 1 for devices... EHCI timed out on TD - token=0x80008d80 USB device not accepting new address (error=22) 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Somlabs iMX6ULL # I'm trying to find the solution on different forums but without success. Hardware is OK because on U-Boot from 2017.03 it works well. Here is a list what I'm trying 1. setenv usb_pgood_delay 10000 2. Changed max_xfer_blk to 32768, 65535 etc. 3. Adding extra lines into usb_storage.c int gave_extra_time = 0; ... if ((srb->sense_buf[2] == 0x02) && (srb->sense_buf[12] == 0x3a)) return -1; ... /* If the status is "Not Ready - becoming ready", give it * more time. Linux issues a spinup command (once) and gives * it 100 seconds. */ if (srb->sense_buf[2] == 0x02 && srb->sense_buf[12] == 0x04 && gave_extra_time == 0) gave_extra_time = retries = 1000; /* Allow 10 seconds. */ ... mdelay(100); } while (retries--); The problem is with disappearing power supply on USB. The flash drive blinks shortly and disabled at all then. Nothing helps so far. On U-Boot 2017.03 when I issue/usb//start/, the flash drive blinks 2 times and LED in it start beam constantly. Of course, all USB flash drive operations working well. U-Boot is available at GitHub - SoMLabs/somlabs-uboot-imx <https://community.nxp.com/external-link.jspa?url=https%3A%2F%2Fgithub.com%2…> - branch 2018.09 if someone wants to check parameters (draft version) I added some parameters related with usb and mass storage form defconfig CONFIG_CMD_USB=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="SomLabs" CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y form dts regulators { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <0>; reg_usb_otg1_vbus: regulator@2 { compatible = "regulator-fixed"; reg = <2>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_otg1>; regulator-name = "usb_otg1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio2 8 GPIO_ACTIVE_HIGH>; enable-active-high; }; reg_usb_otg2_vbus: regulator@3 { compatible = "regulator-fixed"; reg = <3>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_otg2>; regulator-name = "usb_otg2_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; enable-active-high; }; }; pinctrl_usb_otg1: usbotg1grp { fsl,pins = < MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x10b0 >; }; pinctrl_usb_otg2: usbotg2grp { fsl,pins = < MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x10b0 >; }; &usbotg1 { vbus-supply = <&reg_usb_otg1_vbus>; dr_mode = "host"; status = "okay"; }; &usbotg2 { vbus-supply = <&reg_usb_otg2_vbus>; dr_mode = "host"; status = "okay"; }; My board is SomLabs Visionsom option with NAND 512Mb. Thanks in advanced Best Regards Michal

2 1

[U-Boot] i.MX8M layout, rephrased
by Sergey Kubushyn 26 Dec '18

26 Dec '18

I'm looking at U-Boot master tree and u-boot-imx repository. What we have now is quite a mess for i.MX8M. In master we have the following directories: arch/arm/mach-imx/imx8 arch/arm/mach-imx/mx8m arch/arm/include/asm/arch-imx8 arch/arm/include/asm/arch-mx8m In u-boot-imx it is different: arch/arm/mach-imx/imx8 arch/arm/mach-imx/imx8m (vs ../mx8m in master) arch/arm/include/asm/arch/arch-imx8 arch/arm/include/asm/arch/arch-imx8m (vs ../mx8m in master) The question is which one is going to make it in the master tree? The problem here is that files from those directories are referenced in multiple places and the "imx8m"/"mx8m" is all over in the header files and sources so once we decided on either naming one tree would have to make a lot of changes either adding or removing that 'i' before "mx8m". Can anybody responsible tell _WHICH_ one is going to make it into the main source tree? Would it be better if we decide on it sooner than later (i.e. _NOW_) so we won't have to hunt it all over the tree later on? I assume it should be "mx8m" as it is in master tree following suit for other flavors so it is u-boot-imx tree that has to be fixed. Another issue is that ARCH_IMX8 and ARCH_IMX8M are treated as different ARCHITECTURES in u-boot-imx unlike e.g. IMX6 that is treated as one ARCH with different flavors (SX/DL/Q/whatever). That makes a lot of unnecessary confusion and, IMHO, should be somehow cleaned up to make it consistent. Can anybody tell something on this? Any thoughts, ideas, recomendations? --- ****************************************************************** * KSI@home KOI8 Net < > The impossible we do immediately. * * Las Vegas NV, USA < > Miracles require 24-hour notice. * ******************************************************************

4 6

[U-Boot] [PATCH 1/1] efi_loader: use named constant for efi_dp_from_mem()
by Heinrich Schuchardt 26 Dec '18

26 Dec '18

When calling efi_dp_from_mem() use a named constant for the memory type. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index f8f65c63f9d..d61609e84c0 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -350,7 +350,7 @@ static efi_status_t do_bootefi_exec(void *efi, if (!device_path && !image_path) { printf("WARNING: using memory device/image path, this may confuse some payloads!\n"); /* actual addresses filled in after efi_load_pe() */ - memdp = efi_dp_from_mem(0, 0, 0); + memdp = efi_dp_from_mem(EFI_RESERVED_MEMORY_TYPE, 0, 0); device_path = image_path = memdp; /* * Grub expects that the device path of the loaded image is -- 2.19.2

1 0

[U-Boot] [PATCH v2 1/1] efi_loader: refactor switch to hypervisor mode
by Heinrich Schuchardt 26 Dec '18

26 Dec '18

Refactor the switch from supervisor to hypervisor to a new function called at the beginning of do_bootefi(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 Use weak function with implementation in arch directories --- arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/exception_level.c | 41 ++++++++++++++ arch/arm/cpu/armv8/Makefile | 1 + arch/arm/cpu/armv8/exception_level.c | 40 ++++++++++++++ cmd/bootefi.c | 81 +++++----------------------- include/bootm.h | 5 ++ 6 files changed, 101 insertions(+), 68 deletions(-) create mode 100644 arch/arm/cpu/armv7/exception_level.c create mode 100644 arch/arm/cpu/armv8/exception_level.c diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 4f4647c90ac..8c955d0d528 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_SYS_ARM_MPU) += mpu_v7r.o ifneq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_EFI_LOADER) += sctlr.o +obj-$(CONFIG_ARMV7_NONSEC) += exception_level.o endif ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y) diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c new file mode 100644 index 00000000000..e231fc94633 --- /dev/null +++ b/arch/arm/cpu/armv7/exception_level.c @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Switching exception levels + * + * Copyright (c) 2018 Heinrich Schuchardt + */ + +#include <common.h> +#include <bootm.h> +#include <asm/armv7.h> +#include <asm/secure.h> +#include <asm/setjmp.h> + +struct jmp_buf_data hyp_jmp; + +/** + * entry_hyp() - entry point when switching to hypervisor mode + */ +static void entry_hyp(void) +{ + dcache_enable(); + debug("Reached HYP mode\n"); + longjmp(&hyp_jmp, 1); +} + +/** + * leave_supervisor() - switch to hypervisor mode + */ +void leave_supervisor(void) +{ + static bool is_nonsec; + + if (armv7_boot_nonsec() && !is_nonsec) { + if (setjmp(&hyp_jmp)) + return; + dcache_disable(); /* flush cache before switch to HYP */ + armv7_init_nonsec(); + is_nonsec = true; + secure_ram_addr(_do_nonsec_entry)(entry_hyp, 0, 0, 0); + } +} diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index 52c8daa0496..8b0b887a696 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -14,6 +14,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ARMV8_SPL_EXCEPTION_VECTORS) += exceptions.o else obj-y += exceptions.o +obj-y += exception_level.o endif obj-y += cache.o obj-y += tlb.o diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c new file mode 100644 index 00000000000..ad8211bb85d --- /dev/null +++ b/arch/arm/cpu/armv8/exception_level.c @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Switching exception levels + * + * Copyright (c) 2018 Heinrich Schuchardt + */ + +#include <common.h> +#include <bootm.h> +#include <asm/setjmp.h> + +static struct jmp_buf_data hyp_jmp; + +/** + * entry_hyp() - entry point when switching to hypervisor mode + */ +static void entry_hyp(void) +{ + dcache_enable(); + debug("Reached HYP mode\n"); + longjmp(&hyp_jmp, 1); +} + +/** + * leave_supervisor() - switch to hypervisor mode + */ +void leave_supervisor(void) +{ + /* On AArch64 we need to make sure we call our payload in < EL3 */ + if (current_el() == 3) { + if (setjmp(&hyp_jmp)) + return; + smp_kick_all_cpus(); + dcache_disable(); /* flush cache before switch to EL2 */ + + /* Move into EL2 and keep running there */ + armv8_switch_to_el2(0, 0, 0, 0, (uintptr_t)entry_hyp, + ES_TO_AARCH64); + } +} diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 1aaf5319e13..804f527e730 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -5,8 +5,9 @@ * Copyright (c) 2016 Alexander Graf */ -#include <charset.h> #include <common.h> +#include <bootm.h> +#include <charset.h> #include <command.h> #include <dm.h> #include <efi_dxe.h> @@ -21,17 +22,11 @@ #include <asm-generic/unaligned.h> #include <linux/linkage.h> -#ifdef CONFIG_ARMV7_NONSEC -#include <asm/armv7.h> -#include <asm/secure.h> -#endif - DECLARE_GLOBAL_DATA_PTR; #define OBJ_LIST_NOT_INITIALIZED 1 static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; - static struct efi_device_path *bootefi_image_path; static struct efi_device_path *bootefi_device_path; @@ -122,6 +117,15 @@ void __weak allow_unaligned(void) { } +/** + * leave_supervisor() - switch to hypervisor mode + * + * This routine is overridden by architectures requiring this feature. + */ +void __weak leave_supervisor(void) +{ +} + /* * Set the load options of an image from an environment variable. * @@ -233,34 +237,6 @@ static efi_status_t efi_do_enter( return ret; } -#ifdef CONFIG_ARM64 -static efi_status_t efi_run_in_el2(EFIAPI efi_status_t (*entry)( - efi_handle_t image_handle, struct efi_system_table *st), - efi_handle_t image_handle, struct efi_system_table *st) -{ - /* Enable caches again */ - dcache_enable(); - - return efi_do_enter(image_handle, st, entry); -} -#endif - -#ifdef CONFIG_ARMV7_NONSEC -static bool is_nonsec; - -static efi_status_t efi_run_in_hyp(EFIAPI efi_status_t (*entry)( - efi_handle_t image_handle, struct efi_system_table *st), - efi_handle_t image_handle, struct efi_system_table *st) -{ - /* Enable caches again */ - dcache_enable(); - - is_nonsec = true; - - return efi_do_enter(image_handle, st, entry); -} -#endif - /* * efi_carve_out_dt_rsv() - Carve out DT reserved memory ranges * @@ -440,39 +416,6 @@ static efi_status_t do_bootefi_exec(void *efi, goto err_prepare; } -#ifdef CONFIG_ARM64 - /* On AArch64 we need to make sure we call our payload in < EL3 */ - if (current_el() == 3) { - smp_kick_all_cpus(); - dcache_disable(); /* flush cache before switch to EL2 */ - - /* Move into EL2 and keep running there */ - armv8_switch_to_el2((ulong)entry, - (ulong)&image_obj->header, - (ulong)&systab, 0, (ulong)efi_run_in_el2, - ES_TO_AARCH64); - - /* Should never reach here, efi exits with longjmp */ - while (1) { } - } -#endif - -#ifdef CONFIG_ARMV7_NONSEC - if (armv7_boot_nonsec() && !is_nonsec) { - dcache_disable(); /* flush cache before switch to HYP */ - - armv7_init_nonsec(); - secure_ram_addr(_do_nonsec_entry)( - efi_run_in_hyp, - (uintptr_t)entry, - (uintptr_t)&image_obj->header, - (uintptr_t)&systab); - - /* Should never reach here, efi exits with longjmp */ - while (1) { } - } -#endif - ret = efi_do_enter(&image_obj->header, &systab, entry); err_prepare: @@ -558,6 +501,8 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Allow unaligned memory access */ allow_unaligned(); + leave_supervisor(); + /* Initialize EFI drivers */ r = efi_init_obj_list(); if (r != EFI_SUCCESS) { diff --git a/include/bootm.h b/include/bootm.h index 0501414e0dc..c64874c98b5 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -80,4 +80,9 @@ int bootm_decomp_image(int comp, ulong load, ulong image_start, int type, */ void board_quiesce_devices(void); +/** + * leave_supervisor() - switch to hypervisor mode + */ +void leave_supervisor(void); + #endif -- 2.19.2

2 1

[U-Boot] [RFC 1/1] efi_loader: refactor switch to hypervisor mode
by Heinrich Schuchardt 26 Dec '18

26 Dec '18

Refactor the switch from supervisor to hypervisor to a new function called at the beginning of do_bootefi(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- With this patch I am just moving around the switch from supervisor to hypervisor mode within the EFI subsystem. Similar switching also occurs in all other boot commands (cf. arch/arm/lib/bootm.c). Why are we running the U-Boot console in supervisor mode at all? Wouldn't it be advisable for security reasons to switch to hypervisor mode before entering the console? Best regards Heinrich --- cmd/bootefi.c | 109 ++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 62 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 1aaf5319e13..277d4863953 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -31,9 +31,9 @@ DECLARE_GLOBAL_DATA_PTR; #define OBJ_LIST_NOT_INITIALIZED 1 static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; - static struct efi_device_path *bootefi_image_path; static struct efi_device_path *bootefi_device_path; +struct jmp_buf_data hyp_jmp; /* Initialize and populate EFI object list */ efi_status_t efi_init_obj_list(void) @@ -122,6 +122,50 @@ void __weak allow_unaligned(void) { } +/** + * entry_hyp() - entry point when switching to hypervisor mode + */ +static void entry_hyp(void) +{ + dcache_enable(); + debug("Reached HYP mode\n"); + longjmp(&hyp_jmp, 1); +} + +/** + * leave_supervisor() - switch to hypervisor mode + */ +static void leave_supervisor(void) +{ +#ifdef CONFIG_ARMV7_NONSEC + static bool is_nonsec; + + if (armv7_boot_nonsec() && !is_nonsec) { + if (setjmp(&hyp_jmp)) + return; + dcache_disable(); /* flush cache before switch to HYP */ + armv7_init_nonsec(); + is_nonsec = true; + secure_ram_addr(_do_nonsec_entry)(entry_hyp, 0, 0, 0); + } +#endif + +#ifdef CONFIG_ARM64 + /* On AArch64 we need to make sure we call our payload in < EL3 */ + if (current_el() == 3) { + if (setjmp(&hyp_jmp)) + return; + smp_kick_all_cpus(); + dcache_disable(); /* flush cache before switch to EL2 */ + + /* Move into EL2 and keep running there */ + armv8_switch_to_el2(0, 0, 0, 0, (uintptr_t)entry_hyp, + ES_TO_AARCH64); + } +#endif + return; +} + /* * Set the load options of an image from an environment variable. * @@ -233,34 +277,6 @@ static efi_status_t efi_do_enter( return ret; } -#ifdef CONFIG_ARM64 -static efi_status_t efi_run_in_el2(EFIAPI efi_status_t (*entry)( - efi_handle_t image_handle, struct efi_system_table *st), - efi_handle_t image_handle, struct efi_system_table *st) -{ - /* Enable caches again */ - dcache_enable(); - - return efi_do_enter(image_handle, st, entry); -} -#endif - -#ifdef CONFIG_ARMV7_NONSEC -static bool is_nonsec; - -static efi_status_t efi_run_in_hyp(EFIAPI efi_status_t (*entry)( - efi_handle_t image_handle, struct efi_system_table *st), - efi_handle_t image_handle, struct efi_system_table *st) -{ - /* Enable caches again */ - dcache_enable(); - - is_nonsec = true; - - return efi_do_enter(image_handle, st, entry); -} -#endif - /* * efi_carve_out_dt_rsv() - Carve out DT reserved memory ranges * @@ -440,39 +456,6 @@ static efi_status_t do_bootefi_exec(void *efi, goto err_prepare; } -#ifdef CONFIG_ARM64 - /* On AArch64 we need to make sure we call our payload in < EL3 */ - if (current_el() == 3) { - smp_kick_all_cpus(); - dcache_disable(); /* flush cache before switch to EL2 */ - - /* Move into EL2 and keep running there */ - armv8_switch_to_el2((ulong)entry, - (ulong)&image_obj->header, - (ulong)&systab, 0, (ulong)efi_run_in_el2, - ES_TO_AARCH64); - - /* Should never reach here, efi exits with longjmp */ - while (1) { } - } -#endif - -#ifdef CONFIG_ARMV7_NONSEC - if (armv7_boot_nonsec() && !is_nonsec) { - dcache_disable(); /* flush cache before switch to HYP */ - - armv7_init_nonsec(); - secure_ram_addr(_do_nonsec_entry)( - efi_run_in_hyp, - (uintptr_t)entry, - (uintptr_t)&image_obj->header, - (uintptr_t)&systab); - - /* Should never reach here, efi exits with longjmp */ - while (1) { } - } -#endif - ret = efi_do_enter(&image_obj->header, &systab, entry); err_prepare: @@ -558,6 +541,8 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Allow unaligned memory access */ allow_unaligned(); + leave_supervisor(); + /* Initialize EFI drivers */ r = efi_init_obj_list(); if (r != EFI_SUCCESS) { -- 2.19.2

3 9

[U-Boot] [PATCH 1/2] dm: pci: MIGRATION: Add migration plan for PCI
by Simon Glass 26 Dec '18

26 Dec '18

Add a migration plan for PCI which is an important subsystem in U-Boot. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Makefile | 10 ++++++++++ doc/driver-model/MIGRATION.txt | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/Makefile b/Makefile index 5683714947f..4923722f82d 100644 --- a/Makefile +++ b/Makefile @@ -947,6 +947,16 @@ ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y) @echo "See doc/driver-model/MIGRATION.txt for more info." @echo "====================================================" endif +ifeq ($(CONFIG_PCI),y) +ifneq ($(CONFIG_DM_PCI),y) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board does not use CONFIG_DM_PCI Please update" + @echo >&2 "the board to use CONFIG_DM_PCI before the v2019.07 release." + @echo >&2 "Failure to update by the deadline may result in board removal." + @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." + @echo >&2 "====================================================" +endif +endif ifeq ($(CONFIG_OF_EMBED),y) @echo "===================== WARNING ======================" @echo "CONFIG_OF_EMBED is enabled. This option should only" diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt index dce4aa3e1dc..03a2cae7976 100644 --- a/doc/driver-model/MIGRATION.txt +++ b/doc/driver-model/MIGRATION.txt @@ -82,3 +82,13 @@ Partially converted: -- Jagan Teki <jagan(a)openedev.com> 03/14/2018 + + +CONFIG_DM_PCI +------------- +Deadline: 2019.07 + +The PCI subsystem has supported driver model since mid 2015. Maintainers should +submit patches switching over to using CONFIG_DM_PCI and other base driver +model options in time for inclusion in the 2019.04 rerelease. + -- 2.20.0.405.gbc1bbc6f85-goog

4 5

[U-Boot] [RFC] Monthly developer call?
by Tom Rini 26 Dec '18

26 Dec '18

Hey all, It's come up a few times that perhaps we should have a regular real-time meeting of some sort, since that F2F meetings we've had historically have been so helpful. So, what I'd like to propose is a monthly meeting / video call on the 3rd Monday of the month, starting in January. For a time I propose 4PM UTC, which is 11AM US Eastern, 8AM US Eastern and unfortunately very late / early in Asia. I am open to alternating times too as there's not really a chance of a time that works for everyone. For a "how" I'm going to say we should use https://zoom.us/ as they have good support for Linux as a host as well as traditional mobile / desktop platforms. We use it at work and it's reasonably problem free and there's local dial-in numbers pretty much world-wide. -- Tom

2 1