April 2021 - U-Boot

[PATCH] arm64: versal: Remove gd reference
by Michal Simek 19 Apr '21

19 Apr '21

gd is not used in this file that's why doesn't make sense to declare it. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-versal/mp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c index c97c311d3130..58eab4bdf563 100644 --- a/arch/arm/mach-versal/mp.c +++ b/arch/arm/mach-versal/mp.c @@ -10,8 +10,6 @@ #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - #define HALT 0 #define RELEASE 1 -- 2.31.1

2 2

[PATCH] board:pm9261 - Enable DM_ETH
by Ilko Iliev 19 Apr '21

19 Apr '21

This patch remove the network support for PM9261 because currently there is no DM suport for Davicom D9000. --- board/ronetix/pm9261/pm9261.c | 54 ----------------------------------- configs/pm9261_defconfig | 1 + include/configs/pm9261.h | 9 ------ 3 files changed, 1 insertion(+), 63 deletions(-) diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 5be2c5e192..fe52c7c176 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -20,10 +20,6 @@ #include <asm/arch/at91_matrix.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h> -#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_DRIVER_DM9000) -#include <net.h> -#endif -#include <netdev.h> #include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; @@ -80,36 +76,6 @@ static void pm9261_nand_hw_init(void) } #endif - -#ifdef CONFIG_DRIVER_DM9000 -static void pm9261_dm9000_hw_init(void) -{ - struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; - - /* Configure SMC CS2 for DM9000 */ - writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) | - AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(0), - &smc->cs[2].setup); - - writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(8) | - AT91_SMC_PULSE_NRD(4) | AT91_SMC_PULSE_NCS_RD(8), - &smc->cs[2].pulse); - - writel(AT91_SMC_CYCLE_NWE(16) | AT91_SMC_CYCLE_NRD(16), - &smc->cs[2].cycle); - - writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | - AT91_SMC_MODE_EXNW_DISABLE | - AT91_SMC_MODE_BAT | AT91_SMC_MODE_DBW_16 | - AT91_SMC_MODE_TDF_CYCLE(1), - &smc->cs[2].mode); - - /* Configure Interrupt pin as input, no pull-up */ - at91_periph_clk_enable(ATMEL_ID_PIOA); - at91_set_pio_input(AT91_PIO_PORTA, 24, 0); -} -#endif - int board_early_init_f(void) { return 0; @@ -132,13 +98,6 @@ int board_init(void) return 0; } -#ifdef CONFIG_DRIVER_DM9000 -int board_eth_init(struct bd_info *bis) -{ - return dm9000_initialize(bis); -} -#endif - int dram_init(void) { /* dram_init must store complete ramsize in gd->ram_size */ @@ -155,19 +114,6 @@ int dram_init_banksize(void) return 0; } -#ifdef CONFIG_RESET_PHY_R -void reset_phy(void) -{ -#ifdef CONFIG_DRIVER_DM9000 - /* - * Initialize ethernet HW addr prior to starting Linux, - * needed for nfsroot - */ - eth_init(); -#endif -} -#endif - #ifdef CONFIG_DISPLAY_BOARDINFO int checkboard (void) { diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index e0a2ae18c6..774039e8bc 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -50,6 +50,7 @@ CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_DATAFLASH=y +CONFIG_DM_ETH=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 2cc47d1237..382d19a241 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -173,15 +173,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_MAX_FLASH_BANKS 1 -/* Ethernet */ -#define CONFIG_DRIVER_DM9000 1 -#define CONFIG_DM9000_BASE 0x30000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 4) -#define CONFIG_DM9000_USE_16BIT 1 -#define CONFIG_NET_RETRY_COUNT 20 -#define CONFIG_RESET_PHY_R 1 - /* USB */ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB -- 2.25.1

1 0

Fwd: New Defects reported by Coverity Scan for efi_capsule.c
by Heinrich Schuchardt 19 Apr '21

19 Apr '21

Dear Sughosh, Takahiro, Jose, could you please, look into the issues below. -------- Forwarded Message -------- Subject: New Defects reported by Coverity Scan for Das U-Boot Date: Mon, 19 Apr 2021 01:18:38 +0000 (UTC) From: scan-admin(a)coverity.com To: xypron.glpk(a)gmx.de Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 13 new defect(s) introduced to Das U-Boot found with Coverity Scan. 5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 13 of 13 defect(s) ** CID 331153: Code maintainability issues (UNUSED_VALUE) /lib/efi_loader/efi_capsule.c: 661 in find_boot_device() ________________________________________________________________________________________________________ *** CID 331153: Code maintainability issues (UNUSED_VALUE) /lib/efi_loader/efi_capsule.c: 661 in find_boot_device() 655 size = 0; 656 ret = efi_get_variable_int(L"BootOrder", &efi_global_variable_guid, 657 NULL, &size, NULL, NULL); 658 if (ret == EFI_BUFFER_TOO_SMALL) { 659 boot_order = malloc(size); 660 if (!boot_order) { >>> CID 331153: Code maintainability issues (UNUSED_VALUE) >>> Assigning value "9223372036854775817UL" to "ret" here, but that stored value is overwritten before it can be used. 661 ret = EFI_OUT_OF_RESOURCES; @Sughosh, Takahiro The logic after out: should consider ret. Maybe just move the label further down. 662 goto out; 663 } 664 665 ret = efi_get_variable_int(L"BootOrder", 666 &efi_global_variable_guid, ** CID 331147: Code maintainability issues (UNUSED_VALUE) /lib/efi_loader/efi_capsule.c: 456 in efi_update_capsule() ________________________________________________________________________________________________________ *** CID 331147: Code maintainability issues (UNUSED_VALUE) /lib/efi_loader/efi_capsule.c: 456 in efi_update_capsule() 450 efi_status_t ret; 451 452 EFI_ENTRY("%p, %zu, %llu\n", capsule_header_array, capsule_count, 453 scatter_gather_list); 454 455 if (!capsule_count) { >>> CID 331147: Code maintainability issues (UNUSED_VALUE) >>> Assigning value "9223372036854775810UL" to "ret" here, but that stored value is overwritten before it can be used. 456 ret = EFI_INVALID_PARAMETER; @Jose Calling efi_esrt_populate() in this case might not be the right thing to do. 457 goto out; 458 } 459 460 ret = EFI_SUCCESS; 461 for (i = 0, capsule = *capsule_header_array; i < capsule_count; Best regards Heinrich

1 0

Re: gpmi-nand ecc
by Miquel Raynal 19 Apr '21

19 Apr '21

Hi Sean, + u-boot ML Sean Nyekjaer <sean(a)geanix.com> wrote on Wed, 14 Apr 2021 15:13:39 +0200: > Hi, > > I have two boards with a iMX6ULL SoC one attached to a Micron NAND flash (MT29F4G08ABAFAWP) and one a Toshiba (TC58BVG2S0HTAI0). > > After updating the boards from u-boot 2018.07 -> 2020.01, the Micron fitted boards is having ECC problems(in u-boot). > U-boot 2018.07 selects ecc_strength to 18. > U-boot 2020.01 selects ecc_strength to 8, but if I hardcode u-boot to run the mxs_nand_legacy_calc_ecc_layout() it selects 18 bits. > > The Toshiba boards always selects 8 bit ecc_strength so they have no issues. > > The kernel driver (gpmi-nand.c) seems to also use the legacy method (Resulting 18 bits in ecc strength for the Micron NAND). > In common_nfc_set_geometry(): Both chip->ecc.strength and chip->ecc.size are 0. > > I would expect ecc.strength to be set to 8, earlier but cannot find the spot where it should be set. > Is the gpmi-nand driver missing a call to nand_ecc_choose_conf()? > Maybe we need a legacy option for the kernel like u-boot. > > We have +10K boards deployed so it's not so easy to switch from 18 -> 8 bits. > I can explicit fix this in U-boot by forcing the legacy mode via a dt flag, but the gut feeling says this will come back to haunt us :) > > /Sean I honestly don't know about such issue on U-Boot side, maybe you can try to be more specific on what commit broke the logic for you as there are not so many of them between the two versions: $ git l v2018.07..v2020.01 -- drivers/mtd/nand/raw/mxs_nand.c 1eb69ae4985 common: Move ARM cache operations out of common.h 9ab5f221a5e nand: mxs_nand: add API for switching different BCH layouts 1d43e24b946 i.MX6: nand: add nandbcb command for imx 1001502545f CONFIG_SPL_SYS_[DI]CACHE_OFF: add 04568bd0b6d MTD: nand: mxs_nand: Allow driver to auto setup ECC in SPL 5645df9e00a MTD: NAND: mxs_nand_init_dma: Make mxs_nand_init_dma static 5ae585ba3a8 MTD: mxs_nand: Fix BCH read timeout error on boards requiring ECC a430fa06a4a mtd: move NAND files into a raw/ subdirectory Good luck with your debugging, Miquèl

3 2

[PATCH 1/2] gpio: atmel_pio4: add support for sama7g5 pio4 version with 5 banks
by Eugen Hristev 19 Apr '21

19 Apr '21

Add support for sama7g5 pinctrl variant, with 5 banks with a degraded 8 line only 5th bank. Based on Linux Kernel implementation. Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- drivers/gpio/atmel_pio4.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index f615fce32e..bea609db9d 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -173,8 +173,15 @@ int atmel_pio4_get_pio_input(u32 port, u32 pin) #if CONFIG_IS_ENABLED(DM_GPIO) +/** + * struct atmel_pioctrl_data - Atmel PIO controller (pinmux + gpio) data struct + * @nbanks: number of PIO banks + * @last_bank_count: number of lines in the last bank (can be less than + * the rest of the banks). + */ struct atmel_pioctrl_data { u32 nbanks; + u32 last_bank_count; }; struct atmel_pio4_plat { @@ -313,6 +320,12 @@ static int atmel_pio4_probe(struct udevice *dev) NULL); uc_priv->gpio_count = nbanks * ATMEL_PIO_NPINS_PER_BANK; + /* if last bank has limited number of pins, adjust accordingly */ + if (pioctrl_data->last_bank_count != ATMEL_PIO_NPINS_PER_BANK) { + uc_priv->gpio_count -= ATMEL_PIO_NPINS_PER_BANK; + uc_priv->gpio_count += pioctrl_data->last_bank_count; + } + return 0; } @@ -322,12 +335,21 @@ static int atmel_pio4_probe(struct udevice *dev) */ static const struct atmel_pioctrl_data atmel_sama5d2_pioctrl_data = { .nbanks = 4, + .last_bank_count = ATMEL_PIO_NPINS_PER_BANK, +}; + +static const struct atmel_pioctrl_data microchip_sama7g5_pioctrl_data = { + .nbanks = 5, + .last_bank_count = 8, /* 5th bank has only 8 lines on sama7g5 */ }; static const struct udevice_id atmel_pio4_ids[] = { { .compatible = "atmel,sama5d2-gpio", .data = (ulong)&atmel_sama5d2_pioctrl_data, + }, { + .compatible = "microchip,sama7g5-gpio", + .data = (ulong)&microchip_sama7g5_pioctrl_data, }, {} }; -- 2.25.1

2 2

[PATCH v2] ARM: dts: at91: sama5d3: add u-boot properties to sama5d3 pit timer
by Manuel Reis 19 Apr '21

19 Apr '21

in the early SPL boot stage whenever there is a call to udelay, dm_timer_init fails to find the pit timer whenever it traverses the device tree, if this property is not present Signed-off-by: Manuel Reis <mluis.reis(a)gmail.com> CC: Eugen Hristev <eugen.hristev(a)microchip.com> --- arch/arm/dts/sama5d3.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/sama5d3.dtsi b/arch/arm/dts/sama5d3.dtsi index 6ed218eaad..42c30e9f30 100644 --- a/arch/arm/dts/sama5d3.dtsi +++ b/arch/arm/dts/sama5d3.dtsi @@ -1320,6 +1320,7 @@ reg = <0xfffffe30 0xf>; interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>; clocks = <&mck>; + u-boot,dm-pre-reloc; }; watchdog@fffffe40 { -- 2.27.0

4 7

Re: [PATCH] mtd: spi-nor-ids: Add Macronix MX66UW2G345G
by Jagan Teki 19 Apr '21

19 Apr '21

On Tue, Mar 23, 2021 at 7:54 AM zhengxun <zhengxunli.mxic(a)gmail.com> wrote: > > The MX66UW2G345G is Macronix Flash with SINGLE and OCTAL I/O. Hence, > add SPI_NOR_OCTAL_READ flag for this flash. > > Signed-off-by: zhengxun <zhengxunli.mxic(a)gmail.com> > --- Applied to u-boot-spi/master

1 0

[PATCH 1/1] board: freescale: vid.c: Add check for return value of adjust_vdd()
by Priyanka Singh 19 Apr '21

19 Apr '21

Add check for return value of adjust_vdd() Signed-off-by: Biwen Li <biwen.li(a)nxp.com> Signed-off-by: Priyanka Singh <priyanka.singh(a)nxp.com> --- board/freescale/common/vid.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index 6e8296293b..13ef101e7f 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2020 NXP + * Copyright 2020-21 NXP * Copyright 2020 Stephen Carlson <stcarlso(a)linux.microsoft.com> */ @@ -793,13 +793,16 @@ static int do_vdd_override(struct cmd_tbl *cmdtp, char *const argv[]) { ulong override; + int ret = 0; if (argc < 2) return CMD_RET_USAGE; - if (!strict_strtoul(argv[1], 10, &override)) - adjust_vdd(override); /* the value is checked by callee */ - else + if (!strict_strtoul(argv[1], 10, &override)) { + ret = adjust_vdd(override); + if (ret < 0) + return CMD_RET_FAILURE; + } else return CMD_RET_USAGE; return 0; } -- 2.17.1

1 0

Pull request for efi-2021-07-rc1-2
by Heinrich Schuchardt 19 Apr '21

19 Apr '21

Dear Tom, The following changes since commit a6232e065dd9e349bf5908c928734c6b5b018112: Merge branch '2021-04-14-assorted-vboot-improvements' (2021-04-15 17:10:25 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-07-rc1-2 for you to fetch changes up to b1a7a5e0b8822a0868ee9318d8d3fa9645efc12d: efi_loader: fix possible buffer overflow (2021-04-17 20:01:32 +0200) Gitlab showed no problems with the new patches in: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7170 ---------------------------------------------------------------- Pull request for efi-2021-07-rc1-2 Documentation: man-page for fatinfo Bug fixes: memory leak in efi_capsule_scan_dir() incorrect invocations of EFI_CALL macro creating ESRT table buffer overflow in tcg2_create_digest() ---------------------------------------------------------------- Heinrich Schuchardt (5): board: toradex: apalis-imx8x: fix build warning doc: imx: psb: fix footnotes doc: fatinfo man-page doc: duplicate target 'youtube' efi_loader: memory leak in efi_capsule_scan_dir() Masahisa Kojima (1): efi_loader: fix possible buffer overflow Sughosh Ganu (1): efi_loader: esrt: Remove incorrect invocations of EFI_CALL macro doc/board/toradex/apalix-imx8x.rst | 2 +- doc/chromium/overview.rst | 6 +++--- doc/imx/misc/psb.rst | 2 +- doc/usage/index.rst | 1 + lib/efi_loader/efi_capsule.c | 3 +++ lib/efi_loader/efi_esrt.c | 28 ++++++++++++++-------------- lib/efi_loader/efi_tcg2.c | 2 +- 7 files changed, 24 insertions(+), 20 deletions(-)

2 1

[PULL] u-boot-usb/master
by Marek Vasut 19 Apr '21

19 Apr '21

This is a patchset which makes away with the .bind() controller indexing workaround which was broken since before v2021.04, and then adds PHY support and MX8M support on top of that. Better add it into the release early to get as much testing as possible done, because this really does a lot of changes to the ehci-mx6 driver. CI https://source.denx.de/u-boot/custodians/u-boot-usb/-/pipelines/7200 The following changes since commit a6232e065dd9e349bf5908c928734c6b5b018112: Merge branch '2021-04-14-assorted-vboot-improvements' (2021-04-15 17:10:25 -0400) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to d08cdc223db1023ebb8c03d6341fdf45b303700c: ARM: imx8m: verdin-imx8mm: Enable USB Host support (2021-04-18 04:29:36 +0200) ---------------------------------------------------------------- Marek Vasut (24): phy: nop-phy: Add standard usb-nop-xceiv compat string arc: emsdp/iotdk: Use standard compatible string for USB no-op PHY ARM: dts: k2g-evm: Use standard compatible string for USB no-op PHY ARM: dts: imx8mm: Replace deprecated fsl,usbphy DT props with phys ARM: dts: imx8mn: Replace deprecated fsl,usbphy DT props with phys ARM: dts: imx8mm: Add power domain nodes ARM: dts: imx8mn: Add power domain nodes imx: power-domain: Add fsl,imx8mm-gpc compatible string imx: power-domain: Add fsl,imx8mn-gpc compatible string usb: ehci-mx6: Turn off Vbus on probe failure usb: ehci-mx6: Add DM clock support usb: ehci-mx6: Unify USBNC registers usb: ehci-mx6: Parse USB PHY and MISC offsets from DT usb: ehci-mx6: Split ehci_mx6_common_init() usb: ehci-mx6: Pass PHY address to usb_*_phy*() usb: ehci-mx6: Split usb_power_config() usb: ehci-mx6: Pass MISC address to usb_oc_config() usb: ehci-mx6: Use portnr from DT in DM case usb: ehci-mx6: Add generic EHCI PHY support usb: ehci-mx6: Set default CONFIG_MXC_USB_PORTSC if not defined usb: ehci-mx6: Add fsl,imx7d-usb compatible string usb: ehci-mx6: Fix aarch64 build warnings usb: ehci-mx6: Add iMX8M support ARM: imx8m: verdin-imx8mm: Enable USB Host support arch/arc/dts/iot_devkit.dts | 2 +- arch/arm/dts/imx8mm.dtsi | 79 +++++++++++++++- arch/arm/dts/imx8mn.dtsi | 54 ++++++++++- arch/arm/dts/keystone-k2g-evm.dts | 2 - configs/verdin-imx8mm_defconfig | 8 +- drivers/phy/nop-phy.c | 1 + drivers/power/domain/imx8m-power-domain.c | 2 + drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-mx6.c | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- include/configs/verdin-imx8mm.h | 5 + include/dt-bindings/power/imx8mm-power.h | 22 +++++ include/dt-bindings/power/imx8mn-power.h | 15 +++ 12 files changed, 465 insertions(+), 183 deletions(-) create mode 100644 include/dt-bindings/power/imx8mm-power.h create mode 100644 include/dt-bindings/power/imx8mn-power.h

2 1