March 2021 - U-Boot

[GIT PULL] SoCFPGA changes for v2021.04-rc4
by Tan, Ley Foon 08 Mar '21

08 Mar '21

Hi Tom Please pull these changes for v2021.04-rc4. Thanks. Regards Ley Foon The following changes since commit e4dba4ba6f61e8128be0b4200ca2d8cebf62180b: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2021-03-06 07:25:04 -0500) are available in the Git repository at: https://github.com/lftan/u-boot.git v2021.04-rc4 for you to fetch changes up to 9773ebcfbca23c7d6fe1dc202913b005bc23cc89: Makefile: socfpga: Add target to generate hex output for combined spl and dtb (2021-03-08 10:59:12 +0800) ---------------------------------------------------------------- Dalon Westergreen (1): Makefile: socfpga: Add target to generate hex output for combined spl and dtb Siew Chin Lim (6): arm: socfpga: Move Stratix10 and Agilex to use TARGET_SOCFPGA_SOC64 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB) arm: socfpga: cmd: Support 'vab' command arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support configs: socfpga: soc64: Move CONFIG_BOOTCOMMAND to defconfig configs: socfpga: Add defconfig for Agilex with VAB support Makefile | 11 +- arch/arm/Kconfig | 6 +- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 +++ arch/arm/mach-socfpga/Kconfig | 20 +++ arch/arm/mach-socfpga/Makefile | 3 + arch/arm/mach-socfpga/board.c | 45 ++++- arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/reset_manager.h | 3 +- arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 +++++++ .../arm/mach-socfpga/include/mach/system_manager.h | 3 +- arch/arm/mach-socfpga/secure_vab.c | 186 +++++++++++++++++++++ arch/arm/mach-socfpga/vab.c | 34 ++++ common/Kconfig.boot | 2 +- configs/socfpga_agilex_atf_defconfig | 2 + configs/socfpga_agilex_defconfig | 2 + configs/socfpga_agilex_vab_defconfig | 75 +++++++++ configs/socfpga_stratix10_atf_defconfig | 2 + configs/socfpga_stratix10_defconfig | 2 + drivers/ddr/altera/Kconfig | 6 +- drivers/fpga/Kconfig | 2 +- drivers/sysreset/Kconfig | 2 +- include/configs/socfpga_soc64_common.h | 10 +- scripts/Makefile.spl | 7 + 23 files changed, 479 insertions(+), 30 deletions(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.c create mode 100644 arch/arm/mach-socfpga/vab.c create mode 100644 configs/socfpga_agilex_vab_defconfig

2 1

[PATCH] mmc: kconfig: Add CONFIG_SPL_MMC_VERBOSE
by Klaus Heinrich Kiwi 08 Mar '21

08 Mar '21

When building the SPL with MMC config and CONFIG_LOGLEVEL > 7, the function mmc_select_mode() at drivers/mmc/mmc.c will call mmc_mode_name() which is only defined if CONFIG_IS_ENABLED(MMC_VERBOSE) which doesn't have a corresponding CONFIG_SPL_MMC_VERBOSE defined in Kconfig. Fixes this build error: arm-linux-gnueabi-ld.bfd: drivers/built-in.o: in function `mmc_select_mode': /drivers/mmc/mmc.c:192: undefined reference to `mmc_mode_name' make[1]: *** [scripts/Makefile.spl:432: spl/u-boot-spl] Error 1 make: *** [Makefile:1942: spl/u-boot-spl] Error 2 Signed-off-by: Klaus Heinrich Kiwi <klaus(a)linux.vnet.ibm.com> --- common/spl/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 774541c02b..2b36c86e0f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -697,6 +697,13 @@ config SPL_MMC_SUPPORT this option to build the drivers in drivers/mmc as part of an SPL build. +config SPL_MMC_VERBOSE + bool "Output mode information about the MMC" + depends on SPL_MMC_SUPPORT + help + Enable the output of more information about the card such as the + operating mode. + config SYS_MMCSD_FS_BOOT_PARTITION int "MMC Boot Partition" default 1 -- 2.25.1

1 0

RE: [PATCH 3/4] arch: Kconfig: enable IRQ using select for x86 architecture
by Z.q. Hou 08 Mar '21

08 Mar '21

On Tue, 12 Jan 2021 at 02:05, Wasim Khan <wasim.khan(a)oss.nxp.com> wrote: > > From: Wasim Khan <wasim.khan(a)nxp.com> > > use 'select' to enable IRQ as it does not have architecture specific > dependency. > > Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> > --- > arch/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com>

1 0

RE: [PATCH 2/4] arch: arm: update Kconfig to select IRQ when GIC_V3_ITS is enabled
by Z.q. Hou 08 Mar '21

08 Mar '21

On Tue, Jan 12, 2021 at 10:05:07AM +0100, Wasim Khan wrote: > From: Wasim Khan <wasim.khan(a)nxp.com> > > GIC_V3_ITS uses UCLASS_IRQ driver. Update Kconfig to select IRQ when > GIC_V3_ITS is enabled. > > Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> > --- Reviewed-by: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com>

1 0

RE: [PATCH 1/4] misc: make CONFIG_IRQ selectable for all platforms
by Z.q. Hou 08 Mar '21

08 Mar '21

On Tue, Jan 12, 2021 at 10:05:06AM +0100, Wasim Khan wrote: > From: Wasim Khan <wasim.khan(a)nxp.com> > > UCLASS_IRQ driver is not Intel specific. Make CONFIG_IRQ selectable > for all platfroms. > > Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> > --- s/platfroms/platforms/ Regards, Zhiqiang

1 0

Pull request for efi-2021-04-rc3-3
by Heinrich Schuchardt 08 Mar '21

08 Mar '21

Dear Tom, The following changes since commit e4dba4ba6f61e8128be0b4200ca2d8cebf62180b: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2021-03-06 07:25:04 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-04-rc3-3 for you to fetch changes up to 7d3eff3412886f277c724a9effcbe545c4cdd5b5: efi_loader: correct uboot_bin_env.its file format (2021-03-07 17:37:26 +0100) Gitlab CI showed no problems: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/6683 ---------------------------------------------------------------- Pull request for efi-2021-04-rc3-3 New: * Provide library functions for converting UTF-8 streams either to code page 437 or Unicode code points. Bug fixes: * Fix the capsule update unit tests. * Use the terminal size of the video console if it is the primary output. ---------------------------------------------------------------- Heinrich Schuchardt (6): efi_loader: console size of vidconsole efi_loader: move codepage 437 table efi_loader: carve out utf_to_cp() lib/charset: utf8_get() should return error lib/charset: UTF-8 stream conversion efi_loader: correct uboot_bin_env.its file format include/charset.h | 34 +++++++ lib/charset.c | 96 +++++++++++++++++-- lib/efi_loader/efi_console.c | 2 +- lib/efi_loader/efi_unicode_collation.c | 21 +---- test/py/tests/test_efi_capsule/uboot_bin_env.its | 4 +- test/unicode_ut.c | 114 +++++++++++++++++++++++ 6 files changed, 242 insertions(+), 29 deletions(-)

2 1

Habv4 on imx8m
by Stefano Babic 08 Mar '21

08 Mar '21

Hi Peng, Fabio, I accidental saw this code: arch/arm/mach-imx/imx8m/soc.c:#if defined(CONFIG_IMX_HAB) but then arch/arm/mach-imx/Kconfig : config IMX_HAB bool "Support i.MX HAB features" depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 this does not match. As I understand from manual, Habv4 is the same as in mx6. Should we simply enable HAB for imx8m, too ? Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

4 8

[PATCH] button: adc: fix treshold typo
by Neil Armstrong 08 Mar '21

08 Mar '21

Fix the treshold typo in code by threshold. Fixes: c0165c85c3 ("button: add a simple Analog to Digital Converter device based button driver") Suggested-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> --- drivers/button/button-adc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/button/button-adc.c b/drivers/button/button-adc.c index eed86564fb..fd896c76f9 100644 --- a/drivers/button/button-adc.c +++ b/drivers/button/button-adc.c @@ -55,7 +55,7 @@ static int button_adc_of_to_plat(struct udevice *dev) struct button_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct button_adc_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args args; - u32 treshold, up_treshold, t; + u32 threshold, up_threshold, t; ofnode node; int ret; @@ -73,12 +73,12 @@ static int button_adc_of_to_plat(struct udevice *dev) return ret; ret = ofnode_read_u32(dev_ofnode(dev->parent), - "keyup-threshold-microvolt", &up_treshold); + "keyup-threshold-microvolt", &up_threshold); if (ret) return ret; ret = ofnode_read_u32(dev_ofnode(dev), "press-threshold-microvolt", - &treshold); + &threshold); if (ret) return ret; @@ -87,13 +87,13 @@ static int button_adc_of_to_plat(struct udevice *dev) if (ret) return ret; - if (t > treshold) - up_treshold = t; + if (t > threshold) + up_threshold = t; } priv->channel = args.args[0]; - priv->min = treshold; - priv->max = up_treshold; + priv->min = threshold; + priv->max = up_threshold; return ret; } -- 2.25.1

2 2

[RFC/RFT 0/7] arm: meson: static ethernet init cleanup
by Neil Armstrong 08 Mar '21

08 Mar '21

This serie finally removes the static ethernet link setup, MDIO mux & memory power domain after introduction of : - "net: add MMIO Register MDIO MUX driver" at [1] - "net: designware: add DM_MDIO support" at [2] - "net: add Amlogic Meson G12A MDIO MUX driver" at [3] - "net: designware: add Amlogic Meson8b & later glue driver" at [4] These patches makes all this happen automagically thanks to DM_MDIO introduced last year. This has been tested on libretech-ac and Khadas VIM3 to check to most opposite setups, but the GXBB boards hasn't been tested. Note, you'll need [1], [2], [3], [4] applied before these patches [1] https://patchwork.ozlabs.org/project/uboot/patch/20210224140223.2617536-1-n… [2] https://patchwork.ozlabs.org/project/uboot/patch/20210224140239.2617642-1-n… [3] https://patchwork.ozlabs.org/project/uboot/patch/20210224163153.2678768-1-n… [4] https://patchwork.ozlabs.org/project/uboot/patch/20210224193356.2948805-1-n… Neil Armstrong (7): configs: update Amlogic Meson GXL & GXM config for MDIO MUX configs: update Amlogic Meson G12A, G12B & SM1 configs for MDIO MUX arm: meson: remove static MDIO mux handling configs: meson: use Designware glue driver for Amlogic Meson8b & later SoCs net: designware: remove amlogic compatibles arm: meson: remove static ethernet memory power domain enable arm: meson: remove static ethernet link setup arch/arm/include/asm/arch-meson/axg.h | 22 ------- arch/arm/include/asm/arch-meson/eth.h | 12 ---- arch/arm/include/asm/arch-meson/g12a.h | 35 ----------- arch/arm/include/asm/arch-meson/gx.h | 20 ------ arch/arm/mach-meson/board-axg.c | 34 ----------- arch/arm/mach-meson/board-g12a.c | 67 --------------------- arch/arm/mach-meson/board-gx.c | 48 --------------- board/amlogic/beelink-s922x/beelink-s922x.c | 2 - board/amlogic/odroid-n2/odroid-n2.c | 2 - board/amlogic/p200/p200.c | 2 - board/amlogic/p201/p201.c | 2 - board/amlogic/p212/p212.c | 3 - board/amlogic/q200/q200.c | 2 - board/amlogic/s400/s400.c | 2 - board/amlogic/sei510/sei510.c | 3 - board/amlogic/sei610/sei610.c | 3 - board/amlogic/u200/u200.c | 3 +- board/amlogic/vim3/vim3.c | 2 - board/amlogic/w400/w400.c | 2 +- configs/beelink-gtking_defconfig | 5 +- configs/beelink-gtkingpro_defconfig | 5 +- configs/khadas-vim2_defconfig | 5 +- configs/khadas-vim3_defconfig | 5 +- configs/khadas-vim3l_defconfig | 5 +- configs/khadas-vim_defconfig | 7 ++- configs/libretech-ac_defconfig | 7 ++- configs/libretech-cc_defconfig | 7 ++- configs/libretech-cc_v2_defconfig | 7 ++- configs/libretech-s905d-pc_defconfig | 5 +- configs/libretech-s912-pc_defconfig | 5 +- configs/nanopi-k2_defconfig | 2 +- configs/odroid-c2_defconfig | 2 +- configs/odroid-c4_defconfig | 5 +- configs/odroid-n2_defconfig | 5 +- configs/p200_defconfig | 2 +- configs/p201_defconfig | 2 +- configs/p212_defconfig | 7 ++- configs/s400_defconfig | 2 +- configs/sei510_defconfig | 7 ++- configs/sei610_defconfig | 7 ++- configs/u200_defconfig | 7 ++- configs/wetek-core2_defconfig | 5 +- drivers/net/designware.c | 3 - 43 files changed, 79 insertions(+), 306 deletions(-) -- 2.25.1

1 8

[PATCH] net: add MMIO Register MDIO MUX driver
by Neil Armstrong 08 Mar '21

08 Mar '21

Add support for MMIO register MDIO muxes based on the Linux mdio-mux-mmioreg driver. Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> --- drivers/net/Kconfig | 7 ++ drivers/net/Makefile | 1 + drivers/net/mdio_mux_mmioreg.c | 129 +++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 drivers/net/mdio_mux_mmioreg.c diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0e84c22b50..41fa2fe566 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -790,4 +790,11 @@ config FSL_LS_MDIO This driver supports the MDIO bus found on the Fman 10G Ethernet MACs and on the mEMAC (which supports both Clauses 22 and 45). +config MDIO_MUX_MMIOREG + bool "MDIO MUX accessed as a MMIO register access" + depends on DM_MDIO_MUX + help + This driver is used for MDIO muxes driven by writing to a register in + the MMIO physical memory. + endif # NETDEVICES diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a19511aaa7..511c87c3a5 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_MACB) += macb.o obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o obj-$(CONFIG_MDIO_MUX_I2CREG) += mdio_mux_i2creg.o +obj-$(CONFIG_MDIO_MUX_MMIOREG) += mdio_mux_mmioreg.o obj-$(CONFIG_MDIO_MUX_SANDBOX) += mdio_mux_sandbox.o obj-$(CONFIG_MPC8XX_FEC) += mpc8xx_fec.o obj-$(CONFIG_MT7620_ETH) += mt7620-eth.o diff --git a/drivers/net/mdio_mux_mmioreg.c b/drivers/net/mdio_mux_mmioreg.c new file mode 100644 index 0000000000..e1a23e40a2 --- /dev/null +++ b/drivers/net/mdio_mux_mmioreg.c @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2021 BayLibre, SAS + * Author: Neil Armstrong <narmstrong(a)baylibre.com> + * + * Based on linux/drivers/net/phy/mdio-mux-mmioreg.c : + * Copyright 2012 Freescale Semiconductor, Inc. + */ + +#include <dm.h> +#include <errno.h> +#include <log.h> +#include <miiphy.h> +#include <linux/io.h> + +struct mdio_mux_mmioreg_priv { + struct udevice *chip; + phys_addr_t phys; + unsigned int iosize; + unsigned int mask; +}; + +static int mdio_mux_mmioreg_select(struct udevice *mux, int cur, int sel) +{ + struct mdio_mux_mmioreg_priv *priv = dev_get_priv(mux); + + debug("%s: %x -> %x\n", __func__, (u32)cur, (u32)sel); + + /* if last selection didn't change we're good to go */ + if (cur == sel) + return 0; + + switch (priv->iosize) { + case sizeof(u8): { + u8 x, y; + + x = ioread8((void *)priv->phys); + y = (x & ~priv->mask) | (u32)sel; + if (x != y) { + iowrite8((x & ~priv->mask) | sel, (void *)priv->phys); + debug("%s: %02x -> %02x\n", __func__, x, y); + } + + break; + } + case sizeof(u16): { + u16 x, y; + + x = ioread16((void *)priv->phys); + y = (x & ~priv->mask) | (u32)sel; + if (x != y) { + iowrite16((x & ~priv->mask) | sel, (void *)priv->phys); + debug("%s: %04x -> %04x\n", __func__, x, y); + } + + break; + } + case sizeof(u32): { + u32 x, y; + + x = ioread32((void *)priv->phys); + y = (x & ~priv->mask) | (u32)sel; + if (x != y) { + iowrite32((x & ~priv->mask) | sel, (void *)priv->phys); + debug("%s: %08x -> %08x\n", __func__, x, y); + } + + break; + } + } + + return 0; +} + +static const struct mdio_mux_ops mdio_mux_mmioreg_ops = { + .select = mdio_mux_mmioreg_select, +}; + +static int mdio_mux_mmioreg_probe(struct udevice *dev) +{ + struct mdio_mux_mmioreg_priv *priv = dev_get_priv(dev); + phys_addr_t reg_base, reg_size; + u32 reg_mask; + int err; + + reg_base = ofnode_get_addr_size_index(dev_ofnode(dev), 0, &reg_size); + if (reg_base == FDT_ADDR_T_NONE) + return -EINVAL; + + if (reg_size != sizeof(u8) && + reg_size != sizeof(u16) && + reg_size != sizeof(u32)) { + printf("%s: only 8/16/32-bit registers are supported\n", __func__); + return -EINVAL; + } + + err = dev_read_u32(dev, "mux-mask", &reg_mask); + if (err) { + debug("%s: error reading mux-mask property\n", __func__); + return err; + } + + if (reg_mask >= BIT(reg_size * 8)) { + printf("%s: mask doesn't fix in register width\n", __func__); + return -EINVAL; + } + + priv->phys = reg_base; + priv->iosize = reg_size; + priv->mask = reg_mask; + + debug("%s: %llx@%lld / %x\n", __func__, reg_base, reg_size, reg_mask); + + return 0; +} + +static const struct udevice_id mdio_mux_mmioreg_ids[] = { + { .compatible = "mdio-mux-mmioreg" }, + { } +}; + +U_BOOT_DRIVER(mdio_mux_mmioreg) = { + .name = "mdio_mux_mmioreg", + .id = UCLASS_MDIO_MUX, + .of_match = mdio_mux_mmioreg_ids, + .probe = mdio_mux_mmioreg_probe, + .ops = &mdio_mux_mmioreg_ops, + .priv_auto = sizeof(struct mdio_mux_mmioreg_priv), +}; -- 2.25.1

2 2