June 2019 - U-Boot

[U-Boot] [PATCH] mmc: Avoid HS400 mode when accessing boot partitions
by Marek Vasut 19 Jun '19

19 Jun '19

According to JEDEC JESD84-B51.pdf section 6.3.3 Boot operation , HS200 & HS400 mode is not supported during boot operation. The U-Boot code currently only applies this restriction to HS200 mode, extend this to HS400 mode as well. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Jean-Jacques Hiblot <jjhiblot(a)ti.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Peng Fan <peng.fan(a)nxp.com> --- drivers/mmc/mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 456c1b4cc9..71b52c6cf2 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -905,14 +905,14 @@ static int mmc_set_capacity(struct mmc *mmc, int part_num) return 0; } -#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) +#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) static int mmc_boot_part_access_chk(struct mmc *mmc, unsigned int part_num) { int forbidden = 0; bool change = false; if (part_num & PART_ACCESS_MASK) - forbidden = MMC_CAP(MMC_HS_200); + forbidden = MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400); if (MMC_CAP(mmc->selected_mode) & forbidden) { pr_debug("selected mode (%s) is forbidden for part %d\n", -- 2.20.1

4 28

[U-Boot] [PATCH 0/4] Update SiFive Unleashed Clock Driver
by Anup Patel 19 Jun '19

19 Jun '19

This series update SiFive Unleashed clock driver so that: 1. It is in sync with upstream Linux driver 2. It uses latest DT bindings as-per upstream Linux driver With this series, we can now use latest DT bindings with U-Boot. I have tested SiFive Serial driver and Cadence MACB ethernet driver with this changes and both work fine. The legacy FSBL will still pass DTB to U-Boot with older DT bindings which will break the updated SiFive Unleashed clock driver. To tackle this, we have embedded DTB in OpenSBI FW_PAYLOAD firmware for SiFive Unleashed so that OpenSBI will override and pass updated DTB to U-Boot. In fact, the updated DTB passed by OpenSBI can be used by latest Linux (i.e. V5.2-rc1 or higher) as well. The OpenSBI changes to embed SiFive Unleashed DTB can be found in sifive_unleashed_dtb_fix_v1 branch of: https://github.com/avpatel/opensbi.git This series can be found in riscv_unleashed_clk_sync_v1 branch of: https://github.com/avpatel/u-boot.git Anup Patel (4): clk: sifive: Factor-out PLL library as separate module clk: sifive: Sync-up WRPLL library with upstream Linux clk: sifive: Sync-up DT bindings header with upstream Linux clk: sifive: Sync-up main driver with upstream Linux drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/analogbits/Kconfig | 4 + drivers/clk/analogbits/Makefile | 3 + .../{sifive => analogbits}/wrpll-cln28hpc.c | 168 ++++++++---------- drivers/clk/sifive/Kconfig | 3 - drivers/clk/sifive/Makefile | 2 - drivers/clk/sifive/fu540-prci.c | 123 +++++++------ include/dt-bindings/clk/sifive-fu540-prci.h | 29 --- include/dt-bindings/clock/sifive-fu540-prci.h | 18 ++ .../linux/clk}/analogbits-wrpll-cln28hpc.h | 70 +++----- 11 files changed, 195 insertions(+), 227 deletions(-) create mode 100644 drivers/clk/analogbits/Kconfig create mode 100644 drivers/clk/analogbits/Makefile rename drivers/clk/{sifive => analogbits}/wrpll-cln28hpc.c (69%) delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h rename {drivers/clk/sifive => include/linux/clk}/analogbits-wrpll-cln28hpc.h (52%) -- 2.17.1

3 6

[U-Boot] [PATCH V2 0/5] add i.MX8 container loading support
by Peng Fan 19 Jun '19

19 Jun '19

The V1 version: https://patchwork.ozlabs.org/cover/1096334/ This patchset is to support i.MX8 container loading from SPL, i.MX8 AHAB secure boot not support FIT image, so we need to use container image. Currently still use a fixed offset for the 2nd container(u-boot.cnt), future patches will drop this fixed offset and use dynamaic offset according to the size of 1st container for spl. Only MMC is supported now, future patches will also support SPI/NOR/NAND following similar style as mmc part, if the mmc part is ok. Based on the comments in https://patchwork.ozlabs.org/patch/1096336/ So I think we have agreed the approach, the only comments that not addressed from Lukasz is add doc for the container format. The detailed format could be found in RM https://www.nxp.com/docs/en/reference-manual/IMX8DQXPRM.pdf Chapter 5.9.4 High Level Container Format CI: https://travis-ci.org/MrVan/u-boot/builds/547161366 V2: Drop cleanup Makefile since V1, that patch is not correct. Rebased on master Peng Fan (5): spl: Add function to get u-boot raw sector imx8: support parsing i.MX8 Container file spl: mmc: support loading i.MX container format file imx: add container target imx8qxp_mek: switch to use container image Makefile | 8 ++ arch/arm/include/asm/arch-imx8/image.h | 56 +++++++++++ arch/arm/mach-imx/Makefile | 14 ++- arch/arm/mach-imx/imx8/Kconfig | 13 +++ arch/arm/mach-imx/imx8/Makefile | 4 + arch/arm/mach-imx/imx8/parse-container.c | 120 ++++++++++++++++++++++++ board/freescale/imx8qxp_mek/README | 4 +- board/freescale/imx8qxp_mek/uboot-container.cfg | 13 +++ common/spl/spl_mmc.c | 21 ++++- configs/imx8qxp_mek_defconfig | 5 +- include/spl.h | 12 +++ 11 files changed, 260 insertions(+), 10 deletions(-) create mode 100644 arch/arm/include/asm/arch-imx8/image.h create mode 100644 arch/arm/mach-imx/imx8/parse-container.c create mode 100644 board/freescale/imx8qxp_mek/uboot-container.cfg -- 2.16.4

1 5

[U-Boot] [BUG] fs: fat: error when handling long file names
by Heinrich Schuchardt 19 Jun '19

19 Jun '19

Hello Takahiro I hope you have an idea what might be missing in the FAT file system support for long names. When running the SCT I saw this error for the GetInfo functional test: GetInfo() Basic Test - checkpoint3 -- PASS E4F4F6A2-7538-4C79-AA3C-67184EC70E16 /home/supven01/work/sct_workspace/edk2/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c:8607: SystemInfo->Size - 18, BufferSize - 18, Tpl - 8 EFI: Entry efi_file_open(000000007ef8c250, 000000007edeb0c0, "BBTestGetInfoBasicTestCheckpoint3_File_0", 8000000000000003, 0) Error: allocating new dir entry EFI: Exit: efi_file_open: 14 EFI: Entry efi_file_open(000000007ef8c250, 000000007edeb0c8, "BBTestGetInfoBasicTestCheckpoint3_File_1", 8000000000000003, 0) Error: allocating new dir entry In the EFI shell output to a file with a long name sometimes fails (depending on the history of the volume). FS0:\> echo a > foo FS0:\> echo a > abcdefgh.ijk FS0:\> echo a > abcdefgh.ijkl ** Unable to write file /abcdefgh.ijkl ** FS0:\> Up to now the SCT test is the only thing that fails reproducibly. I use this repo for building: https://github.com/xypron/u-boot-build/tree/qemu-arm64 make sct-prepare make sct Best regards Heinrich

2 1

[U-Boot] [PATCH] mmc: tmio: sdhi: Do not use auto-retuning in HS400 mode
by Marek Vasut 18 Jun '19

18 Jun '19

The SDHI supports automatic correction of sampling point in HS200/SDR104 modes. However, on R-Car Gen3, this feature is not supported in HS400 mode. Auto and manual correction cannot both be used in HS400 mode. Therefore, in HS400 mode, disable auto correction and ignore the error status. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Peng Fan <peng.fan(a)nxp.com> --- drivers/mmc/renesas-sdhi.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 7c53aa221e..a36162fca6 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -265,7 +265,10 @@ static int renesas_sdhi_hs400(struct udevice *dev) tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_CKSEL); reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_RVSCNTL); - reg |= RENESAS_SDHI_SCC_RVSCNTL_RVSEN; + if (hs400) + reg &= ~RENESAS_SDHI_SCC_RVSCNTL_RVSEN; + else + reg |= RENESAS_SDHI_SCC_RVSCNTL_RVSEN; tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_RVSCNTL); /* Execute adjust hs400 offset after setting to HS400 mode */ @@ -288,10 +291,13 @@ static unsigned int renesas_sdhi_compare_scc_data(struct tmio_sd_priv *priv) return tmio_sd_readl(priv, RENESAS_SDHI_SCC_SMPCMP); } -static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv, +static int renesas_sdhi_select_tuning(struct udevice *dev, unsigned int tap_num, unsigned int taps, unsigned int smpcmp) { + struct tmio_sd_priv *priv = dev_get_priv(dev); + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); + struct mmc *mmc = upriv->mmc; unsigned long tap_cnt; /* counter of tuning success */ unsigned long tap_start;/* start position of tuning success */ unsigned long tap_end; /* end position of tuning success */ @@ -385,9 +391,12 @@ static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv, /* Set SCC */ tmio_sd_writel(priv, priv->tap_set, RENESAS_SDHI_SCC_TAPSET); - /* Enable auto re-tuning */ + /* Enable auto re-tuning in HS200/SDR104 modes */ reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_RVSCNTL); - reg |= RENESAS_SDHI_SCC_RVSCNTL_RVSEN; + if (mmc->selected_mode == MMC_HS_400) + reg &= ~RENESAS_SDHI_SCC_RVSCNTL_RVSEN; + else + reg |= RENESAS_SDHI_SCC_RVSCNTL_RVSEN; tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_RVSCNTL); return 0; @@ -447,7 +456,7 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode) mdelay(1); } - ret = renesas_sdhi_select_tuning(priv, tap_num, taps, smpcmp); + ret = renesas_sdhi_select_tuning(dev, tap_num, taps, smpcmp); out: if (ret < 0) { -- 2.20.1

1 1

[U-Boot] [PATCH] spl, Makefile: Take external offset into account for fit images
by Sjoerd Simons 18 Jun '19

18 Jun '19

When building a FIT image for SPL to load also take into account the configured external offset. This allows the SPL to load the u-boot FIT image correctly when configuring SECURE_BOOT on i.mx6 is enabled (with CONFIG_FIT_EXTERNAL_OFFSET=0x3000). Note this doesn't allow secure booting; but it does allow an unsigned SPL/u-boot with secure boot support eanbled to boot on open device. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index c55ffa265f..a8808aeefd 100644 --- a/Makefile +++ b/Makefile @@ -1240,6 +1240,7 @@ endif ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) else -- 2.20.1

2 2

[U-Boot] [PATCH v1] fs: do_load: pass device path for efi payload
by Mian Yousaf Kaukab 18 Jun '19

18 Jun '19

fatload command can be used to load the EFI payload since EFI system partition is always a FAT partition. Call into EFI code from do_load() to set the device path from which the last binary was loaded. An EFI application like grub2 can’t find its configuration file without the device path set. Since device path is now set in do_load() there is no need to set it in do_load_wrapper() for the load command. Signed-off-by: Mian Yousaf Kaukab <ykaukab(a)suse.de> --- Changes for v1: - Move efi_set_bootdev() call to do_load() - Rename patch from "cmd: fat: fatload: pass device path for efi payload" cmd/fs.c | 5 ----- fs/fs.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/fs.c b/cmd/fs.c index aaafbf9b52..db74767b7b 100644 --- a/cmd/fs.c +++ b/cmd/fs.c @@ -8,7 +8,6 @@ #include <common.h> #include <command.h> #include <fs.h> -#include <efi_loader.h> static int do_size_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -26,10 +25,6 @@ U_BOOT_CMD( static int do_load_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { -#ifdef CONFIG_CMD_BOOTEFI - efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", - (argc > 4) ? argv[4] : ""); -#endif return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY); } diff --git a/fs/fs.c b/fs/fs.c index 736ebef4a9..48d8f1f6da 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -17,6 +17,7 @@ #include <asm/io.h> #include <div64.h> #include <linux/math64.h> +#include <efi_loader.h> DECLARE_GLOBAL_DATA_PTR; @@ -700,6 +701,10 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], else pos = 0; +#ifdef CONFIG_CMD_BOOTEFI + efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", + (argc > 4) ? argv[4] : ""); +#endif time = get_timer(0); ret = _fs_read(filename, addr, pos, bytes, 1, &len_read); time = get_timer(time); -- 2.11.0

2 1

[U-Boot] Pull request: u-boot-spi/master
by Jagan Teki 18 Jun '19

18 Jun '19

Hi Tom, Please pull this PR. Summary: - Drop zipitz2 board (Tom) - Add DEPRECATED option (Tom) - Mark legacy or non-dm drivers as DEPRECATED (Jagan) thanks, Jagan. The following changes since commit 68b90e57bc034e237923b02acb633dc4e91d44cb: configs: tinker-rk3288 disable CONFIG_SPL_I2C_SUPPORT (2019-06-11 08:13:05 -0400) are available in the Git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 88369d33e322e0cdfbb1f0c33021ad424578619e: configs: Disable now unbuildable SPI options for boards (2019-06-13 12:51:06 +0530) ---------------------------------------------------------------- Jagan Teki (6): Makefile: Trigger a Warning if DEPRECATED is defined Makefile: Trigger a warning for legcay spi drivers spi: Kconfig: Mark MXS_SPI has DEPRECATED spi: Kconfig: Mark SH_SPI as DEPRECATED spi: Kconfig: Mark SOFT_SPI as DEPRECATED spi: Kconfig: Mark LPC32XX_SSP as DEPRECATED Tom Rini (4): arm: Remove zipitz2 board Kconfig: Add SPI / SPI_FLASH as dependencies Kconfig: Add DEPRECATED option configs: Disable now unbuildable SPI options for boards Kconfig | 7 + Makefile | 19 +-- arch/Kconfig | 2 + arch/arm/Kconfig | 5 - board/renesas/sh7752evb/sh7752evb.c | 4 + board/renesas/sh7753evb/sh7753evb.c | 4 + board/renesas/sh7757lcr/sh7757lcr.c | 9 ++ board/work-microwave/work_92105/Makefile | 3 +- board/work-microwave/work_92105/work_92105.c | 2 + board/zipitz2/Kconfig | 9 -- board/zipitz2/MAINTAINERS | 6 - board/zipitz2/Makefile | 8 - board/zipitz2/zipitz2.c | 219 --------------------------- cmd/Kconfig | 3 + configs/bg0900_defconfig | 9 -- configs/devkit3250_defconfig | 2 - configs/mx28evk_auart_console_defconfig | 9 -- configs/mx28evk_defconfig | 9 -- configs/mx28evk_nand_defconfig | 9 -- configs/mx28evk_spi_defconfig | 10 -- configs/sh7752evb_defconfig | 6 - configs/sh7753evb_defconfig | 6 - configs/sh7757lcr_defconfig | 5 - configs/work_92105_defconfig | 2 - configs/zipitz2_defconfig | 34 ----- drivers/spi/Kconfig | 4 + env/Kconfig | 2 +- include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/zipitz2.h | 186 ----------------------- 31 files changed, 46 insertions(+), 550 deletions(-) delete mode 100644 board/zipitz2/Kconfig delete mode 100644 board/zipitz2/MAINTAINERS delete mode 100644 board/zipitz2/Makefile delete mode 100644 board/zipitz2/zipitz2.c delete mode 100644 configs/zipitz2_defconfig delete mode 100644 include/configs/zipitz2.h

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 18 Jun '19

18 Jun '19

Assorted gadget fixes. The following changes since commit c2ea87883ef309570c8903e6de4b8b78685d73d0: Merge tag 'efi-2019-07-rc5' of git://git.denx.de/u-boot-efi (2019-06-12 07:15:38 -0400) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 220f655176de8e6aa4aaea91bb2182260d26c4a4: fastboot: Check if partition really exist in getvar_has_slot() (2019-06-14 12:39:54 +0200) ---------------------------------------------------------------- Igor Opaniuk (1): fastboot: Check if partition really exist in getvar_has_slot() Marek Vasut (1): spl: dfu: Fix printed variable name Sam Protsenko (3): fastboot: Fix slot names reported by getvar fastboot: Use const qualifier for char *part_name fastboot: getvar: Refactor fastboot_*_get_part_info() usage Sjoerd Simons (1): usb: gadget: error out if g_dnl registration fails cmd/usb_gadget_sdp.c | 11 ++++++++--- common/spl/spl_dfu.c | 2 +- common/spl/spl_sdp.c | 6 +++++- drivers/fastboot/fb_getvar.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------ drivers/fastboot/fb_mmc.c | 3 ++- drivers/fastboot/fb_nand.c | 4 ++-- include/fb_mmc.h | 3 ++- include/fb_nand.h | 4 ++-- 8 files changed, 101 insertions(+), 35 deletions(-)

4 8

[U-Boot] [PATCH 2/4 v2] doc: bindings: Add description for MDIO MUX dts nodes
by Alex Marginean 18 Jun '19

18 Jun '19

Adds a short bindings document describing the expected structure of a MDIO MUX dts node. This is based on Linux binding and the example is in fact copied from there. Signed-off-by: Alex Marginean <alexm.osslist(a)gmail.com> --- Changes in v2: - no change doc/device-tree-bindings/net/mdio-mux.txt | 61 +++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 doc/device-tree-bindings/net/mdio-mux.txt diff --git a/doc/device-tree-bindings/net/mdio-mux.txt b/doc/device-tree-bindings/net/mdio-mux.txt new file mode 100644 index 0000000000..fdf817fd93 --- /dev/null +++ b/doc/device-tree-bindings/net/mdio-mux.txt @@ -0,0 +1,61 @@ +The expected structure of an MDIO MUX device tree node is described here. This +is heavily based on current Linux specification. +The MDIO buses downstream of the MUX should be described in the device tree as +child nodes as indicated below. + +Required properties: +mdio-parent-bus = a phandle to the MDIO bus used to perform actual I/O. This is + typically a real MDIO device, unless there are cascaded MUXes. +#address-cells = <1>, each MDIO group is identified by one 32b value. +#size-cells = <0> + +Other properties: +The properties described here are sufficient for MDIO MUX DM class code, but +MUX drivers may define additional properties, either required or optional. + +Required properties in child nodes: +reg = value to be configured on the MUX to select the respective downstream + MDIO. + +Child nodes should normally contain PHY nodes, referenced by phandle from +ethernet nodes of the eth interfaces using these PHYs. + +Example structure, extracted from Linux bindings document: + + /* The parent MDIO bus. */ + smi1: mdio@1180000001900 { + compatible = "cavium,octeon-3860-mdio"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x11800 0x00001900 0x0 0x40>; + }; + + /* + An NXP sn74cbtlv3253 dual 1-of-4 switch controlled by a + pair of GPIO lines. Child busses 2 and 3 populated with 4 + PHYs each. + */ + mdio-mux { + compatible = "mdio-mux-gpio"; + gpios = <&gpio1 3 0>, <&gpio1 4 0>; + mdio-parent-bus = <&smi1>; + #address-cells = <1>; + #size-cells = <0>; + + mdio@2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + + phy11: ethernet-phy@1 { + reg = <1>; + marvell,reg-init = <3 0x10 0 0x5777>, + <3 0x11 0 0x00aa>, + <3 0x12 0 0x4105>, + <3 0x13 0 0x0a60>; + interrupt-parent = <&gpio>; + interrupts = <10 8>; /* Pin 10, active low */ + }; + }; + }; + -- 2.17.1

2 1