November 2021 - U-Boot

Pull request for efi-2022-01-rc2-2
by Heinrich Schuchardt 14 Nov '21

14 Nov '21

Dear Tom, as agreed with Simon I have added the TPMv2 mmio driver to my pull request as this driver is needed for testing the EFI_TCG2_PROTOCOL. Patch Dockerfile: build swtpm https://lists.denx.de/pipermail/u-boot/2021-November/466713.html is another part of the effort to make the protocol testable. The following changes since commit 6354913def1f61711c2278bd2616c748f21f69da: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-marvell (2021-11-10 09:15:18 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-01-rc2-2 for you to fetch changes up to 2a10e06e07540694d82838793ee7cb34f4dbc59c: MAINTAINERS: Add entry for TPM drivers (2021-11-10 20:57:54 +0100) ---------------------------------------------------------------- Pull request for efi-2022-01-rc2-2 UEFI: * fix measurement of BootOrder variable for TCG2 protocol TPM: * TIS mmio driver. This driver supports QEMU's emulated TPM. ---------------------------------------------------------------- Ilias Apalodimas (8): tpm: refactor function names and macros for infineon v1.2 TPM tpm: refactor function names for LPC based TPMs tpm2: Introduce TIS tpm core tpm2: Add a TPMv2 MMIO TIS driver tpm: Use the new API on tpm2 spi driver configs: Enable tpmv2 mmio on qemu for arm/arm64 doc: qemu: Add instructions for swtpm usage MAINTAINERS: Add entry for TPM drivers Masahisa Kojima (1): efi_loader: fix BootOrder variable measurement handling MAINTAINERS | 5 + configs/qemu_arm64_defconfig | 2 + configs/qemu_arm_defconfig | 2 + doc/board/emulation/qemu-arm.rst | 25 +++ drivers/tpm/Kconfig | 9 + drivers/tpm/Makefile | 3 +- drivers/tpm/tpm2_tis_core.c | 463 +++++++++++++++++++++++++++++++++++++++ drivers/tpm/tpm2_tis_mmio.c | 157 +++++++++++++ drivers/tpm/tpm2_tis_spi.c | 447 +++---------------------------------- drivers/tpm/tpm_tis.h | 136 ++++++++++++ drivers/tpm/tpm_tis_infineon.c | 34 +-- drivers/tpm/tpm_tis_lpc.c | 4 +- include/tpm-v2.h | 1 + lib/efi_loader/efi_tcg2.c | 4 +- 14 files changed, 854 insertions(+), 438 deletions(-) create mode 100644 drivers/tpm/tpm2_tis_core.c create mode 100644 drivers/tpm/tpm2_tis_mmio.c

2 1

[PATCH v2 0/2] sandbox: enable testing SYSRESET_WATCHDOG
by Heinrich Schuchardt 14 Nov '21

14 Nov '21

With CONFIG_SYSRESET_WATCHDOG=y the sandbox can use a watchdog based system reset. To make this work calling sandbox_wdt_expire_now() must lead to a reset. Further we need CONFIG_WDT_GPIO=n to actually call the right watchdog. Adjust the watchdog test to avoid a build error. With this change we can test the development suggested in [PATCH 0/4] Improved sysreset/watchdog uclass integration https://lists.denx.de/pipermail/u-boot/2021-August/458656.html v2: move test changes to Makefile Heinrich Schuchardt (2): test/dm: fix watchdog test sandbox: fix sandbox_wdt_expire_now() drivers/watchdog/sandbox_wdt.c | 1 + test/dm/Makefile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.32.0

2 6

[PATCH] bootstage: Differentiate boot progress kconfig entries
by Jan Kiszka 14 Nov '21

14 Nov '21

From: Jan Kiszka <jan.kiszka(a)siemens.com> Both U-Boot proper and SPL entries were using the same description. Fixes: b55881dd ("bootstage: Add SPL support") Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- common/Kconfig.boot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Kconfig.boot b/common/Kconfig.boot index a8d4be23a9..d3a12be228 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -704,7 +704,7 @@ config SHOW_BOOT_PROGRESS 151 common/cmd_nand.c FIT image format OK config SPL_SHOW_BOOT_PROGRESS - bool "Show boot progress in a board-specific manner" + bool "Show boot progress in a board-specific manner in SPL" depends on SPL help Defining this option allows to add some board-specific code (calling -- 2.31.1

2 2

[PATCH v2 00/12] Board specific runtime determined default env
by Marek Behún 14 Nov '21

14 Nov '21

From: Marek Behún <marek.behun(a)nic.cz> Hello Simon, Pali, this is v2 of the series that adds support for board specific runtime determined default environment variables. (Went through CI on github.) As requested, I converted it to use sysinfo (and added support for some new things into sysinfo). I haven't tested the change on ESPRESSObin yet, because I don't have the board at home. But I copy-pasted the code to turris_mox and it worked as expected there. Nonetheless it should be tested, I or Pali can do it today or tomorrow. Marek Marek Behún (12): env: Don't set ready flag if import failed in env_set_default() env: Fix env_get() when returning empty string using env_get_f() env: Simplify env_get_default() sysinfo: Make sysinfo_get_str() behave like snprintf() test: Use ut_asserteq_str() instead of ut_assertok(strcmp()) sysinfo: Add get_str_list() method sysinfo: Make .detect() non-mandatory sysinfo: Add support for iterating string list env: Change return behaviour of env_set_default_vars() env: Add support for overwriting default environment via sysinfo arm: mvebu: Espressobin: Use new API for setting default env at runtime env: Remove support for read-write default_environment[] board/Marvell/mvebu_armada-37xx/board.c | 135 ++++++++++------ board/google/chromebook_coral/coral.c | 13 +- common/board_info.c | 2 +- configs/mvebu_espressobin-88f3720_defconfig | 1 + drivers/sysinfo/gpio.c | 2 +- drivers/sysinfo/rcar3.c | 2 +- drivers/sysinfo/sandbox.c | 20 ++- drivers/sysinfo/sysinfo-uclass.c | 99 +++++++++++- env/common.c | 165 +++++++++++++++++--- include/configs/mvebu_armada-37xx.h | 17 +- include/env.h | 1 + include/env_default.h | 2 - include/env_internal.h | 4 - include/sysinfo.h | 163 ++++++++++++++++++- lib/smbios.c | 2 +- test/dm/cpu.c | 4 +- test/dm/soc.c | 4 +- test/dm/sysinfo-gpio.c | 12 +- test/dm/sysinfo.c | 66 ++++++-- test/dm/usb.c | 2 +- test/dm/virtio.c | 2 +- test/print_ut.c | 32 ++-- 22 files changed, 595 insertions(+), 155 deletions(-) -- 2.32.0

3 32

[PATCH v2] binman: Fix replace subcommand help and comments
by Jan Kiszka 14 Nov '21

14 Nov '21

From: Jan Kiszka <jan.kiszka(a)siemens.com> Fix some copy&paste artifacts. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- tools/binman/cmdline.py | 4 ++-- tools/binman/control.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index d6156df408..d053d1be90 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -99,7 +99,7 @@ controlled by a description in the board device tree.''' replace_parser.add_argument('-C', '--compressed', action='store_true', help='Input data is already compressed if needed for the entry') replace_parser.add_argument('-i', '--image', type=str, required=True, - help='Image filename to extract') + help='Image filename to update') replace_parser.add_argument('-f', '--filename', type=str, help='Input filename to read from') replace_parser.add_argument('-F', '--fix-size', action='store_true', @@ -109,7 +109,7 @@ controlled by a description in the board device tree.''' replace_parser.add_argument('-m', '--map', action='store_true', default=False, help='Output a map file for the updated image') replace_parser.add_argument('paths', type=str, nargs='*', - help='Paths within file to extract (wildcard)') + help='Paths within file to replace (wildcard)') test_parser = subparsers.add_parser('test', help='Run tests') test_parser.add_argument('-P', '--processes', type=int, diff --git a/tools/binman/control.py b/tools/binman/control.py index 0dbcbc28e9..8b5085152a 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -343,10 +343,10 @@ def ReplaceEntries(image_fname, input_fname, indir, entry_paths, Args: image_fname: Image filename to process - input_fname: Single input ilename to use if replacing one file, None + input_fname: Single input filename to use if replacing one file, None otherwise indir: Input directory to use (for any number of files), else None - entry_paths: List of entry paths to extract + entry_paths: List of entry paths to replace do_compress: True if the input data is uncompressed and may need to be compressed if the entry requires it, False if the data is already compressed. -- 2.31.1

2 2

[PATCH] cmd: pxe_utils: sysboot: add label override support
by Amjad Ouled-Ameur 13 Nov '21

13 Nov '21

This will allow consumers to choose a pxe label at runtime instead of having to prompt the user. One good use-case for this, is choosing whether or not to apply a dtbo depending on the hardware configuration. e.g: for TI's AM335x EVM, it would be convenient to apply a particular dtbo only when the J9 jumper is on PRUSS mode. To achieve this, the pxe menu should have 2 labels, one with the dtbo and the other without, then the "pxe_label_override" env variable should point to the label with the dtbo at runtime only when the jumper is on PRUSS mode. This change can be used for different use-cases and bring more flexibilty to consumers who use sysboot/pxe_utils. if "pxe_label_override" is set but does not exist in the pxe menu, the code should fallback to the default label if given, and no failure is returned but rather a warning message. Signed-off-by: Amjad Ouled-Ameur <aouledameur(a)baylibre.com> --- cmd/pxe_utils.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 067c24e5ff4b..b1009f9c7547 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -1354,9 +1354,11 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) struct pxe_label *label; struct list_head *pos; struct menu *m; + char *label_override; int err; int i = 1; char *default_num = NULL; + char *override_num = NULL; /* * Create a menu and add items for all the labels. @@ -1367,6 +1369,8 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) if (!m) return NULL; + label_override = env_get("pxe_label_override"); + list_for_each(pos, &cfg->labels) { label = list_entry(pos, struct pxe_label, list); @@ -1375,11 +1379,22 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) menu_destroy(m); return NULL; } + if (label_override && + (strcmp(label->name, label_override) == 0)) + override_num = label->num; if (cfg->default_label && (strcmp(label->name, cfg->default_label) == 0)) default_num = label->num; } + if (label_override) { + if (override_num) + default_num = override_num; + else + printf("Missing override pxe label: %s\n", + label_override); + } + /* * After we've created items for each label in the menu, set the * menu's default label if one was specified. -- 2.25.1

2 4

[PATCH] pinctrl: meson: Correct the driver GPIO declaration
by Simon Glass 13 Nov '21

13 Nov '21

This should use the provided U_BOOT_DRIVER() macro so that the driver gets added to the appropriate linker list. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> Fixes: 7c9dcfed50f ("pinctrl: meson: rework gx pmx function") --- drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gx.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c index 159f3406a20..99502d89c6c 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c @@ -145,7 +145,7 @@ static const struct dm_gpio_ops meson_gx_gpio_ops = { .direction_output = meson_gpio_direction_output, }; -const struct driver meson_gx_gpio_driver = { +U_BOOT_DRIVER(meson_gx_gpio_driver) = { .name = "meson-gx-gpio", .id = UCLASS_GPIO, .probe = meson_gpio_probe, diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx.h b/drivers/pinctrl/meson/pinctrl-meson-gx.h index 4c1aa1a3002..c70c1f51c6d 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gx.h +++ b/drivers/pinctrl/meson/pinctrl-meson-gx.h @@ -43,6 +43,6 @@ struct meson_gx_pmx_data { } extern const struct pinctrl_ops meson_gx_pinctrl_ops; -extern const struct driver meson_gx_gpio_driver; +extern U_BOOT_DRIVER(meson_gx_gpio_driver); #endif /* __PINCTRL_MESON_GX_H__ */ diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 8c01c739068..93a895c9fa7 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -439,7 +439,7 @@ struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = { .num_groups = ARRAY_SIZE(meson_gxbb_periphs_groups), .num_funcs = ARRAY_SIZE(meson_gxbb_periphs_functions), .num_banks = ARRAY_SIZE(meson_gxbb_periphs_banks), - .gpio_driver = &meson_gx_gpio_driver, + .gpio_driver = DM_DRIVER_REF(meson_gx_gpio_driver), }; struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = { @@ -452,7 +452,7 @@ struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = { .num_groups = ARRAY_SIZE(meson_gxbb_aobus_groups), .num_funcs = ARRAY_SIZE(meson_gxbb_aobus_functions), .num_banks = ARRAY_SIZE(meson_gxbb_aobus_banks), - .gpio_driver = &meson_gx_gpio_driver, + .gpio_driver = DM_DRIVER_REF(meson_gx_gpio_driver), }; static const struct udevice_id meson_gxbb_pinctrl_match[] = { -- 2.34.0.rc1.387.gb447b232ab-goog

2 2

[PATCH v4 0/4] Add octal DTR support for Macronix flash
by JaimeLiao 13 Nov '21

13 Nov '21

This series add support for Macronix octal DTR flash, add flag for Softreset with "INVERT" command extension type on boot and follow linux kernel to enable 4byte opcode when possible. v4: Add flag SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT to seperate command extension types. Replace ifdef with CONFIG_IS_ENABLED and modify uncorrect descriptions. v3: Add flag SPI_NOR_CMD_EXT_INVERT to seperate command extension types. replace CONFIG_SPI_FLASH_MACRONIX with SPI_FLASH_MACRONIX_OCTAL for spi_nor_macronix_octal_dtr_enable function. v2: add ret checking for write enable in spi_nor_macronix_octal_dtr_enable function. JaimeLiao (4): mtd: spi-nor: macronix: add support for Macronix Octal mtd: spi-nor-core: Adding different type of command extension in Soft Reset mtd: spi-nor-core: set 4byte opcode when possible mtd: spi-nor-core: Add support for Macronix Octal flash drivers/mtd/spi/Kconfig | 14 +++++ drivers/mtd/spi/spi-nor-core.c | 94 +++++++++++++++++++++++++++++++++- drivers/mtd/spi/spi-nor-ids.c | 22 +++++++- include/linux/mtd/spi-nor.h | 13 ++++- 4 files changed, 139 insertions(+), 4 deletions(-) -- 2.17.1

4 16

[PATCH 1/1] blk: simplify blk_get_devnum_by_typename()
by Heinrich Schuchardt 13 Nov '21

13 Nov '21

The block descriptor contains the if_type. There is no need to first look up the uclass for the if_type and then to check the parent device's uclass to know if the device has the correct if_type. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/block/blk-uclass.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 83682dcc18..b32067f957 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -33,22 +33,6 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_PVBLOCK] = "pvblock", }; -static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { - [IF_TYPE_IDE] = UCLASS_IDE, - [IF_TYPE_SCSI] = UCLASS_SCSI, - [IF_TYPE_ATAPI] = UCLASS_INVALID, - [IF_TYPE_USB] = UCLASS_MASS_STORAGE, - [IF_TYPE_DOC] = UCLASS_INVALID, - [IF_TYPE_MMC] = UCLASS_MMC, - [IF_TYPE_SD] = UCLASS_INVALID, - [IF_TYPE_SATA] = UCLASS_AHCI, - [IF_TYPE_HOST] = UCLASS_ROOT, - [IF_TYPE_NVME] = UCLASS_NVME, - [IF_TYPE_EFI] = UCLASS_EFI, - [IF_TYPE_VIRTIO] = UCLASS_VIRTIO, - [IF_TYPE_PVBLOCK] = UCLASS_PVBLOCK, -}; - static enum if_type if_typename_to_iftype(const char *if_typename) { int i; @@ -62,11 +46,6 @@ static enum if_type if_typename_to_iftype(const char *if_typename) return IF_TYPE_UNKNOWN; } -static enum uclass_id if_type_to_uclass_id(enum if_type if_type) -{ - return if_type_uclass_id[if_type]; -} - const char *blk_get_if_type_name(enum if_type if_type) { return if_typename_str[if_type]; @@ -93,7 +72,6 @@ struct blk_desc *blk_get_devnum_by_type(enum if_type if_type, int devnum) */ struct blk_desc *blk_get_devnum_by_typename(const char *if_typename, int devnum) { - enum uclass_id uclass_id; enum if_type if_type; struct udevice *dev; struct uclass *uc; @@ -105,12 +83,6 @@ struct blk_desc *blk_get_devnum_by_typename(const char *if_typename, int devnum) if_typename); return NULL; } - uclass_id = if_type_to_uclass_id(if_type); - if (uclass_id == UCLASS_INVALID) { - debug("%s: Unknown uclass for interface type'\n", - if_typename_str[if_type]); - return NULL; - } ret = uclass_get(UCLASS_BLK, &uc); if (ret) @@ -122,13 +94,8 @@ struct blk_desc *blk_get_devnum_by_typename(const char *if_typename, int devnum) if_type, devnum, dev->name, desc->if_type, desc->devnum); if (desc->devnum != devnum) continue; - - /* Find out the parent device uclass */ - if (device_get_uclass_id(dev->parent) != uclass_id) { - debug("%s: parent uclass %d, this dev %d\n", __func__, - device_get_uclass_id(dev->parent), uclass_id); + if (desc->if_type != if_type) continue; - } if (device_probe(dev)) return NULL; -- 2.32.0

3 13

[PATCH 01/20] Convert CONFIG_ARCH_CPU_INIT to Kconfig
by Tom Rini 13 Nov '21

13 Nov '21

This converts the following to Kconfig: CONFIG_ARCH_CPU_INIT Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/s5p4418_nanopi2_defconfig | 1 + include/configs/s5p4418_nanopi2.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig index 06017437cccf..eaf319e58a2a 100644 --- a/configs/s5p4418_nanopi2_defconfig +++ b/configs/s5p4418_nanopi2_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_NEXELL=y CONFIG_SYS_TEXT_BASE=0x74C00000 CONFIG_SYS_MALLOC_LEN=0x2000000 diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index f49f5faa7f12..d22a84a50352 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -77,7 +77,6 @@ * System initialize options (board_init_f) */ /* board_init_f->init_sequence, call arch_cpu_init */ -#define CONFIG_ARCH_CPU_INIT /*----------------------------------------------------------------------- * Miscellaneous configurable options -- 2.25.1

1 40