November 2021 - U-Boot

[PATCH v1 1/2] imx8m: add regs used by GPMI
by Ariel D'Alessandro 05 Nov '21

05 Nov '21

From: Michael Trimarchi <michael(a)amarulasolutions.com> Add regs used by GPMI Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Ariel D'Alessandro <ariel.dalessandro(a)collabora.com> --- arch/arm/include/asm/arch-imx8m/imx-regs.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index b800da13a1e..14955d10900 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -58,6 +58,13 @@ #define SRC_DDRC_RCR_ADDR 0x30391000 #define SRC_DDRC2_RCR_ADDR 0x30391004 +#define APBH_DMA_ARB_BASE_ADDR 0x33000000 +#define APBH_DMA_ARB_END_ADDR 0x33007FFF +#define MXS_APBH_BASE APBH_DMA_ARB_BASE_ADDR + +#define MXS_GPMI_BASE (APBH_DMA_ARB_BASE_ADDR + 0x02000) +#define MXS_BCH_BASE (APBH_DMA_ARB_BASE_ADDR + 0x04000) + #define DDRC_DDR_SS_GPR0 0x3d000000 #define DDRC_IPS_BASE_ADDR(X) (0x3d400000 + ((X) * 0x2000000)) #define DDR_CSD1_BASE_ADDR 0x40000000 -- 2.30.2

1 2

Testing PCIe on Armada 370 (or older) in U-Boot
by Pali Rohár 05 Nov '21

05 Nov '21

Hello! Recently I have sent more PCIe related patches for mvebu/armada SoCs into U-Boot. Now all were merged into U-Boot git master branch. I have tested everything on Armada 38x. I would like to ask if you have some Armada 370 board (or older, e.g. Dove, Kirwood, Discovery, Orion) and if you could test if PCIe cards are correctly detected in recent U-Boot from git master branch. Just calling 'pci 0', 'pci 1', 'pci 2', ... commands and checking output if all connected cards are printed should be enough. On older boards, I would be interested in what is reported in PCI config space of PCIe Root Port. U-Boot from git master branch now exports the first PCIe Root Port at BDF address 0.0.0, so config space can be dumped by U-Boot command 'pci display.b 0.0.0 0 200'.

2 2

[PATCH 1/1] sysreset: watchdog: watchdog cannot power off
by Heinrich Schuchardt 05 Nov '21

05 Nov '21

The watchdog system reset driver can reboot the device but it cannot power it off. If power off is requested, the driver should not reset the system but leave powering off to one of the other system reset drivers. As power cycling is typically not a feature of a watchdog driver the reset types SYSRESET_POWER and SYSRESET_POWER_OFF shall both be excluded. Fixes: 17a0c14164dc ("dm: sysreset: add watchdog-reboot driver") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/sysreset/sysreset_watchdog.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c index 35efcac59d..8a659ee9b9 100644 --- a/drivers/sysreset/sysreset_watchdog.c +++ b/drivers/sysreset/sysreset_watchdog.c @@ -20,9 +20,16 @@ static int wdt_reboot_request(struct udevice *dev, enum sysreset_t type) struct wdt_reboot_plat *plat = dev_get_plat(dev); int ret; - ret = wdt_expire_now(plat->wdt, 0); - if (ret) - return ret; + switch (type) { + case SYSRESET_COLD: + case SYSRESET_WARM: + ret = wdt_expire_now(plat->wdt, 0); + if (ret) + return ret; + break; + default: + return -ENOSYS; + } return -EINPROGRESS; } -- 2.32.0

3 4

fastboot flash sparse image: buffer aligned
by qianfan 05 Nov '21

05 Nov '21

Hi: I'm testing 'fastboot flash' command with sparse images. Due to we write CHUNK_TYPE_RAW format data from unaligned buffer to mmc, the u-boot will report warinnig messages like this: "CACHE: Misaligned operation at range [84000028, 84001028]" if DCACHE is enabled. Is it a bug that we need fixed? Thanks

1 0

fastboot flash sparse image: buffer aligned
by qianfan 05 Nov '21

05 Nov '21

Hi: I'm testing 'fastboot flash' command with sparse images. Due to we write CHUNK_TYPE_RAW format data from unaligned buffer to mmc, the u-boot will report warinnig messages like this: "CACHE: Misaligned operation at range [84000028, 84001028]" if DCACHE is enabled. Is it a bug that we need fixed? Thanks

1 0

[PATCH 1/7] common: spl: move armv7m-specific code to spl_perform_fixups()
by Ovidiu Panait 05 Nov '21

05 Nov '21

Factor out armv7m fragment to spl_perform_fixups(), which is an arch/board specific function designed for this purpose. Signed-off-by: Ovidiu Panait <ovidiu.panait(a)windriver.com> --- arch/arm/cpu/armv7m/cpu.c | 6 ++++++ common/spl/spl.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index 63721018c1..65427b5312 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -12,6 +12,7 @@ #include <irq_func.h> #include <asm/io.h> #include <asm/armv7m.h> +#include <spl.h> /* * This is called right before passing control to @@ -56,3 +57,8 @@ void reset_cpu(void) | (V7M_SCB->aircr & V7M_AIRCR_PRIGROUP_MSK) | V7M_AIRCR_SYSRESET, &V7M_SCB->aircr); } + +void spl_perform_fixups(struct spl_image_info *spl_image) +{ + spl_image->entry_point |= 0x1; +} diff --git a/common/spl/spl.c b/common/spl/spl.c index 0c08da06e8..63556f35bd 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -770,9 +770,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2) ret); } -#ifdef CONFIG_CPU_V7M - spl_image.entry_point |= 0x1; -#endif switch (spl_image.os) { case IH_OS_U_BOOT: debug("Jumping to %s...\n", spl_phase_name(spl_next_phase())); -- 2.25.1

3 8

Re: [PATCH] image-board: fix wrong implementation ram disk address setup from cmdline
by Art Nikpal 05 Nov '21

05 Nov '21

hi Simon > Fixes: f33a2c1bd0f ("image: Remove #ifdefs from select_ramdisk()") > (I believe, can you confirm?) confirm f33a2c1bd0f has wrong implementation logic for raw ramdisk image sure i have tested it ... On Mon, Nov 1, 2021 at 7:47 AM Simon Glass <sjg(a)chromium.org> wrote: > > Hi Artem, > > On Fri, 15 Oct 2021 at 23:19, Artem Lapkin <email2tema(a)gmail.com> wrote: > > > > Problem > > > > Wrong implementation logic: ramdisk cmdline image address always ignored! > > Next block { rd_addr = hextoul(select, NULL) } unusable for raw initrd. > > > > We have unbootable raw initrd images because, select_ramdisk for raw > > initrd images ignore submited select addr and setup rd_datap value to 0 > > > > Come-from: https://patchwork.ozlabs.org/project/uboot/patch/20211015101501.4091141-1-a… > > > > Signed-off-by: Artem Lapkin <art(a)khadas.com> > > --- > > common/image-board.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > Fixes: f33a2c1bd0f ("image: Remove #ifdefs from select_ramdisk()") > > (I believe, can you confirm?) > > Reviewed-by: Simon Glass <sjg(a)chromium.org> > > > > > > diff --git a/common/image-board.c b/common/image-board.c > > index e7660352e9..e7063016ef 100644 > > --- a/common/image-board.c > > +++ b/common/image-board.c > > @@ -333,7 +333,7 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, > > > > if (select) { > > ulong default_addr; > > - bool done = true; > > + bool done = false; > > > > if (CONFIG_IS_ENABLED(FIT)) { > > /* > > @@ -351,13 +351,13 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, > > &fit_uname_config)) { > > debug("* ramdisk: config '%s' from image at 0x%08lx\n", > > fit_uname_config, rd_addr); > > + done = true; > > } else if (fit_parse_subimage(select, default_addr, > > &rd_addr, > > &fit_uname_ramdisk)) { > > debug("* ramdisk: subimage '%s' from image at 0x%08lx\n", > > fit_uname_ramdisk, rd_addr); > > - } else { > > - done = false; > > + done = true; > > } > > } > > if (!done) { > > -- > > 2.25.1 > >

2 1

[PATCH 0/2] add selftest for EFI_TCG2_PROTOCOL and Measured Boot
by Masahisa Kojima 05 Nov '21

05 Nov '21

This patch series adds the selftest for the EFI_TCG2_PROTOCOL and Measured Boot flow. This selftest is verified on qemu with swtpm. This covers most of the functionalities, but there are some limitations and TODO items. [Limitation] - tcg2 selftest must run at the beginning of the efi_selftest because some measurement occurs in efi_tcg2_register() and boottime->image_load(). Need to configure the efi_selftest with "setenv efi_selftest tcg2; bootefi selftest" - Skip ExitBootService measurement test - EFI application can not read PCR after calling ExitBootService - Skip EventLog Validation - Measured Boot measures U-Boot version, so EventLog varies every build having different commit hash. - Skip PCR[0] validation - PCR[0] include U-Boot version measurement, this value varies every build having different commit hash. - Skip PCR[7] validation - Secure Boot Variables can not be updated through efi_selftest. - The initial PCR value of PCR[17 - 22] is all 0xff, I'm not sure it is expected or not. [TODO] - GPT measurement test - Secure Boot Variable test - Eventlog validation Masahisa Kojima (2): efi_loader: add missing const qualifier efi_selftest: add selftest for EFI_TCG2_PROTOCOL and Measured Boot include/efi_api.h | 2 +- lib/efi_loader/efi_boottime.c | 5 +- lib/efi_selftest/Makefile | 10 + .../efi_selftest_miniapp_measuredboot.c | 93 ++ lib/efi_selftest/efi_selftest_tcg2.c | 804 +++++++++++++++++- 5 files changed, 910 insertions(+), 4 deletions(-) create mode 100644 lib/efi_selftest/efi_selftest_miniapp_measuredboot.c -- 2.17.1

4 15

[PATCH v1] env: setenv add resolve value option
by Artem Lapkin 05 Nov '21

05 Nov '21

Add possibility setup env variable with additional resolving vars inside value. Usage examples => setenv a hello => setenv b world => setenv c '${a} ${b}' => setenv -r d '${c}! ${a}...' => printenv d d=hello world! hello... /* internal usage example */ env_resolve("d", "${c}! ${a}..."); /* d="hello world! hello..." */ Notes Resolving works only for ${var} "bracket" and didn't workd for "unbracket" $var => setenv -r d '$c! $a...' => printenv d d=$c! $a... Signed-off-by: Artem Lapkin <art(a)khadas.com> --- cmd/nvedit.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/_exports.h | 1 + include/env.h | 11 +++++++++++ include/exports.h | 1 + 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 3bb6e764c0..6608932dc0 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -229,6 +229,7 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) int i, len; char *name, *value, *s; struct env_entry e, *ep; + bool resolve = 0; debug("Initial value for argc=%d\n", argc); @@ -246,6 +247,9 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) case 'f': /* force */ env_flag |= H_FORCE; break; + case 'r': /* resolve */ + resolve = 1; + break; default: return CMD_RET_USAGE; } @@ -291,6 +295,26 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) if (s != value) *--s = '\0'; + /* + * deep resolve value vars + */ + if (resolve) { + int max_loop = 32; + char value2[CONFIG_SYS_CBSIZE]; + + do { + cli_simple_process_macros(value, value2, CONFIG_SYS_CBSIZE); + if (!strcmp(value, value2)) + break; + value = realloc(value, strlen(value2)); + if (!value) { + printf("## Can't realloc %d bytes\n", len); + return 1; + } + strcpy(value, value2); + } while (max_loop--); + } + e.key = name; e.data = value; hsearch_r(e, ENV_ENTER, &ep, &env_htab, env_flag); @@ -304,6 +328,20 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) return 0; } +int env_resolve(const char *varname, const char *varvalue) +{ + const char * const argv[5] = { "setenv", "-r", varname, varvalue, NULL }; + + /* before import into hashtable */ + if (!(gd->flags & GD_FLG_ENV_READY)) + return 1; + + if (!varvalue || varvalue[0] == '\0') + return _do_env_set(0, 3, (char * const *)argv, H_PROGRAMMATIC); + else + return _do_env_set(0, 4, (char * const *)argv, H_PROGRAMMATIC); +} + int env_set(const char *varname, const char *varvalue) { const char * const argv[4] = { "setenv", varname, varvalue, NULL }; @@ -1371,7 +1409,9 @@ U_BOOT_CMD_COMPLETE( "setenv [-f] name value ...\n" " - [forcibly] set environment variable 'name' to 'value ...'\n" "setenv [-f] name\n" - " - [forcibly] delete environment variable 'name'", + " - [forcibly] delete environment variable 'name'\n" + "setenv [-r] name value ...\n" + " - [resolve] resolve 'value ...' to environment variable\n", var_complete ); diff --git a/include/_exports.h b/include/_exports.h index 8030d70c0b..86bc07f051 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -32,6 +32,7 @@ EXPORT_FUNC(do_reset, int, do_reset, struct cmd_tbl *, int , int , char * const []) EXPORT_FUNC(env_get, char *, env_get, const char*) + EXPORT_FUNC(env_resolve, int, env_resolve, const char *, const char *) EXPORT_FUNC(env_set, int, env_set, const char *, const char *) EXPORT_FUNC(simple_strtoul, unsigned long, simple_strtoul, const char *, char **, unsigned int) diff --git a/include/env.h b/include/env.h index ee5e30d036..c4efc5b7e5 100644 --- a/include/env.h +++ b/include/env.h @@ -133,6 +133,17 @@ int env_get_f(const char *name, char *buf, unsigned int len); */ int env_get_yesno(const char *var); +/** + * env_resolve() - resolve to environment variable + * + * Same as env_set but make deep resolve for variable + * + * @varname: Variable to adjust + * @value: Value to resolve for the variable, or NULL or "" to delete the variable + * @return 0 if OK, 1 on error + */ +int env_resolve(const char *varname, const char *value); + /** * env_set() - set an environment variable * diff --git a/include/exports.h b/include/exports.h index 550cafdc7a..a54b997988 100644 --- a/include/exports.h +++ b/include/exports.h @@ -44,6 +44,7 @@ int vprintf(const char *, va_list); unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base); int strict_strtoul(const char *cp, unsigned int base, unsigned long *res); char *env_get(const char *name); +int env_resolve(const char *varname, const char *value); int env_set(const char *varname, const char *value); long simple_strtol(const char *cp, char **endp, unsigned int base); int strcmp(const char *cs, const char *ct); -- 2.25.1

4 4

[PATCH] net: phy: realtek: Set correct bit for 8211e delays
by Samuel Holland 05 Nov '21

05 Nov '21

commit cb1d40151489 ("net: phy: realtek: Add tx/rx delay config for 8211e") added support for all four possible delay combinations, but set the wrong bit in the RXID and TXID cases. This broke Ethernet on boards using one of those settings. Fix that by fixing the bit selection. Fixes: cb1d40151489 ("net: phy: realtek: Add tx/rx delay config for 8211e") Reported-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- drivers/net/phy/realtek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 84c755525f..24c3ea59bb 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -194,10 +194,10 @@ static int rtl8211e_config(struct phy_device *phydev) MIIM_RTL8211E_RX_DELAY; break; case PHY_INTERFACE_MODE_RGMII_RXID: - val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_TX_DELAY; + val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_RX_DELAY; break; case PHY_INTERFACE_MODE_RGMII_TXID: - val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_RX_DELAY; + val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_TX_DELAY; break; default: /* the rest of the modes imply leaving delays as is. */ goto default_delay; -- 2.32.0

2 1