May 2020 - U-Boot

[U-Boot] [PATCH v1 00/10] arm: pxa: mmc: add driver model support
by Marcel Ziswiler 30 Jun '20

30 Jun '20

This series, after some initial clean-up, ultimately adds support for the driver model (DM) in the PXA MMC driver. Marcel Ziswiler (10): mmc: add missing space before comment delimiter mmc: fsl_esdhc: annotate endifs serial: pxa: clean-up platform data include file Makefile: allow dm_mmc without of_control dm: core: gracefully handle alias seq without of kconfig: mmc: move pxa_mmc_generic to kconfig arm: pxa: mmc: add driver model support colibri_pxa270_defconfig: enable cmd_dm colibri_pxa270: add mmc platform data colibri_pxa270_defconfig: enable dm_mmc Makefile | 2 +- board/toradex/colibri_pxa270/colibri_pxa270.c | 20 ++- configs/colibri_pxa270_defconfig | 3 + configs/zipitz2_defconfig | 1 + drivers/core/read.c | 4 +- drivers/mmc/Kconfig | 8 + drivers/mmc/fsl_esdhc.c | 4 +- drivers/mmc/mmc.c | 2 +- drivers/mmc/pxa_mmc_gen.c | 160 +++++++++++++++--- include/configs/pxa-common.h | 7 - include/configs/zipitz2.h | 8 - include/dm/platform_data/pxa_mmc_gen.h | 22 +++ include/dm/platform_data/serial_pxa.h | 8 +- include/dm/read.h | 4 + scripts/config_whitelist.txt | 1 - 15 files changed, 196 insertions(+), 58 deletions(-) create mode 100644 include/dm/platform_data/pxa_mmc_gen.h -- 2.21.0

8 32

U-Boot Logo showing incorrect colors with eLCDIF
by Fabio Estevam 29 Jun '20

29 Jun '20

Hi, We are converting imx7d-sdb and imx6sx-sdb boards to DM_VIDEO, but we are seeing the Freescale logo with incorrect colors (white area is being shown blue, for example). imx6ul-evk has already been converted to DM_VIDEO and also show the incorrect colors. We haven't started to investigate this issue yet, but just wanted to report in case this is a known issue. Does U-Boot logo appear with the correct color on your boards with eLCDIF controller? Thanks, Fabio Estevam

3 13

[PATCH v3 0/5] rockchip: make it possible to sign the u-boot.itb
by Heiko Stuebner 26 Jun '20

26 Jun '20

From: Heiko Stuebner <heiko.stuebner(a)theobroma-systems.com> This series makes it possible to sign a generated u-boot.itb automatically even if the its-source got created by a generator script. To let the SPL know about the key, the -K option for mkimage points to the dts/dt-spl.dtb which can then get included into the spl binary. Tested on Rockchip PX30 with a TPL -> SPL -> U-Boot.itb bootchain. I've split out the the rsa/crypto fixes into a separate series starting at [0]. [0] https://patchwork.ozlabs.org/project/uboot/patch/20200522141937.3523692-1-h… changes in v3: - add patch to fix imx make_fit_atf.sh error handling - split out rsa fixes into separate series changes in v2.1: - depend on $(CONFIG_SPL_FIT_SIGNATURE)$(U_BOOT_ITS) instead of only $(CONFIG_SPL_FIT_GENERATOR) changes in v2: - add received reviews - fix commit message typo - add doc snippet explaining CONFIG_SPL_FIT_GENERATOR_KEY_HINT Heiko Stuebner (5): imx: mkimage_fit_atf: Fix FIT image if BL31.bin missing mkimage: fit_image: handle multiple errors when writing signatures spl: fit: enable signing a generated u-boot.itb spl: fit: add Kconfig option to specify key-hint for fit_generator rockchip: make_fit_atf: add signature handling Kconfig | 16 ++++++++ Makefile | 11 +++++- arch/arm/mach-imx/mkimage_fit_atf.sh | 4 +- arch/arm/mach-rockchip/make_fit_atf.py | 51 +++++++++++++++++++++++++- doc/uImage.FIT/howto.txt | 13 +++++++ tools/image-host.c | 2 +- 6 files changed, 92 insertions(+), 5 deletions(-) -- 2.25.1

4 13

[PATCH v2 0/2] gpio: Add a managed API
by Pratyush Yadav 26 Jun '20

26 Jun '20

Hi, This is a re-submission of Jean-Jacques' earlier work in October last year. It can be found at [0]. The goal is to facilitate porting drivers from the linux kernel. Most of the series will be about adding managed API to existing infrastructure (GPIO, reset, regmap (already submitted)). This particular series is about GPIOs. It adds a managed API using the API as Linux. To make it 100% compatible with linux, there is a small deviation from u-boot's way of naming the gpio lists: the managed equivalent of gpio_request_by_name(..,"blabla-gpios", ...) is devm_gpiod_get_index(..., "blabla", ...) Changes in v2: - The original series had a patch that checked for NULL pointers in the core GPIO functions. The checks were needed because of the addition of devm_gpiod_get_index_optional() which would return NULL when when no GPIO was assigned to the requested function. This is convenient for drivers that need to handle optional GPIOs. Simon argued that those should be behind a Kconfig option because of code size concerns. He also argued against implicit return in the macro that checked for the optional GPIOs. This submission removes the controversial patch so that base functionality can get unblocked. We still need to take a stance on who is responsible for the NULL check: the driver or the GPIO core? Do we want to trust drivers to take care of the NULL checks, or do we want to distrust them and make sure they don't send us anything bogus in the GPIO core. For now the responsibility lies on the drivers by default. I will send a separate RFC of the NULL check patch and we can probably discuss the issue there. [0] https://patchwork.ozlabs.org/project/uboot/cover/20191001115130.18886-1-jjh… Jean-Jacques Hiblot (2): drivers: gpio: Add a managed API to get a GPIO from the device-tree test: gpio: Add tests for the managed API arch/sandbox/dts/test.dts | 10 ++++ drivers/gpio/gpio-uclass.c | 70 +++++++++++++++++++++++++ include/asm-generic/gpio.h | 47 +++++++++++++++++ test/dm/gpio.c | 102 +++++++++++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+) -- 2.26.2

2 11

[PATCH v2 00/39] Tidy up the 'bd' command.
by Simon Glass 26 Jun '20

26 Jun '20

The code for the 'bd' command never got the 'generic board' treatment many years ago when global_data and bd_info were converted. As a result it still has a lot of arch-specific duplication of generic code. This series aims to make as much code in this file generic as possible, so that it is easy to add new info on all architectures. For the three architectures that actually need additional code (ARM, PPC and m68k) this is moved into arch-specific files. With this series, bdinfo.c drops from nearly 500 lines to just over 100. It also makes x86 report the frame buffer address properly (the original goal of my effort). Changes in v2: - Add a new patch to drop the 'bd' command for tbs2910 - Fix up inadvertent merge of PowerPC/ARM/m68k/arc patches - Fix up inadvertent merge of PowerPC/ARM/m68k/arc patches - Fix up inadvertent merge of PowerPC/ARM/m68k/arc patches - Fix up inadvertent merge of PowerPC/ARM/m68k/arc patches - Drop __maybe_unused on print_lnum() too - Move __maybe_unused on print_lnum() to the early patch - Update commit message with an extra motivation - Squash in the next patch to inline print_eths() - Leave MULTI_DTB_FIT in the generic file as it is not really ARM-specific - Move ARM's bi_arch_number over to ARM-specific code as well - Update the commit message to explain the address more Simon Glass (39): tbs2910: Drop the 'bd' command bdinfo: nds32: Use generic bd_info bdinfo: riscv: Use generic bd_info bdinfo: m68k: Drop bd_info->bi_ipbfreq bdinfo: xtensa: Create a generic do_bdinfo for xtensa bdinfo: mips: Use the generic bd command bdinfo: nios2: Use the generic bd command bdinfo: microblaze: Use the generic bd command bdinfo: sh: Use the generic bd command bdinfo: x86: Use the generic bd command bdinfo: sandbox: Use the generic bd command bdinfo: nds32: Use the generic bd command bdinfo: riscv: Use the generic bd command bdinfo: powerpc: Use the generic bd command bdinfo: m68k: Use the generic bd command bdinfo: arm: Use the generic bd command bdinfo: arc: Use the generic bd command bdinfo: Drop the option to not use the generic 'bd' command bdinfo: Drop unused __maybe_unused bdinfo: microblaze: sh: nios2: Drop arch-specific flash info bdinfo: Drop unnecessary inline on functions bdinfo: Drop print_std_bdinfo() bdinfo: ppc: Drop arch-specific print_baudrate() bdinfo: sh: arc: Drop arch-specific print_bi_mem() bdinfo: Drop print_bi_boot_params() bdinfo: Drop print_bi_flash() bdinfo: Drop print_cpu_word_size() bdinfo: net: ppc: Drop bi_enet1addr and other similar info bdinfo: net: ppc: Drop prints for CONFIG_HAS_ETHn bdinfo: net: Drop legacy ethernet bdinfo bdinfo: net: Inline print_eth_ip_addr() bdinfo: Export some basic printing functions bdinfo: arm: Move ARM-specific info into its own file bdinfo: ppc: Move PPC-specific info into its own file bdinfo: m68k: Move m68k-specific info into its own file bdinfo: m68k: ppc: Move arch-specific code from bdinfo bdinfo: Update the file comments bdinfo: dm: Update fb_base when using driver model bdinfo: x86: vesa: Update fb_base to the correct value arch/arm/lib/Makefile | 1 + arch/arm/lib/bdinfo.c | 51 ++++ arch/m68k/lib/Makefile | 1 + arch/m68k/lib/bdinfo.c | 34 +++ arch/nds32/include/asm/u-boot.h | 20 +- arch/powerpc/lib/Makefile | 2 + arch/powerpc/lib/bdinfo.c | 46 ++++ arch/riscv/include/asm/u-boot.h | 19 +- arch/x86/lib/fsp/fsp_graphics.c | 5 +- cmd/bdinfo.c | 448 +++----------------------------- common/board_r.c | 16 +- configs/tbs2910_defconfig | 1 + drivers/video/video-uclass.c | 1 + include/asm-generic/u-boot.h | 18 -- include/init.h | 9 + 15 files changed, 185 insertions(+), 487 deletions(-) create mode 100644 arch/arm/lib/bdinfo.c create mode 100644 arch/m68k/lib/bdinfo.c create mode 100644 arch/powerpc/lib/bdinfo.c -- 2.26.2.645.ge9eca65c58-goog

5 49

[PATCH] psci: add 'static inline' to invoke_psci_fn() stub
by Masahiro Yamada 25 Jun '20

25 Jun '20

Avoid potential multiple definitions when CONFIG_ARM_PSCI_FW is disabled. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/psci.h b/include/linux/psci.h index 9433df836b..841dbc8da7 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -91,8 +91,8 @@ unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); #else -unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, - unsigned long a2, unsigned long a3) +static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3) { return PSCI_RET_DISABLED; } -- 2.25.1

2 1

[PATCH] arm64: xilinx: Print fpga error value in hex
by Michal Simek 25 Jun '20

25 Jun '20

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Fpga returns error value when fails, error status should be printed in hex format. Signed-off-by: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/fpga/versalpl.c | 2 +- drivers/fpga/zynqmppl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c index 6c69ab7802c6..028d9114f2e3 100644 --- a/drivers/fpga/versalpl.c +++ b/drivers/fpga/versalpl.c @@ -43,7 +43,7 @@ static int versal_load(xilinx_desc *desc, const void *buf, size_t bsize, ret = xilinx_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo, buf_hi, 0, ret_payload); if (ret) - puts("PL FPGA LOAD fail\n"); + printf("PL FPGA LOAD failed with err: 0x%08x\n", ret); return ret; } diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index 4a826e4a71ab..eca212404100 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -236,7 +236,7 @@ static int zynqmp_load(xilinx_desc *desc, const void *buf, size_t bsize, buf_hi, (u32)bsize, 0, ret_payload); if (ret) - puts("PL FPGA LOAD fail\n"); + printf("PL FPGA LOAD failed with err: 0x%08x\n", ret); return ret; } -- 2.26.2

2 1

[PATCH] spi: zynq_[q]spi: Convert config's to macro's
by Michal Simek 25 Jun '20

25 Jun '20

From: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Remove below config options and convert them to macros. They have never been configured to different values than default one. And also it makes sense to reduce the config_whitelist. CONFIG_SYS_ZYNQ_SPI_WAIT CONFIG_SYS_ZYNQ_QSPI_WAIT CONFIG_XILINX_SPI_IDLE_VAL Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/spi/xilinx_spi.c | 6 ++---- drivers/spi/zynq_qspi.c | 6 ++---- drivers/spi/zynq_spi.c | 6 ++---- scripts/config_whitelist.txt | 3 --- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 2b5f2cf54838..a586b41c5b92 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -74,9 +74,7 @@ SPICR_SPE) #define XILSPI_SPICR_DFLT_OFF (SPICR_MASTER_INHIBIT | SPICR_MANUAL_SS) -#ifndef CONFIG_XILINX_SPI_IDLE_VAL -#define CONFIG_XILINX_SPI_IDLE_VAL GENMASK(7, 0) -#endif +#define XILINX_SPI_IDLE_VAL GENMASK(7, 0) #define XILINX_SPISR_TIMEOUT 10000 /* in milliseconds */ @@ -174,7 +172,7 @@ static u32 xilinx_spi_fill_txfifo(struct udevice *bus, const u8 *txp, while (txbytes && !(readl(&regs->spisr) & SPISR_TX_FULL) && i < priv->fifo_depth) { - d = txp ? *txp++ : CONFIG_XILINX_SPI_IDLE_VAL; + d = txp ? *txp++ : XILINX_SPI_IDLE_VAL; debug("spi_xfer: tx:%x ", d); /* write out and wait for processing (receive data) */ writel(d & SPIDTR_8BIT_MASK, &regs->spidtr); diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index 9ad1927a5d51..164746a0df85 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -45,9 +45,7 @@ DECLARE_GLOBAL_DATA_PTR; #define ZYNQ_QSPI_CR_SS_SHIFT 10 /* Slave select shift */ #define ZYNQ_QSPI_FIFO_DEPTH 63 -#ifndef CONFIG_SYS_ZYNQ_QSPI_WAIT -#define CONFIG_SYS_ZYNQ_QSPI_WAIT CONFIG_SYS_HZ/100 /* 10 ms */ -#endif +#define ZYNQ_QSPI_WAIT (CONFIG_SYS_HZ / 100) /* 10 ms */ /* zynq qspi register set */ struct zynq_qspi_regs { @@ -348,7 +346,7 @@ static int zynq_qspi_irq_poll(struct zynq_qspi_priv *priv) do { status = readl(&regs->isr); } while ((status == 0) && - (get_timer(timeout) < CONFIG_SYS_ZYNQ_QSPI_WAIT)); + (get_timer(timeout) < ZYNQ_QSPI_WAIT)); if (status == 0) { printf("zynq_qspi_irq_poll: Timeout!\n"); diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 0b2b2f481037..ea24df278319 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -33,9 +33,7 @@ DECLARE_GLOBAL_DATA_PTR; #define ZYNQ_SPI_CR_SS_SHIFT 10 /* Slave select shift */ #define ZYNQ_SPI_FIFO_DEPTH 128 -#ifndef CONFIG_SYS_ZYNQ_SPI_WAIT -#define CONFIG_SYS_ZYNQ_SPI_WAIT (CONFIG_SYS_HZ/100) /* 10 ms */ -#endif +#define ZYNQ_SPI_WAIT (CONFIG_SYS_HZ / 100) /* 10 ms */ /* zynq spi register set */ struct zynq_spi_regs { @@ -248,7 +246,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen, ts = get_timer(0); status = readl(&regs->isr); while (!(status & ZYNQ_SPI_IXR_TXOW_MASK)) { - if (get_timer(ts) > CONFIG_SYS_ZYNQ_SPI_WAIT) { + if (get_timer(ts) > ZYNQ_SPI_WAIT) { printf("spi_xfer: Timeout! TX FIFO not full\n"); return -1; } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 253c46159b6b..2be1022e3af8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4015,8 +4015,6 @@ CONFIG_SYS_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB3_ADDR CONFIG_SYS_XIMG_LEN -CONFIG_SYS_ZYNQ_QSPI_WAIT -CONFIG_SYS_ZYNQ_SPI_WAIT CONFIG_SYS_i2C_FSL CONFIG_TAM3517_SETTINGS CONFIG_TCA642X @@ -4242,7 +4240,6 @@ CONFIG_X86_MRC_ADDR CONFIG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR CONFIG_XGI_XG22_BASE -CONFIG_XILINX_SPI_IDLE_VAL CONFIG_XSENGINE CONFIG_XTFPGA CONFIG_YAFFSFS_PROVIDE_VALUES -- 2.26.2

2 1

[PATCH] net: gem: Disable PCS autonegotiation in case of fixed-link
by Michal Simek 25 Jun '20

25 Jun '20

Disable PCS autonegotiation if fixed-link node is present in device tree. This way systems with multiple GEM instances with a combination of SGMII-fixed and SGMII-PHY will work. Reported-by: Goran Marinkovic <goran.marinkovic(a)psi.ch> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> --- drivers/net/zynq_gem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index a158824fc9fd..8cbe40dc75b1 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -448,8 +448,12 @@ static int zynq_gem_init(struct udevice *dev) nwconfig |= ZYNQ_GEM_NWCFG_SGMII_ENBL | ZYNQ_GEM_NWCFG_PCS_SEL; #ifdef CONFIG_ARM64 + if (priv->phydev->phy_id != PHY_FIXED_ID) writel(readl(&regs->pcscntrl) | ZYNQ_GEM_PCS_CTL_ANEG_ENBL, &regs->pcscntrl); + else + writel(readl(&regs->pcscntrl) & ~ZYNQ_GEM_PCS_CTL_ANEG_ENBL, + &regs->pcscntrl); #endif } -- 2.26.2

2 1

[PATCH 0/5] xilinx: DT/Kconfig changes
by Michal Simek 25 Jun '20

25 Jun '20

Hi, this is small series with misc changes target configs and DTs. Thanks, Michal Ashok Reddy Soma (2): arm: zynq: Enable alternative memory test arm64: versal: Enable config to map TCM and OCM Saeed Nowshadi (1): arm64: zynqmp: Fix si570 clock output names and references T Karthik Reddy (2): arm64: zynqmp: Reduce console buffer size arm64: zynqmp: Change spi-max-frequency for qspi mini arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 10 +++++----- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + include/configs/xilinx_zynqmp_mini.h | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) -- 2.26.2

2 6