July 2022 - U-Boot

[PATCH] tools: relocate-rela: Don't assume <elf.h> defines Microblaze stuff
by Mark Kettenis 27 Jul '22

27 Jul '22

The contents of <elf.h> differ between OSes. It may only define the relocation types for the host architecture, and may not contain machine-specific defines for more obscure architectures (such as Microblaze) at all. Define the relevant constants for Microblaze locally if they are not provided by <elf.h>. Fixes: 034944b33bc8 ("tools: relocate-rela: Add support for 32bit Microblaze relocation") Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- tools/relocate-rela.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c index 090fb1acb2..c57c3cfade 100644 --- a/tools/relocate-rela.c +++ b/tools/relocate-rela.c @@ -20,6 +20,26 @@ #define R_AARCH64_RELATIVE 1027 #endif +#ifndef EM_MICROBLAZE +#define EM_MICROBLAZE 189 +#endif + +#ifndef R_MICROBLAZE_NONE +#define R_MICROBLAZE_NONE 0 +#endif + +#ifndef R_MICROBLAZE_32 +#define R_MICROBLAZE_32 1 +#endif + +#ifndef R_MICROBLAZE_REL +#define R_MICROBLAZE_REL 16 +#endif + +#ifndef R_MICROBLAZE_GLOB_DAT +#define R_MICROBLAZE_GLOB_DAT 18 +#endif + static int ei_class; static uint64_t rela_start, rela_end, text_base, dyn_start; -- 2.37.1

3 2

[PATCH/RFC] rockchip: derive GPIO bank from alias if available
by John Keeping 27 Jul '22

27 Jul '22

Upstream device trees now use standard node names like "gpio@ff..." but the rk_gpio driver expects a name like "gpio0@ff..." (note the index before the @). This is not a change that can be made in a -u-boot.dtsi file, so updating to the latest upstream device trees requires updating the driver. When a sequence number is given explicitly via an alias it makes sense to use this for the bank number (and aliases can be added via -u-boot.dtsi when they are not present upstream), so make this the preferred scheme for assigning a bank index, falling back to the current method if no alias is defined. Signed-off-by: John Keeping <john(a)metanate.com> --- I'm not sure if it would be better just to use dev_seq(dev) unconditionally here. If no aliases are defined, then the device tree nodes are in the right order for all Rockchip SoCs anyway so the sequence numbers will be sensible. But this feels like the change with less risk of unintentionally introducing a regression. drivers/gpio/rk_gpio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c index 68f30157a9..b2f6d0e925 100644 --- a/drivers/gpio/rk_gpio.c +++ b/drivers/gpio/rk_gpio.c @@ -151,8 +151,13 @@ static int rockchip_gpio_probe(struct udevice *dev) return ret; uc_priv->gpio_count = ROCKCHIP_GPIOS_PER_BANK; - end = strrchr(dev->name, '@'); - priv->bank = trailing_strtoln(dev->name, end); + + ret = dev_read_alias_seq(dev, &priv->bank); + if (ret) { + end = strrchr(dev->name, '@'); + priv->bank = trailing_strtoln(dev->name, end); + } + priv->name[0] = 'A' + priv->bank; uc_priv->bank_name = priv->name; -- 2.37.1

2 2

[PATCH v4] Improve Windows build documentation
by Martin Bonner 27 Jul '22

27 Jul '22

* Add three more modules that are required. * Remove the version numbers (because they are hard to keep in sync with the latest MSYS2 versions) * Add a pacman command line to install everything. Signed-off-by: Martin Bonner <martingreybeard(a)gmail.com> --- doc/build/tools.rst | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/build/tools.rst b/doc/build/tools.rst index c06f915274..5f8a04a31b 100644 --- a/doc/build/tools.rst +++ b/doc/build/tools.rst @@ -24,14 +24,20 @@ you can use MSYS2, a software distro and building platform for Windows. Download the MSYS2 installer from https://www.msys2.org. Make sure you have installed all required packages below in order to build these host tools:: - * gcc (9.1.0) - * make (4.2.1) - * bison (3.4.2) - * diffutils (3.7) - * openssl-devel (1.1.1.d) - -Note the version numbers in these parentheses above are the package versions -at the time being when writing this document. The MSYS2 installer tested is + * gcc + * make + * bison + * diffutils + * openssl-devel + * flex + * libgnutls-devel + * libuuid-devel + +You probably want ``git`` as well. You can install all these with:: + + $ pacman -S gcc make bison diffutils openssl-devel flex libgnutls-devel libuuid-devel git + +The MSYS2 installer tested is http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20190524.exe. There are 3 MSYS subsystems installed: MSYS2, MinGW32 and MinGW64. Each -- Martin Bonner

4 9

[PATCH] board: freescale: p1_p2_rdb_pc: Remove I-flag from second L2 SRAM mapping
by Pali Rohár 27 Jul '22

27 Jul '22

U-Boot for initial L2 SRAM uses L2 memory-mapping mode and not L2 with locked lines. P2020 reference manual about L2 memory-mapping mode says: Accesses to memory-mapped SRAM are cacheable only in the corresponding e500 L1 caches. So there is no need to set Caching-Inhibit I-bit for second part of initial L2 SRAM mapping in TLB entry. Remove it. First part of initial L2 SRAM mapping already does not have I-bit set. For more details see also: https://lore.kernel.org/u-boot/20220508150844.qqxg452rs4wtf5bs@pali/ Signed-off-by: Pali Rohár <pali(a)kernel.org> --- board/freescale/p1_p2_rdb_pc/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c index 52acd22dc95a..74bf8cc58ff9 100644 --- a/board/freescale/p1_p2_rdb_pc/tlb.c +++ b/board/freescale/p1_p2_rdb_pc/tlb.c @@ -105,14 +105,14 @@ struct fsl_e_tlb_entry tlb_table[] = { #endif /* RAMBOOT/SPL */ #ifdef CONFIG_SYS_INIT_L2_ADDR - /* *I*G - L2SRAM */ + /* ***G - L2SRAM */ SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR, CONFIG_SYS_INIT_L2_ADDR_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G, 0, 11, BOOKE_PAGESZ_256K, 1), #if CONFIG_SYS_L2_SIZE >= (256 << 10) SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR + 0x40000, CONFIG_SYS_INIT_L2_ADDR_PHYS + 0x40000, - MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G, 0, 12, BOOKE_PAGESZ_256K, 1) #endif #endif -- 2.20.1

1 0

[PATCH] cmd: part: Add partition-related type command
by Enric Balletbo i Serra 27 Jul '22

27 Jul '22

This implements the following command: part type mmc 0:1 -> print partittion type UUID part type mmc 0:1 uuid -> set environment variable to partition type UUID "part type" can be useful when writing a bootcmd which searches for a specific partition type to enable automatic discovery of partitions and their intended usage or mount point. Signed-off-by: Enric Balletbo i Serra <eballetbo(a)redhat.com> --- cmd/part.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/cmd/part.c b/cmd/part.c index 9d419c967c..26b0cc84fe 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -182,6 +182,29 @@ static int do_part_number(int argc, char *const argv[]) return do_part_info(argc, argv, CMD_PART_INFO_NUMBER); } +static int do_part_type(int argc, char *const argv[]) +{ + int part; + struct blk_desc *dev_desc; + struct disk_partition info; + + if (argc < 2) + return CMD_RET_USAGE; + if (argc > 3) + return CMD_RET_USAGE; + + part = blk_get_device_part_str(argv[0], argv[1], &dev_desc, &info, 0); + if (part < 0) + return 1; + + if (argc > 2) + env_set(argv[2], info.type_guid); + else + printf("%s\n", info.type_guid); + + return 0; +} + static int do_part_types(int argc, char * const argv[]) { struct part_driver *drv = ll_entry_start(struct part_driver, @@ -218,6 +241,8 @@ static int do_part(struct cmd_tbl *cmdtp, int flag, int argc, return do_part_size(argc - 2, argv + 2); else if (!strcmp(argv[1], "number")) return do_part_number(argc - 2, argv + 2); + else if (!strcmp(argv[1], "type")) + return do_part_type(argc - 2, argv + 2); else if (!strcmp(argv[1], "types")) return do_part_types(argc - 2, argv + 2); return CMD_RET_USAGE; @@ -244,6 +269,10 @@ U_BOOT_CMD( "part number <interface> <dev> <part> <varname>\n" " - set environment variable to the partition number using the partition name\n" " part must be specified as partition name\n" + "part type <interface> <dev>:<part>\n" + " - print partition type\n" + "part type <interface> <dev>:<part> <varname>\n" + " - set environment variable to partition type\n" "part types\n" " - list supported partition table types" ); -- 2.37.1

3 2

[PATCH v2] Provide more details of exactly how configuration signatures are calculated
by Martin Bonner 27 Jul '22

27 Jul '22

Describe exactly which bytes are hashed and in what order when signing a configuration. Signed-off-by: Martin Bonner <martingreybeard(a)gmail.com> --- doc/uImage.FIT/signature.txt | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt index 61a72db3c7..c71280b63b 100644 --- a/doc/uImage.FIT/signature.txt +++ b/doc/uImage.FIT/signature.txt @@ -382,6 +382,32 @@ verified later even if the FIT has been signed with other keys in the meantime. +Details +------- +The signature node contains a property ('hashed-nodes') which lists all the +nodes that the signature was made over. The image is walked in order and each +tag processed as follows: +- DTB_BEGIN_NODE: The tag and the following name are included in the signature + if the node or its parent are present in 'hashed-nodes' +- DTB_END_NODE: The tag is included in the signature if the node or its parent + are present in 'hashed-nodes' +- DTB_PROPERTY: The tag, the length word, the offset in the string table, and + the data are all included if the current node is present in 'hashed-nodes' + and the property name is not 'data'. +- DTB_END: The tag is always included in the signature. +- DTB_NOP: The tag is included in the signature if the current node is present + in 'hashed-nodes' + +In addition, the signature contains a property 'hashed-strings' which contains +the offset and length in the string table of the strings that are to be +included in the signature (this is done last). + +IMPORTANT: To verify the signature outside u-boot, it is vital to not only +calculate the hash of the image and verify the signature with that, but also to +calculate the hashes of the kernel, fdt, and ramdisk images and check those +match the hash values in the corresponding 'hash*' subnodes. + + Verification ------------ FITs are verified when loaded. After the configuration is selected a list -- Martin Bonner

3 2

[GIT PULL] Please pull u-boot-mmc master
by Jaehoon Chung 27 Jul '22

27 Jul '22

Dear Tom, Please pull u-boot-mmc master into u-boot master branch. If there is any problem, let me know, plz. Best Regards, Jaehoon Chung CI: https://source.denx.de/u-boot/custodians/u-boot-mmc/-/pipelines/12906 The following changes since commit 86feeab3dc71977afb70f595e42060ce324086d0: Merge tag 'u-boot-imx-20220726' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2022-07-26 10:26:00 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-mmc.git master for you to fetch changes up to 2785fc4868db1f2643ffd2b989c88cde9dcced4c: mmc: pci_mmc.c should build with ACPIGEN=n (2022-07-27 15:19:42 +0900) ---------------------------------------------------------------- Heinrich Schuchardt (1): mmc: pci_mmc.c should build with ACPIGEN=n Jim Liu (1): mmc: nuvoton: Add NPCM7xx mmc driver Pali Rohár (1): mmc: fsl_esdhc: Fix 'Internal clock never stabilised.' error Ying-Chun Liu (PaulLiu) (2): drivers: mmc: write protect single boot area cmd: mmc: allow to write protect single boot partition cmd/mmc.c | 18 ++++++++-- drivers/mmc/Kconfig | 12 +++++++ drivers/mmc/Makefile | 1 + drivers/mmc/fsl_esdhc.c | 17 ++++++++++ drivers/mmc/mmc.c | 27 +++++++++++++++ drivers/mmc/npcm_sdhci.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/pci_mmc.c | 3 ++ include/mmc.h | 16 +++++++++ 8 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 drivers/mmc/npcm_sdhci.c

2 1

[GIT PULL] Please pull u-boot-pmic master
by Jaehoon Chung 27 Jul '22

27 Jul '22

Dear Tom, Please pull u-boot-pmic master into u-boot master branch. If there is a problem, let me know, plz Best Regards, Jaehoon Chung CI: https://source.denx.de/u-boot/custodians/u-boot-pmic/-/pipelines/12905 The following changes since commit 86feeab3dc71977afb70f595e42060ce324086d0: Merge tag 'u-boot-imx-20220726' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2022-07-26 10:26:00 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-pmic.git master for you to fetch changes up to 67b5663d771121b3d606fc3346dc83024618448b: pmic: pca9450: permit config on all bucks and LDOs (2022-07-27 13:04:34 +0900) ---------------------------------------------------------------- Heiko Thiery (1): pmic: pca9450: permit config on all bucks and LDOs drivers/power/regulator/pca9450.c | 42 ++++++++++++--------------------------- 1 file changed, 13 insertions(+), 29 deletions(-)

2 1

Please pull u-boot-dm
by Simon Glass 27 Jul '22

27 Jul '22

Hi Tom, Build here: https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/12903 The following changes since commit 6e15cda270a060cf87c6c643a1cc3da65ffb242d: Prepare v2022.10-rc1 (2022-07-25 20:31:12 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-26jul22 for you to fetch changes up to dce4322c0e1940e11ef9ff086890b8c474707317: patman: By default don't pass "--no-tree" to checkpatch for linux (2022-07-26 02:30:56 -0600) ---------------------------------------------------------------- minor dm- and fdt-related fixes start of test for fdt command ---------------------------------------------------------------- Douglas Anderson (1): patman: By default don't pass "--no-tree" to checkpatch for linux Heinrich Schuchardt (5): dm: avoid NULL dereference in add_item() test: fix log tests dm: avoid NULL dereference in lists_bind_fdt() configs: sandbox_defconfig: CONFIG_LOG_MAX_LEVEL=9 dm: fix logic of lists_bind_fdt() Marek Vasut (1): binman: Increase default fitImage data section resize step from 1k to 64k Oleksandr Suvorov (1): dm: fix mis-word in SPL_DM description Patrick Delaunay (1): log: force DEBUG when LOG_DEBUG is activated Simon Glass (3): addrmap: Support on sandbox fdt: Start a test for the fdt command doc: Make a start on docs for fdt command board/sandbox/sandbox.c | 9 +++ common/cli.c | 15 +++++ configs/sandbox_defconfig | 3 + doc/develop/logging.rst | 19 +++--- doc/usage/cmd/fdt.rst | 69 ++++++++++++++++++++++ doc/usage/index.rst | 1 + drivers/core/Kconfig | 2 +- drivers/core/acpi.c | 4 +- drivers/core/lists.c | 15 +++-- include/addr_map.h | 2 + include/command.h | 10 ++++ include/log.h | 3 + include/test/suites.h | 1 + lib/addr_map.c | 5 +- test/cmd/Makefile | 1 + test/cmd/addrmap.c | 5 +- test/cmd/fdt.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ test/cmd_ut.c | 6 ++ test/log/log_test.c | 11 ++-- tools/binman/etype/fit.py | 1 + tools/patman/checkpatch.py | 11 ++-- tools/patman/control.py | 7 ++- tools/patman/main.py | 6 ++ tools/patman/settings.py | 3 +- 24 files changed, 314 insertions(+), 37 deletions(-) create mode 100644 doc/usage/cmd/fdt.rst create mode 100644 test/cmd/fdt.c Regards, Simon

2 1

[PATCH 1/3] mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON when necessary
by haibo.chen＠nxp.com 27 Jul '22

27 Jul '22

From: Haibo Chen <haibo.chen(a)nxp.com> After commit f132aab40327 ("Revert "mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON to control card clock output""), it involve issue in mmc_switch_voltage(), because of the special design of usdhc. For FSL_USDHC, it do not implement VENDORSPEC_CKEN/PEREN/HCKEN/IPGEN, these are reserved bits(Though RM contain the definition of these bits, but actually internal IC logic do not implement, already confirm with IC team). Instead, use VENDORSPEC_FRC_SDCLK_ON to gate on/off the card clock output. Here is the definition of this bit in RM: [8] FRC_SDCLK_ON Force CLK output active Do not set this bit to 1 unless it is necessary. Also, make sure that this bit is cleared when uSDHC’s clock is about to be changed (frequency change, clock source change, or delay chain tuning). 0b - CLK active or inactive is fully controlled by the hardware. 1b - Force CLK active In default, the FRC_SDCLK_ON is 0. This means, when there is no command or data transfer on bus, hardware will gate off the card clock. But in some case, we need the card clock keep on. Take IO voltage 1.8v switch as example, after IO voltage change to 1.8v, spec require gate off the card clock for 5ms, and gate on the clock back, once detect the card clock on, then the card will draw the dat0 to high immediately. If there is not clock gate off/on behavior, some card will keep the dat0 to low level. This is the reason we fail in mmc_switch_voltage(). To fix this issue, and concern that this is only the fsl usdhc hardware design limitation, set the bit FRC_SDCLK_ON in the beginning of the wait_dat0() and clear it in the end. To make sure the 1.8v IO voltage switch process align with SD specification. For standard tuning process, usdhc specification also require the card clock keep on, so also add these behavior in fsl_esdhc_execute_tuning(). Signed-off-by: Haibo Chen <haibo.chen(a)nxp.com> --- drivers/mmc/fsl_esdhc_imx.c | 19 ++++++++++++++++++- include/fsl_esdhc_imx.h | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 9299635f50..362e3e13b6 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -832,12 +832,15 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) u32 irqstaten = esdhc_read32(&regs->irqstaten); u32 irqsigen = esdhc_read32(&regs->irqsigen); int i, ret = -ETIMEDOUT; - u32 val, mixctrl; + u32 val, mixctrl, tmp; /* clock tuning is not needed for upto 52MHz */ if (mmc->clock <= 52000000) return 0; + /* make sure the card clock keep on */ + esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON); + /* This is readw/writew SDHCI_HOST_CONTROL2 when tuning */ if (priv->flags & ESDHC_FLAG_STD_TUNING) { val = esdhc_read32(&regs->autoc12err); @@ -897,6 +900,11 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) esdhc_stop_tuning(mmc); + /* change to default setting, let host control the card clock */ + esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON); + if (readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100)) + pr_warn("fsl_esdhc_imx: card clock not gate off as expect.\n"); + return ret; } #endif @@ -1560,9 +1568,18 @@ static int fsl_esdhc_wait_dat0(struct udevice *dev, int state, struct fsl_esdhc_priv *priv = dev_get_priv(dev); struct fsl_esdhc *regs = priv->esdhc_regs; + /* make sure the card clock keep on */ + esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON); + ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, !!(tmp & PRSSTAT_DAT0) == !!state, timeout_us); + + /* change to default setting, let host control the card clock */ + esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON); + if (readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100)) + pr_warn("fsl_esdhc_imx: card clock not gate off as expect.\n"); + return ret; } diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index 2153f29bef..b8efd2a166 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -37,6 +37,7 @@ #define VENDORSPEC_HCKEN 0x00001000 #define VENDORSPEC_IPGEN 0x00000800 #define VENDORSPEC_INIT 0x20007809 +#define VENDORSPEC_FRC_SDCLK_ON 0x00000100 #define IRQSTAT 0x0002e030 #define IRQSTAT_DMAE (0x10000000) @@ -94,6 +95,7 @@ #define PRSSTAT_CINS (0x00010000) #define PRSSTAT_BREN (0x00000800) #define PRSSTAT_BWEN (0x00000400) +#define PRSSTAT_SDOFF (0x00000080) #define PRSSTAT_SDSTB (0X00000008) #define PRSSTAT_DLA (0x00000004) #define PRSSTAT_CICHB (0x00000002) -- 2.17.1

6 11