December 2021 - U-Boot

[PATCH v2] efi_loader: Don't limit the StMM buffer size explicitly
by Ilias Apalodimas 27 Dec '21

27 Dec '21

From: Ilias Apalodimas <apalos(a)gmail.com> Currently we allow and explicitly check a single shared page with StandAloneMM. This is dictated by OP-TEE which runs the application. However there's no way for us dynamically discover the number of pages we are allowed to use. Since writing big EFI signature list variable requires more than a page, OP-TEE has bumped the number of shared pages to four. Let's remove our explicit check and allow the request to reach OP-TEE even if it's bigger than what it supports. There's no need to sanitize the number of pages internally. OP-TEE will fail if we try to write more than it's allowed. The error will just trigger later on, during the StMM access. While at it add an error message to help users figure out what failed. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Tested-by: Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org> Signed-off-by: Ilias Apalodimas <apalos(a)gmail.com> --- Changes since v1: (was "Bump the number of shared pages with StandAloneMM") - Remove the check entirely and rely on tee trigeering the error include/tee.h | 1 + lib/efi_loader/efi_variable_tee.c | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/tee.h b/include/tee.h index 44e9cd4321bc..087810bd12e4 100644 --- a/include/tee.h +++ b/include/tee.h @@ -39,6 +39,7 @@ #define TEE_SUCCESS 0x00000000 #define TEE_ERROR_STORAGE_NOT_AVAILABLE 0xf0100003 #define TEE_ERROR_GENERIC 0xffff0000 +#define TEE_ERROR_EXCESS_DATA 0xffff0004 #define TEE_ERROR_BAD_PARAMETERS 0xffff0006 #define TEE_ERROR_ITEM_NOT_FOUND 0xffff0008 #define TEE_ERROR_NOT_IMPLEMENTED 0xffff0009 diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c index 281f886124af..b2d1513bea5d 100644 --- a/lib/efi_loader/efi_variable_tee.c +++ b/lib/efi_loader/efi_variable_tee.c @@ -15,7 +15,6 @@ #include <malloc.h> #include <mm_communication.h> -#define OPTEE_PAGE_SIZE BIT(12) extern struct efi_var_file __efi_runtime_data *efi_var_buf; static efi_uintn_t max_buffer_size; /* comm + var + func + data */ static efi_uintn_t max_payload_size; /* func + data */ @@ -113,9 +112,18 @@ static efi_status_t optee_mm_communicate(void *comm_buf, ulong dsize) rc = tee_invoke_func(conn.tee, &arg, 2, param); tee_shm_free(shm); + /* + * Although the max payload is configurable on StMM, we only share + * four pages from OP-TEE for the non-secure buffer used to communicate + * with StMM. OP-TEE will reject anything bigger than that and will + * return. So le'ts at least warn users + */ tee_close_session(conn.tee, conn.session); - if (rc || arg.ret != TEE_SUCCESS) + if (rc || arg.ret != TEE_SUCCESS) { + if (arg.ret == TEE_ERROR_EXCESS_DATA) + log_err("Variable payload too large\n"); return EFI_DEVICE_ERROR; + } switch (param[1].u.value.a) { case ARM_SVC_SPM_RET_SUCCESS: @@ -255,15 +263,6 @@ efi_status_t EFIAPI get_max_payload(efi_uintn_t *size) goto out; } *size = var_payload->size; - /* - * Although the max payload is configurable on StMM, we only share a - * single page from OP-TEE for the non-secure buffer used to communicate - * with StMM. Since OP-TEE will reject to map anything bigger than that, - * make sure we are in bounds. - */ - if (*size > OPTEE_PAGE_SIZE) - *size = OPTEE_PAGE_SIZE - MM_COMMUNICATE_HEADER_SIZE - - MM_VARIABLE_COMMUNICATE_SIZE; /* * There seems to be a bug in EDK2 miscalculating the boundaries and * size checks, so deduct 2 more bytes to fulfill this requirement. Fix -- 2.30.2

3 10

[PATCH] doc: Fix usage of CFG_RPMB_WRITE_KEY
by Ilias Apalodimas 27 Dec '21

27 Dec '21

This is a 'y/n' selection, so fix it. While at it remove the duplicate usage of CFG_CORE_HEAP_SIZE Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- doc/develop/uefi/uefi.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index a3e2656ab818..5c9d402bf100 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -248,9 +248,9 @@ OP-TEE Build instructions $ export ARCH=arm $ CROSS_COMPILE32=arm-linux-gnueabihf- make -j32 CFG_ARM64_core=y \ PLATFORM=<myboard> CFG_STMM_PATH=BL32_AP_MM.fd CFG_RPMB_FS=y \ - CFG_RPMB_FS_DEV_ID=0 CFG_CORE_HEAP_SIZE=524288 CFG_RPMB_WRITE_KEY=1 \ - CFG_CORE_HEAP_SIZE=524288 CFG_CORE_DYN_SHM=y CFG_RPMB_TESTKEY=y \ - CFG_REE_FS=n CFG_CORE_ARM64_PA_BITS=48 CFG_TEE_CORE_LOG_LEVEL=1 \ + CFG_RPMB_FS_DEV_ID=0 CFG_CORE_HEAP_SIZE=524288 CFG_RPMB_WRITE_KEY=y \ + CFG_CORE_DYN_SHM=y CFG_RPMB_TESTKEY=y CFG_REE_FS=n \ + CFG_CORE_ARM64_PA_BITS=48 CFG_TEE_CORE_LOG_LEVEL=1 \ CFG_TEE_TA_LOG_LEVEL=1 CFG_SCTLR_ALIGNMENT_CHECK=n U-Boot Build instructions -- 2.30.2

1 0

Pull request: u-boot-rockchip-20211226
by Kever Yang 26 Dec '21

26 Dec '21

Hi Tom, Please pull the rockchip fixes: - Add kaslrseed support; - rk3568 spl and image tool support; - px30 dts sync from kernel; - rk3399 emmc fix; - rockchip fastboot cmd fix; Gitlab ci: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/10351 Thanks, - Kever The following changes since commit 734ad933766f0dbbeafe1b27211686940a5e6d16: Prepare v2022.01-rc4 (2021-12-20 11:15:15 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20211226 for you to fetch changes up to 376b08d0f159ec1047ad65b5d6e36fd2cbf6d8ff: rockchip: mkimage: Add support for rk3568 SoC (2021-12-24 18:30:08 +0800) ---------------------------------------------------------------- Chris Morgan (2): cmd: kaslrseed: add command to generate value from hwrng rockchip: px30: add support for HW RNG for Odroid Go Advance Jagan Teki (3): arm64: dts: rockchip: px30: Move dmc into -u-boot.dtsi arm64: dts: rockchip: Sync px30 from linux-next engicam: px30: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF John Keeping (1): rockchip: boot_mode: fix fastboot command Kever Yang (3): rockchip: mkimage: rename RK_SIGNATURE to RK_MAGIC rockchip: mkimage: Add image header version rockchip: mkimage: Add support for rk3568 SoC Nico Cheng (3): rockchip: Kconfig: Enable SPL support for rk3568 arm: dts: rockchip: rk3568: Enable sdhci and sdmmc0 node rockchip: rk3568: add arch_cpu_init() Quentin Schulz (2): doc: rockchip: puma: update build and flash instructions power: pmic/fan53555: allow dm be omitted by SPL Sjoerd Simons (1): configs: rock-pi-4: Enable rockchip efuse support Yi Liu (1): rockchip: mkimage: Add support for idb header V2 Yifeng Zhao (1): dts: rockchip: rk3399: enable emmc phy for spl arch/arm/dts/Makefile | 5 +- arch/arm/dts/px30-engicam-common.dtsi | 90 +++++++ arch/arm/dts/px30-engicam-ctouch2.dtsi | 22 ++ arch/arm/dts/px30-engicam-edimm2.2.dtsi | 59 +++++ .../dts/px30-engicam-px30-core-ctouch2-of10.dts | 77 ++++++ ...uch2.dts => px30-engicam-px30-core-ctouch2.dts} | 4 +- arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts | 43 ++++ ...-px30-core.dtsi => px30-engicam-px30-core.dtsi} | 11 +- arch/arm/dts/px30-evb.dts | 143 +++++++++-- arch/arm/dts/px30-px30-core-edimm2.2.dts | 21 -- arch/arm/dts/px30-u-boot.dtsi | 14 +- arch/arm/dts/px30.dtsi | 275 +++++++++++++++------ arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 18 +- arch/arm/dts/rk3326-odroid-go2.dts | 178 ++++--------- arch/arm/dts/rk3399-u-boot.dtsi | 4 + arch/arm/dts/rk3568-u-boot.dtsi | 17 ++ arch/arm/mach-rockchip/Kconfig | 2 + arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/px30/Kconfig | 8 + arch/arm/mach-rockchip/rk3568/rk3568.c | 27 +- board/engicam/px30_core/MAINTAINERS | 6 + board/theobroma-systems/puma_rk3399/README | 66 +++-- cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/kaslrseed.c | 81 ++++++ configs/evb-rk3568_defconfig | 25 +- configs/px30-core-ctouch2-of10-px30_defconfig | 108 ++++++++ configs/px30-core-ctouch2-px30_defconfig | 4 +- configs/px30-core-edimm2.2-px30_defconfig | 4 +- configs/rock-pi-4-rk3399_defconfig | 1 + configs/rock-pi-4c-rk3399_defconfig | 1 + doc/README.rockchip | 27 +- drivers/power/pmic/Kconfig | 14 ++ drivers/power/pmic/Makefile | 2 +- include/configs/rk3568_common.h | 6 + tools/rkcommon.c | 226 +++++++++++++---- 36 files changed, 1225 insertions(+), 374 deletions(-) create mode 100644 arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts rename arch/arm/dts/{px30-px30-core-ctouch2.dts => px30-engicam-px30-core-ctouch2.dts} (80%) create mode 100644 arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts rename arch/arm/dts/{px30-px30-core.dtsi => px30-engicam-px30-core.dtsi} (96%) delete mode 100644 arch/arm/dts/px30-px30-core-edimm2.2.dts create mode 100644 cmd/kaslrseed.c create mode 100644 configs/px30-core-ctouch2-of10-px30_defconfig

2 1

iMX8MM support for HAB and encrypted image in the mainline
by Mircea Ciocan 26 Dec '21

26 Dec '21

Hello everybody, I have a board with iMX8MM that needs to have HAB and encryption of the U-Boot and kernel image active. OP-TEE is a nice to have, but no hard requirement and there is absolutely no need for any multimedia features (for all is needed the related blocks cold remain "dark"). I knew of course of the NXP fork used allover, that is mutilated beyond recognition IMHO, but I was wondering if the above needed features are supported in the mainline and if there is even a scrap of documentation/tutorial regarding implementing this on the mainlime. Thanks and best regards, Mircea

1 0

[PATCH u-boot-marvell 00/11] Another kwbimage series
by Marek Behún 25 Dec '21

25 Dec '21

From: Marek Behún <marek.behun(a)nic.cz> Hi Stefan, Pali has prepared another series of patches for kwbimage, I have reviewed them. Marek Pali Rohár (11): tools: kwbimage: Add support for new commands UART_PORT and UART_MPP tools: kwbimage: Explicitly set version also for kwbimage v0 tools: kwbimage: Set BOOT_FROM by default to SPI tools: kwbimage: Fix validation of kwbimage v0 tools: kwbimage: Remove unused enums and prototypes tools: kwbimage: Align final UART image to 128 bytes tools: kwbimage: Do not put final image padding to the image data size tools: kwbimage: Align kwbimage header to proper size tools: kwbimage: Fill the real header size into the main header tools: kwbimage: Properly calculate and align kwbimage v0 header size tools: kwbimage: Properly set srcaddr in kwbimage v0 tools/kwbimage.c | 250 ++++++++++++++++++++++++++++++++--------------- tools/kwbimage.h | 25 +---- 2 files changed, 174 insertions(+), 101 deletions(-) -- 2.32.0

4 35

[RFC PATCH v2 0/3] imx8m: move env_get_location for imx8mn and imx8mp at board level
by Tommaso Merciai 25 Dec '21

25 Dec '21

This series move env_get_location from soc to board level. As suggested by Michael <michael(a)amarulasolutions.com> make no sense to define an unique way for multiple board. One board can boot from emmc and having env on spi flash etc.. Anyways, this function is kept in both imx8mn and imx8mp evk boards instead of being completely dropped. (as suggested by Andrey <andrey.zhizhikin(a)leica-geosystems.com>) Tommaso Merciai (3): imx8m: drop env_get_location for imx8mn and imx8mp imx: imx8mn_evk: override env_get_location imx: imx8mp_evk: override env_get_location arch/arm/mach-imx/imx8m/soc.c | 39 ------------------------- board/freescale/imx8mn_evk/imx8mn_evk.c | 35 ++++++++++++++++++++++ board/freescale/imx8mp_evk/imx8mp_evk.c | 34 +++++++++++++++++++++ 3 files changed, 69 insertions(+), 39 deletions(-) -- 2.25.1

2 6

[PATCH] mkimage: fix segfault on MacOS arm64
by Sergey V. Lobanov 25 Dec '21

25 Dec '21

mkimage segfaults due ASLR mechasim on MacOS arm64 It is required to use _dyld_get_image_vmaddr_slide() to prevent segfault on MacOS arm64 This patch ased on the discussion https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45… Thanks to Ronny Kotzschmar and ptpt52 github user Signed-off-by: Sergey V. Lobanov <sergey(a)lobanov.in> --- tools/imagetool.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/imagetool.h b/tools/imagetool.h index e229a34ffc..13775ff9b3 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -271,11 +271,16 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); * b) we need a API call to get the respective section symbols */ #if defined(__MACH__) #include <mach-o/getsect.h> +#include <mach-o/dyld.h> -#define INIT_SECTION(name) do { \ +#define INIT_SECTION(name) struct image_type_params \ + **__cat(__start_, name), **__cat(__stop_, name); \ + do { \ unsigned long name ## _len; \ char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ + __cat(pstart_, name) += \ + _dyld_get_image_vmaddr_slide(0); \ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ @@ -283,7 +288,6 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); } while (0) #define SECTION(name) __attribute__((section("__DATA, " #name))) -struct image_type_params **__start_image_type, **__stop_image_type; #else #define INIT_SECTION(name) /* no-op for ELF */ #define SECTION(name) __attribute__((section(#name))) -- 2.30.1 (Apple Git-130)

1 1

[RFC PATCH v2 0/8] FWU: Add support for FWU Multi Bank Update feature
by Sughosh Ganu 25 Dec '21

25 Dec '21

The patchset adds support for the FWU Multi Bank Update[1] feature. Certain aspects of the Dependable Boot[2] specification have also been implemented. The FWU multi bank update feature is used for supporting multiple sets(also called banks) of firmware image(s), allowing the platform to boot from a different bank, in case it fails to boot from the active bank. This functionality is supported by keeping the relevant information in a structure called metadata, which provides information on the images. Among other parameters, the metadata structure contains information on the currect active bank that is being used to boot image(s). Functionality is being added to work with the UEFI capsule driver in u-boot. The metadata is read to gather information on the update bank, which is the bank to which the firmware images would be flashed to. On a successful completion of the update of all components, the active bank field in the metadata is updated, to reflect the bank from which the platform will boot on the subsequent boots. Currently, the feature is being enabled on the STM32MP157C-DK2 board which boots a FIP image from a uSD card partitioned with the GPT partioning scheme. This also requires changes in the previous stage of bootloader, which parses the metadata and selects the bank to boot the image(s) from. Support is being added in tf-a(BL2 stage) for the STM32MP157C-DK2 board to boot the active bank images. These changes are under review currently[3]. Changes since V1: * Rename metadata with mdata for all symbols. Applicable for all patches * Move all function declarations to a separate header fwu.h * Drop the patch which added the get_gpt_hdr_parts api, as suggested by Patrick * Use the logic suggested by Patrick to get the partition type guids and partition guid's instead of defining a new api * Drop the parameter in the function fwu_revert_boot_index as suggested by Etienne * Use BIT for all macros * Call the platform function fwu_plat_get_alt_num for getting the alt_num for the image partition, instead of the earlier hard-coded approach. * Change the logic in gpt_check_mdata_validity as suggested by Ilias. * Other smaller code style changes suggested by Ilias * Define a new function fwu_plat_get_alt_num using logic suggested by Patrick for returning the alt_num for the partition * Define a new function plat_fill_gpt_partition_guids to fill the guid array with Partition Type guids * Use the TAMP_BOOTCOUNT register as suggested by Yann Gautier instead of the earlier unused register 10 * Define a new function fwu_plat_get_alt_num for filling up all the dfu partitions with a preset ImageTypeId guid * Remove the distinction made in the earlier version for setting image_type_id as suggested by Heinrich * Define a funtion fwu_update_checks_pass to do the checks before initiating the update * Log the status of the boottime checks using boottime_check variable and allow system to boot instead of hanging the platform(fwu_boottime_checks) * Call function fwu_update_checks_pass to check if the update can be initiated * Do not allow firmware update from efi_init_obj_list as the fwu boot-time checks need to be run Todo's ------ 1) Add a test(selftest) for the metadata access. 2) Add a tool for generation of the metadata. Not sure if this needs to be part of the u-boot repository though. 3) Add a tool for generation of the firmware accept/reject dummy capsule. Need to check if this can be added to the mkeficapsule tool in u-boot. [1] - https://developer.arm.com/documentation/den0118/a [2] - https://staging-git.codelinaro.org/linaro/firmware-dual-banked-updates/test [3] - https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/12566 Sughosh Ganu (8): FWU: Add FWU metadata structure and functions for accessing metadata FWU: Add FWU metadata access functions for GPT partitioned block devices FWU: stm32mp1: Add helper functions for accessing FWU metadata FWU: STM32MP1: Add support to read boot index from backup register EFI: FMP: Add provision to update image's ImageTypeId in image descriptor FWU: Add boot time checks as highlighted by the FWU specification FWU: Add support for FWU Multi Bank Update feature FWU: cmd: Add a command to read FWU metadata board/st/stm32mp1/stm32mp1.c | 169 ++++++++ cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/fwu_mdata.c | 64 +++ common/board_r.c | 6 + include/fwu.h | 51 +++ include/fwu_mdata.h | 104 +++++ lib/Kconfig | 32 ++ lib/Makefile | 1 + lib/efi_loader/efi_capsule.c | 198 ++++++++- lib/efi_loader/efi_firmware.c | 90 +++- lib/efi_loader/efi_setup.c | 3 +- lib/fwu_updates/Makefile | 11 + lib/fwu_updates/fwu.c | 190 +++++++++ lib/fwu_updates/fwu_mdata.c | 236 +++++++++++ lib/fwu_updates/fwu_mdata_gpt_blk.c | 635 ++++++++++++++++++++++++++++ 16 files changed, 1787 insertions(+), 11 deletions(-) create mode 100644 cmd/fwu_mdata.c create mode 100644 include/fwu.h create mode 100644 include/fwu_mdata.h create mode 100644 lib/fwu_updates/Makefile create mode 100644 lib/fwu_updates/fwu.c create mode 100644 lib/fwu_updates/fwu_mdata.c create mode 100644 lib/fwu_updates/fwu_mdata_gpt_blk.c -- 2.17.1

4 37

[RFC] usb: xhci-dwc3: Support role switch default role
by Mark Kettenis 25 Dec '21

25 Dec '21

When the device tree indicates support for role switching through the "usb-role-switch" property, take the "role-switch-default-mode" property into account when deciding which role to put the controller into. This makes USB devices work on Apple M1 systems where the device tree may include a "dr_mode" property that is set to "otg", but where we need to put the controller into "host" mode to see devices connected to the type-C ports. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- I'm far from sure this is the right approach. But it does appear that U-Boot doesn't really support role switching. So making sure U-Boot uses the default role defined in the device tree makes sense to me. drivers/usb/common/common.c | 16 ++++++++++++++++ drivers/usb/host/xhci-dwc3.c | 6 ++++++ include/linux/usb/otg.h | 10 ++++++++++ 3 files changed, 32 insertions(+) diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index ee0c064f1f..cff86a51ae 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -40,6 +40,22 @@ enum usb_dr_mode usb_get_dr_mode(ofnode node) return USB_DR_MODE_UNKNOWN; } +enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node) +{ + const char *dr_mode; + int i; + + dr_mode = ofnode_read_string(node, "role-switch-default-mode"); + if (!dr_mode) + return USB_DR_MODE_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++) + if (!strcmp(dr_mode, usb_dr_modes[i])) + return i; + + return USB_DR_MODE_UNKNOWN; +} + static const char *const speed_names[] = { [USB_SPEED_UNKNOWN] = "UNKNOWN", [USB_SPEED_LOW] = "low-speed", diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index bec0d98081..1dbd65dfaa 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -209,6 +209,12 @@ static int xhci_dwc3_probe(struct udevice *dev) writel(reg, &dwc3_reg->g_usb2phycfg[0]); dr_mode = usb_get_dr_mode(dev_ofnode(dev)); + if (dr_mode == USB_DR_MODE_OTG && + dev_read_bool(dev, "usb-role-switch")) { + dr_mode = usb_get_role_switch_default_mode(dev_ofnode(dev)); + if (dr_mode == USB_DR_MODE_UNKNOWN) + dr_mode = USB_DR_MODE_OTG; + } if (dr_mode == USB_DR_MODE_UNKNOWN) /* by default set dual role mode to HOST */ dr_mode = USB_DR_MODE_HOST; diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index c19b916be9..5d0dac950e 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -27,6 +27,16 @@ enum usb_dr_mode { */ enum usb_dr_mode usb_get_dr_mode(ofnode node); +/** + * usb_get_dr_mode() - Get dual role mode for given device + * @node: ofnode of the given device + * + * The function gets phy interface string from property + * 'role-switch-defaulr-mode', and returns the correspondig enum + * usb_dr_mode + */ +enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node); + /** * usb_get_maximum_speed() - Get maximum speed for given device * @node: ofnode of the given device -- 2.34.1

1 0

[PATCH v8 00/32] fdt: Make OF_BOARD a boolean option
by Simon Glass 24 Dec '21

24 Dec '21

With Ilias' efforts we have dropped OF_PRIOR_STAGE and OF_HOSTFILE so there are only three ways to obtain a devicetree: - OF_SEPARATE - the normal way, where the devicetree is built and appended to U-Boot - OF_EMBED - for development purposes, the devicetree is embedded in the ELF file (also used for EFI) - OF_BOARD - the board figures it out on its own The last one is currently set up so that no devicetree is needed at all in the U-Boot tree. Most boards do provide one, but some don't. Some don't even provide instructions on how to boot on the board. The problems with this approach were covered in another patch[1], since removed from this series. In practice, OF_BOARD is not really distinct from OF_SEPARATE. Any board can obtain its devicetree at runtime, even it is has a devicetree built in U-Boot. This is because U-Boot may be a second-stage bootloader and its caller may have a better idea about the hardware available in the machine. This is the case with a few QEMU boards, for example. So it makes no sense to have OF_BOARD as a 'choice'. It should be an option, available with either OF_SEPARATE or OF_EMBED. This would allow rpi3, for example, to run with the devicetree provided by the prior bootloader. This series makes this change, adding various missing devicetree files (and placeholders) to make the build work. To make the 'prior stage' side of things more deterministic, a new OF_HAS_PRIOR_STAGE is added, which cannot be disabled by updated a board's defconfig. This should help to prevent mistakes. It also adds a run-time message showing where the devicetree came from, as well as warnings if the board's expected flow is not being used. This comes originally from the 'standard passage' series, which depends on this series. It also provides a few qemu clean-ups discovered along the way. The qemu-riscv64_spl problem is fixed. Please see [2] for discussion on the v6 series. I put Heinrich's Tested-by tag[3] for the series onto the three devicetree patches (ARM and RISC-V) that I think it most affects. It isn't possible to apply a tag to a whole series at present and in any case there are changes in v7. This series is available at u-boot-dm/ofb-working [1] https://patchwork.ozlabs.org/project/uboot/patch/20211207001209.3467163-2-s… [2] https://lore.kernel.org/u-boot/20211205133207.GW1220664@bill-the-cat/T/#mcd… [3] https://lore.kernel.org/u-boot/93913911-4d20-d28f-ee04-739985184c5e@canonic… Changes in v8: - Add a new patch to make it easier to debug u-boot.dtsi files - Add an fdt: tag - Add new patch to ensure that OF_BOARD is used when needed - Drop documentation patches - Drop the build-time warning, since people may ignore it - Drop the devicetree docs in the README - Enable the flash as suggested by Linus Walleij - Fix devicetree logic so that just u-boot.dtb is omitted - Mention that this is empty, rather than a dummy file - Mention the follower patch - Move board-config changes to a separate patch - Rebase patch - Reword commit message to mention the dynamic devicetree - Use an empty tree due to maintainer objections Changes in v7: - Add new patch to add a Kconfig for boards with a prior stage - Bring in files from Linux instead - Drop FDTSRC_PASSAGE for now - Fix 'Is' typo in commit message - Reword commit message - Rewrite the commit message - Switch to using an empty file for qemu virt - Use 'empty' instead of 'fake' Changes in v6: - Expand the commit message based on comments Changes in v5: - Add new patches to clean up fdtdec_setup() and surrounds - Merge RISC-V and ARM patches since they are similar Simon Glass (32): arm: qemu: Mention -nographic in the docs arm: riscv: qemu: Explain how to extract the generated dt arm: qemu: Add a devicetree file for qemu_arm arm: qemu: Add a devicetree file for qemu_arm64 virt riscv: qemu: Split devicetree files for qemu_riscv32/64 arm: rpi: Sync rpi dts files from Linux arm: vexpress: Add a devicetree files for juno arm: xenguest_arm64: Add a empty devicetree file arm: octeontx: Add an empty devicetree file arm: xilinx_versal_virt: Add a devicetree file arm: bcm7xxx: Add a devicetree file arm: qemu-ppce500: Add a devicetree file arm: highbank: Add devicetree files fdt: Make OF_BOARD a bool option fdt: Drop CONFIG_BINMAN_STANDALONE_FDT fdt: Make it easier to debug u-boot.dtsi files fdt: Move MULTI_DTB_FIT handling out of fdtdec_setup() fdt: Drop #ifdefs with MULTI_DTB_FIT fdt: Drop CONFIG_SPL_BUILD check in fdtdec_setup() fdt: Drop #ifdef around board_fdt_blob_setup() fdt: Use if() for fdtcontroladdr check fdt: Drop OF_CONTROL check in fdtdec_setup() fdt: Drop remaining preprocessor macros in fdtdec_setup() fdt: Don't call board_fdt_blob_setup() without OF_BOARD dm: core: Allow getting some basic stats fdt: Record where the devicetree came from fdt: Report the devicetree source fdt: Add a Kconfig for boards with a prior stage fdt: Enable OF_HAS_PRIOR_STAGE for most boards with OF_BOARD fdt: Makefile: Ensure that OF_BOARD is used when needed fdt: Avoid emitting an device tree when not needed fdt: Show a runtime warning based on devicetree source Makefile | 16 +- README | 29 - arch/arm/Kconfig | 12 +- arch/arm/dts/Makefile | 20 +- arch/arm/dts/bcm2711-rpi-4-b.dts | 262 ++++ arch/arm/dts/bcm2711-rpi.dtsi | 74 ++ arch/arm/dts/bcm2711.dtsi | 1100 +++++++++++++++++ arch/arm/dts/bcm2835-common.dtsi | 207 ++++ arch/arm/dts/bcm2835-rpi-a-plus.dts | 18 +- arch/arm/dts/bcm2835-rpi-a.dts | 16 +- arch/arm/dts/bcm2835-rpi-b-plus.dts | 18 +- arch/arm/dts/bcm2835-rpi-b-rev2.dts | 16 +- arch/arm/dts/bcm2835-rpi-b.dts | 16 +- arch/arm/dts/bcm2835-rpi-cm1-io1.dts | 9 + arch/arm/dts/bcm2835-rpi-cm1.dtsi | 7 +- arch/arm/dts/bcm2835-rpi-common.dtsi | 12 + arch/arm/dts/bcm2835-rpi-zero-w.dts | 20 +- arch/arm/dts/bcm2835-rpi-zero.dts | 16 +- arch/arm/dts/bcm2835-rpi.dtsi | 35 +- arch/arm/dts/bcm2835.dtsi | 2 + arch/arm/dts/bcm2836-rpi-2-b.dts | 14 +- arch/arm/dts/bcm2836.dtsi | 2 + arch/arm/dts/bcm2837-rpi-3-a-plus.dts | 9 +- arch/arm/dts/bcm2837-rpi-3-b-plus.dts | 9 +- arch/arm/dts/bcm2837-rpi-3-b.dts | 5 +- arch/arm/dts/bcm2837-rpi-cm3-io3.dts | 9 + arch/arm/dts/bcm2837-rpi-cm3.dtsi | 9 + arch/arm/dts/bcm2837.dtsi | 2 + arch/arm/dts/bcm283x-rpi-usb-peripheral.dtsi | 7 + arch/arm/dts/bcm283x.dtsi | 224 +--- arch/arm/dts/bcm7xxx.dts | 15 + arch/arm/dts/highbank.dts | 9 + arch/arm/dts/juno-base.dtsi | 831 +++++++++++++ arch/arm/dts/juno-clocks.dtsi | 46 + arch/arm/dts/juno-cs-r1r2.dtsi | 85 ++ arch/arm/dts/juno-motherboard.dtsi | 303 +++++ arch/arm/dts/juno-r2-u-boot.dtsi | 20 + arch/arm/dts/juno-r2.dts | 322 +++++ arch/arm/dts/octeontx.dts | 14 + arch/arm/dts/qemu-arm.dts | 11 + arch/arm/dts/qemu-arm64.dts | 11 + arch/arm/dts/xenguest-arm64.dts | 15 + arch/arm/dts/xilinx-versal-virt.dts | 11 + arch/arm/mach-bcm283x/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/powerpc/dts/Makefile | 1 + arch/powerpc/dts/qemu-ppce500.dts | 10 + arch/riscv/dts/Makefile | 2 +- .../dts/{qemu-virt.dts => qemu-virt32.dts} | 3 + arch/riscv/dts/qemu-virt64.dts | 11 + board/emulation/qemu-riscv/Kconfig | 1 + cmd/bdinfo.c | 2 + common/board_r.c | 24 + configs/ae350_rv32_defconfig | 1 - configs/ae350_rv32_spl_defconfig | 1 - configs/ae350_rv32_spl_xip_defconfig | 1 - configs/ae350_rv64_defconfig | 1 - configs/ae350_rv64_spl_defconfig | 1 - configs/ae350_rv64_spl_xip_defconfig | 1 - configs/bcm7260_defconfig | 2 +- configs/bcm7445_defconfig | 2 +- configs/highbank_defconfig | 2 +- configs/octeontx2_95xx_defconfig | 2 +- configs/octeontx2_96xx_defconfig | 2 +- configs/octeontx_81xx_defconfig | 2 +- configs/octeontx_83xx_defconfig | 2 +- configs/qemu-ppce500_defconfig | 3 +- configs/qemu-riscv32_defconfig | 2 +- configs/qemu-riscv32_smode_defconfig | 2 +- configs/qemu-riscv32_spl_defconfig | 5 +- configs/qemu-riscv64_defconfig | 2 +- configs/qemu-riscv64_smode_defconfig | 2 +- configs/qemu-riscv64_spl_defconfig | 4 +- configs/qemu_arm64_defconfig | 2 +- configs/qemu_arm_defconfig | 2 +- configs/rpi_4_32b_defconfig | 2 +- configs/rpi_4_defconfig | 2 +- configs/rpi_arm64_defconfig | 2 +- configs/vexpress_aemv8a_juno_defconfig | 2 +- configs/xenguest_arm64_defconfig | 3 +- configs/xilinx_versal_virt_defconfig | 1 + doc/board/emulation/qemu-arm.rst | 10 +- doc/board/emulation/qemu-riscv.rst | 3 + doc/develop/devicetree/dt_qemu.rst | 48 + doc/develop/devicetree/index.rst | 1 + drivers/core/device.c | 11 + drivers/core/root.c | 7 + drivers/core/uclass.c | 13 + dts/Kconfig | 65 +- include/asm-generic/global_data.h | 12 + include/dm/device.h | 11 +- include/dm/root.h | 8 + include/dm/uclass-internal.h | 7 + include/dt-bindings/clock/bcm2835.h | 2 + include/fdtdec.h | 53 +- lib/fdtdec.c | 141 ++- scripts/Makefile.lib | 4 +- scripts/check-of.sh | 42 + scripts/of_whitelist.txt | 1 + test/dm/core.c | 41 + tools/binman/binman.rst | 34 +- 101 files changed, 4082 insertions(+), 432 deletions(-) create mode 100644 arch/arm/dts/bcm2711-rpi-4-b.dts create mode 100644 arch/arm/dts/bcm2711-rpi.dtsi create mode 100644 arch/arm/dts/bcm2711.dtsi create mode 100644 arch/arm/dts/bcm2835-common.dtsi create mode 100644 arch/arm/dts/bcm2835-rpi-common.dtsi create mode 100644 arch/arm/dts/bcm283x-rpi-usb-peripheral.dtsi create mode 100644 arch/arm/dts/bcm7xxx.dts create mode 100644 arch/arm/dts/highbank.dts create mode 100644 arch/arm/dts/juno-base.dtsi create mode 100644 arch/arm/dts/juno-clocks.dtsi create mode 100644 arch/arm/dts/juno-cs-r1r2.dtsi create mode 100644 arch/arm/dts/juno-motherboard.dtsi create mode 100644 arch/arm/dts/juno-r2-u-boot.dtsi create mode 100644 arch/arm/dts/juno-r2.dts create mode 100644 arch/arm/dts/octeontx.dts create mode 100644 arch/arm/dts/qemu-arm.dts create mode 100644 arch/arm/dts/qemu-arm64.dts create mode 100644 arch/arm/dts/xenguest-arm64.dts create mode 100644 arch/arm/dts/xilinx-versal-virt.dts create mode 100644 arch/powerpc/dts/qemu-ppce500.dts rename arch/riscv/dts/{qemu-virt.dts => qemu-virt32.dts} (94%) create mode 100644 arch/riscv/dts/qemu-virt64.dts create mode 100644 doc/develop/devicetree/dt_qemu.rst create mode 100755 scripts/check-of.sh create mode 100644 scripts/of_whitelist.txt -- 2.34.1.173.g76aa8bc2d0-goog

3 35