June 2018 - U-Boot

[U-Boot] [PATCH v3 1/6] x86: efi_loader: Build EFI memory map per E820 table
by Bin Meng 02 Jul '18

02 Jul '18

On x86 traditional E820 table is used to pass the memory information to kernel. With EFI loader we can build the EFI memory map from it. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: None Changes in v2: None arch/x86/lib/e820.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index 9a9ec99..8b34f67 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <efi_loader.h> #include <asm/e820.h> DECLARE_GLOBAL_DATA_PTR; @@ -34,3 +35,41 @@ __weak unsigned int install_e820_map(unsigned int max_entries, return 4; } + +#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD) +void efi_add_known_memory(void) +{ + struct e820_entry e820[E820MAX]; + unsigned int i, num; + u64 start, pages; + int type; + + num = install_e820_map(ARRAY_SIZE(e820), e820); + + for (i = 0; i < num; ++i) { + start = e820[i].addr; + pages = ALIGN(e820[i].size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT; + + switch (e820[i].type) { + case E820_RAM: + type = EFI_CONVENTIONAL_MEMORY; + break; + case E820_RESERVED: + type = EFI_RESERVED_MEMORY_TYPE; + break; + case E820_ACPI: + type = EFI_ACPI_RECLAIM_MEMORY; + break; + case E820_NVS: + type = EFI_ACPI_MEMORY_NVS; + break; + case E820_UNUSABLE: + default: + type = EFI_UNUSABLE_MEMORY; + break; + } + + efi_add_memory_map(start, pages, type, false); + } +} +#endif /* defined(EFI_LOADER) && !defined(CONFIG_SPL_BUILD) */ -- 2.7.4

2 13

[U-Boot] [PATCH 1/3] spi: mxc: Fix compilation problem of DM_SPI class driver
by Michael Trimarchi 30 Jun '18

30 Jun '18

drivers/spi/mxc_spi.c:507: undefined reference to `dev_get_addr' linux-ld.bfd: BFD (GNU Binutils) 2.29.1 assertion fail elf32-arm.c:9509 Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- drivers/spi/mxc_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index b77129c..fcb214a 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -504,7 +504,7 @@ static int mxc_spi_probe(struct udevice *bus) return -EINVAL; } - plat->base = dev_get_addr(bus); + plat->base = devfdt_get_addr(bus); if (plat->base == FDT_ADDR_T_NONE) return -ENODEV; -- 2.7.4

5 9

[U-Boot] [PATCH] ARM: rmobile: gen2: Enable ACTLR[0] (Enable invalidates of BTB) to facilitate CVE_2017-5715 WA in OS
by Marek Vasut 30 Jun '18

30 Jun '18

Enable CVE_2017_5715 mitigation on CPU0 on R-Car H2, M2W, M2N, V2H, which all contain Cortex-A15 cores. R-Car E2 contains only Cortex-A7 cores and is not affected. Without this enabled, Linux kernel reports: CPU0: Spectre v2: firmware did not set auxiliary control register IBE bit, system vulnerable With this enabled, Linux kernel reports: CPU0: Spectre v2: using ICIALLU workaround NOTE: This by itself does not enable the workaround for other CPUs than CPU0 and may require additional kernel patches for the other CPUs in SMP configurations. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nishanth Menon <nm(a)ti.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- arch/arm/mach-rmobile/Kconfig.32 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index c0b5b2457c..6c492ff409 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -13,18 +13,22 @@ config R8A7740 config R8A7790 bool "Renesas SoC R8A7790" select RCAR_GEN2 + select ARM_CORTEX_A15_CVE_2017_5715 config R8A7791 bool "Renesas SoC R8A7791" select RCAR_GEN2 + select ARM_CORTEX_A15_CVE_2017_5715 config R8A7792 bool "Renesas SoC R8A7792" select RCAR_GEN2 + select ARM_CORTEX_A15_CVE_2017_5715 config R8A7793 bool "Renesas SoC R8A7793" select RCAR_GEN2 + select ARM_CORTEX_A15_CVE_2017_5715 config R8A7794 bool "Renesas SoC R8A7794" -- 2.16.2

1 0

[U-Boot] [PATCH 1/1] efi_driver: set DM_FLAG_NAME_ALLOCED flag
by Heinrich Schuchardt 30 Jun '18

30 Jun '18

Set the DM_FLAG_NAME_ALLOCED flag to avoid a memory leak when the block device is removed. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_driver/efi_block_device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 9c807ff71d..89faae43d0 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -161,6 +161,8 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) return ret; if (!bdev) return -ENOENT; + /* Set the DM_FLAG_NAME_ALLOCED flag to avoid a memory leak */ + device_set_name_alloced(bdev); /* Allocate priv */ ret = device_probe(bdev); if (ret) -- 2.18.0

1 0

[U-Boot] [PATCH v2 00/11] sandbox: net: Fix sandbox eth drivers
by Joe Hershberger 30 Jun '18

30 Jun '18

It seems as sandbox moved to livetree these drivers were not updated. Heinrich suggested correctly that at this point we should be enumerating network interface names, not hard-coding eth0. Also, there were a few bugs that needed fixing. Changes in v2: - New patch - go back to u8_array - move DT accesses to ofdata_to_platdata() - store the host interface details in priv - switch to dev_read_string() Joe Hershberger (11): sandbox: eth-raw: Correct valid socket test in send/recv sandbox: Fix format of fake-host-hwaddr in test.dts net: Only call halt on a driver that has been init'ed sandbox: eth-raw: Make sure descriptors are always initialized net: Correct comment in Kconfig net: sandbox: Convert sandbox mock eth driver to livetree net: sandbox-raw: Convert raw eth driver to livetree sandbox: eth-raw: Add a function to ask the host about localhost sandbox: eth-raw: Allow interface to be specified by index sandbox: eth-raw: Make random MAC addresses available to eth-raw sandbox: eth-raw: Add a SIMPLE_BUS to enumerate host interfaces arch/sandbox/cpu/eth-raw-os.c | 81 ++++++++++++++++++++++++++--------- arch/sandbox/dts/sandbox.dts | 19 +++----- arch/sandbox/dts/sandbox64.dts | 19 +++----- arch/sandbox/dts/test.dts | 8 ++-- arch/sandbox/include/asm/eth-raw-os.h | 38 +++++++++++++++- drivers/net/Kconfig | 2 +- drivers/net/Makefile | 1 + drivers/net/sandbox-raw-bus.c | 65 ++++++++++++++++++++++++++++ drivers/net/sandbox-raw.c | 53 ++++++++++++++++++----- drivers/net/sandbox.c | 16 +++++-- net/eth-uclass.c | 2 +- 11 files changed, 235 insertions(+), 69 deletions(-) create mode 100644 drivers/net/sandbox-raw-bus.c -- 2.11.0

3 22

[U-Boot] [PATCH] usb: ohci: change the NUM_EDs from 8 to 32
by Zeng Tao 30 Jun '18

30 Jun '18

For ohci, the maximam supported endpoint number is 32(in and out), and now we have used (usb_pipeendpoint(pipe) << 1) to index the specified endpoint descritor, usb_pipeendpoint(pipe) can reach 0xf, so we need change the NUM_EDs from 8 to 32. Signed-off-by: Zeng Tao <prime.zeng(a)hisilicon.com> --- drivers/usb/host/ohci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index 2350831..fba78dc 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -359,7 +359,7 @@ typedef struct } urb_priv_t; #define URB_DEL 1 -#define NUM_EDS 8 /* num of preallocated endpoint descriptors */ +#define NUM_EDS 32 /* num of preallocated endpoint descriptors */ #define NUM_TD 64 /* we need more TDs than EDs */ -- 2.7.4

3 5

[U-Boot] [PATCH 1/1] lib: div64: fix typeo in include/div64.h
by Heinrich Schuchardt 29 Jun '18

29 Jun '18

%s/reminder/remainder/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/div64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/div64.h b/include/div64.h index cecb2322bc..76563ef978 100644 --- a/include/div64.h +++ b/include/div64.h @@ -232,7 +232,7 @@ extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor); #endif /* BITS_PER_LONG */ /* Wrapper for do_div(). Doesn't modify dividend and returns - * the result, not reminder. + * the result, not remainder. */ static inline uint64_t lldiv(uint64_t dividend, uint32_t divisor) { -- 2.18.0

2 1

[U-Boot] [PATCH 0/4] ARM: Provide workaround setup bits for CVE-2017-5715 (A8/A15)
by Nishanth Menon 29 Jun '18

29 Jun '18

Hi, This is a follow on from https://marc.info/?l=u-boot&m=151691688828176&w=2 (RFC) NOTE: * As per ARM recommendations[2], and discussions in list[1] ARM Cortex-A9/12/17 do not need additional steps in u-boot to enable the OS level workarounds. * This itself is'nt a complete solution and is based on recommendation This from Arm[2] for variant 2 CVE-2017-5715 -> Kernel changes can be seen on linux next (next-20180612) or on linux master (upcoming v4.18-rc1 tag). * I think it is necessary on older SoCs without firmware support (such as older OMAPs and AM*) to have kernel support mirroring what we do in u-boot to support additional cores AND/OR low power states where contexts are lost (assuming ACR states are'nt saved). just my 2 cents. Few of the tests (with linux next-20180612): AM571-IDK: https://pastebin.ubuntu.com/p/sr5X6sN3Tr/ (single core A15) OMAP5-uEVM: https://pastebin.ubuntu.com/p/9yDM22bJ6n/ (dual core A15) OMAP3-beagle-xm: https://pastebin.ubuntu.com/p/9DfDkpyxym/ (Single A8) AM335x-Beaglebone-black: https://pastebin.ubuntu.com/p/DczT9jPMwb/ (Single A8) Nishanth Menon (4): ARM: Introduce ability to enable ACR::IBE on Cortex-A8 for CVE-2017-5715 ARM: Introduce ability to enable invalidate of BTB with ICIALLU on Cortex-A15 for CVE-2017-5715 ARM: mach-omap2: omap5/dra7: Enable ACTLR[0] (Enable invalidates of BTB) to facilitate CVE_2017-5715 WA in OS ARM: mach-omap2: omap3/am335x: Enable ACR::IBE on Cortex-A8 SoCs for CVE-2017-5715 arch/arm/Kconfig | 9 +++++++++ arch/arm/cpu/armv7/start.S | 15 +++++++++++++-- arch/arm/mach-omap2/Kconfig | 3 +++ 3 files changed, 25 insertions(+), 2 deletions(-) [1] https://marc.info/?t=151639906500002&r=1&w=2 [2] https://developer.arm.com/support/security-update [3] https://marc.info/?t=151543790400007&r=1&w=2 and the latest in: https://marc.info/?l=linux-arm-kernel&m=151689379521082&w=2 [4] https://github.com/ARM-software/arm-trusted-firmware/wiki/ARM-Trusted-Firmw… https://www.op-tee.org/security-advisories/ https://www.linaro.org/blog/meltdown-spectre/ -- 2.15.1

6 27

[U-Boot] [PATCH] cmd: fastboot: Validate user input
by Sam Protsenko 29 Jun '18

29 Jun '18

In case when user provides '-' as USB controller index, like this: => fastboot - data abort occurs in strcmp() function in do_fastboot(), here: if (!strcmp(argv[1], "udp")) That's because argv[1] is NULL when user types in the '-', and null pointer dereference occurs in strcmp() (which is ok according to C standard specification). So we must validate user input to prevent such behavior. While at it, check also the result of strtoul() function and handle error cases properly. Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- cmd/fastboot.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cmd/fastboot.c b/cmd/fastboot.c index e6ae0570d5..dab686eef4 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -38,13 +38,18 @@ static int do_fastboot_usb(int argc, char *const argv[], #if CONFIG_IS_ENABLED(USB_FUNCTION_FASTBOOT) int controller_index; char *usb_controller; + char *endp; int ret; if (argc < 2) return CMD_RET_USAGE; usb_controller = argv[1]; - controller_index = simple_strtoul(usb_controller, NULL, 0); + controller_index = simple_strtoul(usb_controller, &endp, 0); + if (*endp != '\0') { + pr_err("Error: Wrong USB controller index format\n"); + return CMD_RET_FAILURE; + } ret = board_usb_init(controller_index, USB_INIT_DEVICE); if (ret) { @@ -120,6 +125,12 @@ NXTARG: ; } + /* Handle case when USB controller param is just '-' */ + if (!argv[1]) { + pr_err("Error: Incorrect USB controller index\n"); + return CMD_RET_USAGE; + } + fastboot_init((void *)buf_addr, buf_size); if (!strcmp(argv[1], "udp")) -- 2.17.1

2 2

[U-Boot] [PATCH v3] dm: sunxi: Use DM for MMC and SATA on all A20 boards
by Adam Sampson 29 Jun '18

29 Jun '18

Generalise the change in commit 3936514b82e8 ("dm: sunxi: Move Linksprite_pcDuino3 to use DM for MMC, SATA") so it applies to all A20 boards: use the driver model for MMC and SATA, in preparation for CONFIG_BLK defaulting to y. Tested on Linksprite_pcDuino3_Nano. Signed-off-by: Adam Sampson <ats(a)offog.org> Acked-by: Maxime Ripard <maxime.ripard(a)bootlin.com> --- Changes for v2: - at Maxime's suggestion, enabled by default at the Kconfig level for all A20 boards (which means the one board Simon updated previously doesn't need to specify them any more) Changes for v3: - only select DM_MMC if MMC is enabled, for boards without MMC arch/arm/mach-sunxi/Kconfig | 2 ++ configs/Linksprite_pcDuino3_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index a3f7723028..8f70c6750e 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -174,6 +174,8 @@ config MACH_SUN7I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select DM_MMC if MMC + select DM_SCSI if SCSI select DRAM_SUN4I select PHY_SUN4I_USB select SUNXI_GEN_SUN4I diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index d7e9c26cbf..f987cef711 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -13,10 +13,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SCSI_AHCI=y -CONFIG_DM_MMC=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y -- 2.18.0

1 0