June 2022 - U-Boot

[PATCH 0/5] spl: binman: Fixes for BINMAN_SYMBOLS
by Alper Nebi Yasak 10 Jun '22

10 Jun '22

There's some trouble with an i.MX8M series [1] trying to use binman symbols. The crux of it is the 'u_boot_any' symbols BINMAN_SYMBOLS configs declare, and the boards creating partial binman images including an SPL without a U-Boot the symbol is referring to. Normally this should be easy to resolve by disabling BINMAN_SYMBOLS configs, but that causes a build error. Apparently some parts of the SPL code (RAW_IMAGE_SUPPORT, RAM_DEVICE) use the symbols directly without guarding them by BINMAN_SYMBOLS, implicitly requiring it. The first patch fixes the issue above, the rest are minor things I tinkered with while trying to understand the issue. These apply onto u-boot/next. I have also triggered an Azure CI run [2] via a Github pull request. [1] arm64: binman: use binman symbols for imx https://lore.kernel.org/u-boot/20220603071715.15212-1-peng.fan@oss.nxp.com/ [2] #20220610.3 spl: binman: Fixes for BINMAN_SYMBOLS https://dev.azure.com/u-boot/u-boot/_build/results?buildId=4431&view=results Alper Nebi Yasak (5): spl: binman: Fix use of undeclared u_boot_any symbols spl: binman: Make TPL_BINMAN_SYMBOLS depend on TPL_FRAMEWORK spl: binman: Declare extern symbols for VPL as well spl: binman: Let u-boot-spl/vpl symbol declarations be disabled spl: binman: Add a config option for binman symbols in VPL common/spl/Kconfig | 12 ++++++------ common/spl/Kconfig.tpl | 14 +++++++------- common/spl/Kconfig.vpl | 12 ++++++++++++ common/spl/spl.c | 13 +++++++++---- common/spl/spl_ram.c | 2 +- include/spl.h | 2 ++ 6 files changed, 37 insertions(+), 18 deletions(-) -- 2.36.1

2 6

[PATCH 0/6] Add video damage tracking
by Alexander Graf 09 Jun '22

09 Jun '22

This patch set speeds up graphics output on ARM by a factor of 60x. On most ARM SBCs, we keep the frame buffer in DRAM and map it as cached, but need it accessible by the display controller which reads directly from a later point of consistency. Hence, we flush the frame buffer to DRAM on every change. The full frame buffer. Unfortunately, with the advent of 4k displays, we are seeing frame buffers that can take a while to flush out. This was reported by Da Xue with grub, which happily print 1000s of spaces on the screen to draw a menu. Every printed space triggers a cache flush. This patch set implements the easiest mitigation against this problem: Damage tracking. We remember the lowest common denominator region that was touched since the last video_sync() call and only flush that. With this patch set applied, we reduce drawing a large grub menu (with serial console attached for size information) on an RK3399-ROC system at 1440p from 55 seconds to less than 1 second. Alternatives considered: 1) Lazy sync - Sandbox does this. It only calls video_sync(true) ever so often. We are missing timers to do this generically. 2) Double buffering - We could try to identify whether anything changed at all and only draw to the FB if it did. That would require maintaining a second buffer that we need to scan. 3) Text buffer - Maintain a buffer of all text printed on the screen with respective location. Don't write if the old and new character are identical. This would limit applicability to text only and is an optimization on top of this patch set. 4) Hash screen lines - Create a hash (sha256?) over every line when it changes. Only flush when it does. I'm not sure if this would waste more time, memory and cache than the current approach. It would make full screen updates much more expensive. Alexander Graf (6): dm: video: Add damage tracking API dm: video: Add damage notification on display clear vidconsole: Add damage notifications to all vidconsole drivers video: Add damage notification on bmp display efi_loader: GOP: Add damage notification on BLT video: Only dcache flush damaged lines drivers/video/Kconfig | 15 ++++++ drivers/video/console_normal.c | 10 ++++ drivers/video/console_rotate.c | 18 +++++++ drivers/video/console_truetype.c | 12 +++++ drivers/video/video-uclass.c | 89 +++++++++++++++++++++++++++++--- drivers/video/video_bmp.c | 2 + include/video.h | 39 +++++++++++++- lib/efi_loader/efi_gop.c | 11 ++++ 8 files changed, 187 insertions(+), 9 deletions(-) -- 2.32.1 (Apple Git-133)

4 15

[PATCH] kontron-sl-mx8mm: Add CAAM support
by Fabio Estevam 09 Jun '22

09 Jun '22

Add CAAM support, which is required when enabling HAB secure boot. Select CONFIG_SPL_DRIVERS_MISC so that CONFIG_IMX_HAB could build successfully, if selected. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 17 +++++++++++++++++ arch/arm/mach-imx/imx8m/Kconfig | 3 +++ board/kontron/sl-mx8mm/spl.c | 9 +++++++++ configs/kontron-sl-mx8mm_defconfig | 1 + 4 files changed, 30 insertions(+) diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi index 22d18e6f1cf8..11d915310f74 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi @@ -25,6 +25,23 @@ }; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &fec1 { phy-mode = "rgmii-rxid"; }; diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 61397bf88d13..5c59422ecb79 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -106,6 +106,9 @@ config TARGET_KONTRON_MX8MM select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MN_BSH_SMM_S2 bool "imx8mn-bsh-smm-s2" diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index 4ef03c8c172f..5a513722c5d5 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -13,6 +13,9 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/iomux-v3.h> #include <dm/uclass.h> +#include <dm/device.h> +#include <dm/uclass-internal.h> +#include <dm/device-internal.h> #include <hang.h> #include <i2c.h> #include <init.h> @@ -213,6 +216,12 @@ void spl_board_init(void) struct udevice *dev; int ret; + if (IS_ENABLED(CONFIG_FSL_CAAM)) { + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + } + puts("Normal Boot\n"); ret = uclass_get_device_by_name(UCLASS_CLK, diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index 2e9d52522b21..eae9ac0dbebf 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_KONTRON_MX8MM=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x42000000 -- 2.25.1

3 2

[PATCH v4 00/16] Add support for NVMEM API
by Sean Anderson 09 Jun '22

09 Jun '22

This adds support for the nvmem-cells properties cropping up in manyb device trees. This is an easy way to load configuration, version information, or calibration data from a non-volatile memory source. For more information, refer to patch 6 ("misc: Add support for nvmem cells"). For the moment I have only added some integration tests using the ethernet addresses. This hits the main code paths (looking up nvmem cells) but doesn't test writing. I can add a few stand-alone tests if desired. CI: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=4167&view=results The patches are structured in the following manner: 1-9: These are general cleanups, and may be applied independently of the rest of the series. 10-12: Add NVMEM support 13-15: Support reading ethernet addresses using the NVMEM API and add some tests. 16: Example demonstrating how this series could be reworked to be a uclass. It should not be applied. Changes in v4: - Fix dm_test_alias_highest_id test failing because we changed the number of aliases - Fix segmentation fault if DSA master fails to probe - Add fallbacks for i2c_eeprom_* functions. This fixes build errors if CONFIG_I2C_EEPROM was not enabled. - Fix failing to find nvmem devices if some supported uclasses were not enabled. - Remove typedefs from documentation - Document some of the design background, and why a new uclass was not created. - Enable CONFIG_NVMEM for sandbox_spl_defconfig - Enable CONFIG_I2C_EEPROM for sandbox_spl_defconfig - Add RFC patch illustrating how this series could be reworked to use a more conventional, uclass-based approach. Changes in v3: - Add aliases for ethernet devices - Add mac address for eth8 to environment - Move patch adding test earlier in the series - Add test for eth8 as well Changes in v2: - Call the appropriate API functions directly from nvmem_cell_(read|write). This means we can drop the nvmem_interface machinery. Sean Anderson (16): sandbox: net: Add aliases for ethernet devices sandbox: net: Add mac address for eth8 to environment test: eth: Add test for ethernet addresses sandbox: net: Remove fake-host-hwaddr sandbox: Remove eth2addr from environment sandbox: Move some mac addresses to device tree net: dsa: Fix segmentation fault if master fails to probe misc: i2c_eeprom: Make i2c_eeprom_write use a const buf misc: i2c_eeprom: Add fallbacks misc: Add support for nvmem cells sandbox: Enable NVMEM net: Add support for reading mac addresses from nvmem cells test: Load mac address with i2c eeprom test: Load mac address using RTC test: Load mac address using misc device [RFC] misc: nvmem: Convert to using udevices MAINTAINERS | 7 ++ arch/sandbox/dts/sandbox.dts | 1 - arch/sandbox/dts/sandbox64.dts | 1 - arch/sandbox/dts/test.dts | 34 +++++- board/sandbox/sandbox.env | 4 - configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_noinst_defconfig | 1 + configs/sandbox_spl_defconfig | 3 + doc/api/index.rst | 1 + doc/api/nvmem.rst | 7 ++ drivers/misc/Kconfig | 16 +++ drivers/misc/Makefile | 1 + drivers/misc/i2c_eeprom.c | 40 ++++++- drivers/misc/i2c_eeprom_emul.c | 4 + drivers/misc/misc-uclass.c | 58 ++++++++- drivers/misc/misc_sandbox.c | 3 + drivers/misc/nvmem.c | 106 +++++++++++++++++ drivers/net/sandbox.c | 10 +- drivers/rtc/i2c_rtc_emul.c | 10 ++ drivers/rtc/rtc-uclass.c | 46 ++++++- include/dm/uclass-id.h | 1 + include/i2c_eeprom.h | 27 ++++- include/nvmem.h | 185 +++++++++++++++++++++++++++++ net/dsa-uclass.c | 6 +- net/eth-uclass.c | 13 +- test/dm/eth.c | 29 +++++ test/dm/test-fdt.c | 2 +- 29 files changed, 584 insertions(+), 35 deletions(-) create mode 100644 doc/api/nvmem.rst create mode 100644 drivers/misc/nvmem.c create mode 100644 include/nvmem.h -- 2.35.1.1320.gc452695387.dirty

3 18

[PATCH] rockchip: make_fit_atf: generate signed conf when FIT_SIGN_KEY is set
by Jerome Forissier 09 Jun '22

09 Jun '22

Introduce the environment variable FIT_SIGN_KEY which when set is the name of the key that should be used to sign the binaries and configuration in the FIT image. Usage example (tested on RockPi4B): mkdir keys openssl genpkey -algorithm RSA -out keys/dev.key \ -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 openssl req -batch -new -x509 -key keys/dev.key -out keys/dev.crt FIT_SIGN_KEY=dev TEE=.../tee.bin BL31=.../bl31.elf \ ../../git/arch/arm/mach-rockchip/make_fit_atf.py \ arch/arm/dts/rk3399-rock-pi-4b.dtb > u-boot.its cp spl/dts/dt-spl.dtb spl/u-boot-spl.dtb ./tools/mkimage -E -B 0x8 -p 0x0 -f u-boot.its -k keys \ -r -K spl/u-boot-spl.dtb u-boot.itb cat tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl-nodtb.bin \ spl/u-boot-spl.dtb > idbloader.img Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- arch/arm/mach-rockchip/make_fit_atf.py | 49 ++++++++++++++++++-------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index f3224d2555..e587760ccf 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -28,19 +28,6 @@ DT_HEADER = """ images { """ -DT_UBOOT = """ - uboot { - description = "U-Boot (64-bit)"; - data = /incbin/("u-boot-nodtb.bin"); - type = "standalone"; - os = "U-Boot"; - arch = "arm64"; - compression = "none"; - load = <0x%08x>; - }; - -""" - DT_IMAGES_NODE_END = """ }; """ @@ -60,6 +47,7 @@ def append_bl31_node(file, atf_index, phy_addr, elf_entry): file.write('\t\t\tload = <0x%08x>;\n' % phy_addr) if atf_index == 1: file.write('\t\t\tentry = <0x%08x>;\n' % elf_entry) + append_hash_sig_nodes(file) file.write('\t\t};\n') file.write('\n') @@ -75,6 +63,7 @@ def append_tee_node(file, atf_index, phy_addr, elf_entry): file.write('\t\t\tcompression = "none";\n') file.write('\t\t\tload = <0x%08x>;\n' % phy_addr) file.write('\t\t\tentry = <0x%08x>;\n' % elf_entry) + append_hash_sig_nodes(file) file.write('\t\t};\n') file.write('\n') @@ -88,6 +77,7 @@ def append_fdt_node(file, dtbs): file.write('\t\t\tdata = /incbin/("%s");\n' % dtb) file.write('\t\t\ttype = "flat_dt";\n') file.write('\t\t\tcompression = "none";\n') + append_hash_sig_nodes(file) file.write('\t\t};\n') file.write('\n') cnt = cnt + 1 @@ -108,6 +98,13 @@ def append_conf_section(file, cnt, dtname, segments): if segments <= 1: file.write(';\n') file.write('\t\t\tfdt = "fdt_%d";\n' % cnt) + key_name = os.getenv('FIT_SIGN_KEY') + if key_name: + file.write('\t\t\tsignature {\n') + file.write('\t\t\t\tsign-images = "firmware","loadables","fdt";\n') + file.write('\t\t\t\talgo = "sha1,rsa2048";\n') + file.write('\t\t\t\tkey-name-hint = "dev";\n') + file.write('\t\t\t};\n') file.write('\t\t};\n') file.write('\n') @@ -123,12 +120,34 @@ def append_conf_node(file, dtbs, segments): file.write('\t};\n') file.write('\n') -def generate_atf_fit_dts_uboot(fit_file, uboot_file_name): +def generate_atf_fit_dts_uboot(file, uboot_file_name): segments = unpack_elf(uboot_file_name) if len(segments) != 1: raise ValueError("Invalid u-boot ELF image '%s'" % uboot_file_name) index, entry, p_paddr, data = segments[0] - fit_file.write(DT_UBOOT % p_paddr) + file.write('\n') + file.write('\t\tuboot {\n') + file.write('\t\t\tdescription = "U-Boot (64-bit)";\n') + file.write('\t\t\tdata = /incbin/("u-boot-nodtb.bin");\n') + file.write('\t\t\ttype = "standalone";\n') + file.write('\t\t\tos = "U-Boot";\n') + file.write('\t\t\tarch = "arm64";\n') + file.write('\t\t\tcompression = "none";\n') + file.write('\t\t\tload = <0x%08x>;\n' % p_paddr) + append_hash_sig_nodes(file) + file.write('\t\t};\n') + file.write('\n') + +def append_hash_sig_nodes(file): + key_name = os.getenv("FIT_SIGN_KEY") + if key_name: + file.write('\t\t\thash-1 {\n') + file.write('\t\t\t\talgo = "sha1";\n') + file.write('\t\t\t};\n') + file.write('\t\t\tsignature-1 {\n') + file.write('\t\t\t\talgo = "sha1,rsa2048";\n') + file.write('\t\t\t\tkey-name-hint = "%s";\n' % key_name) + file.write('\t\t\t};\n') def generate_atf_fit_dts_bl31(fit_file, bl31_file_name, tee_file_name, dtbs_file_name): segments = unpack_elf(bl31_file_name) -- 2.34.1

1 0

imx6sabresd: Board hangs when CONFIG_IMX_HAB=y
by Fabio Estevam 09 Jun '22

09 Jun '22

Hi, Enabling IMX_HAB in mx6sabresd_defconfig: --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -122,3 +122,5 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_BMP_16BPP=y +CONFIG_IMX_HAB=y +CONFIG_SPL_DRIVERS_MISC=y causes the following hang in SPL: U-Boot SPL 2022.07-rc3-00096-g5ff62f64ae (Jun 09 2022 - 08:48:45 -0300) Trying to boot from MMC1 hab fuse not enabled Authenticate image from DDR location 0x177fcd40... bad magic magic=0x10 length=0xe825 version=0xb2 bad length magic=0x10 length=0xe825 version=0xb2 bad version magic=0x10 length=0xe825 version=0xb2 Error: Invalid IVT structure Does anyone have any suggestions on how to fix the SPL hang? Thanks, Fabio Estevam

1 0

[PATCH v2 0/7] Add support for FLexSPI Boot for i.MX8m
by Mamta Shukla 09 Jun '22

09 Jun '22

This series of patch adds support for generating FlexSPI Header file and booting from QSPI on i.MX8m. Changes in v2: -Add check for error in case open() for fspi_fd in imx8mkimage.c fails -Remove extra line in commit message -Remove extra line in imx8mm_evk_fspi_defconfig -New patch in series to add an entry for imx8mm_evk_fspi_defconfig in board/freescale/imx8mm_evk/MAINTAINERS -New patch in series to add instructions to build and boot from QSPI Flash Mamta Shukla (7): tools: mkimage: Add support to generate FlexSPI Header for i.MX8m dts: imx8mm-uboot: Add support to pack FlexSPI Header using binman configs: Add config for enabling FSPI boot option for i.MX8m board: freescale: Add QSPI Boot support in spl for i.MX8m configs: imx8mm: Define CONFIG_SYS_UBOOT_BASE for i.MX8m board: freescale: Add entry for imx8mm_evk_fspi_defconfig doc: board: nxp: Add instructions to boot from QSPI arch/arm/dts/imx8mm-u-boot.dtsi | 22 +++- board/freescale/imx8mm_evk/MAINTAINERS | 1 + .../imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg | 9 ++ board/freescale/imx8mm_evk/spl.c | 2 + configs/imx8mm_evk_fspi_defconfig | 115 ++++++++++++++++++ doc/board/nxp/imx8mm_evk.rst | 38 +++++- include/configs/imx8mm_evk.h | 7 +- include/imximage.h | 38 ++++++ tools/Kconfig | 59 +++++++++ tools/imx8mimage.c | 81 +++++++++++- 10 files changed, 364 insertions(+), 8 deletions(-) create mode 100644 board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg create mode 100644 configs/imx8mm_evk_fspi_defconfig -- 2.25.1

1 7

[PATCH] secure boot: enable ARCH_MISC_INIT config.
by Gaurav Jain 09 Jun '22

09 Jun '22

add ARCH_MISC_INIT to initilaize caam jr driver. Signed-off-by: Gaurav Jain <gaurav.jain(a)nxp.com> --- board/freescale/common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index 6553bf63bf..b0e6e43f4f 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -3,6 +3,7 @@ config CHAIN_OF_TRUST imply CMD_BLOB imply CMD_HASH if ARM select FSL_CAAM + select ARCH_MISC_INIT select SPL_BOARD_INIT if (ARM && SPL) select SPL_HASH if (ARM && SPL) select SHA_HW_ACCEL -- 2.25.1

1 0

[PATCH v3 00/12] virtio: Harden and test vring
by Andrew Scull 08 Jun '22

08 Jun '22

Make the virtio ring code resilient against corruption of the buffers shared with the device. It follows the example of Linux by keeping a private copy of the descriptors and metadata for state tracking and only ever writing to the descriptors that are shared with the device. I was able to test these hardening steps in the sandbox by simulating device writes to the queues. >From v1: - Fix build errors on SPL by making dependency on virtio drivers explicit >From v2: - Refactor vring init loop per review Andrew Scull (12): virtio_ring: Merge identical variables virtio_ring: Add helper to attach vring descriptor virtio_ring: Maintain a shadow copy of descriptors virtio_ring: Check used descriptors are chain heads dm: test: virtio: Test the virtio ring virtio: sandbox: Fix device features bitfield test: dm: virtio: Test notify before del_vqs test: dm: virtio: Split out virtio device tests virtio: sandbox: Bind RNG rather than block device test: dm: virtio: Test virtio device driver probing virtio: rng: Check length before copying test: dm: virtio_rng: Test virtio-rng with faked device drivers/virtio/virtio_ring.c | 96 ++++++++++------ drivers/virtio/virtio_rng.c | 3 + drivers/virtio/virtio_sandbox.c | 4 +- include/virtio_ring.h | 12 ++ test/dm/Makefile | 6 +- test/dm/virtio.c | 99 ---------------- test/dm/virtio_device.c | 195 ++++++++++++++++++++++++++++++++ test/dm/virtio_rng.c | 52 +++++++++ 8 files changed, 330 insertions(+), 137 deletions(-) create mode 100644 test/dm/virtio_device.c create mode 100644 test/dm/virtio_rng.c -- 2.36.0.550.gb090851708-goog

2 13

[PATCH 0/4] imx8mn_bsh_smm_s2: fix NAND booting
by Dario Binacchi 08 Jun '22

08 Jun '22

The series contains all the patches required by the BSH smm s2 board for booting from NAND and properly mounting the UBI rootfs. Dario Binacchi (4): configs: imx8mn_bsh_smm_s2: add NAND driver configs: imx8mn_bsh_smm_s2: add UBI commands configs: imx8mn_bsh_smm_s2: remove console from bootargs configs: imx8mn_bsh_smm_s2: add mtdparts to bootargs configs/imx8mn_bsh_smm_s2_defconfig | 6 ++++++ include/configs/imx8mn_bsh_smm_s2.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.32.0

1 4