January 2019 - U-Boot

[U-Boot] [PULL] efi patch queue 2019-01-28
by Alexander Graf 29 Jan '19

29 Jan '19

Hi Tom, This is my current patch queue for efi. Please pull. Alex The following changes since commit e964df1e2ae7b2c041a9d767f03ad2b72a3f2ac7: Merge branch '2019-01-16-master-imports' (2019-01-17 17:42:03 -0500) are available in the git repository at: git://github.com/agraf/u-boot.git tags/signed-efi-next for you to fetch changes up to b90a387650970fa9dbda7403070dbbf564cf81b8: efi_loader: debug output for HII protocols (2019-01-26 11:48:18 +0100) ---------------------------------------------------------------- Patch queue for efi - 2019-01-28 Goodness this time around: - HII protocol, finally allows us to run the UEFI Shell! - efi selftest now available on Cortex-M - NVMe support for distro boot - Lots of code cleanup ---------------------------------------------------------------- AKASHI Takahiro (8): distro: not taint environment variables if possible efi_loader: move efi_init_obj_list() to a new efi_setup.c efi_loader: implement GetNextVariableName() efi_selftest: fix variables test for GetNextVariableName() efi: hii: add guid package support efi: hii: add keyboard layout package support efi: hii: add HII config routing/access protocols efi_selftest: add HII database protocols test Akashi, Takahiro (1): lib: add u16_strcpy/strdup functions Heinrich Schuchardt (36): efi_loader: efi_guid_t must be 64-bit aligned efi_loader: struct efi_configuration_table test: tests for u16_strdup() and u16_strcpy() distro_bootcmd: add NVME support efi_loader: efi_add_runtime_mmio() efi_loader: efi_connect_controller() use %pD efi_loader: use named constant for efi_dp_from_mem() efi_loader: CMD_BOOTEFI_HELLO_COMPILE in configs efi_loader: fix memory allocation on sandbox efi_loader: avoid unnecessary pointer to long conversion efi_loader: signature of StartImage and Exit efi_selftest: allow building on ARMv7-M doc: README.uefi: fix typos efi_loader: use const efi_guid_t * for variable services efi_loader: efi_set_variable use const void * efi_selftest: SNP unit test on sandbox efi_selftest: events unit test, check return values efi_selftest: tpl unit test, check return values efi_driver: simplify error message efi_loader: refactor switch to non-secure mode efi_loader: fix CopyMem() efi_loader: use u16* for file name efi_loader: consistent build flags for EFI applications efi_loader: remove duplicate GUID definition efi_loader: eliminate duplicate function hex2mem() efi_loader: remove duplicate function mem2hex() efi_loader: comments for variable services efi_loader: provide freestanding library efi_loader: use freestanding library for efi apps efi_loader: use library memcpy() in helloworld.efi efi_loader: do not use symbolic links efi_loader: fix GetNextVariableName efi_loader: GetNextVariableName() relies on REGEX x86: do not use i386 code for x86_64 memory functions efi_selftest: fix HII tests efi_loader: debug output for HII protocols Leif Lindholm (1): efi_loader: Initial HII database protocols arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/exception_level.c | 56 ++ arch/arm/cpu/armv8/Makefile | 1 + arch/arm/cpu/armv8/exception_level.c | 55 ++ arch/arm/lib/Makefile | 6 +- arch/x86/include/asm/string.h | 31 +- arch/x86/lib/Makefile | 2 +- cmd/Kconfig | 2 +- cmd/bootefi.c | 152 +--- common/bootm.c | 10 + configs/chromebook_link64_defconfig | 1 - configs/kp_imx6q_tpc_defconfig | 1 - configs/qemu-x86_64_defconfig | 1 - configs/stm32f429-discovery_defconfig | 1 - configs/stm32f429-evaluation_defconfig | 1 - configs/stm32f469-discovery_defconfig | 1 - doc/README.uefi | 10 +- include/bootm.h | 5 + include/charset.h | 23 + include/config_distro_bootcmd.h | 40 +- include/efi.h | 2 +- include/efi_api.h | 445 ++++++++++- include/efi_loader.h | 24 +- lib/charset.c | 29 + lib/efi_driver/efi_uclass.c | 3 +- lib/efi_loader/Kconfig | 1 + lib/efi_loader/Makefile | 4 +- lib/efi_loader/efi_boottime.c | 32 +- lib/efi_loader/efi_file.c | 14 +- lib/efi_loader/efi_freestanding.c | 90 +++ lib/efi_loader/efi_hii.c | 1095 ++++++++++++++++++++++++++ lib/efi_loader/efi_hii_config.c | 146 ++++ lib/efi_loader/efi_memory.c | 6 + lib/efi_loader/efi_runtime.c | 3 +- lib/efi_loader/efi_setup.c | 86 ++ lib/efi_loader/efi_variable.c | 300 +++++-- lib/efi_loader/helloworld.c | 36 +- lib/efi_selftest/Makefile | 11 +- lib/efi_selftest/efi_selftest_block_device.c | 6 +- lib/efi_selftest/efi_selftest_events.c | 6 +- lib/efi_selftest/efi_selftest_hii.c | 1035 ++++++++++++++++++++++++ lib/efi_selftest/efi_selftest_hii_data.c | 453 +++++++++++ lib/efi_selftest/efi_selftest_snp.c | 8 + lib/efi_selftest/efi_selftest_tpl.c | 4 +- lib/efi_selftest/efi_selftest_variables.c | 17 +- scripts/Makefile.lib | 2 +- test/unicode_ut.c | 23 + 47 files changed, 3948 insertions(+), 333 deletions(-) create mode 100644 arch/arm/cpu/armv7/exception_level.c create mode 100644 arch/arm/cpu/armv8/exception_level.c create mode 100644 lib/efi_loader/efi_freestanding.c create mode 100644 lib/efi_loader/efi_hii.c create mode 100644 lib/efi_loader/efi_hii_config.c create mode 100644 lib/efi_loader/efi_setup.c create mode 100644 lib/efi_selftest/efi_selftest_hii.c create mode 100644 lib/efi_selftest/efi_selftest_hii_data.c

3 3

[U-Boot] [PATCH u-boot 00/11] meson: add support for Video Output
by Neil Armstrong 29 Jan '19

29 Jan '19

This patchset adds support for CVBS and/or HDMI output for Amlogic Meson GX SoCs (GXBB, GXL and GXM) based on the Linux Meson DRM driver ported to the U-Boot Video DM model. It supports only the "DMT" video modes reported by the monitors since AVI InfoFrame management is missing from the U-Boot video model. The port includes some changes in the dw-hdmi driver to support custom PHY calls and support for the ColorSpace converter since the Amlogic Meson GX video pipeline can only output un YUV444 mode, thus activating the CSC is needed to output RGB for HDMI. Video Support needs some tweaks in the DT like the u-boot,dm-pre-reloc for the VPU node and a tweak to access the HHI registers from the DW-HDMI glue driver. A port of a linux patch is also necessary to hook a regulator to enable HDMI. Finally, it enables console mux and console env for all Amlogic boards and enabled Video Support for the Libre Computer AML-S905X-CC board. Jorge Ramirez-Ortiz (2): video: dw_hdmi: support SoC specific read/write ops video: dw_hdmi: add support for color conversion Maxime Jourdan (6): power: domain: meson-gx-pwrc-vpu: add missing depends arm64: dts: meson-gx: vpu should be probed before relocation arm64: dts: meson-gx: add hhi reg entry to hdmi_tx arm: meson: board-gx: Setup VPU in fdt arm: meson64: enable console mux and console env by default arm: libretech-cc: enable video by default Neil Armstrong (3): video: Add Meson Video Processing Unit Driver arm64: dts: meson-gx: Add hdmi_5v regulator as hdmi tx supply configs: meson64: use vidconsole and usbkbd if enabled arch/arm/dts/meson-gx-u-boot.dtsi | 21 + arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi | 7 + arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 7 + .../meson-gxl-s905x-khadas-vim-u-boot.dtsi | 7 + arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 1 + .../meson-gxl-s905x-libretech-cc-u-boot.dtsi | 7 + arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 1 + arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi | 7 + arch/arm/dts/meson-gxl-s905x-p212.dts | 1 + .../arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 7 + arch/arm/dts/meson-gxm-khadas-vim2.dts | 1 + arch/arm/include/asm/arch-meson/meson-vpu.h | 13 + arch/arm/mach-meson/board-gx.c | 5 + configs/khadas-vim2_defconfig | 2 + configs/khadas-vim_defconfig | 2 + configs/libretech-cc_defconfig | 8 + configs/odroid-c2_defconfig | 2 + configs/p212_defconfig | 2 + drivers/power/domain/Kconfig | 2 +- drivers/video/Kconfig | 2 + drivers/video/Makefile | 1 + drivers/video/dw_hdmi.c | 267 ++- drivers/video/meson/Kconfig | 12 + drivers/video/meson/Makefile | 9 + drivers/video/meson/meson_canvas.c | 45 + drivers/video/meson/meson_dw_hdmi.c | 445 +++++ drivers/video/meson/meson_dw_hdmi.h | 134 ++ drivers/video/meson/meson_plane.c | 177 ++ drivers/video/meson/meson_registers.h | 1393 ++++++++++++++++ drivers/video/meson/meson_vclk.c | 893 ++++++++++ drivers/video/meson/meson_venc.c | 1464 +++++++++++++++++ drivers/video/meson/meson_vpu.c | 211 +++ drivers/video/meson/meson_vpu.h | 97 ++ drivers/video/meson/meson_vpu_init.c | 440 +++++ drivers/video/meson/simplefb_common.c | 29 + drivers/video/meson/simplefb_common.h | 21 + include/configs/meson64.h | 23 + include/dw_hdmi.h | 74 + include/media_bus_format.h | 156 ++ 39 files changed, 5992 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/meson-gx-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxl-s905x-libretech-cc-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi create mode 100644 arch/arm/include/asm/arch-meson/meson-vpu.h create mode 100644 drivers/video/meson/Kconfig create mode 100644 drivers/video/meson/Makefile create mode 100644 drivers/video/meson/meson_canvas.c create mode 100644 drivers/video/meson/meson_dw_hdmi.c create mode 100644 drivers/video/meson/meson_dw_hdmi.h create mode 100644 drivers/video/meson/meson_plane.c create mode 100644 drivers/video/meson/meson_registers.h create mode 100644 drivers/video/meson/meson_vclk.c create mode 100644 drivers/video/meson/meson_venc.c create mode 100644 drivers/video/meson/meson_vpu.c create mode 100644 drivers/video/meson/meson_vpu.h create mode 100644 drivers/video/meson/meson_vpu_init.c create mode 100644 drivers/video/meson/simplefb_common.c create mode 100644 drivers/video/meson/simplefb_common.h create mode 100644 include/media_bus_format.h -- 2.20.1

2 22

[U-Boot] [PULL u-boot] Please pull u-boot-amlogic-20190128
by Neil Armstrong 29 Jan '19

29 Jan '19

Hi Tom, First of all, greetings from BayLibre for the new year (a bit late) ! Here is single patch adding support for pinconf on the amlogic pinctrl driver. Thanks, Neil The following changes since commit 0da90255083681a02b24528f80da9d4062ff634a: Merge branch '2019-01-25-master-imports' (2019-01-26 22:47:55 -0500) are available in the Git repository at: git://git.denx.de/u-boot-amlogic.git tags/u-boot-amlogic-20190128 for you to fetch changes up to ed7bef7336a992f1edac1106de5d0f36405faa5b: pinctrl: meson: add pinconf support (2019-01-28 14:04:58 +0100) ---------------------------------------------------------------- Adds pinconf support for the Amlogic pinctrl driver ---------------------------------------------------------------- Jerome Brunet (1): pinctrl: meson: add pinconf support drivers/pinctrl/meson/Kconfig | 1 + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 10 +++ drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 10 +++ drivers/pinctrl/meson/pinctrl-meson.c | 101 ++++++++++++++++++++++++-- drivers/pinctrl/meson/pinctrl-meson.h | 8 ++ 5 files changed, 123 insertions(+), 7 deletions(-)

2 2

[U-Boot] [PATCH] mmc: dwmmc: Poll for iDMAC TX/RX interrupt
by Ley Foon Tan 29 Jan '19

29 Jan '19

Poll for iDMAC TX/RX interrupt before disable DMA. This to prevent disable DMA before data is transfer completed. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- drivers/mmc/dw_mmc.c | 19 +++++++++++++++++++ include/dwmmc.h | 7 +++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 7544b84..93a836e 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -12,6 +12,7 @@ #include <memalign.h> #include <mmc.h> #include <dwmmc.h> +#include <wait_bit.h> #define PAGE_SIZE 4096 @@ -55,6 +56,9 @@ static void dwmci_prepare_data(struct dwmci_host *host, dwmci_wait_reset(host, DWMCI_CTRL_FIFO_RESET); + /* Clear IDMAC interrupt */ + dwmci_writel(host, DWMCI_IDSTS, 0xFFFFFFFF); + data_start = (ulong)cur_idmac; dwmci_writel(host, DWMCI_DBADDR, (ulong)cur_idmac); @@ -340,6 +344,18 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, /* only dma mode need it */ if (!host->fifo_mode) { + if (data->flags == MMC_DATA_READ) + mask = DWMCI_IDINTEN_RI; + else + mask = DWMCI_IDINTEN_TI; + ret = wait_for_bit_le32(host->ioaddr + DWMCI_IDSTS, + mask, true, 1000, false); + if (ret) + debug("%s: DWMCI_IDINTEN mask 0x%x timeout.\n", + __func__, mask); + /* clear interrupts */ + dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK); + ctrl = dwmci_readl(host, DWMCI_CTRL); ctrl &= ~(DWMCI_DMA_EN); dwmci_writel(host, DWMCI_CTRL, ctrl); @@ -494,6 +510,9 @@ static int dwmci_init(struct mmc *mmc) dwmci_writel(host, DWMCI_CLKENA, 0); dwmci_writel(host, DWMCI_CLKSRC, 0); + if (!host->fifo_mode) + dwmci_writel(host, DWMCI_IDINTEN, DWMCI_IDINTEN_MASK); + return 0; } diff --git a/include/dwmmc.h b/include/dwmmc.h index 4ceda5e..f06720d 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -130,6 +130,13 @@ /* UHS register */ #define DWMCI_DDR_MODE (1 << 16) +/* Internal IDMAC interrupt defines */ +#define DWMCI_IDINTEN_RI BIT(1) +#define DWMCI_IDINTEN_TI BIT(0) + +#define DWMCI_IDINTEN_MASK (DWMCI_IDINTEN_TI | \ + DWMCI_IDINTEN_RI) + /* quirks */ #define DWMCI_QUIRK_DISABLE_SMU (1 << 0) -- 1.7.1

3 3

[U-Boot] [PATCH 0/5] arm: socfpga: implement proper peripheral reset handling
by Simon Goldschmidt 29 Jan '19

29 Jan '19

This series implements peripheral reset handling for socfpga gen5. It moves from enabling all peripherals during SPL startup to using the socfpga reset driver from all peripherals and enabling peripherals when they are used. As Linux cannot even handle this in 4.20, a Kconfig option is added to keep the old behaviour of just enabling all peripherals from SPL. This option is default 'y' for now but should be moved to default 'n' in the near future once a Linux kernel supports reset handling for all drivers. Simon Goldschmidt (5): arm: socfpga: gen5: add reset handles to devicetrees arm: socfpga: move SDR reset handling to driver mtd: rawnand: denali: add reset handling spi: cadence_qspi: add reset handling arm: socfpga: implement proper peripheral reset arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 6 ++ arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 5 ++ .../socfpga_cyclone5_de0_nano_soc-u-boot.dtsi | 6 ++ arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 5 ++ arch/arm/dts/socfpga_cyclone5_is1.dts | 5 ++ .../dts/socfpga_cyclone5_socdk-u-boot.dtsi | 6 ++ .../dts/socfpga_cyclone5_sockit-u-boot.dtsi | 6 ++ .../dts/socfpga_cyclone5_socrates-u-boot.dtsi | 10 +++ arch/arm/dts/socfpga_cyclone5_sr1500.dts | 5 ++ .../socfpga_cyclone5_vining_fpga-u-boot.dtsi | 6 ++ arch/arm/dts/socfpga_u-boot.dtsi | 61 +++++++++++++++++++ arch/arm/mach-socfpga/Kconfig | 10 +++ arch/arm/mach-socfpga/misc_gen5.c | 2 + arch/arm/mach-socfpga/spl_gen5.c | 11 +++- drivers/ddr/altera/sdram_gen5.c | 4 ++ drivers/mtd/nand/raw/denali_dt.c | 8 +++ drivers/spi/cadence_qspi.c | 9 +++ 18 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/socfpga_u-boot.dtsi -- 2.17.1

3 34

Re: [U-Boot] [RFC 1/9] Arm: dts: imx7d-pico: Import Linux pico-pi dts
by Offouga Joris 29 Jan '19

29 Jan '19

> Le 28 janv. 2019 à 07:53, Jun Nie <jun.nie(a)linaro.org> a écrit : > > Joris Offouga <offougajoris(a)gmail.com> 于2019年1月25日周五下午8:27写道： >> >> >>>> Le 25/01/2019 à 02:19, Jun Nie a écrit : >>>> Joris Offouga <offougajoris(a)gmail.com> 于2019年1月24日周四下午9:07写道： >>>> >>>>>> Le 24/01/2019 à 13:54, Jun Nie a écrit : >>>>>> Joris Offouga <offougajoris(a)gmail.com> 于2019年1月24日周四下午6:30写道： >>>>>> Le 24/01/2019 à 11:02, Jun Nie a écrit : >>>>>>>>>> Hi Joris, >>>>>>>>>> >>>>>>>>>> I've been told that this board exhibits this same problem even without >>>>>>>>>> the DM conversion. >>>>>>>>>> >>>>>>>>>> "PMIC: PFUZE3000 DEV_ID=0x0 REV_ID=0xfffffffb >>>>>>>>>> read error from device: 9df65458 register: 0x69! >>>>>>>>>> write error to device: 9df65458 register: 0x23! >>>>>>>>>> write error to device: 9df65458 register: 0x31!" >>>>>>>>> The result before DM conversion is : >>>>>>>>> >>>>>>>>> PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11 >>>>>>>>> >>>>>>>>> Did you have this problem with the warp7 ? >>>>>>>> No. >>>>>>>> >>>>>>>> Jun - do you see the above error on the pico ? >>>>>>> No. The only line I see about PMIC is: >>>>>>> PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11 >>>>>>> >>>>>>> Jun >>>>>> Yes it is the line that appears before the conversion >>>>>> >>>>>> Jun - do you have the pico board ? >>>>>> >>>>>> Can you help me with the conversion ? >>>>>> >>>>>> Joris >>>>> OK, I can try it. Where can I find a git branch with these patches? >>>> Non, fork the repo and I create a branch on my repo you go? >>>> >>>> If you have a preference, tell me >>> Right, you create a branch, I will clone and test on it. >> >> I create a branch pico-imx7d/convert_dm on my github repo : >> >> https://github.com/jorisoffouga/u-boot/tree/pico-imx7d/convert_dm > > Hi Joris, > > I burn u-boot.img to offset 69KB, but SPL does not boot into u-boot > according to log. Not sure Hi Jun You have the same behavior as me. For the spl I think it should copy Otavio and Fabio who put it in place. > > U-Boot SPL 2019.01-00273-g3006f29-dirty (Jan 27 2019 - 22:19:00 +0800) > Trying to boot from MMC1 > > If I replace SPL with DCD file for early initilization, I see below > log. Suppose it is due to i2c failure. > > 4474 U-Boot 2019.01-00274-gca08248-dirty (Jan 27 2019 - 22:28:17 +0800) > 4475 > 4476 CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) > 4477 CPU: Commercial temperature grade (0C to 95C) at 27C > 4478 Reset cause: POR > 4479 Model: TechNexion PICO-IMX7D Board and PI baseboard > 4480 Board: i.MX7D PICOSOM > 4481 DRAM: 512 MiB > 4482 read error from device: 9df54458 register: 0x3! > 4483 PMIC: PFUZE3000 DEV_ID=0x0 REV_ID=0xfffffffb > 4484 read error from device: 9df54458 register: 0x69! > 4485 write error to device: 9df54458 register: 0x23! > 4486 write error to device: 9df54458 register: 0x31! > 4487 write error to device: 9df54458 register: 0x21! > 4488 write error to device: 9df54458 register: 0x2f! > 4489 read error from device: 9df54458 register: 0x2e! > 4490 write error to device: 9df54458 register: 0x2e! > 4491 MMC: FSL_SDHC: 2, FSL_SDHC: 1, FSL_SDHC: 0 > 4492 Loading Environment from MMC... OK > 4493 In: serial@30a70000 > 4494 Out: serial@30a70000 > 4495 Err: serial@30a70000 > 4496 Net: gpio@30250000: dir_output: error: gpio GPIO6_11 not reserved > 4497 gpio@30250000: set_value: error: gpio GPIO6_11 not reserved > 4498 Board Net Initialization Failed > 4499 No ethernet found. > 4500 Hit any key to stop autoboot: 2 ^H^H^H 1 ^H^H^H 0 > 4501 Saving Environment to MMC... Writing to MMC(0)... OK > 4502 switch to partitions #0, OK > 4503 mmc0(part 0) is current device > 4504 Scanning mmc 0:1... > 4505 Found U-Boot script /boot.scr > 4506 830 bytes read in 3 ms (269.5 KiB/s) > 4507 ## Executing script at 80800000 > > Jun Joris > >>> >>> Jun >> Joris >>> >>>> Joris >>>> >>>>> Jun

1 0

[U-Boot] [PATCH v6.1] cmd: env: add "-e" option for handling UEFI variables
by AKASHI Takahiro 29 Jan '19

29 Jan '19

# This is a replacement of my patch#1[1] with minor updates. # The other patches are the exact same as in v6. # [1] https://lists.denx.de/pipermail/u-boot/2019-January/356035.html "env [print|set] -e" allows for handling uefi variables without knowing details about mapping to corresponding u-boot variables. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- MAINTAINERS | 1 + cmd/Kconfig | 6 + cmd/Makefile | 1 + cmd/nvedit.c | 28 +++- cmd/nvedit_efi.c | 340 ++++++++++++++++++++++++++++++++++++++++++++++ include/command.h | 4 + 6 files changed, 379 insertions(+), 1 deletion(-) create mode 100644 cmd/nvedit_efi.c diff --git a/MAINTAINERS b/MAINTAINERS index ae825014bda9..22ac686ab2d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -438,6 +438,7 @@ F: lib/efi*/ F: test/py/tests/test_efi* F: test/unicode_ut.c F: cmd/bootefi.c +F: cmd/nvedit_efi.c F: tools/file2include.c FPGA diff --git a/cmd/Kconfig b/cmd/Kconfig index ea1a325eb301..c66333598d31 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -53,6 +53,12 @@ config SYS_PROMPT This string is displayed in the command line to the left of the cursor. +config CMD_NVEDIT_EFI + bool + depends on EFI_LOADER + default y + imply HEXDUMP + menu "Autoboot options" config AUTOBOOT diff --git a/cmd/Makefile b/cmd/Makefile index 15ae4d250f50..142e0ee222ca 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -98,6 +98,7 @@ obj-$(CONFIG_CMD_MTD) += mtd.o obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o obj-$(CONFIG_CMD_NAND) += nand.o obj-$(CONFIG_CMD_NET) += net.o +obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o obj-$(CONFIG_CMD_ONENAND) += onenand.o obj-$(CONFIG_CMD_OSD) += osd.o obj-$(CONFIG_CMD_PART) += part.o diff --git a/cmd/nvedit.c b/cmd/nvedit.c index ce746bbf1b3e..7973d7add5fc 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -119,6 +119,11 @@ static int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, int rcode = 0; int env_flag = H_HIDE_DOT; +#if defined(CONFIG_CMD_NVEDIT_EFI) + if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e') + return do_env_print_efi(cmdtp, flag, --argc, ++argv); +#endif + if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'a') { argc--; argv++; @@ -216,6 +221,12 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag) ENTRY e, *ep; debug("Initial value for argc=%d\n", argc); + +#if defined(CONFIG_CMD_NVEDIT_EFI) + if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e') + return do_env_set_efi(NULL, flag, --argc, ++argv); +#endif + while (argc > 1 && **(argv + 1) == '-') { char *arg = *++argv; @@ -1263,14 +1274,21 @@ static char env_help_text[] = "env import [-d] [-t [-r] | -b | -c] addr [size] [var ...] - import environment\n" #endif "env print [-a | name ...] - print environment\n" +#if defined(CONFIG_CMD_NVEDIT_EFI) + "env print -e [name ...] - print UEFI environment\n" +#endif #if defined(CONFIG_CMD_RUN) "env run var [...] - run commands in an environment variable\n" #endif #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) "env save - save environment\n" #endif +#if defined(CONFIG_CMD_NVEDIT_EFI) + "env set [-e | -f] name [arg ...]\n"; +#else "env set [-f] name [arg ...]\n"; #endif +#endif U_BOOT_CMD( env, CONFIG_SYS_MAXARGS, 1, do_env, @@ -1295,6 +1313,10 @@ U_BOOT_CMD_COMPLETE( printenv, CONFIG_SYS_MAXARGS, 1, do_env_print, "print environment variables", "[-a]\n - print [all] values of all environment variables\n" +#if defined(CONFIG_CMD_NVEDIT_EFI) + "printenv -e [<name> ...]\n" + " - print UEFI variable 'name' or all the variables\n" +#endif "printenv name ...\n" " - print value of environment variable 'name'", var_complete @@ -1322,7 +1344,11 @@ U_BOOT_CMD_COMPLETE( U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", - "[-f] name value ...\n" +#if defined(CONFIG_CMD_NVEDIT_EFI) + "-e <name> [<value> ...]\n" + " - set UEFI variable 'name' to 'value' ...'\n" +#endif + "setenv [-f] name value ...\n" " - [forcibly] set environment variable 'name' to 'value ...'\n" "setenv [-f] name\n" " - [forcibly] delete environment variable 'name'", diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c new file mode 100644 index 000000000000..64225e2247af --- /dev/null +++ b/cmd/nvedit_efi.c @@ -0,0 +1,340 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Integrate UEFI variables to u-boot env interface + * + * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited + */ + +#include <charset.h> +#include <common.h> +#include <command.h> +#include <efi_loader.h> +#include <exports.h> +#include <hexdump.h> +#include <malloc.h> +#include <linux/kernel.h> + +/* + * From efi_variable.c, + * + * Mapping between UEFI variables and u-boot variables: + * + * efi_$guid_$varname = {attributes}(type)value + */ + +static const struct { + u32 mask; + char *text; +} efi_var_attrs[] = { + {EFI_VARIABLE_NON_VOLATILE, "NV"}, + {EFI_VARIABLE_BOOTSERVICE_ACCESS, "BS"}, + {EFI_VARIABLE_RUNTIME_ACCESS, "RT"}, + {EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, "AW"}, + {EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS, "AT"}, +}; + +/* show information of named variable */ +static void print_variable_info(u16 *name, efi_guid_t *guid) +{ + u32 attributes; + u8 *data; + efi_uintn_t size; + int count, i; + efi_status_t ret; + + data = NULL; + size = 0; + ret = efi_get_variable(name, guid, &attributes, &size, data); + if (ret == EFI_BUFFER_TOO_SMALL) { + data = malloc(size); + if (!data) + goto out; + + ret = efi_get_variable(name, guid, &attributes, &size, data); + } + if (ret == EFI_NOT_FOUND) { + printf("Error: \"%ls\" not defined\n", name); + goto out; + } + if (ret != EFI_SUCCESS) + goto out; + + printf("%ls:", name); + for (count = 0, i = 0; i < ARRAY_SIZE(efi_var_attrs); i++) + if (attributes & efi_var_attrs[i].mask) { + if (count) + putc('|'); + else + putc(' '); + count++; + puts(efi_var_attrs[i].text); + } + printf(", DataSize = 0x%lx\n", size); + print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1, data, size, true); + + return; +out: + free(data); +} + +static int efi_dump_var_ones(int argc, char * const argv[]) +{ + u16 *var_name16, *p; + efi_uintn_t buf_size, size; + + buf_size = 128; + var_name16 = malloc(buf_size); + if (!var_name16) + return CMD_RET_FAILURE; + + for (; argc > 0; argc--, argv++) { + size = (utf8_utf16_strlen(argv[0]) + 1) * sizeof(u16); + if (buf_size < size) { + buf_size = size; + p = realloc(var_name16, buf_size); + if (!p) { + free(var_name16); + return CMD_RET_FAILURE; + } + var_name16 = p; + } + + p = var_name16; + utf8_utf16_strcpy(&p, argv[0]); + + print_variable_info(var_name16, + (efi_guid_t *)&efi_global_variable_guid); + } + + free(var_name16); + + return CMD_RET_SUCCESS; +} + +static int efi_dump_var_all(void) +{ + u16 *var_name16, *p; + efi_uintn_t buf_size, size; + efi_guid_t guid; + efi_status_t ret; + + buf_size = 128; + var_name16 = malloc(buf_size); + if (!var_name16) + return CMD_RET_FAILURE; + + var_name16[0] = 0; + for (;;) { + size = buf_size; + ret = efi_get_next_variable_name(&size, var_name16, &guid); + if (ret == EFI_NOT_FOUND) + break; + if (ret == EFI_BUFFER_TOO_SMALL) { + buf_size = size; + p = realloc(var_name16, buf_size); + if (!p) { + free(var_name16); + return CMD_RET_FAILURE; + } + var_name16 = p; + ret = efi_get_next_variable_name(&size, var_name16, + &guid); + } + if (ret != EFI_SUCCESS) { + free(var_name16); + return CMD_RET_FAILURE; + } + + print_variable_info(var_name16, &guid); + } + + free(var_name16); + + return CMD_RET_SUCCESS; +} + +static int efi_dump_var(cmd_tbl_t *cmdtp, int flag, + int argc, char * const argv[]) +{ + if (argc > 1) + /* show specified UEFI variables */ + return efi_dump_var_ones(--argc, ++argv); + + /* enumerate and show all UEFI variables */ + return efi_dump_var_all(); +} + +int do_env_print_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + efi_status_t r; + + /* Initialize EFI drivers */ + r = efi_init_obj_list(); + if (r != EFI_SUCCESS) { + printf("Error: Cannot initialize UEFI sub-system, r = %lu\n", + r & ~EFI_ERROR_MASK); + return CMD_RET_FAILURE; + } + + return efi_dump_var(cmdtp, flag, argc, argv); +} + +/* + * Interpret a given data string and append it to buffer. + * Buffer will be realloc'ed if necessary. + */ +static int append_value(char **bufp, unsigned long *sizep, char *data) +{ + char *tmp_buf = NULL, *new_buf = NULL, *value; + unsigned long len = 0; + + if (!strncmp(data, "=0x", 2)) { /* hexadecimal number */ + union { + u8 u8; + u16 u16; + u32 u32; + u64 u64; + } tmp_data; + unsigned long hex_value; + void *hex_ptr; + + data += 3; + len = strlen(data); + if ((len & 0x1)) /* not multiple of two */ + return -1; + + len /= 2; + if (len > 8) + return -1; + else if (len > 4) + len = 8; + else if (len > 2) + len = 4; + + /* convert hex hexadecimal number */ + if (strict_strtoul(data, 16, &hex_value) < 0) + return -1; + + tmp_buf = malloc(len); + if (!tmp_buf) + return -1; + + if (len == 1) { + tmp_data.u8 = hex_value; + hex_ptr = &tmp_data.u8; + } else if (len == 2) { + tmp_data.u16 = hex_value; + hex_ptr = &tmp_data.u16; + } else if (len == 4) { + tmp_data.u32 = hex_value; + hex_ptr = &tmp_data.u32; + } else { + tmp_data.u64 = hex_value; + hex_ptr = &tmp_data.u64; + } + memcpy(tmp_buf, hex_ptr, len); + value = tmp_buf; + + } else if (!strncmp(data, "=H", 2)) { /* hexadecimal-byte array */ + data += 2; + len = strlen(data); + if (len & 0x1) /* not multiple of two */ + return -1; + + len /= 2; + tmp_buf = malloc(len); + if (!tmp_buf) + return -1; + + if (hex2bin((u8 *)tmp_buf, data, len) < 0) + return -1; + + value = tmp_buf; + } else { /* string */ + if (!strncmp(data, "=\"", 2) || !strncmp(data, "=S\"", 3)) { + if (data[1] == '"') + data += 2; + else + data += 3; + value = data; + len = strlen(data) - 1; + if (data[len] != '"') + return -1; + } else { + value = data; + len = strlen(data); + } + } + + new_buf = realloc(*bufp, *sizep + len); + if (!new_buf) + goto out; + + memcpy(new_buf + *sizep, value, len); + *bufp = new_buf; + *sizep += len; + +out: + free(tmp_buf); + + return 0; +} + +static int efi_set_var(cmd_tbl_t *cmdtp, int flag, + int argc, char * const argv[]) +{ + char *var_name, *value = NULL; + efi_uintn_t size = 0; + u16 *var_name16 = NULL, *p; + efi_guid_t guid; + efi_status_t ret; + + if (argc == 1) + return CMD_RET_SUCCESS; + + var_name = argv[1]; + if (argc == 2) { + /* remove */ + value = NULL; + size = 0; + } else { /* set */ + argc -= 2; + argv += 2; + + for ( ; argc > 0; argc--, argv++) + if (append_value(&value, &size, argv[0]) < 0) { + ret = CMD_RET_FAILURE; + goto out; + } + } + + var_name16 = malloc((strlen(var_name) + 1) * 2); + p = var_name16; + utf8_utf16_strncpy(&p, var_name, strlen(var_name) + 1); + + guid = efi_global_variable_guid; + ret = efi_set_variable(var_name16, &guid, + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS, size, value); + ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); +out: + free(value); + free(var_name16); + + return ret; +} + +int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + efi_status_t r; + + /* Initialize EFI drivers */ + r = efi_init_obj_list(); + if (r != EFI_SUCCESS) { + printf("Error: Cannot initialize UEFI sub-system, r = %lu\n", + r & ~EFI_ERROR_MASK); + return CMD_RET_FAILURE; + } + + return efi_set_var(cmdtp, flag, argc, argv); +} diff --git a/include/command.h b/include/command.h index feddef300ccc..efc4dfc457c1 100644 --- a/include/command.h +++ b/include/command.h @@ -51,6 +51,10 @@ extern int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #if defined(CONFIG_CMD_BOOTEFI) extern int do_bootefi_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #endif +#if defined(CONFIG_CMD_NVEDIT_EFI) +int do_env_print_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +#endif /* common/command.c */ int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int -- 2.19.1

1 0

[U-Boot] [PATCH] mmc: tmio: renesas: Add 1uS delay after DMA completion on older IPs
by Marek Vasut 29 Jan '19

29 Jan '19

The internal DMAC asserts DMA transfer end bit too early on older version of the TMIO IPs which use bit 17 for DTRAEND. Add 1uS delay after the completion of DMA transfer and before invalidating the cache to let the DMAC fully complete the transfer. Otherwise, it could happen that the last few bytes of a transferred data are not available. A test case to trigger this behavior is the following command, ran on the U-Boot command line, with Sandisk 16 GiB UHS-I card inserted into SDHI slot 0 and with first partition being of type FAT: => while true ; do mmc rescan ; fstype mmc 0:1 ; done Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mmc/tmio-common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 0b6a284f2e..2421915a07 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -367,6 +367,9 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) ret = tmio_sd_dma_wait_for_irq(dev, poll_flag, data->blocks); + if (poll_flag == TMIO_SD_DMA_INFO1_END_RD) + udelay(1); + __dma_unmap_single(dma_addr, len, dir); return ret; -- 2.19.2

1 0

[U-Boot] [PATCH] mmc: tmio: Make DMA transfer end bit configurable
by Marek Vasut 29 Jan '19

29 Jan '19

Different versions of the SDHI core use either bit 17 or bit 20 for the DTRAEND indication, which can differ even between SoC revisions. Make the DTRAEND bit position part of the driver private data, so that the probe function can set this accordingly. Set this to 20 on Socionext SoCs and either 17 or 20 on Renesas SoCs, depending on the SoC. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mmc/renesas-sdhi.c | 10 ++++++++++ drivers/mmc/tmio-common.c | 8 +++----- drivers/mmc/tmio-common.h | 1 + drivers/mmc/uniphier-sd.c | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 733b6d62f5..a556acd5cb 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -462,6 +462,16 @@ static void renesas_sdhi_filter_caps(struct udevice *dev) priv->nrtaps = 4; else priv->nrtaps = 8; + + /* H3 ES1.x and M3W ES1.0 uses bit 17 for DTRAEND */ + if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) && + (rmobile_get_cpu_rev_integer() <= 1)) || + ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) && + (rmobile_get_cpu_rev_integer() == 1) && + (rmobile_get_cpu_rev_fraction() == 0))) + priv->read_poll_flag = TMIO_SD_DMA_INFO1_END_RD; + else + priv->read_poll_flag = TMIO_SD_DMA_INFO1_END_RD2; } static int renesas_sdhi_probe(struct udevice *dev) diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 201492001f..0b6a284f2e 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -347,12 +347,10 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) /* * The DMA READ completion flag position differs on Socionext * and Renesas SoCs. It is bit 20 on Socionext SoCs and using - * bit 17 is a hardware bug and forbidden. It is bit 17 on - * Renesas SoCs and bit 20 does not work on them. + * bit 17 is a hardware bug and forbidden. It is either bit 17 + * or bit 20 on Renesas SoCs, depending on SoC. */ - poll_flag = (priv->caps & TMIO_SD_CAP_RCAR) ? - TMIO_SD_DMA_INFO1_END_RD : - TMIO_SD_DMA_INFO1_END_RD2; + poll_flag = priv->read_poll_flag; tmp |= TMIO_SD_DMA_MODE_DIR_RD; } else { buf = (void *)data->src; diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index 192026ce3e..58ce3d65b0 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -119,6 +119,7 @@ struct tmio_sd_priv { void __iomem *regbase; unsigned int version; u32 caps; + u32 read_poll_flag; #define TMIO_SD_CAP_NONREMOVABLE BIT(0) /* Nonremovable e.g. eMMC */ #define TMIO_SD_CAP_DMA_INTERNAL BIT(1) /* have internal DMA engine */ #define TMIO_SD_CAP_DIV1024 BIT(2) /* divisor 1024 is available */ diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index 6539880ab5..8f89bda233 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -47,6 +47,7 @@ static int uniphier_sd_probe(struct udevice *dev) struct tmio_sd_priv *priv = dev_get_priv(dev); priv->clk_get_rate = uniphier_sd_clk_get_rate; + priv->read_poll_flag = TMIO_SD_DMA_INFO1_END_RD2; #ifndef CONFIG_SPL_BUILD int ret; -- 2.19.2

1 0

[U-Boot] [PATCH v2 0/3] efi_loader: add removable device support
by AKASHI Takahiro 29 Jan '19

29 Jan '19

Under the current implementation, any removable device which is attached to the platform will not be recognized after any efi-related command, in particular bootefi, is once executed. This patch set resolves this problem by re-scanning and recreating a disk device list for efi operations. # I didn't run selftest "block device" as I don't know how we can # create a test disk image. # Heinrich, can you provide a script? -Takahiro Akashi Changes in v2 (Nov 15, 2018) * efi_init_obj_list() will never return an error once it has succeeded * add "invalid" flag to efi_disk to indicate that a given device is now in stale state * modify block io protocol and file protocol to honor invalid flag * simplify efi simple file system protocol/file procotol by removing details of an u-boot block device * some function were renamed after Heinrich's comment AKASHI Takahiro (3): efi_loader: export efi_locate_handle() function efi_loader: enumerate disk devices every time efi_loader: remove block device details from efi file cmd/bootefi.c | 17 ++- include/efi_loader.h | 14 ++- lib/efi_loader/efi_boottime.c | 7 +- lib/efi_loader/efi_disk.c | 229 +++++++++++++++++++++++++++++++++- lib/efi_loader/efi_file.c | 21 ++-- 5 files changed, 266 insertions(+), 22 deletions(-) -- 2.19.0

5 52