June 2019 - U-Boot

[U-Boot] [PATCH v2 1/3] sysreset: switch to using SYSRESET_POWER_OFF for poweroff
by Urja Rannikko 15 Aug '19

15 Aug '19

It seems that SYSRESET_POWER_OFF was added recently, and all previous code used SYSRESET_POWER for poweroff. SYSRESET_POWER is supposed to be a PMIC-level power cycle, not a poweroff. Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> --- v2: Do not change STPMIC1 driver (thats actually SYSRESET_POWER) Note: I didnt touch the test/dm/sysreset.c code yet, mostly because I wanted to get feedback on this first and that i'd need to understand the tests properly to do that (and i havent used them before at all). --- arch/arm/mach-stm32mp/cmd_poweroff.c | 2 +- arch/sandbox/cpu/state.c | 2 +- drivers/sysreset/sysreset_psci.c | 2 +- drivers/sysreset/sysreset_sandbox.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_poweroff.c b/arch/arm/mach-stm32mp/cmd_poweroff.c index f54dd1daf2..62347425a0 100644 --- a/arch/arm/mach-stm32mp/cmd_poweroff.c +++ b/arch/arm/mach-stm32mp/cmd_poweroff.c @@ -14,7 +14,7 @@ int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) puts("poweroff ...\n"); mdelay(100); - ret = sysreset_walk(SYSRESET_POWER); + ret = sysreset_walk(SYSRESET_POWER_OFF); if (ret == -EINPROGRESS) mdelay(1000); diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index d3b9c05985..dee5fde4f7 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -355,7 +355,7 @@ void state_reset_for_test(struct sandbox_state *state) { /* No reset yet, so mark it as such. Always allow power reset */ state->last_sysreset = SYSRESET_COUNT; - state->sysreset_allowed[SYSRESET_POWER] = true; + state->sysreset_allowed[SYSRESET_POWER_OFF] = true; memset(&state->wdt, '\0', sizeof(state->wdt)); memset(state->spi, '\0', sizeof(state->spi)); diff --git a/drivers/sysreset/sysreset_psci.c b/drivers/sysreset/sysreset_psci.c index de2ec8aeb1..c7907b3226 100644 --- a/drivers/sysreset/sysreset_psci.c +++ b/drivers/sysreset/sysreset_psci.c @@ -18,7 +18,7 @@ static int psci_sysreset_request(struct udevice *dev, enum sysreset_t type) case SYSRESET_COLD: function_id = PSCI_0_2_FN_SYSTEM_RESET; break; - case SYSRESET_POWER: + case SYSRESET_POWER_OFF: function_id = PSCI_0_2_FN_SYSTEM_OFF; break; default: diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c index 38e2a7e241..8bc9f4b4cc 100644 --- a/drivers/sysreset/sysreset_sandbox.c +++ b/drivers/sysreset/sysreset_sandbox.c @@ -57,13 +57,13 @@ static int sandbox_sysreset_request(struct udevice *dev, enum sysreset_t type) case SYSRESET_COLD: state->last_sysreset = type; break; - case SYSRESET_POWER: + case SYSRESET_POWER_OFF: state->last_sysreset = type; if (!state->sysreset_allowed[type]) return -EACCES; sandbox_exit(); break; - case SYSRESET_POWER_OFF: + case SYSRESET_POWER: if (!state->sysreset_allowed[type]) return -EACCES; default: -- 2.21.0

5 9

[U-Boot] [PATCH v4 0/5] dm: spi: Convert Freescale ESPI driver to driver
by Chuanhua Han 15 Aug '19

15 Aug '19

In order to convert the Freescale ESPI driver to the driver model, there are 5 related patches in the current patch set: 0001-spl-dm-disable-SPI-DM-flash-for-non-DM-SPL.patch 0002-dm-spi-Convert-Freescale-ESPI-driver-to-driver-model.patch 0003-powerpc-dts-t2080-add-espi-controller-node-support.patch 0004-powerpc-dts-t2080qds-add-espi-slave-nodes-support.patch 0005-configs-enable-espi-device-module-in-T2080QDS.patch The first patch is to solve the problem that spl can't work when spiboot, and this is required for SPI boot. The other four patches are supported by the driver model. This patchset already supports the full dm mode, and fsl_espi driver support both OF_CONTROL and PLATDATA. Chuanhua Han (5): spl: dm: disable SPI DM flash for non-DM SPL dm: spi: Convert Freescale ESPI driver to driver model powerpc: dts: t2080: add espi controller node support powerpc: dts: t2080qds: add espi slave nodes support configs: enable espi device module in T2080QDS arch/powerpc/dts/t2080.dtsi | 10 + arch/powerpc/dts/t2080qds.dts | 33 ++ configs/T2080QDS_NAND_defconfig | 2 + configs/T2080QDS_SDCARD_defconfig | 2 + configs/T2080QDS_SECURE_BOOT_defconfig | 2 + configs/T2080QDS_SPIFLASH_defconfig | 2 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 + configs/T2080QDS_defconfig | 2 + drivers/spi/fsl_espi.c | 444 ++++++++++++++++------ include/config_uncmd_spl.h | 1 + include/dm/platform_data/fsl_espi.h | 16 + 11 files changed, 395 insertions(+), 121 deletions(-) create mode 100644 include/dm/platform_data/fsl_espi.h -- 2.17.1

4 28

[U-Boot] [RESEND PATCH] core: ofnode: Add ofnode_get_addr_size_index
by Keerthy 14 Aug '19

14 Aug '19

Add ofnode_get_addr_size_index function to fetch the address and size of the reg space based on index. Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- Previous discussion can be found here: * https://patchwork.ozlabs.org/patch/999659/ drivers/core/ofnode.c | 13 ++++++++++--- include/dm/ofnode.h | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 785f5c3acf..5bb06d3b00 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -251,7 +251,7 @@ int ofnode_read_size(ofnode node, const char *propname) return -EINVAL; } -fdt_addr_t ofnode_get_addr_index(ofnode node, int index) +fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size) { int na, ns; @@ -260,7 +260,7 @@ fdt_addr_t ofnode_get_addr_index(ofnode node, int index) uint flags; prop_val = of_get_address(ofnode_to_np(node), index, - NULL, &flags); + (u64 *)size, &flags); if (!prop_val) return FDT_ADDR_T_NONE; @@ -277,12 +277,19 @@ fdt_addr_t ofnode_get_addr_index(ofnode node, int index) ns = ofnode_read_simple_size_cells(ofnode_get_parent(node)); return fdtdec_get_addr_size_fixed(gd->fdt_blob, ofnode_to_offset(node), "reg", - index, na, ns, NULL, true); + index, na, ns, size, true); } return FDT_ADDR_T_NONE; } +fdt_addr_t ofnode_get_addr_index(ofnode node, int index) +{ + fdt_size_t size; + + return ofnode_get_addr_size_index(node, index, &size); +} + fdt_addr_t ofnode_get_addr(ofnode node) { return ofnode_get_addr_index(node, 0); diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index d206ee2caa..1be5ba4b45 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -354,6 +354,20 @@ ofnode ofnode_get_by_phandle(uint phandle); */ int ofnode_read_size(ofnode node, const char *propname); +/** + * ofnode_get_addr_size_index() - get an address/size from a node + * based on index + * + * This reads the register address/size from a node based on index + * + * @node: node to read from + * @index: Index of address to read (0 for first) + * @size: Pointer to size of the address + * @return address, or FDT_ADDR_T_NONE if not present or invalid + */ +phys_addr_t ofnode_get_addr_size_index(ofnode node, int index, + fdt_size_t *size); + /** * ofnode_get_addr_index() - get an address from a node * -- 2.17.1

4 8

[U-Boot] [PATCH] drivers/spi: fsl_qspi: fix controller busy check
by Thomas Schaefer 14 Aug '19

14 Aug '19

> On Mon, Jun 24, 2019 at 10:34 PM Fabio Estevam <festevam(a)gmail.com> wrote: > > > > From: Thomas Schaefer <thomas.schaefer(a)kontron.com> > > > > During QSPI reads, current is_busy_controller function sporadically > > fails with -ETIMEDOUT due to fixed number of 5 test loops. This > > patch fixes this by using the readl_poll_timeout function with > > 1000 us timeout. > > This sounds like two different functionalities into one patch. better create a timeout fix in one patch and another patch to migrate read_poll. I have split the patch into a series of 2 to differentiate functionality, as follows Thomas

4 5

[U-Boot] [RFC PATCH] qemu-x86: Use config_distro_bootcmd
by Joshua Watt 14 Aug '19

14 Aug '19

Converts qemu x86 machines to boot using distro_config. The intent is to allow u-boot in qemu to be maximally compatible with many boot methods without having to change the config. Currently, u-boot will only boot in a very limited set of circumstances where there is a /boot/vmlinuz on scsi 0:3 with no ramdisk. If distro_bootcmd fails, u-boot will fall back to the original method. Signed-off-by: Joshua Watt <JPEWhacker(a)gmail.com> --- include/configs/qemu-x86.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 64e7a60b8a..d9c96e295d 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -10,8 +10,38 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/sizes.h> + +#define CONFIG_BOOTCOMMAND \ + "run distro_bootcmd; " \ + "ext2load scsi 0:3 01000000 /boot/vmlinuz; " \ + "zboot 01000000" + +#define BOOT_TARGET_DEVICES(func) \ + func(USB, usb, 0) \ + func(SCSI, scsi, 0) \ + func(VIRTIO, virtio, 0) \ + func(IDE, ide, 0) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> #include <configs/x86-common.h> +#undef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE SZ_256K + +#define CONFIG_PREBOOT "pci enum" + +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_STD_DEVICES_SETTINGS \ + "scriptaddr=0x8000000\0" \ + "kernel_addr_r=0x1000000\0" \ + "ramdisk_addr_r=0x4000000\0" \ + "consoledev=ttyS0\0" \ + CONFIG_OTHBOOTARGS \ + BOOTENV + #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ -- 2.21.0

3 11

[U-Boot] [PATCH v2] armv8: ls1028a: Add environment variables to facilitate the boot
by Yuantian Tang 14 Aug '19

14 Aug '19

Add some environment variables to facilitate the auto boot. Signed-off-by: Yuantian Tang <andy.tang(a)nxp.com> --- v2: - merge with its dependent patch include/configs/ls1028a_common.h | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 0db86396e9..022981bfa3 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -67,6 +67,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ func(USB, usb, 0) #include <config_distro_bootcmd.h> @@ -127,25 +128,46 @@ "${scripthdraddr} ${prefix}${boot_script_hdr} " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ - "sd_bootcmd=echo Trying load from SD ..;" \ + "xspi_bootcmd=echo Trying load from FlexSPI flash ...;" \ + "sf probe 0:0 && sf read $load_addr " \ + "$kernel_start $kernel_size ; env exists secureboot &&" \ + "sf read $kernelheader_addr_r $kernelheader_start " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ + " bootm $load_addr#$board\0" \ + "xspi_hdploadcmd=echo Trying load HDP firmware from FlexSPI...;" \ + "sf probe 0:0 && sf read $load_addr 0x940000 0x30000 " \ + "&& hdp load $load_addr 0x2000\0" \ + "sd_bootcmd=echo Trying load from SD ...;" \ "mmcinfo; mmc read $load_addr " \ "$kernel_addr_sd $kernel_size_sd && " \ "env exists secureboot && mmc read $kernelheader_addr_r " \ "$kernelhdr_addr_sd $kernelhdr_size_sd " \ " && esbc_validate ${kernelheader_addr_r};" \ "bootm $load_addr#$board\0" \ + "sd_hdploadcmd=echo Trying load HDP firmware from SD..;" \ + "mmcinfo;mmc read $load_addr 0x4a00 0x200 " \ + "&& hdp load $load_addr 0x2000\0" \ "emmc_bootcmd=echo Trying load from EMMC ..;" \ "mmcinfo; mmc dev 1; mmc read $load_addr " \ "$kernel_addr_sd $kernel_size_sd && " \ "env exists secureboot && mmc read $kernelheader_addr_r " \ "$kernelhdr_addr_sd $kernelhdr_size_sd " \ " && esbc_validate ${kernelheader_addr_r};" \ - "bootm $load_addr#$board\0" + "bootm $load_addr#$board\0" \ + "emmc_hdploadcmd=echo Trying load HDP firmware from EMMC..;" \ + "mmc dev 1;mmcinfo;mmc read $load_addr 0x4a00 0x200 " \ + "&& hdp load $load_addr 0x2000\0" #undef CONFIG_BOOTCOMMAND +#define XSPI_NOR_BOOTCOMMAND \ + "run xspi_hdploadcmd; run distro_bootcmd; run xspi_bootcmd; " \ + "env exists secureboot && esbc_halt;;" #define SD_BOOTCOMMAND \ - "run distro_bootcmd;run sd_bootcmd; " \ + "run sd_hdploadcmd; run distro_bootcmd;run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#define SD2_BOOTCOMMAND \ + "run emmc_hdploadcmd; run distro_bootcmd;run emmc_bootcmd; " \ "env exists secureboot && esbc_halt;" /* Monitor Command Prompt */ -- 2.17.1

2 1

[U-Boot] [PATCH v2 00/12] System Firmware Loader for TI K3 family SoCs
by Andreas Dannenberg 13 Aug '19

13 Aug '19

Updated version of the SYSFW loader series for K3 family AM654x devices. The fundamantal approach of tapping into the SPL loader framework has been kept for reasons discussed already. The series also still uses "early BSS" in SPL's board_init_f(). I'm well aware of the concerns previously brought up regarding this mainly by Simon Glass but I have not been able to find a better / more universal solution for this yet (one proposal was to move SYSFW loading into board_init_r() which is not easily solvable as SYSFW is needed to bring up DDR on K3 SoCs). Long story short I propose to consider the current proposed approach nevertheless (as it is also used by other platforms) at least as an initial step, and then migrate once a better solution is available. I have not yet included support for TI's newest K3 family J721E SoC which Lokesh posted an initial patch series [5] for due to the complex dependencies of all the different series we have currently posted/pending (if I were to add support for J721E which eventually will be required then the SYSFW loader series would have Lokesh's series as a pre-requisite as well). This being said I would like to propose the following staging sequence for the different TI K3 SoCs patches currently under review: Step 1) Faiz' "Add Support for eMMC in Am65x-evm" series [1]. It needs a small update to actuall allow for eMMC boot I posted earlier. Step 2) The SYSFW loader series proposed here Step 3) An updated version (v3) of the AM654x EEPROM support [3]. Will post this today. Step 4) An updated version of Lokesh's "arm: k3: Allow for exclusive and shared device requests" series. In addition to a rebase such an updated series should include updating power domain properties for devices that were added during the previous steps. Step 5) An updated version of Lokesh's "arm: k3: arm64: Initial support Texas Instrument's J721E Platform" series [5] also adding in the few lines of codes to leverage SYSFW. Step 6 & beyond) Various rproc patches, etc. The above is to allow for things to build in a logical order while avoiding merge conflicts. 1+2+3 added will provide a pretty good initial working U-Boot using eMMC and SD media for AM654x which is a device available today plus a foundation for everything else, hence it is at the top of the list. Changes since initial submission: - Dropped patch "armv7R: dts: k3: am654: Update mmc nodes for loading sysfw". This is taken care off by the "Add Support for eMMC in Am65x-evm" patch series [1] which this series was rebased on. - Replaced patch "spl: Allow skipping clearing BSS during relocation" with a functionally equivalent patch "spl: Allow performing BSS init early before board_init_f()" which is a bit more elegant solution which itself is a slight evolution what previously posted by Simon Goldschmidt [2] - Collected various review tags [1] https://patchwork.ozlabs.org/project/uboot/list/?series=111723 [2] https://patchwork.ozlabs.org/patch/1067363/ [3] https://patchwork.ozlabs.org/project/uboot/list/?series=109266 [4] https://patchwork.ozlabs.org/project/uboot/list/?series=109163 [5] https://patchwork.ozlabs.org/project/uboot/list/?series=109296 -- Andreas Dannenberg Texas Instruments Inc Andreas Dannenberg (10): mmc: am654_sdhci: Allow driver to probe without PDs specified spl: Allow performing BSS init early before board_init_f() spl: Make image loader infrastructure more universal arm: K3: Introduce System Firmware loader framework armV7R: K3: am654: Allow using SPL BSS pre-relocation armv7R: K3: am654: Use full malloc implementation in SPL armV7R: K3: am654: Load SYSFW binary and config from boot media configs: am65x_evm_r5: All sysfw to be loaded via MMC configs: am65x_hs_evm_r5: All sysfw to be loaded via MMC configs: am65x_hs_evm: Add Support for eMMC boot Faiz Abbas (2): configs: am65x_evm: Add Support for eMMC boot am65x: README: Add eMMC layout and flash instructions arch/arm/lib/crt0.S | 53 ++-- arch/arm/mach-k3/Kconfig | 39 +++ arch/arm/mach-k3/Makefile | 3 + arch/arm/mach-k3/am6_init.c | 27 +- arch/arm/mach-k3/include/mach/sysfw-loader.h | 12 + arch/arm/mach-k3/sysfw-loader.c | 260 +++++++++++++++++++ board/ti/am65x/Kconfig | 1 + board/ti/am65x/README | 52 ++++ common/spl/Kconfig | 10 + common/spl/spl_fit.c | 14 + common/spl/spl_mmc.c | 76 ++++-- configs/am65x_evm_a53_defconfig | 2 + configs/am65x_evm_r5_defconfig | 7 +- configs/am65x_hs_evm_a53_defconfig | 2 + configs/am65x_hs_evm_r5_defconfig | 7 +- drivers/mmc/am654_sdhci.c | 16 +- include/configs/am65x_evm.h | 30 ++- include/spl.h | 26 ++ 18 files changed, 580 insertions(+), 57 deletions(-) create mode 100644 arch/arm/mach-k3/include/mach/sysfw-loader.h create mode 100644 arch/arm/mach-k3/sysfw-loader.c -- 2.17.1

4 40

[U-Boot] [PATCH 0/3] Intel FPGA PCIe fixes
by Ley Foon Tan 13 Aug '19

13 Aug '19

This patchset fix issues in Intel FPGA PCIe driver. - Fix TLP polling timeout - Fix enumerating mult-function PCIe device issue - Fix PCIe switch read config register issue Ley Foon Tan (3): pci: intel: Increase TLP polling counter pci: intel: Fix error when enumerating multi-function PCIe device pci: intel: Fix configuration type based on secondary number drivers/pci/pcie_intel_fpga.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) -- 2.19.0

3 9

[U-Boot] x86 FSP 2
by Simon Glass 13 Aug '19

13 Aug '19

Hi Bin, I'm looking at Apollo Lake and it seems to use a newer FSP version (2.0). The API differences seem to be fairly minor but the packaging seems a little more complicated. I'm thinking of introducing a Kconfig for this and moving the existing fsp implementation into an arch/x86/lib/fsp1 directory and adding an fsp2 there also. What do you think? Have you done anything with this newer version? Regards, Simon

2 4

[U-Boot] Verified boot of images without signatures
by Patrick Doyle 13 Aug '19

13 Aug '19

I am looking at enabling verified boot in the v2019.04-rc4 tag of u-boot. I was pleased when I learned how to embed the public authentication key in my u-boot device tree, sign my kernel using my private authentication key, and see u-boot validate the signature on boot. But then I was very surprised to learn that I could still boot an unsigned image. So I started looking at the code and I found `fit_image_verify_with_data() in "common/image_fit.c", which does: if (IMAGE_ENABLE_VERIFY && fit_image_verify_required_sigs(fit, image_noffset, data, size, gd_fdt_blob(), &verify_all)) { err_msg = "Unable to verify required signature"; goto error; } /* Process all hash subnodes of the component image node */ fdt_for_each_subnode(noffset, fit, image_noffset) { const char *name = fit_get_name(fit, noffset, NULL); /* * Check subnode name, must be equal to "hash". * Multiple hash nodes require unique unit node * names, e.g. hash-1, hash-2, etc. */ if (!strncmp(name, FIT_HASH_NODENAME, strlen(FIT_HASH_NODENAME))) { if (fit_image_check_hash(fit, noffset, data, size, &err_msg)) goto error; puts("+ "); } else if (IMAGE_ENABLE_VERIFY && verify_all && !strncmp(name, FIT_SIG_NODENAME, strlen(FIT_SIG_NODENAME))) { ret = fit_image_check_sig(fit, noffset, data, size, -1, &err_msg); /* * Show an indication on failure, but do not return * an error. Only keys marked 'required' can cause * an image validation failure. See the call to * fit_image_verify_required_sigs() above. */ if (ret) puts("- "); else puts("+ "); } } I see that if I create a "required" property in my signature block, then u-boot will require that the signature match. But if I don't have that, then it will happily boot an unsigned image (or even one that doesn't have any signature blocks). Am I missing something here? Has this been improved/addressed since v2019.04-rc4? If the answers are "No" and "No", then I will go in and address it myself. I welcome any tips folks might care to give me in advance of me just submitting a patch to address this. --wpd

3 3