March 2019 - U-Boot

[U-Boot] [PATCH 1/2] mv_ddr: ddr3: fix tRAS timimg parameter
by Chris Packham 19 Mar '19

19 Mar '19

From: Chris Packham <chris.packham(a)alliedtelesis.co.nz> Based on the JEDEC standard JESD79-3F. The tRAS timings should include the highest speed bins at a given frequency. This is similar to commit 683c67b ("mv_ddr: ddr3: fix tfaw timimg parameter") where the wrong comparison was used in the initial implementation. Signed-off-by: Chris Packham <chris.packham(a)alliedtelesis.co.nz> [https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/15] Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- drivers/ddr/marvell/a38x/ddr3_training_db.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/ddr/marvell/a38x/ddr3_training_db.c b/drivers/ddr/marvell/a38x/ddr3_training_db.c index 111a8586c6e3..b2f11a839961 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_db.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_db.c @@ -420,13 +420,13 @@ unsigned int mv_ddr_speed_bin_timing_get(enum mv_ddr_speed_bin index, enum mv_dd result = speed_bin_table_t_rcd_t_rp[index]; break; case SPEED_BIN_TRAS: - if (index < SPEED_BIN_DDR_1066G) + if (index <= SPEED_BIN_DDR_1066G) result = 37500; - else if (index < SPEED_BIN_DDR_1333J) + else if (index <= SPEED_BIN_DDR_1333J) result = 36000; - else if (index < SPEED_BIN_DDR_1600K) + else if (index <= SPEED_BIN_DDR_1600K) result = 35000; - else if (index < SPEED_BIN_DDR_1866M) + else if (index <= SPEED_BIN_DDR_1866M) result = 34000; else result = 33000; -- 2.21.0

3 4

[U-Boot] [PATCH] ARM: kirkwood: add spi0 alias for dreamplug
by Chris Packham 19 Mar '19

19 Mar '19

The conversion to DM_SPI managed to break accessing the environment on dreamplug. This is because the environment code relies on being to able to select the SPI device based on the sequence number. Add an alias so that the spi0 bus gets sequence number 0. Reported-by: Leigh Brown <leigh(a)solinno.co.uk> Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- Leigh, Could you test this on your system for me. I'm only able to compile test this myself. arch/arm/dts/kirkwood-dreamplug.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/kirkwood-dreamplug.dts b/arch/arm/dts/kirkwood-dreamplug.dts index a647a65c20a0..ccd74dd7fb33 100644 --- a/arch/arm/dts/kirkwood-dreamplug.dts +++ b/arch/arm/dts/kirkwood-dreamplug.dts @@ -18,6 +18,10 @@ stdout-path = &uart0; }; + aliases { + spi0 = &spi0; + }; + ocp@f1000000 { pinctrl: pin-controller@10000 { pmx_led_bluetooth: pmx-led-bluetooth { -- 2.21.0

3 4

[U-Boot] [PATCH] MAINTAINERS: Update u-boot-marvell entry
by Stefan Roese 19 Mar '19

19 Mar '19

This patch does the following changes to the u-boot-marvell maintainers entry: - Add Armada-7k/8k to the list - Remove Prafulla and Luka since they have been silent on the list for a long time. Please speak up, if you would like to continue or better start maintaining. - Add multiple Marvell / MVEBU related driver directories and files Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Tom Rini <trini(a)konsulko.com> --- MAINTAINERS | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 29449ffed6..7fa3e059f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -166,16 +166,19 @@ S: Maintained F: arch/arm/cpu/armv8/hisilicon F: arch/arm/include/asm/arch-hi6220/ -ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX -M: Prafulla Wadaskar <prafulla(a)marvell.com> -M: Luka Perkov <luka.perkov(a)sartura.hr> +ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K M: Stefan Roese <sr(a)denx.de> S: Maintained T: git git://git.denx.de/u-boot-marvell.git F: arch/arm/mach-kirkwood/ F: arch/arm/mach-mvebu/ F: drivers/ata/ahci_mvebu.c -F: drivers/phy/marvell/ +F: drivers/ddr/marvell/ +F: drivers/gpio/mvebu_gpio.c +F: drivers/spi/kirkwood_spi.c +F: drivers/pci/pci_mvebu.c +F: drivers/pci/pcie_dw_mvebu.c +F: drivers/watchdog/orion_wdt.c ARM MARVELL PXA M: Marek Vasut <marex(a)denx.de> -- 2.20.1

2 2

[U-Boot] [PATCH] configs/clearfog_gt_8k: add network interface support
by Baruch Siach 19 Mar '19

19 Mar '19

Enable the mvpp2 network driver for the Armada 8K SoC. Enable the Marvell PHY driver for the on-board 1512 PHY. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- configs/clearfog_gt_8k_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig index ee8487765413..526c14a3947f 100644 --- a/configs/clearfog_gt_8k_defconfig +++ b/configs/clearfog_gt_8k_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_DEFAULT_DEVICE_TREE="armada-8040-clearfog-gt-8k" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_AHCI_MVEBU=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y @@ -48,8 +49,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y +CONFIG_MVPP2=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_DM_PCI=y -- 2.20.1

2 2

[U-Boot] [PATCH] pci: pci_mvebu: Add comment about missing of_n_addr_cells() call
by Stefan Roese 19 Mar '19

19 Mar '19

This patch adds a comment to explain the use of the hardcoded value for the number of address cells in mvebu_get_tgt_attr(). This should help to rework this function, once CONFIG_OF_LIVE is enabled for MVEBU in general. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Bin Meng <bmeng.cn(a)gmail.com> --- drivers/pci/pci_mvebu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index 6026fa67f9..e21dc10c2f 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -369,6 +369,12 @@ static int mvebu_get_tgt_attr(ofnode node, int devfn, if (!range) return -EINVAL; + /* + * Linux uses of_n_addr_cells() to get the number of address cells + * here. Currently this function is only available in U-Boot when + * CONFIG_OF_LIVE is enabled. Until this is enabled for MVEBU in + * general, lets't hardcode the "pna" value in the U-Boot code. + */ pna = 2; /* hardcoded for now because of lack of of_n_addr_cells() */ rangesz = pna + na + ns; nranges = rlen / sizeof(__be32) / rangesz; -- 2.20.1

1 1

[U-Boot] [PATCH 1/1] efi_loader: endless loop in add_strings_package()
by Heinrich Schuchardt 19 Mar '19

19 Mar '19

Avoid an endless loop in add_strings_package(). Fixes Coverity CID 185833 Suggested-by: Takahiro Akashi <takahiro.akashi(a)linaro.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_hii.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c index 3a966fa4dff..61b71dec621 100644 --- a/lib/efi_loader/efi_hii.c +++ b/lib/efi_loader/efi_hii.c @@ -227,9 +227,8 @@ out: error: if (stbl) { free(stbl->language); - if (idx > 0) - while (--idx >= 0) - free(stbl->strings[idx].string); + while (idx > 0) + free(stbl->strings[--idx].string); free(stbl->strings); } free(stbl); -- 2.20.1

1 0

[U-Boot] [PATCH v3] usb: host: Print device name when scanning
by Ismael Luceno Cortes 19 Mar '19

19 Mar '19

Drop the counter, it has no meaning other than being the order in which the interface is found; the name assigned to the USB host controller interface is a better indicator. Example of the original output: > USB0: USB EHCI 1.10 > scanning bus 0 for devices... 2 USB Device(s) found > scanning usb for storage devices... 1 Storage Device(s) found Patched output: > Bus usb@ee080100: USB EHCI 1.10 > scanning bus 0 for devices... 2 USB Device(s) found > scanning usb for storage devices... 1 Storage Device(s) found Signed-off-by: Ismael Luceno <ismael.luceno(a)silicon-gears.com> --- Notes: Changes since v2: - Dropped counter altogether. Changes since v1: - Improved commit message. drivers/usb/host/usb-uclass.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index 611ea97a72..a7179abc3a 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -242,7 +242,6 @@ int usb_init(void) struct usb_bus_priv *priv; struct udevice *bus; struct uclass *uc; - int count = 0; int ret; asynch_allowed = 1; @@ -255,8 +254,7 @@ int usb_init(void) uclass_foreach_dev(bus, uc) { /* init low_level USB */ - printf("USB%d: ", count); - count++; + printf("Bus %s: ", bus->name); #ifdef CONFIG_SANDBOX /* @@ -327,10 +325,8 @@ int usb_init(void) remove_inactive_children(uc, bus); /* if we were not able to find at least one working bus, bail out */ - if (!count) - printf("No controllers found\n"); - else if (controllers_initialized == 0) - printf("USB error: all controllers failed lowlevel init\n"); + if (controllers_initialized == 0) + printf("No working controllers found\n"); return usb_started ? 0 : -1; } -- 2.19.1

2 3

[U-Boot] Odroid U3 - Upgrade to latest u-boot kernel load fails.
by Anand Moon 19 Mar '19

19 Mar '19

Hi Krzysztof / Marek, After I update the latest u-boot on my Odroud U3+ it fails to load the kernel it hangs. I am using Archlinux on Odroid U3. U-Boot 2019.04-rc3-00131-g8303467e80d-dirty (Mar 18 2019 - 12:12:23 +0000) CPU: Exynos4412 @ 1 GHz Model: Odroid based on Exynos4412 Type: u3 DRAM: 2 GiB LDO20(a)VDDQ_EMMC_1.8V: set 1800000 uV; enabling LDO22(a)VDDQ_EMMC_2.8V: set 2800000 uV; enabling LDO21(a)TFLASH_2.8V: set 2800000 uV; enabling MMC: SAMSUNG SDHCI: 1, EXYNOS DWMMC: 0 Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment Net: No ethernet found. Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot/boot.scr 769 bytes read in 6 ms (125 KiB/s) ## Executing script at 42000000 6901856 bytes read in 253 ms (26 MiB/s) 53078 bytes read in 19 ms (2.7 MiB/s) 6590950 bytes read in 240 ms (26.2 MiB/s) Kernel image @ 0x41000000 [ 0x000000 - 0x695060 ] ## Flattened Device Tree blob at 40800000 Booting using the fdt blob at 0x40800000 Loading Ramdisk to 4f9b6000, end 4ffff1e6 ... OK Loading Device Tree to 4f9a6000, end 4f9b5f55 ... OK Starting kernel ... Old u-boot boots fine see the logs below. -------------------------------------------------------------------------------------------------- U-Boot 2018.01-1 (Feb 13 2018 - 02:19:55 +0000) Arch Linux ARM CPU: Exynos4412 @ 1 GHz Model: Odroid based on Exynos4412 Board: Odroid based on Exynos4412 Type: u3 DRAM: 2 GiB LDO20(a)VDDQ_EMMC_1.8V: set 1800000 uV; enabling LDO22(a)VDDQ_EMMC_2.8V: set 2800000 uV; enabling LDO21(a)TFLASH_2.8V: set 2800000 uV; enabling MMC: sdhci@12530000 - probe failed: -19 *** Warning - bad CRC, using default environment Net: No ethernet found. Hit any key to stop autoboot: 0 no mmc device at slot 1 switch to partitions #0, OK mmc0(part 0) is current device Scanning mmc 0:1... Found U-Boot script /boot/boot.scr 770 bytes read in 31 ms (23.4 KiB/s) ## Executing script at 50000000 6625416 bytes read in 267 ms (23.7 MiB/s) 72531 bytes read in 483 ms (146.5 KiB/s) 6590888 bytes read in 256 ms (24.6 MiB/s) Kernel image @ 0x42000000 [ 0x000000 - 0x651888 ] ## Flattened Device Tree blob at 43000000 Booting using the fdt blob at 0x43000000 Loading Ramdisk to 4f9b6000, end 4ffff1a8 ... OK Loading Device Tree to 4f9a1000, end 4f9b5b52 ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0xa00 [ 0.000000] Linux version 5.0.1-1-ARCH (builduser@leming) (gcc version 8.2.1 20181127 (GCC)) #1 SMP PREEMPT Tue Mar 12 04:09:35 UTC 2019 [ 0.000000] CPU: ARMv7 Processor [413fc090] revision 0 (ARMv7), cr=10c5387d [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache [ 0.000000] OF: fdt: Machine model: Hardkernel ODROID-U3 board based on Exynos4412 [ 0.000000] Memory policy: Data cache writealloc [ 0.000000] Reserved memory: created DMA memory pool at 0xbf700000, size 8 MiB [ 0.000000] OF: reserved mem: initialized node region_mfc_right, compatible id shared-dma-pool [ 0.000000] Reserved memory: created DMA memory pool at 0xbd300000, size 36 MiB Please could you share the details on how to debug this issue or how to resolve. Best Regards -Anand

2 6

[U-Boot] [PATCH] misc: fs_loader: Replace label with DT phandle
by tien.fong.chee＠intel.com 19 Mar '19

19 Mar '19

From: Tien Fong Chee <tien.fong.chee(a)intel.com> In previously label which will be expanded to the node's full path was used, and now replacing label with most commonly used DT phandle. The codes were changed accordingly to the use of DT phandle and supporting multiple instances. Signed-off-by: Tien Fong Chee <tien.fong.chee(a)intel.com> --- doc/driver-model/fs_firmware_loader.txt | 58 +++++++++++++++++++++++++------ drivers/misc/fs_loader.c | 36 ++++++++----------- 2 files changed, 62 insertions(+), 32 deletions(-) diff --git a/doc/driver-model/fs_firmware_loader.txt b/doc/driver-model/fs_firmware_loader.txt index b9aee84..d9f966e 100644 --- a/doc/driver-model/fs_firmware_loader.txt +++ b/doc/driver-model/fs_firmware_loader.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Intel Corporation <www.intel.com> +# Copyright (C) 2018-2019 Intel Corporation <www.intel.com> # # SPDX-License-Identifier: GPL-2.0 @@ -46,15 +46,48 @@ Firmware storage device described in device tree source ubivol = "ubi0"; }; - Then, firmware_loader property would be set with the path of fs_loader - node under /chosen node such as: + Then, firmware-loader property can be added with any device node, which + driver would use the firmware loader for loading. + + The value of the firmware-loader property should be set with phandle + of the fs-loader node. + For example: + firmware-loader = <&fs_loader0>; + + If there are majority of devices using the same fs-loader node, then + firmware-loader property can be added under /chosen node instead of + adding to each of device node. + + For example: /{ chosen { - firmware_loader = &fs_loader0; + firmware-loader = <&fs_loader0>; }; }; - However, this driver is also designed to support U-boot environment + In each respective driver of devices using firmware loader, the firmware + loaded instance should be created by DT phandle. + + For example of getting DT phandle from /chosen and creating instance: + chosen_node = ofnode_path("/chosen"); + if (!ofnode_valid(chosen_node)) { + debug("/chosen node was not found.\n"); + return -ENOENT; + } + + phandle_p = ofnode_get_property(chosen_node, "firmware-loader", &size); + if (!phandle_p) { + debug("firmware-loader property was not found.\n"); + return -ENOENT; + } + + phandle = fdt32_to_cpu(*phandle_p); + ret = uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER, + phandle, &dev); + if (ret) + return ret; + + Firmware loader driver is also designed to support U-boot environment variables, so all these data from FDT can be overwritten through the U-boot environment variable during run time. For examples: @@ -104,9 +137,12 @@ return: Description: The firmware is loaded directly into the buffer pointed to by buf -Example of creating firmware loader instance and calling -request_firmware_into_buf API: - if (uclass_get_device(UCLASS_FS_FIRMWARE_LOADER, 0, &dev)) { - request_firmware_into_buf(dev, filename, buffer_location, - buffer_size, offset_ofreading); - } +Example of calling request_firmware_into_buf API after creating firmware loader +instance: + ret = uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER, + phandle, &dev); + if (ret) + return ret; + + request_firmware_into_buf(dev, filename, buffer_location, buffer_size, + offset_ofreading); diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index a2e3763..f42eeff 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2018 Intel Corporation <www.intel.com> + * Copyright (C) 2018-2019 Intel Corporation <www.intel.com> * */ #include <common.h> @@ -219,32 +219,26 @@ int request_firmware_into_buf(struct udevice *dev, static int fs_loader_ofdata_to_platdata(struct udevice *dev) { - const char *fs_loader_path; u32 phandlepart[2]; - fs_loader_path = ofnode_get_chosen_prop("firmware-loader"); + ofnode fs_loader_node = dev_ofnode(dev); - if (fs_loader_path) { - ofnode fs_loader_node; + if (ofnode_valid(fs_loader_node)) { + struct device_platdata *plat; - fs_loader_node = ofnode_path(fs_loader_path); - if (ofnode_valid(fs_loader_node)) { - struct device_platdata *plat; - plat = dev->platdata; - - if (!ofnode_read_u32_array(fs_loader_node, - "phandlepart", - phandlepart, 2)) { - plat->phandlepart.phandle = phandlepart[0]; - plat->phandlepart.partition = phandlepart[1]; - } + plat = dev->platdata; + if (!ofnode_read_u32_array(fs_loader_node, + "phandlepart", + phandlepart, 2)) { + plat->phandlepart.phandle = phandlepart[0]; + plat->phandlepart.partition = phandlepart[1]; + } - plat->mtdpart = (char *)ofnode_read_string( - fs_loader_node, "mtdpart"); + plat->mtdpart = (char *)ofnode_read_string( + fs_loader_node, "mtdpart"); - plat->ubivol = (char *)ofnode_read_string( - fs_loader_node, "ubivol"); - } + plat->ubivol = (char *)ofnode_read_string( + fs_loader_node, "ubivol"); } return 0; -- 1.7.7.4

3 5

[U-Boot] [PATCH v3 0/1] efi_loader: support BootNext and BootCurrent
by AKASHI Takahiro 19 Mar '19

19 Mar '19

This patch was originally posted as a single one, but then was merged in my "run -e." Now I would like to post it on its own. With this patch, EFI Boot Manager will handles BootNext and BootCurrent variable as UEFI specification describes. Changes in v3 (Mar 8, 2019) * add error messages around BootNext * delete BootNext anyway when processing BootOrder Changes in v2 (Mar 5, 2019) * extract this patch from my "run -e" patch set * use efi_[get|set]_variable instead of 'rs->*' * add EFI_CALL * cosmetic changes AKASHI Takahiro (1): efi_loader: bootmgr: support BootNext and BootCurrent variable behavior lib/efi_loader/efi_bootmgr.c | 54 +++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) -- 2.20.1

2 3