August 2020 - U-Boot

[PATCH v1] arm: socfpga: soc64: Check FPGA Config status register before bridge reset
by Chee Hong Ang 06 Aug '20

06 Aug '20

Instead of querying SDM for FPGA configuration status through mailbox messages, U-Boot now checks System Manager's FPGA Config status register for FPGA configuration status before resetting bridge. Signed-off-by: Chee Hong Ang <chee.hong.ang(a)intel.com> --- arch/arm/mach-socfpga/include/mach/misc.h | 5 +++++ .../mach-socfpga/include/mach/system_manager_soc64.h | 6 +++++- arch/arm/mach-socfpga/misc_s10.c | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h index a85c5ae..43cc3d4 100644 --- a/arch/arm/mach-socfpga/include/mach/misc.h +++ b/arch/arm/mach-socfpga/include/mach/misc.h @@ -39,6 +39,11 @@ void socfpga_init_security_policies(void); void socfpga_sdram_remap_zero(void); #endif +#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \ + defined(CONFIG_TARGET_SOCFPGA_AGILEX) +int socfpga_get_fpga_config(void); +#endif + void do_bridge_reset(int enable, unsigned int mask); void socfpga_pl310_clear(void); void socfpga_get_managers_addr(void); diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h index c90f63a..5e3f54a 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h @@ -88,8 +88,12 @@ void sysmgr_pinmux_table_delay(const u32 **table, unsigned int *table_len); #define SYSMGR_ECC_OCRAM_EN BIT(0) #define SYSMGR_ECC_OCRAM_SERR BIT(3) #define SYSMGR_ECC_OCRAM_DERR BIT(4) -#define SYSMGR_FPGAINTF_USEFPGA 0x1 +#define SYSMGR_FPGACONFIG_FPGA_COMPLETE BIT(0) +#define SYSMGR_FPGACONFIG_EARLY_USERMODE BIT(1) +#define SYSMGR_FPGACONFIG_READY_MASK (SYSMGR_FPGACONFIG_FPGA_COMPLETE | \ + SYSMGR_FPGACONFIG_EARLY_USERMODE) +#define SYSMGR_FPGAINTF_USEFPGA 0x1 #define SYSMGR_FPGAINTF_NAND BIT(4) #define SYSMGR_FPGAINTF_SDMMC BIT(8) #define SYSMGR_FPGAINTF_SPIM0 BIT(16) diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c index 670bfa1..c8751db 100644 --- a/arch/arm/mach-socfpga/misc_s10.c +++ b/arch/arm/mach-socfpga/misc_s10.c @@ -151,17 +151,19 @@ int arch_early_init_r(void) return 0; } +/* Return 0 if FPGA is ready otherwise return non-zero */ +int socfpga_get_fpga_config(void) +{ + return (readl(socfpga_get_sysmgr_addr() + SYSMGR_SOC64_FPGA_CONFIG) & + SYSMGR_FPGACONFIG_READY_MASK) != SYSMGR_FPGACONFIG_READY_MASK; +} + void do_bridge_reset(int enable, unsigned int mask) { /* Check FPGA status before bridge enable */ - if (enable) { - int ret = mbox_get_fpga_config_status(MBOX_RECONFIG_STATUS); - - if (ret && ret != MBOX_CFGSTAT_STATE_CONFIG) - ret = mbox_get_fpga_config_status(MBOX_CONFIG_STATUS); - - if (ret) - return; + if (socfpga_get_fpga_config()) { + puts("FPGA not ready. Bridge reset aborted!\n"); + return; } socfpga_bridges_reset(enable); -- 2.2.0

2 1

[PATCH v2 0/2] Enable sysreset support for SoCFPGA SoC64 platforms
by Chee Hong Ang 06 Aug '20

06 Aug '20

Rename S10 sysreset driver to common name (SoC64). SoCFPGA sysreset driver supports S10 and Agilex platforms now. Chee Hong Ang (2): sysreset: socfpga: soc64: Rename SYSRESET SoCFPGA driver for S10 to SoC64 sysreset: socfpga: agilex: Enable sysreset support arch/arm/Kconfig | 2 +- drivers/sysreset/Kconfig | 8 ++++---- drivers/sysreset/Makefile | 2 +- .../sysreset/{sysreset_socfpga_s10.c => sysreset_socfpga_soc64.c} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename drivers/sysreset/{sysreset_socfpga_s10.c => sysreset_socfpga_soc64.c} (100%) -- 2.2.0

2 4

[PATCH] sun50i: a64: A64-Teres-I board detect builtin keyboard
by Jonas Smedegaard 06 Aug '20

06 Aug '20

A64-Teres-I board is a laptop which comes with a builtin keyboard. The keyboard+trackpad controller pauses for 2 seconds at a firmware prompt before loading its HID interface. U-Boot needs to wait equally long to reliably enable the keyboard. Signed-off-by: Jonas Smedegaard <dr(a)jones.dk> Reviewed-by: Tom Rini <trini(a)konsulko.com> Series-Cc: Jagan Teki <jagan(a)amarulasolutions.com> Series-Cc: Lukasz Majewski <lukma(a)denx.de> Series-Cc: Andre Przywara <andre.przywara(a)arm.com> --- Changes in v6: - (none - reduced to single patch, after patch 1 of 2 got applied) Changes in v5: - after delay do usb start (not usb reset) Changes in v4: - (none) Changes in v3: - (none) Changes in v2: - (none) --- configs/teres_i_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/teres_i_defconfig b/configs/teres_i_defconfig index 1eba20e5f5..ee07f86f64 100644 --- a/configs/teres_i_defconfig +++ b/configs/teres_i_defconfig @@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949 CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PL7" CONFIG_I2C0_ENABLE=y +CONFIG_PREBOOT="setenv usb_pgood_delay 2000; usb start" CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-teres-i" CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y -- 2.28.0

1 0

[PULL] u-boot-sh/master
by Marek Vasut 05 Aug '20

05 Aug '20

The following changes since commit a2d051e7b6a8f87add1067d936bb0c805a47b0df: Merge branch '2020-07-31-more-env-updates' (2020-07-31 10:13:07 -0400) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 5f52d6e90846b4f375a9dc0537773e9a6ad58f68: sh: r2dplus: Enable additional PCI ethernet devices (2020-08-02 19:58:27 +0200) ---------------------------------------------------------------- Marek Vasut (6): sh: r2dplus: Switch to DM ETH sh: r2dplus: Add pci enum to preboot sh: Set gd->malloc_base if MALLOC_F_LEN is set sh: r2dplus: Add SCIF1 to the basic DT sh: r2dplus: Enable DM_SERIAL and DM_CLK sh: r2dplus: Enable additional PCI ethernet devices arch/sh/dts/sh7751-r2dplus.dts | 23 +++++++++++++++++++++++ arch/sh/lib/start.S | 8 +++++++- configs/r2dplus_defconfig | 13 +++++++++++-- include/configs/r2dplus.h | 1 - 4 files changed, 41 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] tools: env: Fix printf() warning in fw_env
by Simon Glass 05 Aug '20

05 Aug '20

The printf() string produces a warning about %d not matching size_t. Fix it and put the format string on one line to avoid a checkpatch warning. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/env/fw_env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 3ab1ae69c7a..ccbeb5552bc 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -952,8 +952,8 @@ static int flash_read_buf(int dev, int fd, void *buf, size_t count, return -1; } if (rc != readlen) { - fprintf(stderr, "Read error on %s: " - "Attempted to read %d bytes but got %d\n", + fprintf(stderr, + "Read error on %s: Attempted to read %zd bytes but got %d\n", DEVNAME(dev), readlen, rc); return -1; } -- 2.28.0.163.g6104cc2f0b6-goog

2 3

[PATCH] ARM: add Kconfig option for PSCI 0.1
by Icenowy Zheng 05 Aug '20

05 Aug '20

We still have some platforms that only implements functionalities in PSCI 0.1 (e.g. Allwinner ARMv7 SoCs). Add a Kconfig option for exporting only PSCI 0.1. The code to export PSCI 0.1 is still available and gets activated by this patch. In addition, default ARCH_SUNXI U-Boot PSCI implementation to export PSCI 0.1, to fix poweroff/reboot regression on Allwinner multi-core ARMv7 SoCs. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> --- arch/arm/cpu/armv7/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig index 8eee801dce..60bb0a9e1e 100644 --- a/arch/arm/cpu/armv7/Kconfig +++ b/arch/arm/cpu/armv7/Kconfig @@ -44,6 +44,7 @@ config ARMV7_PSCI choice prompt "Supported PSCI version" depends on ARMV7_PSCI + default ARMV7_PSCI_0_1 if ARCH_SUNXI default ARMV7_PSCI_1_0 help Select the supported PSCI version. @@ -53,6 +54,9 @@ config ARMV7_PSCI_1_0 config ARMV7_PSCI_0_2 bool "PSCI V0.2" + +config ARMV7_PSCI_0_1 + bool "PSCI V0.1" endchoice config ARMV7_PSCI_NR_CPUS -- 2.27.0

2 1

[PATCH 1/1] cmd: bdinfo: cleanup phys_addr_t output
by Heinrich Schuchardt 05 Aug '20

05 Aug '20

We currently print the memory size with at least 8 hexadecimal digits. This creates a ragged output on 64 bit boards, e.g. on a Kendryte K210: DRAM bank = 0x0000000000000002 -> start = 0x0000000080600000 -> size = 0x0000000000200000 memstart = 0x0000000000000000 memsize = 0x00000000 flashstart = 0x0000000000000000 flashsize = 0x0000000000000000 flashoffset = 0x0000000000000000 All other numbers are printed with the number of digits needed for the type ulong. So use this value as minimum number of digits (precision) for printing physical addresses. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bdinfo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 8b2c105e77..519f5de146 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -33,9 +33,10 @@ static void print_eth(int idx) printf("%-12s= %s\n", name, val); } -static void print_lnum(const char *name, unsigned long long value) +static void print_phys_addr(const char *name, phys_addr_t value) { - printf("%-12s= 0x%.8llX\n", name, value); + printf("%-12s= 0x%.*llx\n", name, 2 * (int)sizeof(ulong), + (unsigned long long)value); } void bdinfo_print_mhz(const char *name, unsigned long hz) @@ -74,7 +75,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bdinfo_print_num("boot_params", (ulong)bd->bi_boot_params); print_bi_dram(bd); bdinfo_print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_phys_addr("memsize", bd->bi_memsize); bdinfo_print_num("flashstart", (ulong)bd->bi_flashstart); bdinfo_print_num("flashsize", (ulong)bd->bi_flashsize); bdinfo_print_num("flashoffset", (ulong)bd->bi_flashoffset); -- 2.27.0

5 4

[PATCH] cmd: bootz: fix device-tree overlap test
by Baruch Siach 05 Aug '20

05 Aug '20

The address of the kernel image is stored in images->ep. zi_start is the offset of execution entry in the image, which is usually 0 for ARM zImage. Fixes boot error when ftd is stored near RAM address 0x0: ERROR: FDT image overlaps OS image (OS=0x0..0x5fd608) Fixes: fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image") Cc: Tero Kristo <t-kristo(a)ti.com> Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- cmd/bootz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bootz.c b/cmd/bootz.c index 1c8b0cf89f92..7556cd2752a8 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -54,7 +54,7 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc, * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not * have a header that provide this informaiton. */ - if (bootm_find_images(flag, argc, argv, zi_start, zi_end - zi_start)) + if (bootm_find_images(flag, argc, argv, images->ep, zi_end - zi_start)) return 1; return 0; -- 2.27.0

2 1

[PATCH v2] fit_image: Use calloc() to fix reproducibility issue
by Fabio Estevam 05 Aug '20

05 Aug '20

Vagrant Cascadian reported that mx6cuboxi target no longer builds reproducibility on Debian. One example of builds mismatches: 00096680: 696e 6700 736f 756e 642d 6461 6900 6465 ing.sound-dai.de -00096690: 7465 6374 2d67 7069 6f73 0000 tect-gpios.. +00096690: 7465 6374 2d67 7069 6f73 0061 tect-gpios.a This problem happens because all the buffers in fit_image.c are allocated via malloc(), which does not zero out the allocated buffer. Using calloc() fixes this unpredictable behaviour as it guarantees that the allocated buffer are zero initialized. Reported-by: Vagrant Cascadian <vagrant(a)reproducible-builds.org> Suggested-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- Changes since v1: - Improve the commit log description by stating why calloc() helps. tools/fit_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/fit_image.c b/tools/fit_image.c index a082d9386d..0c6185d892 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -388,7 +388,7 @@ static int fit_build(struct image_tool_params *params, const char *fname) size = fit_calc_size(params); if (size < 0) return -1; - buf = malloc(size); + buf = calloc(1, size); if (!buf) { fprintf(stderr, "%s: Out of memory (%d bytes)\n", params->cmdname, size); @@ -467,7 +467,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) * Allocate space to hold the image data we will extract, * extral space allocate for image alignment to prevent overflow. */ - buf = malloc(fit_size + (align_size * image_number)); + buf = calloc(1, fit_size + (align_size * image_number)); if (!buf) { ret = -ENOMEM; goto err_munmap; @@ -572,7 +572,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname) /* Allocate space to hold the new FIT */ size = sbuf.st_size + 16384; - fdt = malloc(size); + fdt = calloc(1, size); if (!fdt) { fprintf(stderr, "%s: Failed to allocate memory (%d bytes)\n", __func__, size); @@ -673,7 +673,7 @@ static int copyfile(const char *src, const char *dst) goto out; } - buf = malloc(512); + buf = calloc(1, 512); if (!buf) { printf("Can't allocate buffer to copy file\n"); goto out; -- 2.17.1

3 2

[PATCH v2 0/1] Fix SPL_EARLY_BSS applying to normal build
by Brian Moyer 05 Aug '20

05 Aug '20

SPL_CLEAR_BSS is called regardless of build type if CONFIG_SPL_EARLY_BSS is defined. This seems to break u-boot proper and doesn't seem like the correct behavior. Early bss clearing in u-boot proper happens before relocation and causes lots of problems because .rel.dyn and .bss overlap. Changes in v2: - Adding a check to the first SPL_CLEAR_BSS resulted in BSS never getting cleared for u-boot proper. Added an or condition to the second call. - SPL_CLEAR_BSS is the only bss clearing operation. Renamed to just CLEAR_BSS for clarity. Brian Moyer (1): arm: Add SPL build check to SPL early bss clear arch/arm/lib/crt0.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.17.1

2 2