March 2019 - U-Boot

[U-Boot] [PATCH 1/2] ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210
by Thierry Reding 21 Mar '19

21 Mar '19

From: Thierry Reding <treding(a)nvidia.com> On Tegra210 the parents for the disp1 and disp2 clocks are slightly different from earlier chips. Only pll_p, pll_d_out0, pll_d2_out0 and clk_m are valid parents (technically pll_d_out is as well, but U-Boot doesn't know anything about it). Fix up the type name and the mux definition. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- arch/arm/mach-tegra/tegra210/clock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c index 06068c4b7b8d..0d7cafea2017 100644 --- a/arch/arm/mach-tegra/tegra210/clock.c +++ b/arch/arm/mach-tegra/tegra210/clock.c @@ -40,7 +40,7 @@ enum clock_type_id { CLOCK_TYPE_PDCT, CLOCK_TYPE_ACPT, CLOCK_TYPE_ASPTE, - CLOCK_TYPE_PMDACD2T, + CLOCK_TYPE_PDD2T, CLOCK_TYPE_PCST, CLOCK_TYPE_DP, @@ -97,8 +97,8 @@ static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX+1] = { { CLK(AUDIO), CLK(SFROM32KHZ), CLK(PERIPH), CLK(OSC), CLK(EPCI), CLK(NONE), CLK(NONE), CLK(NONE), MASK_BITS_31_29}, - { CLK(PERIPH), CLK(MEMORY), CLK(DISPLAY), CLK(AUDIO), - CLK(CGENERAL), CLK(DISPLAY2), CLK(OSC), CLK(NONE), + { CLK(PERIPH), CLK(NONE), CLK(DISPLAY), CLK(NONE), + CLK(NONE), CLK(DISPLAY2), CLK(OSC), CLK(NONE), MASK_BITS_31_29}, { CLK(PERIPH), CLK(CGENERAL), CLK(SFROM32KHZ), CLK(OSC), CLK(NONE), CLK(NONE), CLK(NONE), CLK(NONE), @@ -174,8 +174,8 @@ static enum clock_type_id clock_periph_type[PERIPHC_COUNT] = { TYPE(PERIPHC_0bh, CLOCK_TYPE_NONE), TYPE(PERIPHC_0ch, CLOCK_TYPE_NONE), TYPE(PERIPHC_SBC1, CLOCK_TYPE_PC2CC3M_T), - TYPE(PERIPHC_DISP1, CLOCK_TYPE_PMDACD2T), - TYPE(PERIPHC_DISP2, CLOCK_TYPE_PMDACD2T), + TYPE(PERIPHC_DISP1, CLOCK_TYPE_PDD2T), + TYPE(PERIPHC_DISP2, CLOCK_TYPE_PDD2T), /* 0x10 */ TYPE(PERIPHC_10h, CLOCK_TYPE_NONE), -- 2.21.0

1 1

[U-Boot] [PATCH 1/2] armv8: fsl-layerscape: add missing sec jr base address defines
by laurentiu.tudor＠nxp.com 21 Mar '19

21 Mar '19

From: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Add defines for all the SEC job rings base addresses. Signed-off-by: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> --- arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 9fab88ab2f..fc14fb6fe0 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -89,10 +89,18 @@ /* SEC */ #define CONFIG_SYS_FSL_SEC_OFFSET 0x07000000ull #define CONFIG_SYS_FSL_JR0_OFFSET 0x07010000ull +#define FSL_SEC_JR0_OFFSET CONFIG_SYS_FSL_JR0_OFFSET +#define FSL_SEC_JR1_OFFSET 0x07020000ull +#define FSL_SEC_JR2_OFFSET 0x07030000ull +#define FSL_SEC_JR3_OFFSET 0x07040000ull #define CONFIG_SYS_FSL_SEC_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_SEC_OFFSET) #define CONFIG_SYS_FSL_JR0_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_JR0_OFFSET) +#define FSL_SEC_JR0_BASE_ADDR (CONFIG_SYS_IMMR + FSL_SEC_JR0_OFFSET) +#define FSL_SEC_JR1_BASE_ADDR (CONFIG_SYS_IMMR + FSL_SEC_JR1_OFFSET) +#define FSL_SEC_JR2_BASE_ADDR (CONFIG_SYS_IMMR + FSL_SEC_JR2_OFFSET) +#define FSL_SEC_JR3_BASE_ADDR (CONFIG_SYS_IMMR + FSL_SEC_JR3_OFFSET) #ifdef CONFIG_TFABOOT #ifdef CONFIG_NXP_LSCH3_2 -- 2.17.1

3 12

[U-Boot] [PATCH v2 0/5] arm: socfpga: stack and Kconfig cleanups
by Simon Goldschmidt 21 Mar '19

21 Mar '19

This series cleans up stack definitions in socfpga_common.h as well as cleans up defconfig files by implying/defaulting common things in Kconfig files. Finally, it reduces the malloc pool size used in first stage of gen5 SPL (without ddr available) in order to have more space available for code. As this series does not contain direct bugfixes, it targets the socfpga-next branch. Changes in v2: - fix commit message: "SPL post-reloc", not "SPL pre-reloc" - added patch to imply/default common config options - added patch to reduce gen5 SPL initial malloc pool to 2 KiB Simon Goldschmidt (5): arm: socfpga: fix comment about SPL memory layout arm: socfpga: a10: move SPL stack size to Kconfig arm: socfpga: put initial U-Boot stack into DDR arm: socfpga: imply/default common config options arm: socfpga: gen5: reduce SPL pre-reloc malloc arch/arm/Kconfig | 3 ++ arch/arm/mach-socfpga/Kconfig | 22 ++++++++++++++ configs/socfpga_arria10_defconfig | 7 ----- configs/socfpga_arria5_defconfig | 10 ------- configs/socfpga_cyclone5_defconfig | 10 ------- configs/socfpga_dbm_soc1_defconfig | 10 ------- configs/socfpga_de0_nano_soc_defconfig | 10 ------- configs/socfpga_de10_nano_defconfig | 10 ------- configs/socfpga_de1_soc_defconfig | 10 ------- configs/socfpga_is1_defconfig | 8 ------ configs/socfpga_sockit_defconfig | 10 ------- configs/socfpga_socrates_defconfig | 10 ------- configs/socfpga_sr1500_defconfig | 10 ------- configs/socfpga_stratix10_defconfig | 4 --- configs/socfpga_vining_fpga_defconfig | 10 ------- include/configs/socfpga_common.h | 40 +++++++++++--------------- 16 files changed, 41 insertions(+), 143 deletions(-) -- 2.17.1

3 15

[U-Boot] [PATCH v2 0/6] Update Stratix 10 SDRAM driver
by Ley Foon Tan 21 Mar '19

21 Mar '19

This patchset update Stratix 10 SDRAM driver to support: - Multi-banks memory - Stratix 10 support up to 2 memory banks: Bank 0: Address 0, size 2GB Bank 1: Address 0x100000000, size 124GB - Add warm reset boot checking function (Patch[5]) - Add ECC memory scrubbing support (Patch [6]) - Use cache enabled + "DC ZVA" instruction to clear memory to zeros v1 -> v2: --------- - Decode memory bank configuration from device tree - Use asm volatile() and "memory" clobber History: -------- v1: https://patchwork.ozlabs.org/cover/1055134/ Ley Foon Tan (6): ddr: altera: stratix10: Move SDRAM size check to SDRAM driver ddr: altera: Stratix10: Add multi-banks DRAM size check configs: stratix10: Change CONFIG_NR_DRAM_BANKS to 2 arm: dts: Stratix10: Modify stratix10 socdk memory node arm: socfpga: stratix10: Add cpu_has_been_warmreset() ddr: altera: Stratix10: Add ECC memory scrubbing arch/arm/dts/socfpga_stratix10_socdk.dts | 4 +- .../include/mach/reset_manager_s10.h | 3 + .../arm/mach-socfpga/include/mach/sdram_s10.h | 9 ++ arch/arm/mach-socfpga/reset_manager_s10.c | 9 ++ arch/arm/mach-socfpga/spl_s10.c | 11 -- configs/socfpga_stratix10_defconfig | 2 +- drivers/ddr/altera/sdram_s10.c | 136 +++++++++++++++++- 7 files changed, 159 insertions(+), 15 deletions(-) -- 2.19.0

2 7

[U-Boot] [PATCH] hikey: Take peripherals out of reset during board init
by Manivannan Sadhasivam 21 Mar '19

21 Mar '19

Peripherals like I2C and SPI needs to be taken out of reset during board init for functioning properly. Hence, add `hi6220_periph_reset` function for doing the same. For instance without this function, I2C will fail like below while booting linux: [ 0.608033] i2c_designware f7100000.i2c: Unknown Synopsys component type: 0x00000000 [ 0.621378] i2c_designware f7101000.i2c: Unknown Synopsys component type: 0x00000000 [ 0.633818] i2c_designware f7102000.i2c: Unknown Synopsys component type: 0x00000000 Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> --- board/hisilicon/hikey/hikey.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 940ae82c45b..f8b8c372bfd 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -364,6 +364,20 @@ static void hi6220_pmussi_init(void) gpio_direction_output(0, 1); } +static void hi6220_periph_reset(void) +{ + u32 data, bits; + + /* Bring I2C0/I2C1/I2C2/SPI0 out of reset */ + bits = PERI_RST3_I2C0 | PERI_RST3_I2C1 | PERI_RST3_I2C2 | PERI_RST3_SSP; + writel(bits, &peri_sc->rst3_dis); + + /* Wait until the peripherals are out of reset */ + do { + data = readl(&peri_sc->rst3_dis); + } while (data & bits); +} + int misc_init_r(void) { return 0; @@ -371,6 +385,8 @@ int misc_init_r(void) int board_init(void) { + hi6220_periph_reset(); + return 0; } -- 2.17.1

3 3

[U-Boot] [PATCH v2 0/2] sunxi: add spi flash bootcmd
by Oskari Lemmela 21 Mar '19

21 Mar '19

Patches enable booting FIT image from SPI flash device. Changes since v1: - Move bootcmd to config_distro_bootcmd - Add Kconfig options to enable and configure it Oskari Lemmela (2): distro_bootcmd: add spi flash boot command sunxi: enable distro spi boot command Kconfig | 29 +++++++++++++++++++++++++++++ include/config_distro_bootcmd.h | 16 ++++++++++++++++ include/configs/sunxi-common.h | 1 + 3 files changed, 46 insertions(+) -- 2.17.1

3 5

[U-Boot] [PATCH] configs: icorem6: Use imx6 cratch register for bootcount
by Jagan Teki 21 Mar '19

21 Mar '19

SRAM address used for bootcount on exiting code is erasing previous count value when system reset from Linux. So use the dedicated imx6 scratch register, GPR2 to preserve the contents even if the system reset from Linux. Fixes: 4eb9aa39350e ("configs: imx6qdl_icore_mmc: Enable watchdog and bootcounter") Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- configs/imx6qdl_icore_mmc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 68ad1c6d20..24e99718e6 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -16,7 +16,7 @@ CONFIG_CMD_BOOTCOUNT=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y -CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000 +CONFIG_SYS_BOOTCOUNT_ADDR=0x020D8024 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_IMX_WATCHDOG=y CONFIG_DEBUG_UART=y -- 2.18.0.321.gffc6fa0e3

3 3

[U-Boot] [PATCH] spl: spl_nand.c: Add NAND loading message
by Stefan Roese 21 Mar '19

21 Mar '19

This patch adds a short message to the SPL NAND loader, which displays the source and destinations addresses including the size of the loaded image, like this: U-Boot SPL 2019.04-rc3-00113-g486efd8aaf (Mar 15 2019 - 14:18:02 +0100) Trying to boot from NAND Loading U-Boot from 0x00040000 (size 0x000a0000) to 0x22900000 I find this message quite helpful - hopefully others do so as well. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- common/spl/spl_nand.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 6eb190f1ea..47eaddc002 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -17,6 +17,11 @@ static int spl_nand_load_image(struct spl_image_info *spl_image, { nand_init(); +#if defined(CONFIG_SPL_SERIAL_SUPPORT) + printf("Loading U-Boot from 0x%08x (size 0x%08x) to 0x%08x\n", + CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, + CONFIG_SYS_NAND_U_BOOT_DST); +#endif nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, (void *)CONFIG_SYS_NAND_U_BOOT_DST); -- 2.21.0

2 2

[U-Boot] [PATCH] ti: am335x_evm: Enable CONFIG_SPL_OF_CONTROL
by Tom Rini 21 Mar '19

21 Mar '19

Enable support for SPL_OF_CONTROL on this platform. That means doing a few things: - Add u-boot,dm-pre-reloc to a number of nodes - Drop static platdata in the board file. - A lot of tweaks to the defconfig. We remove some things such as SPL_USE_ARCH_MEMCPY/SET for space. Increase our malloc len. - Drop, for now at least, USB SPL support as it's causing a hang. Cc: Faiz Abbas <faiz_abbas(a)ti.com> Cc: Lokesh Vutla <lokeshvutla(a)ti.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/dts/am335x-evm-u-boot.dtsi | 45 +++++++++++++++++++++++++++++++++++-- board/ti/am335x/board.c | 30 ------------------------- configs/am335x_evm_defconfig | 14 ++++++++---- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi index b6b97ed16d91..16a9f855ad1f 100644 --- a/arch/arm/dts/am335x-evm-u-boot.dtsi +++ b/arch/arm/dts/am335x-evm-u-boot.dtsi @@ -3,11 +3,52 @@ * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ +#include "am33xx-u-boot.dtsi" -&mmc3 { - status = "disabled"; +&l4_wkup { + u-boot,dm-pre-reloc; +}; + +&scm { + u-boot,dm-pre-reloc; +}; + +&am33xx_pinmux { + u-boot,dm-pre-reloc; +}; + +&uart0_pins { + u-boot,dm-pre-reloc; +}; + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&gpio0 { + u-boot,dm-pre-reloc; +}; + +&i2c0 { + u-boot,dm-pre-reloc; +}; + +&i2c0_pins { + u-boot,dm-pre-reloc; }; &usb0 { dr_mode = "peripheral"; }; + +&mmc1 { + u-boot,dm-pre-reloc; +}; + +&mmc1_pins { + u-boot,dm-pre-reloc; +}; + +&mmc3 { + status = "disabled"; +}; diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index d67f94ad47ba..bfad1a75a456 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -1054,33 +1054,3 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) secure_boot_verify_image(p_image, p_size); } #endif - -#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct omap_hsmmc_plat am335x_mmc0_platdata = { - .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, - .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT, - .cfg.f_min = 400000, - .cfg.f_max = 52000000, - .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, - .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, -}; - -U_BOOT_DEVICE(am335x_mmc0) = { - .name = "omap_hsmmc", - .platdata = &am335x_mmc0_platdata, -}; - -static const struct omap_hsmmc_plat am335x_mmc1_platdata = { - .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE, - .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT, - .cfg.f_min = 400000, - .cfg.f_max = 52000000, - .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, - .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, -}; - -U_BOOT_DEVICE(am335x_mmc1) = { - .name = "omap_hsmmc", - .platdata = &am335x_mmc1_platdata, -}; -#endif diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 924116835251..dd690dcb495c 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -1,23 +1,26 @@ CONFIG_ARM=y +# CONFIG_SPL_USE_ARCH_MEMCPY is not set +# CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y CONFIG_TI_COMMON_CMD_OPTIONS=y +CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_AM33XX=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" +CONFIG_LOGLEVEL=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_FS_EXT4 is not set CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_ETHER=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_FLASH is not set @@ -28,10 +31,12 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" +CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -# CONFIG_BLK is not set +CONFIG_SPL_OF_TRANSLATE=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y @@ -68,5 +73,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 CONFIG_USB_ETHER=y CONFIG_DYNAMIC_CRC_TABLE=y +CONFIG_SPL_TINY_MEMSET=y CONFIG_RSA=y CONFIG_LZO=y -- 2.7.4

3 5

[U-Boot] [PATCH v2 1/1] efi_loader: release file buffer after loading image
by Heinrich Schuchardt 21 Mar '19

21 Mar '19

Commit 0e18f584de59 ("efi_loader: LoadImage: always allocate new pages") ensured that whether we load an image from file or from memory we end up with the same number of newly allocated buffers. But essentially we ended up with one buffer too many in both cases: efi_load_pe() copies and rebases the UEFI image. We do not need the buffer with the file contents afterwards. Fixes: 0e18f584de59 ("efi_loader: LoadImage: always allocate new pages") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: update commit message --- lib/efi_loader/efi_boottime.c | 50 +++++++++++++---------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index bd8b8a17ae..391681260c 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1693,6 +1693,7 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy, struct efi_loaded_image_obj **image_obj = (struct efi_loaded_image_obj **)image_handle; efi_status_t ret; + void *dest_buffer; EFI_ENTRY("%d, %p, %pD, %p, %zd, %p", boot_policy, parent_image, file_path, source_buffer, source_size, image_handle); @@ -1708,7 +1709,7 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy, } if (!source_buffer) { - ret = efi_load_image_from_path(file_path, &source_buffer, + ret = efi_load_image_from_path(file_path, &dest_buffer, &source_size); if (ret != EFI_SUCCESS) goto error; @@ -1721,41 +1722,26 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy, /* In this case, file_path is the "device" path, i.e. * something like a HARDWARE_DEVICE:MEMORY_MAPPED */ - u64 addr; - void *dest_buffer; - - ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, - EFI_RUNTIME_SERVICES_CODE, - efi_size_in_pages(source_size), &addr); - if (ret != EFI_SUCCESS) - goto error; - dest_buffer = (void *)(uintptr_t)addr; - memcpy(dest_buffer, source_buffer, source_size); - source_buffer = dest_buffer; - + dest_buffer = source_buffer; dp = file_path; fp = NULL; } ret = efi_setup_loaded_image(dp, fp, image_obj, &info); - if (ret != EFI_SUCCESS) - goto error_invalid_image; - ret = efi_load_pe(*image_obj, source_buffer, info); - if (ret != EFI_SUCCESS) - goto error_invalid_image; - /* Update the type of the allocated memory */ - efi_add_memory_map((uintptr_t)source_buffer, - efi_size_in_pages(source_size), - info->image_code_type, false); - info->system_table = &systab; - info->parent_handle = parent_image; - return EFI_EXIT(EFI_SUCCESS); -error_invalid_image: - /* The image is invalid. Release all associated resources. */ - efi_free_pages((uintptr_t)source_buffer, - efi_size_in_pages(source_size)); - efi_delete_handle(*image_handle); - *image_handle = NULL; - free(info); + if (ret == EFI_SUCCESS) + ret = efi_load_pe(*image_obj, dest_buffer, info); + if (!source_buffer) + /* Release buffer to which file was loaded */ + efi_free_pages((uintptr_t)dest_buffer, + efi_size_in_pages(source_size)); + if (ret == EFI_SUCCESS) { + info->system_table = &systab; + info->parent_handle = parent_image; + } else { + /* The image is invalid. Release all associated resources. */ + efi_delete_handle(*image_handle); + *image_handle = NULL; + free(info); + } error: return EFI_EXIT(ret); } -- 2.20.1

1 0