June 2020 - U-Boot

[PATCH 0/5] Fixes for running U-boot under QEMU/KVM
by Ard Biesheuvel 08 Jun '20

08 Jun '20

This series fixes a number of issues that exist in the QEMU/mach-virt port of u-boot, and that prevent it from executing correctly under virtualization (as opposed to TCG emulation) As the Linux EFI subsystem maintainer, I am looking to increase test coverage for the EFI related changes that are under development for Linux, and one of the things I plan to do is start using U-boot as test firmware for boot testing. This can be done under TCG emulation, but given how loosely TCG implements the architecture, it is better to test under virtualization as well. With these changes applied, u-boot can boot Linux in EFI mode under KVM. Cc: Tom Rini <trini(a)konsulko.com> Cc: Sughosh Ganu <sughosh.ganu(a)linaro.org> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Ard Biesheuvel (5): arm: enable allocate-on-read for LPAE's DCACHE_WRITEBACK arm: qemu: enable LPAE on 32-bit arm: qemu: implement enable_caches() arm: qemu: disable the EFI workaround for older GRUB arm: qemu: override flash accessors to use virtualizable instructions arch/arm/include/asm/system.h | 2 +- board/emulation/qemu-arm/qemu-arm.c | 62 ++++++++++++++++++++ configs/qemu_arm_defconfig | 2 + include/configs/qemu-arm.h | 1 + 4 files changed, 66 insertions(+), 1 deletion(-) -- 2.26.2

3 18

Pull request for UEFI sub-system for efi-2020-07-rc4 (2)
by Heinrich Schuchardt 08 Jun '20

08 Jun '20

The following changes since commit 88bd5b1793600b0f5f25c3d236b4d049fb986140: configs: Resync with savedefconfig (2020-06-04 19:29:09 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2020-07-rc4-2 for you to fetch changes up to 325567d3c59fba32bdbf33a8ec981a8ccb096780: efi_loader: comments EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL (2020-06-05 04:04:41 +0200) ---------------------------------------------------------------- Pull request for UEFI sub-system for efi-2020-07-rc4 (2) The following problems are resolved: * When booting via UEFI an SMBIOS table is presented to the operating system. If U-Boot tries to add an empty string, this results in corrupted SMBIOS information. We will now use "Unknown" as property value. * The EFI_RNG_PROTOCOL uses the DM_RNG drivers. For the virtio RNG driver the missing DM_RNG Kconfig dependency is added. * Missing function descriptions for the EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL are added. Testing on Gitlab CI and Travis CI showed no problems: https://travis-ci.org/github/xypron2/u-boot/builds/694876302 https://gitlab.denx.de/u-boot/custodians/u-boot-efi/pipelines/3545 ---------------------------------------------------------------- Heinrich Schuchardt (3): smbios: empty strings in smbios_add_string() virtio: VIRTIO_RNG depends on DM_RNG efi_loader: comments EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL drivers/virtio/Kconfig | 12 +++-- lib/efi_loader/efi_console.c | 124 +++++++++++++++++++++++++++++++++++++++---- lib/smbios.c | 2 + 3 files changed, 124 insertions(+), 14 deletions(-)

2 1

[PATCH 1/1] arm: sunxi: increase SYS_MALLOC_F_LEN
by Heinrich Schuchardt 08 Jun '20

08 Jun '20

The current default of 0x400 for SYS_MALLOC_F_LEN is too small if any additional drivers marked as DM_FLAG_PRE_RELOC are loaded before relocation. CONFIG_RSA=y which is needed for UEFI secure boot or for FIT image verification loads the driver mod_exp_sw which has DM_FLAG_PRE_RELOC. CONFIG_LOG=Y is another setting requiring additional early malloc area, cf. log_init(). When running pine64-lts_defconfig with CONFIG_RSA=y and debug UART enabled we see as output in main U-Boot alloc_simple() alloc space exhausted With this patch the default values of SYS_MALLOC_F_LEN and SPL_SYS_MALLOC_F_LEN on ARCH_SUNXI are raised to 0x2000. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 0e7ccc0b07..13204e2384 100644 --- a/Kconfig +++ b/Kconfig @@ -146,7 +146,7 @@ config SYS_MALLOC_F_LEN default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \ - ARCH_LS1046A) + ARCH_LS1046A || ARCH_SUNXI) default 0x400 help Before relocation, memory is very limited on many platforms. Still, -- 2.20.1

3 3

[PATCH 1/3] Watchdog: introduce ARM SBSA watchdog driver
by Biwen Li 08 Jun '20

08 Jun '20

From: Zhao Qiang <qiang.zhao(a)nxp.com> According to Server Base System Architecture (SBSA) specification, the SBSA Generic Watchdog has two stage timeouts: the first signal (WS0) is for alerting the system by interrupt, the second one (WS1) is a real hardware reset. More details about the hardware specification of this device: ARM DEN0029B - Server Base System Architecture (SBSA) This driver can operate ARM SBSA Generic Watchdog as a single stage In the single stage mode, when the timeout is reached, your system will be reset by WS1. The first signal (WS0) is ignored. Signed-off-by: Zhao Qiang <qiang.zhao(a)nxp.com> --- MAINTAINERS | 1 + drivers/watchdog/Kconfig | 6 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sbsa_gwdt.c | 131 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 drivers/watchdog/sbsa_gwdt.c diff --git a/MAINTAINERS b/MAINTAINERS index 1fd975c..09554c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -685,6 +685,7 @@ M: Priyanka Jain <priyanka.jain(a)nxp.com> S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git F: drivers/watchdog/sp805_wdt.c +F: drivers/watchdog/sbsa_gwdt.c I2C M: Heiko Schocher <hs(a)denx.de> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index bf06180..191891c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -163,6 +163,12 @@ config WDT_SANDBOX can be probed and supports all of the methods of WDT, but does not really do anything. +config WDT_SBSA + bool "SBSA watchdog timer support" + depends on WDT + help + Select this to enable SBSA watchdog timer. + config WDT_SP805 bool "SP805 watchdog timer support" depends on WDT diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 519bbd3..0f0b2eb 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o obj-$(CONFIG_WDT_MTK) += mtk_wdt.o obj-$(CONFIG_WDT_OMAP3) += omap_wdt.o +obj-$(CONFIG_WDT_SBSA) += sbsa_gwdt.o obj-$(CONFIG_WDT_SP805) += sp805_wdt.o obj-$(CONFIG_WDT_STM32MP) += stm32mp_wdt.o obj-$(CONFIG_WDT_TANGIER) += tangier_wdt.o diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c new file mode 100644 index 0000000..99acb89 --- /dev/null +++ b/drivers/watchdog/sbsa_gwdt.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Watchdog driver for SBSA + * + * Copyright 2019 NXP + */ + +#include <asm/io.h> +#include <common.h> +#include <dm/device.h> +#include <dm/fdtaddr.h> +#include <dm/read.h> +#include <linux/bitops.h> +#include <watchdog.h> +#include <wdt.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* SBSA Generic Watchdog register definitions */ +/* refresh frame */ +#define SBSA_GWDT_WRR 0x000 + +/* control frame */ +#define SBSA_GWDT_WCS 0x000 +#define SBSA_GWDT_WOR 0x008 +#define SBSA_GWDT_WCV 0x010 + +/* refresh/control frame */ +#define SBSA_GWDT_W_IIDR 0xfcc +#define SBSA_GWDT_IDR 0xfd0 + +/* Watchdog Control and Status Register */ +#define SBSA_GWDT_WCS_EN BIT(0) +#define SBSA_GWDT_WCS_WS0 BIT(1) +#define SBSA_GWDT_WCS_WS1 BIT(2) + +struct sbsa_gwdt_priv { + void __iomem *reg_refresh; + void __iomem *reg_control; +}; + +static int sbsa_gwdt_reset(struct udevice *dev) +{ + struct sbsa_gwdt_priv *priv = dev_get_priv(dev); + + writel(0, priv->reg_refresh + SBSA_GWDT_WRR); + + return 0; +} + +static int sbsa_gwdt_start(struct udevice *dev, u64 timeout, ulong flags) +{ + u32 clk; + u32 load_value; + + struct sbsa_gwdt_priv *priv = dev_get_priv(dev); + /* + * it work in the single stage mode in u-boot, + * The first signal (WS0) is ignored, + * the timeout is (WOR * 2), so the WOR should be configured + * to half value of timeout. + */ + clk = get_tbclk(); + writel(clk / 2 * timeout, + priv->reg_control + SBSA_GWDT_WOR); + + /* writing WCS will cause an explicit watchdog refresh */ + writel(SBSA_GWDT_WCS_EN, priv->reg_control + SBSA_GWDT_WCS); + + return 0; +} + +static int sbsa_gwdt_stop(struct udevice *dev) +{ + struct sbsa_gwdt_priv *priv = dev_get_priv(dev); + + writel(0, priv->reg_control + SBSA_GWDT_WCS); + + return 0; +} + +static int sbsa_gwdt_expire_now(struct udevice *dev, ulong flags) +{ + sbsa_gwdt_start(dev, 0, flags); + + return 0; +} + +static int sbsa_gwdt_probe(struct udevice *dev) +{ + debug("%s: Probing wdt%u (sbsa-gwdt)\n", __func__, dev->seq); + + return 0; +} + +static int sbsa_gwdt_ofdata_to_platdata(struct udevice *dev) +{ + struct sbsa_gwdt_priv *priv = dev_get_priv(dev); + + priv->reg_control = (void __iomem *)dev_read_addr_index(dev, 0); + if (IS_ERR(priv->reg_control)) + return PTR_ERR(priv->reg_control); + + priv->reg_refresh = (void __iomem *)dev_read_addr_index(dev, 1); + if (IS_ERR(priv->reg_refresh)) + return PTR_ERR(priv->reg_refresh); + + return 0; +} + +static const struct wdt_ops sbsa_gwdt_ops = { + .start = sbsa_gwdt_start, + .reset = sbsa_gwdt_reset, + .stop = sbsa_gwdt_stop, + .expire_now = sbsa_gwdt_expire_now, +}; + +static const struct udevice_id sbsa_gwdt_ids[] = { + { .compatible = "arm,sbsa-gwdt" }, + {} +}; + +U_BOOT_DRIVER(sbsa_gwdt) = { + .name = "sbsa_gwdt", + .id = UCLASS_WDT, + .of_match = sbsa_gwdt_ids, + .probe = sbsa_gwdt_probe, + .priv_auto_alloc_size = sizeof(struct sbsa_gwdt_priv), + .ofdata_to_platdata = sbsa_gwdt_ofdata_to_platdata, + .ops = &sbsa_gwdt_ops, +}; -- 2.7.4

1 2

[PATCH] drivers: net: qe: deselect QE when DM_ETH is enabled
by Madalin Bucur 08 Jun '20

08 Jun '20

A compilation error appears when QE is compiled with DM_ETH enabled: drivers/qe/uec.c: In function 'init_phy': drivers/qe/uec.c:425:28: error: dereferencing pointer to incomplete type 'struct eth_device' uec = (uec_private_t *)dev->priv; ^~ drivers/qe/uec.c: In function 'uec_initialize': drivers/qe/uec.c:1357:43: error: invalid application of 'sizeof' to incomplete type 'struct eth_device' dev = (struct eth_device *)malloc(sizeof(struct eth_device)); ^~~~~~ The patch disables CONFIG_QE when CONFIG_DM_ETH is set. Signed-off-by: Madalin Bucur <madalin.bucur(a)oss.nxp.com> --- drivers/qe/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig index 864b36b..44c9f01 100644 --- a/drivers/qe/Kconfig +++ b/drivers/qe/Kconfig @@ -3,7 +3,7 @@ # config QE bool "Enable support for QUICC Engine" - depends on PPC + depends on PPC && !DM_ETH default y if ARCH_T1040 || ARCH_T1042 || ARCH_T1024 || ARCH_P1021 \ || ARCH_P1025 help -- 2.1.0

2 1

[PATCH] powerpc: mpc85xx: fix unused variable warning
by Madalin Bucur 08 Jun '20

08 Jun '20

Fix unused variable warning when CONFIG_QE is not set. Signed-off-by: Madalin Bucur <madalin.bucur(a)oss.nxp.com> --- arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 52fa458..f716a9d 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -1028,13 +1028,13 @@ void arch_preboot_os(void) void cpu_secondary_init_r(void) { +#ifdef CONFIG_QE #ifdef CONFIG_U_QE uint qe_base = CONFIG_SYS_IMMR + 0x00140000; /* QE immr base */ -#elif defined CONFIG_QE +#else uint qe_base = CONFIG_SYS_IMMR + 0x00080000; /* QE immr base */ #endif -#ifdef CONFIG_QE qe_init(qe_base); qe_reset(); #endif -- 2.1.0

2 1

[PATCH] powerpc/mpc85xx: Fix compiling error with DM_GPIO
by Madalin Bucur 08 Jun '20

08 Jun '20

P4080DS compilation fails with DM_GPIO enabled: drivers/gpio/gpio-uclass.c:355:5: error: redefinition of 'gpio_request' int gpio_request(unsigned gpio, const char *label) ^~~~~~~~~~~~ In file included from ./arch/powerpc/include/asm/arch/gpio.h:17:0, from ./arch/powerpc/include/asm/gpio.h:1, from drivers/gpio/gpio-uclass.c:16: ./arch/powerpc/include/asm/mpc85xx_gpio.h:68:19: note: previous definition of 'gpio_request' was here static inline int gpio_request(unsigned gpio, const char *label) ^~~~~~~~~~~~ Signed-off-by: Madalin Bucur <madalin.bucur(a)oss.nxp.com> --- arch/powerpc/include/asm/mpc85xx_gpio.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h index 1b332f0..feebe15 100644 --- a/arch/powerpc/include/asm/mpc85xx_gpio.h +++ b/arch/powerpc/include/asm/mpc85xx_gpio.h @@ -6,6 +6,7 @@ #ifndef POWERPC_ASM_MPC85XX_GPIO_H_ #define POWERPC_ASM_MPC85XX_GPIO_H_ +#ifndef CONFIG_DM_GPIO # include <asm/immap_85xx.h> /* @@ -110,5 +111,5 @@ static inline int gpio_is_valid(int gpio) { return (gpio >= 0) && (gpio < 32); } - +#endif /* not CONFIG_DM_GPIO */ #endif /* not POWERPC_ASM_MPC85XX_GPIO_H_ */ -- 2.1.0

2 1

[PATCH] drivers: net: e1000: with DM_ETH needs DM_PCI too
by Madalin Bucur 08 Jun '20

08 Jun '20

Compilation error occur when DM_ETH is enabled without DM_PCI. Signed-off-by: Madalin Bucur <madalin.bucur(a)oss.nxp.com> --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 4d1013c..4313d04 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -156,6 +156,7 @@ config DWC_ETH_QOS config E1000 bool "Intel PRO/1000 Gigabit Ethernet support" + depends on (DM_ETH && DM_PCI) || !DM_ETH help This driver supports Intel(R) PRO/1000 gigabit ethernet family of adapters. For more information on how to identify your adapter, go -- 2.1.0

2 1

[PATCHv2 0/3] net: tsec: Fix issues of DM driver
by Zhiqiang Hou 08 Jun '20

08 Jun '20

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> This patch set is to fix some issues of eTSEC DM driver. Hou Zhiqiang (3): doc: dt-bindings: tsec: Correct the Ethernet port compatible string net: tsec: Access eTSEC registers using virtual address net: tsec: Access TBI PHY through the corresponding MII doc/device-tree-bindings/net/fsl-tsec-phy.txt | 4 +-- drivers/net/tsec.c | 32 ++++++++++++++++--- 2 files changed, 29 insertions(+), 7 deletions(-) -- 2.17.1

4 6

[PATCH 1/1] mtd: cfi_flash: use __raw_writeq(), __raw_readq()
by Heinrich Schuchardt 08 Jun '20

08 Jun '20

Functions __raw_writeq(), __raw_readq() are available for all architectures. So let's use them. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/mtd/cfi_flash.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index b7289ba539..e31e07ca80 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -155,8 +155,7 @@ __maybe_weak void flash_write32(u32 value, void *addr) __maybe_weak void flash_write64(u64 value, void *addr) { - /* No architectures currently implement __raw_writeq() */ - *(volatile u64 *)addr = value; + __raw_writeq(value, addr); } __maybe_weak u8 flash_read8(void *addr) @@ -176,8 +175,7 @@ __maybe_weak u32 flash_read32(void *addr) __maybe_weak u64 flash_read64(void *addr) { - /* No architectures currently implement __raw_readq() */ - return *(volatile u64 *)addr; + return __raw_readq(addr); } /*----------------------------------------------------------------------- -- 2.26.2

2 4