March 2022 - U-Boot

[PATCH v2 1/3] rng: add OP-TEE based Random Number Generator
by Patrick Delaunay 28 Mar '22

28 Mar '22

Add driver for OP-TEE based Random Number Generator on ARM SoCs where hardware entropy sources are not accessible to normal world and the RNG service is provided by a HWRNG Trusted Application (TA). This driver is based on the linux driver: char/hw_random/optee-rng.c Series_changes: 2 - change SPDX-License-Identifier, becausee "GPL-2.0+” is obsolete reference: https://spdx.dev/ids/ - update Kconfig long help message as proposed by Heinrich - replace memset(.., 0, sizeof(..)) by struct initialisation (= {0};) - add function descriptions Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- (no changes since v1) MAINTAINERS | 1 + drivers/rng/Kconfig | 9 ++ drivers/rng/Makefile | 1 + drivers/rng/optee_rng.c | 180 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 191 insertions(+) create mode 100644 drivers/rng/optee_rng.c diff --git a/MAINTAINERS b/MAINTAINERS index f25ca7cd00..3356c65dd0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -481,6 +481,7 @@ F: drivers/power/regulator/stpmic1.c F: drivers/ram/stm32mp1/ F: drivers/remoteproc/stm32_copro.c F: drivers/reset/stm32-reset.c +F: drivers/rng/optee_rng.c F: drivers/rng/stm32mp1_rng.c F: drivers/rtc/stm32_rtc.c F: drivers/serial/serial_stm32.* diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig index b1c5ab93d1..c10f7d345b 100644 --- a/drivers/rng/Kconfig +++ b/drivers/rng/Kconfig @@ -31,6 +31,15 @@ config RNG_MSM This driver provides support for the Random Number Generator hardware found on Qualcomm SoCs. +config RNG_OPTEE + bool "OP-TEE based Random Number Generator support" + depends on DM_RNG && OPTEE + help + This driver provides support for the OP-TEE based Random Number + Generator on ARM SoCs where hardware entropy sources are not + accessible to normal world but reserved and used by the OP-TEE + to avoid the weakness of a software PRNG. + config RNG_STM32MP1 bool "Enable random number generator for STM32MP1" depends on ARCH_STM32MP diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile index 39f7ee3f03..435b3b965a 100644 --- a/drivers/rng/Makefile +++ b/drivers/rng/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_DM_RNG) += rng-uclass.o obj-$(CONFIG_RNG_MESON) += meson-rng.o obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o obj-$(CONFIG_RNG_MSM) += msm_rng.o +obj-$(CONFIG_RNG_OPTEE) += optee_rng.o obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.o obj-$(CONFIG_RNG_IPROC200) += iproc_rng200.o diff --git a/drivers/rng/optee_rng.c b/drivers/rng/optee_rng.c new file mode 100644 index 0000000000..7be428ac91 --- /dev/null +++ b/drivers/rng/optee_rng.c @@ -0,0 +1,180 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause +/* + * Copyright (C) 2022, STMicroelectronics - All Rights Reserved + */ +#define LOG_CATEGORY UCLASS_RNG + +#include <common.h> + +#include <rng.h> +#include <tee.h> +#include <dm/device.h> +#include <dm/device_compat.h> +#include <linux/sizes.h> + +#define TEE_ERROR_HEALTH_TEST_FAIL 0x00000001 + +/* + * TA_CMD_GET_ENTROPY - Get Entropy from RNG + * + * param[0] (inout memref) - Entropy buffer memory reference + * param[1] unused + * param[2] unused + * param[3] unused + * + * Result: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + * TEE_ERROR_NOT_SUPPORTED - Requested entropy size greater than size of pool + * TEE_ERROR_HEALTH_TEST_FAIL - Continuous health testing failed + */ +#define TA_CMD_GET_ENTROPY 0x0 + +#define MAX_ENTROPY_REQ_SZ SZ_4K + +#define TA_HWRNG_UUID { 0xab7a617c, 0xb8e7, 0x4d8f, \ + { 0x83, 0x01, 0xd0, 0x9b, 0x61, 0x03, 0x6b, 0x64 } } + +/** + * struct optee_rng_priv - OP-TEE Random Number Generator private data + * @session_id: RNG TA session identifier. + */ +struct optee_rng_priv { + u32 session_id; +}; + +/** + * get_optee_rng_data() - read RNG data from OP-TEE TA + * + * @dev: device + * @entropy_shm_pool: shared memory pool used for TEE message + * @buf: buffer to receive data + * @size: size of buffer, limited by entropy_shm_pool size + * Return: 0 if ok + */ +static int get_optee_rng_data(struct udevice *dev, + struct tee_shm *entropy_shm_pool, + void *buf, size_t *size) +{ + struct optee_rng_priv *priv = dev_get_priv(dev); + int ret = 0; + struct tee_invoke_arg arg = {0}; + struct tee_param param = {0}; + + /* Invoke TA_CMD_GET_ENTROPY function of Trusted App */ + arg.func = TA_CMD_GET_ENTROPY; + arg.session = priv->session_id; + + /* Fill invoke cmd params */ + param.attr = TEE_PARAM_ATTR_TYPE_MEMREF_INOUT; + param.u.memref.shm = entropy_shm_pool; + param.u.memref.size = *size; + + ret = tee_invoke_func(dev->parent, &arg, 1, &param); + if (ret || arg.ret) { + if (!ret) + ret = -EPROTO; + dev_err(dev, "TA_CMD_GET_ENTROPY invoke err: %d 0x%x\n", ret, arg.ret); + *size = 0; + + return ret; + } + + memcpy(buf, param.u.memref.shm->addr, param.u.memref.size); + *size = param.u.memref.size; + + return 0; +} + +/** + * optee_rng_read() - rng read ops for OP-TEE RNG device + * + * @dev: device + * @buf: buffer to receive data + * @len: size of buffer + * Return: 0 if ok + */ +static int optee_rng_read(struct udevice *dev, void *buf, size_t len) +{ + size_t read = 0, rng_size = 0; + struct tee_shm *entropy_shm_pool; + u8 *data = buf; + int ret; + + ret = tee_shm_alloc(dev->parent, MAX_ENTROPY_REQ_SZ, 0, &entropy_shm_pool); + if (ret) { + dev_err(dev, "tee_shm_alloc failed: %d\n", ret); + return ret; + } + + while (read < len) { + rng_size = min(len - read, (size_t)MAX_ENTROPY_REQ_SZ); + ret = get_optee_rng_data(dev, entropy_shm_pool, data, &rng_size); + if (ret) + goto shm_free; + data += rng_size; + read += rng_size; + } + +shm_free: + tee_shm_free(entropy_shm_pool); + + return ret; +} + +/** + * optee_rng_probe() - probe function for OP-TEE RNG device + * + * @dev: device + * Return: 0 if ok + */ +static int optee_rng_probe(struct udevice *dev) +{ + const struct tee_optee_ta_uuid uuid = TA_HWRNG_UUID; + struct optee_rng_priv *priv = dev_get_priv(dev); + struct tee_open_session_arg sess_arg = {0}; + int ret; + + /* Open session with hwrng Trusted App */ + tee_optee_ta_uuid_to_octets(sess_arg.uuid, &uuid); + sess_arg.clnt_login = TEE_LOGIN_PUBLIC; + + ret = tee_open_session(dev->parent, &sess_arg, 0, NULL); + if (ret || sess_arg.ret) { + if (!ret) + ret = -EIO; + dev_err(dev, "can't open session: %d 0x%x\n", ret, sess_arg.ret); + return ret; + } + priv->session_id = sess_arg.session; + + return 0; +} + +/** + * optee_rng_remove() - remove function for OP-TEE RNG device + * + * @dev: device + * Return: 0 + */ +static int optee_rng_remove(struct udevice *dev) +{ + struct optee_rng_priv *priv = dev_get_priv(dev); + + tee_close_session(dev->parent, priv->session_id); + + return 0; +} + +static const struct dm_rng_ops optee_rng_ops = { + .read = optee_rng_read, +}; + +U_BOOT_DRIVER(optee_rng) = { + .name = "optee-rng", + .id = UCLASS_RNG, + .ops = &optee_rng_ops, + .probe = optee_rng_probe, + .remove = optee_rng_remove, + .priv_auto = sizeof(struct optee_rng_priv), +}; -- 2.25.1

3 4

Re: [PATCH v3 28/29] test: serial: Add test for putc/puts
by Simon Glass 28 Mar '22

28 Mar '22

Hi Sean, On Tue, 22 Mar 2022 at 15:00, Sean Anderson <sean.anderson(a)seco.com> wrote: > > This adds a test to ensure that puts is equivalent to putc called in a > loop. We don't verify the contents of the message to avoid having to > record console output a second time (though that could be added in the > future). The globals are initialized to non-zero values to avoid a > warning; in particular, the character count is off-by-one (but we always > make relative measurements). > > Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> > --- > > Changes in v3: > - New > > arch/sandbox/include/asm/serial.h | 6 ++++++ > drivers/serial/sandbox.c | 23 +++++++++++++++++++---- > test/dm/serial.c | 19 +++++++++++++++++++ > 3 files changed, 44 insertions(+), 4 deletions(-) Reviewed-by: Simon Glass <sjg(a)chromium.org> But please can you add functions to change sandbox_serial_enabled (and read from sandbox_serial_written) to asm/test.h since that is how these sorts of things are done in other drivers.

2 1

[PATCH 0/6] net: fm: Verify Fman microcode
by Sean Anderson 28 Mar '22

28 Mar '22

Surprisingly, Fman microcode does not seem to be verified. This series aims to rectify this by introducing an optional FIT wrapper. This wrapper is made mandatory if FIT_SIGNATURE is enabled. NXP boards do not use this config, so the microcode will remain unverified for them. This is OK, since we do not want to break existing systems. Sean Anderson (6): ARMv8/sec_firmware: Remove SEC_FIRMWARE_FIT_CNF_NAME image: fit: Add some helpers for getting data misc: fs_loader: Add function to get the chosen loader net: fm: Add firmware name parameter net: fm: Support loading firmware from a filesystem net: fm: Add support for FIT firmware arch/arm/cpu/armv8/sec_firmware.c | 52 +++------------------------ arch/arm/mach-k3/common.c | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- boot/image-fit.c | 37 +++++++++++++++++++ cmd/fpga.c | 24 ++++--------- drivers/fpga/socfpga_arria10.c | 24 ++----------- drivers/misc/fs_loader.c | 27 ++++++++++++++ drivers/net/fm/fm.c | 58 +++++++++++++++++++++++++++--- drivers/net/fm/fm.h | 2 +- drivers/net/fm/init.c | 4 +-- drivers/net/fsl-mc/mc.c | 30 ++-------------- drivers/net/pfe_eth/pfe_firmware.c | 40 +-------------------- drivers/qe/Kconfig | 4 +++ include/fs_loader.h | 12 +++++++ include/image.h | 4 +++ 15 files changed, 159 insertions(+), 163 deletions(-) -- 2.25.1

2 9

[PATCH 00/11] virtio: pci: Add and fix consistency checks
by Andrew Scull 28 Mar '22

28 Mar '22

The virtio PCI drivers forgo a number of consistency checks, particularly around pointer validation and bounds checking. This series focuses on the modern driver to add those checks. The start of the series adds and fixes some basic bounds checks. Later patches ensure PCI addresses fall within the expected regions rather than any arbitrary address. The series applies atop v2022.04-rc4. I have been boot testing on the AOSP cuttlefish virtualized device and protected KVM as part of the Android Virtualization Framework (AVF). Andrew Scull (11): virtio: pci: Fix discovery of device config length virtio: pci: Bounds check device config access virtio: pci: Bounds check notification writes virtio: pci: Check virtio common config size virtio: pci: Check virtio capability is in bounds virtio: pci: Read entire capability into memory virtio: pci: Check virtio configs are mapped pci: Check region ranges are addressable pci: Add function to validate PCI address range virtio: pci: Check mapped range is in a PCI region virtio: pci: Allow exclusion of legacy driver drivers/pci/pci-uclass.c | 47 ++++++++- drivers/virtio/Kconfig | 9 ++ drivers/virtio/Makefile | 3 +- drivers/virtio/virtio_pci_modern.c | 147 ++++++++++++++++++++++------- include/pci.h | 16 ++++ 5 files changed, 184 insertions(+), 38 deletions(-) -- 2.35.1.894.gb6a874cedc-goog

2 34

[PATCH] Fix URLs to old freescale git repos
by Pali Rohár 28 Mar '22

28 Mar '22

Freescale git repos are now on source.codeaurora.org. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- doc/README.mpc85xx-sd-spi-boot | 2 +- drivers/misc/mxc_ocotp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/README.mpc85xx-sd-spi-boot b/doc/README.mpc85xx-sd-spi-boot index e3f580446a1c..329de4e6c4c1 100644 --- a/doc/README.mpc85xx-sd-spi-boot +++ b/doc/README.mpc85xx-sd-spi-boot @@ -14,7 +14,7 @@ Where to get boot_format: ======================== you can browse it online at: -http://git.freescale.com/git/cgit.cgi/ppc/sdk/boot-format.git/ +https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/boot-format Building ======== diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c index b1893a5c7eba..8ee18f29d9be 100644 --- a/drivers/misc/mxc_ocotp.c +++ b/drivers/misc/mxc_ocotp.c @@ -6,7 +6,7 @@ * Based on Dirk Behme's * https://github.com/dirkbehme/u-boot-imx6/blob/28b17e9/drivers/misc/imx_otp.c, * which is based on Freescale's - * http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/tree/drivers/misc/i…, + * https://source.codeaurora.org/external/imx/uboot-imx/tree/drivers/misc/imx_…, * which is: * Copyright (C) 2011 Freescale Semiconductor, Inc. */ -- 2.20.1

2 1

[PATCH] Makefile: add drivers/video/u_boot_logo.S to clean
by Heinrich Schuchardt 28 Mar '22

28 Mar '22

make sandbox_defconfig make mrproper make tests fails with ../drivers/video/u_boot_logo.S: Assembler messages: ../drivers/video/u_boot_logo.S:5: Error: file not found: drivers/video/u_boot_logo.bmp We have to delete the generated file. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8e2441ecb1..98692172bc 100644 --- a/Makefile +++ b/Makefile @@ -2186,7 +2186,8 @@ CLEAN_DIRS += $(MODVERDIR) \ $(foreach d, spl tpl, $(patsubst %,$d/%, \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) -CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ +CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ + drivers/video/u_boot_logo.S tools/version.h \ u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ -- 2.34.1

3 2

[PATCH v4] mtd: gpmi: fix the bch setting backward compatible issue
by Han Xu 28 Mar '22

28 Mar '22

Previous u-boot code changed the default bch setting behavior and caused backward compatible issue. This fix choose the legacy bch geometry back again as the default option. If the minimum ecc strength that NAND chips required need to be chosen, it can be enabled by either adding DT flag "fsl,use-minimum-ecc" or CONFIG_NAND_MXS_USE_MINIMUM_ECC in configs. The unused flag "fsl,legacy-bch-geometry" get removed. Fixes: 51cdf83eea (mtd: gpmi: provide the option to use legacy bch geometry) Fixes: 616f03daba (mtd: gpmi: change the BCH layout setting for large oob NAND) Tested-by: Tim Harvey <tharvey(a)gateworks.com> Tested-by: Sean Nyekjaer <sean(a)geanix.com> Signed-off-by: Han Xu <han.xu(a)nxp.com> --- Changes in v2: - change the commit log about backward compatible issue is in u-boot - removed the unused flag - add fixes and test tag Changes in v3: - fix the fixes syntax - fix the change log syntax - add more test tag Changes in v4: - change the fix tag to single line --- drivers/mtd/nand/raw/mxs_nand.c | 71 ++++++++++++++++++++++++++---- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 - include/mxs_nand.h | 2 - 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index 748056a43e..ee5d7fde9c 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -195,6 +195,7 @@ static inline int mxs_nand_legacy_calc_ecc_layout(struct bch_geometry *geo, struct nand_chip *chip = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(chip); unsigned int block_mark_bit_offset; + int corr, ds_corr; /* The default for the length of Galois Field. */ geo->gf_len = 13; @@ -225,6 +226,17 @@ static inline int mxs_nand_legacy_calc_ecc_layout(struct bch_geometry *geo, geo->ecc_strength = min(round_down(geo->ecc_strength, 2), nand_info->max_ecc_strength_supported); + /* check ecc strength, same as nand_ecc_is_strong_enough() did*/ + if (chip->ecc_step_ds) { + corr = mtd->writesize * geo->ecc_strength / + geo->ecc_chunkn_size; + ds_corr = mtd->writesize * chip->ecc_strength_ds / + chip->ecc_step_ds; + if (corr < ds_corr || + geo->ecc_strength < chip->ecc_strength_ds) + return -EINVAL; + } + block_mark_bit_offset = mtd->writesize * 8 - (geo->ecc_strength * geo->gf_len * (geo->ecc_chunk_count - 1) + MXS_NAND_METADATA_SIZE * 8); @@ -1111,6 +1123,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *nand = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(nand); + int err; if (chip->ecc_strength_ds > nand_info->max_ecc_strength_supported) { printf("unsupported NAND chip, minimum ecc required %d\n" @@ -1118,19 +1131,57 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) return -EINVAL; } - if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) && - mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) { - dev_warn(mtd->dev, "use legacy bch geometry\n"); - return mxs_nand_legacy_calc_ecc_layout(geo, mtd); + /* use the legacy bch setting by default */ + if ((!nand_info->use_minimum_ecc && mtd->oobsize < 1024) || + !(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0)) { + dev_dbg(mtd->dev, "use legacy bch geometry\n"); + err = mxs_nand_legacy_calc_ecc_layout(geo, mtd); + if (!err) + return 0; } - if (mtd->oobsize > 1024 || chip->ecc_step_ds < mtd->oobsize) - return mxs_nand_calc_ecc_for_large_oob(geo, mtd); + /* for large oob nand */ + if (mtd->oobsize > 1024) { + dev_dbg(mtd->dev, "use large oob bch geometry\n"); + err = mxs_nand_calc_ecc_for_large_oob(geo, mtd); + if (!err) + return 0; + } - return mxs_nand_calc_ecc_layout_by_info(geo, mtd, - chip->ecc_strength_ds, chip->ecc_step_ds); + /* otherwise use the minimum ecc nand chips required */ + dev_dbg(mtd->dev, "use minimum ecc bch geometry\n"); + err = mxs_nand_calc_ecc_layout_by_info(geo, mtd, chip->ecc_strength_ds, + chip->ecc_step_ds); - return 0; + if (err) + dev_err(mtd->dev, "none of the bch geometry setting works\n"); + + return err; +} + +void mxs_nand_dump_geo(struct mtd_info *mtd) +{ + struct nand_chip *nand = mtd_to_nand(mtd); + struct mxs_nand_info *nand_info = nand_get_controller_data(nand); + struct bch_geometry *geo = &nand_info->bch_geometry; + + dev_dbg(mtd->dev, "BCH Geometry :\n" + "GF Length\t\t: %u\n" + "ECC Strength\t\t: %u\n" + "ECC for Meta\t\t: %u\n" + "ECC Chunk0 Size\t\t: %u\n" + "ECC Chunkn Size\t\t: %u\n" + "ECC Chunk Count\t\t: %u\n" + "Block Mark Byte Offset\t: %u\n" + "Block Mark Bit Offset\t: %u\n", + geo->gf_len, + geo->ecc_strength, + geo->ecc_for_meta, + geo->ecc_chunk0_size, + geo->ecc_chunkn_size, + geo->ecc_chunk_count, + geo->block_mark_byte_offset, + geo->block_mark_bit_offset); } /* @@ -1159,6 +1210,8 @@ int mxs_nand_setup_ecc(struct mtd_info *mtd) if (ret) return ret; + mxs_nand_dump_geo(mtd); + /* Configure BCH and set NFC geometry */ mxs_reset_block(&bch_regs->hw_bch_ctrl_reg); diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index 878796d555..b9833a646f 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -92,8 +92,6 @@ static int mxs_nand_dt_probe(struct udevice *dev) info->use_minimum_ecc = dev_read_bool(dev, "fsl,use-minimum-ecc"); - info->legacy_bch_geometry = dev_read_bool(dev, "fsl,legacy-bch-geometry"); - if (IS_ENABLED(CONFIG_CLK) && IS_ENABLED(CONFIG_IMX8)) { /* Assigned clock already set clock */ struct clk gpmi_clk; diff --git a/include/mxs_nand.h b/include/mxs_nand.h index 66c909318d..741dc8734e 100644 --- a/include/mxs_nand.h +++ b/include/mxs_nand.h @@ -44,8 +44,6 @@ struct mxs_nand_info { struct udevice *dev; unsigned int max_ecc_strength_supported; bool use_minimum_ecc; - /* legacy bch geometry flag */ - bool legacy_bch_geometry; int cur_chip; uint32_t cmd_queue_len; -- 2.17.1

3 2

[PATCH] arm: apple: Fix mem layout
by Mark Kettenis 28 Mar '22

28 Mar '22

The current approach for setting the environment variables that describe the memory layout runs the risk of overlapping with reserved memory regions. Use the lmb code to derive the addresses for these variables instead. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- Another candidate for 2022.04. Not a regression either, but the current code may end up randomly failing due to address space randomization. The efi_loader bootpath seems to be unaffected, but attempt to load a Linux kernel directly are more likely to fail. Also tested widely by people using the Asahi Linux installer. arch/arm/mach-apple/board.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index 54005f3adf..722dff1f64 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <efi_loader.h> +#include <lmb.h> #include <asm/armv8/mmu.h> #include <asm/global_data.h> @@ -266,32 +267,27 @@ u64 get_page_table_size(void) return SZ_256K; } +#define KERNEL_COMP_SIZE SZ_128M + int board_late_init(void) { - unsigned long base; - unsigned long top; + struct lmb lmb; u32 status = 0; - /* Reserve 4M each for scriptaddr and pxefile_addr_r at the top of RAM - * at least 1M below the stack. - */ - top = gd->start_addr_sp - CONFIG_STACK_SIZE - SZ_8M - SZ_1M; - top = ALIGN_DOWN(top, SZ_8M); - - status |= env_set_hex("scriptaddr", top + SZ_4M); - status |= env_set_hex("pxefile_addr_r", top); + lmb_init_and_reserve(&lmb, gd->bd, (void *)gd->fdt_blob); /* somewhat based on the Linux Kernel boot requirements: * align by 2M and maximal FDT size 2M */ - base = ALIGN(gd->ram_base, SZ_2M); - - status |= env_set_hex("fdt_addr_r", base); - status |= env_set_hex("kernel_addr_r", base + SZ_2M); - status |= env_set_hex("ramdisk_addr_r", base + SZ_128M); - status |= env_set_hex("loadaddr", base + SZ_2G); - status |= env_set_hex("kernel_comp_addr_r", base + SZ_2G - SZ_128M); - status |= env_set_hex("kernel_comp_size", SZ_128M); + status |= env_set_hex("loadaddr", lmb_alloc(&lmb, SZ_1G, SZ_2M)); + status |= env_set_hex("fdt_addr_r", lmb_alloc(&lmb, SZ_2M, SZ_2M)); + status |= env_set_hex("kernel_addr_r", lmb_alloc(&lmb, SZ_128M, SZ_2M)); + status |= env_set_hex("ramdisk_addr_r", lmb_alloc(&lmb, SZ_1G, SZ_2M)); + status |= env_set_hex("kernel_comp_addr_r", + lmb_alloc(&lmb, KERNEL_COMP_SIZE, SZ_2M)); + status |= env_set_hex("kernel_comp_size", KERNEL_COMP_SIZE); + status |= env_set_hex("scriptaddr", lmb_alloc(&lmb, SZ_4M, SZ_2M)); + status |= env_set_hex("pxefile_addr_r", lmb_alloc(&lmb, SZ_4M, SZ_2M)); if (status) log_warning("late_init: Failed to set run time variables\n"); -- 2.35.1

4 4

[PATCH] arm: apple: Increase RTKit timeout
by Mark Kettenis 28 Mar '22

28 Mar '22

From: Hector Martin <marcan(a)marcan.st> The firmware on larger NVMe drives needs more than 100ms to come up. Change the timeout to 1s. Signed-off-by: Hector Martin <marcan(a)marcan.st> Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- While technically this isn't a regression, it would be nice to have this in the 2022.04 release as without this NVMe storage can't be access on models ordered with bugger storage options (4TB or more). This has been widely tested already by people using the Asahi Linux installer. arch/arm/mach-apple/rtkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/rtkit.c index dff475cab7..2dcb8bdd3e 100644 --- a/arch/arm/mach-apple/rtkit.c +++ b/arch/arm/mach-apple/rtkit.c @@ -170,7 +170,7 @@ wait_epmap: pwrstate = APPLE_RTKIT_PWR_STATE_SLEEP; while (pwrstate != APPLE_RTKIT_PWR_STATE_ON) { - ret = mbox_recv(chan, &msg, 100000); + ret = mbox_recv(chan, &msg, 1000000); if (ret < 0) return ret; -- 2.35.1

3 2

[PATCH v2] boot: image: fixup zstd decompression buffer initialization typo
by Jérôme Carretero 28 Mar '22

28 Mar '22

The code was mistakenly initializing the input buffer twice. Tested to be working on BeagleBone by adjusting CONFIG_SYS_BOOTM_LEN to 64MiB (probably works with less) and preparing uImage with: cat arch/arm/boot/Image \ | zstd --ultra -22 --zstd=windowLog=22 \ > linux.bin.zst mkimage -A arm -T kernel uImage -C zstd -d linux.bin.zst \ -a 0x80008000 -e 0x80008000 Without the windowLog restriction, bootm fails with a zstd decompression error 7 (window too large), which I haven't troubleshooted. There should be a bit more documentation on the feature... Reviewed-by: Simon Glass <sjg(a)chromium.org> Fixes: 458b30af66c image: Update image_decomp() to avoid ifdefs --- boot/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/image.c b/boot/image.c index 07fa2d3160..121df0c838 100644 --- a/boot/image.c +++ b/boot/image.c @@ -500,7 +500,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, struct abuf in, out; abuf_init_set(&in, image_buf, image_len); - abuf_init_set(&in, load_buf, unc_len); + abuf_init_set(&out, load_buf, unc_len); ret = zstd_decompress(&in, &out); if (ret >= 0) { image_len = ret; -- 2.35.1

2 1