October 2023 - U-Boot

[PATCH v2] imx8mp-dhcom-pdk3-overlay-rev100: Pass #address-cells/size-cells
by Fabio Estevam 18 Oct '23

18 Oct '23

From: Fabio Estevam <festevam(a)denx.de> Pass #address-cells/size-cells in the mdio node to avoid the following DTC warning: DTCO arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dtbo Warning (reg_format): /fragment@0/__overlay__:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #address-cells value Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #size-cells value Signed-off-by: Fabio Estevam <festevam(a)denx.de> Reviewed-by: Marek Vasut <marex(a)denx.de> --- Changes since v1: - Remove the ethphy0g label. (Marek) arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts index f27e6429abe4..bad015536166 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts @@ -5,6 +5,13 @@ /dts-v1/; /plugin/; -&ethphy0g { - reg = <7>; +&eqos { + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-phy@7 { + reg = <7>; + }; + }; }; -- 2.34.1

2 1

[PATCH] imx8mp-dhcom-pdk3-overlay-rev100: Pass #address-cells/size-cells
by Fabio Estevam 18 Oct '23

18 Oct '23

From: Fabio Estevam <festevam(a)denx.de> Pass #address-cells/size-cells in the mdio node to avoid the following DTC warning: DTCO arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dtbo Warning (reg_format): /fragment@0/__overlay__:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #address-cells value Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #size-cells value Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts index f27e6429ab..94bee3c508 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts @@ -5,6 +5,13 @@ /dts-v1/; /plugin/; -&ethphy0g { - reg = <7>; +&eqos { + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy0g: ethernet-phy@7 { + reg = <7>; + }; + }; }; -- 2.34.1

2 1

[PATCH v5 0/6] Introduce the sysinfo command
by Detlev Casanova 18 Oct '23

18 Oct '23

The command can be used to show various information that can be used to identify the running system. Currently supported subcommands are: * model: A string representing the model * id: The id of the board * revision: The revision of this board. Changes since v4: - Use less snprintf calls in drivers/sysinfo/rcar3.c - Rebase on master Changes since v3: - Fix documentation typo. Changes since v2: - Fix code style. - Use printf() instead of debug(). - Clarify sysinfo new ids types (int). - Add a test for sysinfo command. - Add documentation for sysinfo command. Changes since v1: - Removed shell function to select linux device tree. This will be distributions job. - Break revision in rev_major and rev_minor in the sysinfo driver. Detlev Casanova (6): sysinfo: Add IDs for board id and revision cmd: Add a sysinfo command sysinfo: Add a test sysinfo: Add documentation sysinfo: rcar3: Use int instead of char for revision sysinfo: rcar3: Implement BOARD_ID and BOARD_REV_* cmd/Kconfig | 6 ++ cmd/Makefile | 1 + cmd/sysinfo.c | 133 ++++++++++++++++++++++++++++++++++++++ configs/sandbox_defconfig | 1 + doc/usage/cmd/sysinfo.rst | 56 ++++++++++++++++ drivers/sysinfo/rcar3.c | 110 +++++++++++++++++++++---------- drivers/sysinfo/sandbox.c | 17 +++++ include/sysinfo.h | 5 ++ test/cmd/Makefile | 1 + test/cmd/test_sysinfo.c | 51 +++++++++++++++ 10 files changed, 347 insertions(+), 34 deletions(-) create mode 100644 cmd/sysinfo.c create mode 100644 doc/usage/cmd/sysinfo.rst create mode 100644 test/cmd/test_sysinfo.c -- 2.41.0

4 20

[PATCH RESEND] sunxi: add axp313a support
by SASANO Takayoshi 18 Oct '23

18 Oct '23

There is no response from previous post, I think this patch is not reached to suitable person and not reviewed yet. axp313a code is a part of power/sunxi. This is needed for Mango Pi MQ-Quad and Orange Pi Zero3. From 9127de42691f86ef5ed22dcf5fa0b44b03288a07 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi <uaa(a)uaa.org.uk> Date: Thu, 13 Jul 2023 20:41:40 +0900 Subject: [PATCH] add axp313a support Signed-off-by: SASANO Takayoshi <uaa(a)uaa.org.uk> --- arch/arm/mach-sunxi/pmic_bus.c | 4 +- board/sunxi/board.c | 9 +- drivers/power/Kconfig | 16 ++- drivers/power/Makefile | 1 + drivers/power/axp313a.c | 171 +++++++++++++++++++++++++++++++++ drivers/power/pmic/axp.c | 1 + include/axp313a.h | 31 ++++++ include/axp_pmic.h | 2 + 8 files changed, 226 insertions(+), 9 deletions(-) create mode 100644 drivers/power/axp313a.c create mode 100644 include/axp313a.h diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c index c090840637..3e7bb5a5d1 100644 --- a/arch/arm/mach-sunxi/pmic_bus.c +++ b/arch/arm/mach-sunxi/pmic_bus.c @@ -21,7 +21,7 @@ #define AXP209_I2C_ADDR 0x34 -#define AXP305_I2C_ADDR 0x36 +#define AXP305_I2C_ADDR 0x36 /* AXP305 and AXP313A */ #define AXP221_CHIP_ADDR 0x68 @@ -32,7 +32,7 @@ static int pmic_i2c_address(void) { if (IS_ENABLED(CONFIG_AXP152_POWER)) return AXP152_I2C_ADDR; - if (IS_ENABLED(CONFIG_AXP305_POWER)) + if (IS_ENABLED(CONFIG_AXP305_POWER) || IS_ENABLED(CONFIG_AXP313A_POWER)) return AXP305_I2C_ADDR; /* Other AXP2xx and AXP8xx variants */ diff --git a/board/sunxi/board.c b/board/sunxi/board.c index f321cd58a6..9b0069cd52 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -584,6 +584,7 @@ void sunxi_board_init(void) #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ + defined CONFIG_AXP313A_POWER || \ defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER power_failed = axp_init(); @@ -605,7 +606,8 @@ void sunxi_board_init(void) power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); #endif -#if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) +#if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) && \ + !defined(CONFIG_AXP313A_POWER) power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); #endif #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ @@ -617,10 +619,11 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); #endif -#if !defined(CONFIG_AXP305_POWER) +#if !defined(CONFIG_AXP305_POWER) && !defined(CONFIG_AXP313A_POWER) power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); #endif -#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) && \ + !defined(CONFIG_AXP313A_POWER) power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); #endif #ifdef CONFIG_AXP209_POWER diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 7f3b990d23..12189eec9f 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -101,6 +101,14 @@ config AXP305_POWER Select this to enable support for the axp305 pmic found on most H616 boards. +config AXP313A_POWER + bool "axp313a pmic support" + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp313a pmic found on some + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I @@ -143,8 +151,8 @@ config AXP_DCDC1_VOLT config AXP_DCDC2_VOLT int "axp pmic dcdc2 voltage" - depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER - default 900 if AXP818_POWER + depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP313A_POWER + default 900 if AXP818_POWER || AXP313A_POWER default 1400 if AXP152_POWER || AXP209_POWER default 1200 if MACH_SUN6I default 1100 if MACH_SUN8I @@ -161,8 +169,8 @@ config AXP_DCDC2_VOLT config AXP_DCDC3_VOLT int "axp pmic dcdc3 voltage" - depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER - default 900 if AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP313A_POWER + default 900 if AXP809_POWER || AXP818_POWER || AXP313A_POWER default 1500 if AXP152_POWER default 1250 if AXP209_POWER default 1100 if MACH_SUN8I_R40 diff --git a/drivers/power/Makefile b/drivers/power/Makefile index ba64b2c593..f851f4a94e 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o obj-$(CONFIG_AXP305_POWER) += axp305.o +obj-$(CONFIG_AXP313A_POWER) += axp313a.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.o diff --git a/drivers/power/axp313a.c b/drivers/power/axp313a.c new file mode 100644 index 0000000000..90be8942bb --- /dev/null +++ b/drivers/power/axp313a.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * AXP313A driver based on AXP221 driver + * + * + * (C) Copyright 2023 SASANO Takayoshi <uaa(a)uaa.org.uk> + * + * Based on axp221.c + * (C) Copyright 2014 Hans de Goede <hdegoede(a)redhat.com> + * (C) Copyright 2013 Oliver Schinagl <oliver(a)schinagl.nl> + */ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp313a_mvolt_to_cfg(int mvolt, int min, int max, int div) +{ + if (mvolt < min) + mvolt = min; + else if (mvolt > max) + mvolt = max; + + return (mvolt - min) / div; +} + +int axp_set_dcdc1(unsigned int mvolt) +{ + int ret; + u8 cfg; + + if (mvolt >= 1600) + cfg = 88 + axp313a_mvolt_to_cfg(mvolt, 1600, 3400, 100); + else if (mvolt >= 1220) + cfg = 71 + axp313a_mvolt_to_cfg(mvolt, 1220, 1540, 20); + else + cfg = axp313a_mvolt_to_cfg(mvolt, 500, 1200, 10); + + if (mvolt == 0) + return pmic_bus_clrbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DCDC1); + + ret = pmic_bus_write(AXP313A_DCDC1_CTRL, cfg); + if (ret) + return ret; + + return pmic_bus_setbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DCDC1); +} + +int axp_set_dcdc2(unsigned int mvolt) +{ + int ret; + u8 cfg; + + if (mvolt >= 1220) + cfg = 71 + axp313a_mvolt_to_cfg(mvolt, 1220, 1540, 20); + else + cfg = axp313a_mvolt_to_cfg(mvolt, 500, 1200, 10); + + if (mvolt == 0) + return pmic_bus_clrbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DCDC2); + + ret = pmic_bus_write(AXP313A_DCDC2_CTRL, cfg); + if (ret) + return ret; + + return pmic_bus_setbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DCDC2); +} + +int axp_set_dcdc3(unsigned int mvolt) +{ + int ret; + u8 cfg; + + if (mvolt >= 1220) + cfg = 71 + axp313a_mvolt_to_cfg(mvolt, 1220, 1840, 20); + else + cfg = axp313a_mvolt_to_cfg(mvolt, 500, 1200, 10); + + if (mvolt == 0) + return pmic_bus_clrbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DCDC3); + + ret = pmic_bus_write(AXP313A_DCDC3_CTRL, cfg); + if (ret) + return ret; + + return pmic_bus_setbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DCDC3); +} + +int axp_set_aldo1(unsigned int mvolt) +{ + int ret; + u8 cfg = axp313a_mvolt_to_cfg(mvolt, 500, 3500, 100); + + if (mvolt == 0) + return pmic_bus_clrbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_ALDO1); + + ret = pmic_bus_write(AXP313A_ALDO1_CTRL, cfg); + if (cfg) + return ret; + + return pmic_bus_setbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_ALDO1); +} + +int axp_set_dldo(int dldo_num, unsigned int mvolt) +{ + int ret; + u8 cfg = axp313a_mvolt_to_cfg(mvolt, 500, 3500, 100); + + if (dldo_num != 1) + return -EINVAL; + + if (mvolt == 0) + return pmic_bus_clrbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DLDO1); + + ret = pmic_bus_write(AXP313A_DLDO1_CTRL, cfg); + if (cfg) + return ret; + + return pmic_bus_setbits(AXP313A_OUTPUT_CTRL, + AXP313A_OUTPUT_CTRL_DLDO1); +} + +int axp_init(void) +{ + int ret; + u8 axp_chip_id; + + ret = pmic_bus_init(); + if (ret) + return ret; + + ret = pmic_bus_read(AXP313A_CHIP_VERSION, &axp_chip_id); + if (ret) + return ret; + + axp_chip_id &= AXP313A_CHIP_VERSION_MASK; + switch (axp_chip_id) { + case AXP313A_CHIP_VERSION_AXP1530: + case AXP313A_CHIP_VERSION_AXP313A: + case AXP313A_CHIP_VERSION_AXP313B: + break; + default: + return -EINVAL; + } + + return ret; +} + +#if !IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + pmic_bus_write(AXP313A_SHUTDOWN, AXP313A_POWEROFF); + + /* infinite loop during shutdown */ + while (1); + + /* not reached */ + return 0; +} +#endif diff --git a/drivers/power/pmic/axp.c b/drivers/power/pmic/axp.c index 025dac24f2..d23c16d996 100644 --- a/drivers/power/pmic/axp.c +++ b/drivers/power/pmic/axp.c @@ -87,6 +87,7 @@ static const struct udevice_id axp_pmic_ids[] = { { .compatible = "x-powers,axp209", .data = AXP209_ID }, { .compatible = "x-powers,axp221", .data = AXP221_ID }, { .compatible = "x-powers,axp223", .data = AXP223_ID }, + { .compatible = "x-powers,axp313a", .data = AXP313A_ID }, { .compatible = "x-powers,axp803", .data = AXP803_ID }, { .compatible = "x-powers,axp806", .data = AXP806_ID }, { .compatible = "x-powers,axp809", .data = AXP809_ID }, diff --git a/include/axp313a.h b/include/axp313a.h new file mode 100644 index 0000000000..a61a11a53c --- /dev/null +++ b/include/axp313a.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2023 SASANO Takayoshi <uaa(a)uaa.org.uk> + */ + +enum axp313a_reg { + AXP313A_POWER_STATUS = 0x00, + AXP313A_CHIP_VERSION = 0x03, + AXP313A_OUTPUT_CTRL = 0x10, + AXP313A_DCDC1_CTRL = 0x13, + AXP313A_DCDC2_CTRL = 0x14, + AXP313A_DCDC3_CTRL = 0x15, + AXP313A_ALDO1_CTRL = 0x16, + AXP313A_DLDO1_CTRL = 0x17, + AXP313A_SHUTDOWN = 0x1a, + AXP313A_IRQ_ENABLE = 0x20, + AXP313A_IRQ_STATUS = 0x21, +}; + +#define AXP313A_CHIP_VERSION_MASK 0xcf +#define AXP313A_CHIP_VERSION_AXP1530 0x48 +#define AXP313A_CHIP_VERSION_AXP313A 0x4b +#define AXP313A_CHIP_VERSION_AXP313B 0x4c + +#define AXP313A_OUTPUT_CTRL_DCDC1 BIT(0) +#define AXP313A_OUTPUT_CTRL_DCDC2 BIT(1) +#define AXP313A_OUTPUT_CTRL_DCDC3 BIT(2) +#define AXP313A_OUTPUT_CTRL_ALDO1 BIT(3) +#define AXP313A_OUTPUT_CTRL_DLDO1 BIT(4) + +#define AXP313A_POWEROFF BIT(7) diff --git a/include/axp_pmic.h b/include/axp_pmic.h index 4ac6486583..9b6d7d900c 100644 --- a/include/axp_pmic.h +++ b/include/axp_pmic.h @@ -13,6 +13,7 @@ #include <axp209.h> #include <axp221.h> #include <axp305.h> +#include <axp313a.h> #include <axp809.h> #include <axp818.h> @@ -32,6 +33,7 @@ enum { AXP209_ID, AXP221_ID, AXP223_ID, + AXP313A_ID, AXP803_ID, AXP806_ID, AXP809_ID, -- 2.30.2 -- SASANO Takayoshi (JG1UAA) <uaa(a)uaa.org.uk>

2 4

[PATCH] sphinx: Bump urllib3 version
by Tom Rini 18 Oct '23

18 Oct '23

While unlikely to be a direct issue for us, urllib3 before 2.0.7 is vulnerable to CVE-2023-45803, so bump our version up. Reported-by: GitHub dependabot Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/sphinx/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt index 6d45a3fefffe..39ececb96c2b 100644 --- a/doc/sphinx/requirements.txt +++ b/doc/sphinx/requirements.txt @@ -23,4 +23,4 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -urllib3==2.0.6 +urllib3==2.0.7 -- 2.34.1

2 1

[PATCH] spl: mmc: Fix subsequent calls to spl_mmc_load with CONFIG_BLK
by Sean Anderson 18 Oct '23

18 Oct '23

MMC devices do not have uclass platdata containing blk_descs, only their child block devices do. Fortunately, we have a function just for this purpose. This fixes subsequent calls to spl_mmc_load. Fixes: bf28d9a6599 ("spl: mmc: Use correct MMC device when loading image") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- common/spl/spl_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index a665091b00f..2be991d5890 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -396,7 +396,7 @@ static int spl_mmc_get_mmc_devnum(struct mmc *mmc) #if !CONFIG_IS_ENABLED(BLK) block_dev = &mmc->block_dev; #else - block_dev = dev_get_uclass_plat(mmc->dev); + block_dev = mmc_get_blk_desc(mmc); #endif return block_dev->devnum; } -- 2.37.1

2 1

[PATCH] Revert "fs: ext4: check the minimal partition size to mount"
by Sean Anderson 18 Oct '23

18 Oct '23

This check breaks small partitions (under 1024 blocks) because part_length is in units of part.blksz and not bytes. Given the purpose of this function, we really want to make sure the partition is SUPERBLOCK_START + SUPERBLOCK_SIZE (2048) bytes so we can call ext4_read_superblock without error. The obvious solution is to convert callers from things like ext4fs_mount(part_info.size) to ext4fs_mount(part_info.size * part_info.blksz); However, I'm not really a fan of the bloat that would cause, especially since the error is now suppressed. I think the best course of action here is to just revert the patch. This reverts commit 9905cae65e03335aefcb1ebfab5b7ee62d89f64e. Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- fs/ext4/ext4_common.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 9a9c520e22c..f50de7c089e 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -2373,10 +2373,6 @@ int ext4fs_mount(unsigned part_length) struct ext2_data *data; int status; struct ext_filesystem *fs = get_fs(); - - if (part_length < SUPERBLOCK_SIZE) - return 0; - data = zalloc(SUPERBLOCK_SIZE); if (!data) return 0; -- 2.37.1

4 3

[PATCH v2 00/29] test: spl: Test some load methods
by Sean Anderson 18 Oct '23

18 Oct '23

This series adds some tests for various SPL load methods, with the intent of helping debug v6 of [1]. With that in mind, notable omissions include NAND and ROMAPI, which both lack sandbox implementations, and OS_BOOT, which I have deferred due to its complexity. Semihosting is also omitted, but I think we can test that with qemu. In order to test all of these methods, we must first generate suitable images, possibly on filesystems. While other tests have historically generated these images using external tools (e.g. mkimage, mkfs, etc.), I have chosen to generate them on the fly. This is for a few reasons: - By removing external dependencies on pytest to create certain files, the tests become self-contained. This makes them easier to iterate on and debug. - By generating tests at runtime, we can dynamically vary the content. This helps detect test failures, as even if tests are loaded to the same location, the expected content will be different. - We are not testing the image parsers themselves (e.g. spl_load_simple_fit or fs_read) but rather the load methods (e.g. spl_mmc_load_image). It is unnecessary to exercise full functionality or generate 100% correct images. - By reducing functionality to only what is necessary, the complexity of various formats can often be greatly reduced. This series depends on [2-3], which are small fixes identified through this patch set. The organization of patches in this series is as follows: - General fixes for bugs which are unlikely to be triggered outside of this series - Changes to IMX8 container images to facilitate testing - General prep. work, particularly regarding linker issues - The tests themselves Passing CI at [4]. [1] https://lore.kernel.org/all/20230731224304.111081-1-sean.anderson@seco.com/ [2] https://lore.kernel.org/all/20230930204246.515254-1-seanga2@gmail.com/ [3] https://lore.kernel.org/all/20231008014748.1987840-1-seanga2@gmail.com/ [4] https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/18128 Changes in v2: - Use "address of" to describe the "&" operator - Remove check for zero entry point in spl_load_fit_image - Use log_err for errors in read_auth_container - Clarify commit message for patch "Check header before calling spl_load_imx_container" - Hide SPL_OF_REAL unless SANDBOX is enabled - Disable sandbox filesystem in SPL instead of compiling it in - Split ext4 defines into their own commit - Use SPL_TPL_ for compiling fastboot functions - Use callbacks to invalidate SPL caches instead of disabling them entirely - Split off -T support into its own commit - Compare to PHASE_SPL in sandbox_cmdline_cb_test_fdt for clarity - Remove redundant condition on CONFIG_SPL_UT_LOAD in test/image/Makefile - Remove unused mapmem.h include in spl_load_os.c - Fix size not being updated in board_spl_fit_buffer_addr - Fix return value documentation for check_image_info - Explicitly invalidate FAT block device cache before testing - Remove unused dm.h include in spl_load.c - Add note about why we enable SPL_TIMER - Explicitly invalidate FAT block device cache before testing - Correct return value documentation for do_spl_test_load - Explicitly invalidate FAT and MMC caches before testing - Add a comment about why we need to initialize bi_dram - Clarify generation process for LZMA data Sean Anderson (29): spl: legacy: Fix referencing _image_binary_end spl: nor: Don't allocate header on stack spl: fit: Fix entry point for SPL_LOAD_FIT_FULL arm: imx: Fix i.MX8 container load address arm: imx: Add newlines after error messages arm: imx: Use log_err for errors in read_auth_container arm: imx: Add function to validate i.MX8 containers arm: imx: Check header before calling spl_load_imx_container Move i.MX8 container image loading support to common/spl spl: Allow enabling SPL_OF_REAL and SPL_OF_PLATDATA at the same time lib: acpi: Fix linking SPL when ACPIGEN is enabled fs: Disable sandbox filesystem in SPL fs: ext4: Fix building ext4 in SPL if write is enabled fs: ext4: Add some defines for testing net: Fix compiling SPL when fastboot is enabled net: bootp: Move port numbers to header net: bootp: Fall back to BOOTP from DHCP when unit testing spl: Add callbacks to invalidate cached devices spl: Use map_sysmem where appropriate sandbox: Support -T in spl test: spl: Split tests up and use some configs test: spl: Fix spl_test_load not failing if fname doesn't exist test: spl: Add functions to create images test: spl: Add functions to create filesystems test: spl: Add a test for spl_blk_load_image test: spl: Add a test for the MMC load method test: spl: Add a test for the NET load method test: spl: Add a test for the NOR load method test: spl: Add a test for the SPI load method .azure-pipelines.yml | 4 + .gitlab-ci.yml | 7 + MAINTAINERS | 2 + arch/arm/include/asm/mach-imx/ahab.h | 2 +- arch/arm/mach-imx/Kconfig | 13 - arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cmd_dek.c | 4 +- arch/arm/mach-imx/ele_ahab.c | 4 +- arch/arm/mach-imx/image-container.c | 4 +- arch/arm/mach-imx/imx8/ahab.c | 4 +- arch/arm/mach-imx/spl_imx_romapi.c | 8 +- arch/sandbox/cpu/spl.c | 4 + arch/sandbox/cpu/start.c | 9 +- arch/sandbox/cpu/u-boot-spl.lds | 2 + arch/sandbox/include/asm/spl.h | 3 + common/spl/Kconfig | 15 + common/spl/Makefile | 1 + common/spl/spl.c | 4 +- common/spl/spl_blk_fs.c | 6 +- common/spl/spl_ext.c | 4 +- common/spl/spl_fat.c | 16 +- common/spl/spl_fit.c | 39 +- .../spl/spl_imx_container.c | 13 +- common/spl/spl_legacy.c | 8 +- common/spl/spl_mmc.c | 16 +- common/spl/spl_nand.c | 4 +- common/spl/spl_net.c | 10 +- common/spl/spl_nor.c | 18 +- common/spl/spl_spi.c | 18 +- configs/deneb_defconfig | 2 + configs/giedi_defconfig | 2 + configs/imx8qm_mek_defconfig | 2 + configs/imx8qxp_mek_defconfig | 2 + configs/sandbox_noinst_defconfig | 31 +- configs/sandbox_spl_defconfig | 8 + configs/sandbox_vpl_defconfig | 1 + drivers/core/Makefile | 1 + drivers/core/root.c | 2 +- drivers/i2c/Makefile | 2 +- drivers/i2c/i2c-emul-uclass.c | 2 +- drivers/serial/sandbox.c | 2 +- drivers/sysreset/sysreset_sandbox.c | 2 +- drivers/usb/gadget/f_sdp.c | 4 +- dts/Kconfig | 8 +- fs/fs.c | 2 +- include/configs/sandbox.h | 3 + include/ext4fs.h | 1 + include/ext_common.h | 14 + .../image.h => include/imx_container.h | 9 + include/spl.h | 36 + include/test/spl.h | 155 ++++ lib/Kconfig | 6 + lib/Makefile | 1 + net/Makefile | 4 +- net/bootp.c | 9 +- net/bootp.h | 3 + net/net.c | 4 +- test/Kconfig | 1 + test/Makefile | 5 +- test/image/Kconfig | 50 ++ test/image/Makefile | 7 +- test/image/spl_load.c | 690 ++++++++++++++++-- test/image/spl_load_fs.c | 428 +++++++++++ test/image/spl_load_net.c | 252 +++++++ test/image/spl_load_nor.c | 39 + test/image/spl_load_os.c | 76 ++ test/image/spl_load_spi.c | 41 ++ test/py/tests/test_spl.py | 10 + test/test-main.c | 2 +- 69 files changed, 2000 insertions(+), 163 deletions(-) rename arch/arm/mach-imx/parse-container.c => common/spl/spl_imx_container.c (91%) rename arch/arm/include/asm/mach-imx/image.h => include/imx_container.h (82%) create mode 100644 include/test/spl.h create mode 100644 test/image/Kconfig create mode 100644 test/image/spl_load_fs.c create mode 100644 test/image/spl_load_net.c create mode 100644 test/image/spl_load_nor.c create mode 100644 test/image/spl_load_os.c create mode 100644 test/image/spl_load_spi.c -- 2.37.1

4 42

commit 83c63f0d118 (led: Move OF "label" property parsing to core)
by Rasmus Villemoes 18 Oct '23

18 Oct '23

Hi, I'm trying to resurrect an old submission of a driver for ti,lp5562, so had occasion to dig into drivers/led/. And I think commit 83c63f0d118 is buggy or at least incomplete. Many of the drivers that were subsequently modified to not do that "label" parsing rely, in their .probe method, on the top node being distinguished by not having a ->label. And led-uclass itself does that /* Ignore the top-level LED node */ if (uc_plat->label && !strcmp(label, uc_plat->label)) return uclass_get_device_tail(dev, 0, devp); The drivers used to only do that label-parsing for subnodes of the top node, so that worked, but the new code assigns some ->label for anything bound to a LED uclass driver. There have been at least two patches to individual drivers to fix this up since (the current top two patches touching drivers/led/), but I think that's the wrong way to handle this. At the same time, I actually think 83c63f0d118 didn't go far enough in deduplicating, since all drivers are left with essentially the same loop: static int led_gpio_bind(struct udevice *parent) { struct udevice *dev; ofnode node; int ret; dev_for_each_subnode(node, parent) { ret = device_bind_driver_to_node(parent, "gpio_led", ofnode_get_name(node), node, &dev); if (ret) return ret; } return 0; } static int bcm6753_led_bind(struct udevice *parent) { ofnode node; dev_for_each_subnode(node, parent) { struct udevice *dev; int ret; ret = device_bind_driver_to_node(parent, "bcm6753-led", ofnode_get_name(node), node, &dev); if (ret) return ret; } return 0; } and that string can, if I'm not mistaken, be gotten from parent->driver->name. So we really should be able to create a generic_led_bind() that does exactly this loop + the "label" parsing, remove the label parsing from post_bind (so it doesn't apply to the top nodes), and switch all drivers over to this generic_led_bind(). Alternatively, we can still create a generic_led_bind() that just does the loop as above, but then somehow prevent the top nodes from gaining ->label, say by not adding the nodename fallback if the node has a "compatible" property (though that seems like a hack, maybe there's a cleaner way). WDYT? Rasmus

2 4

[PATCH 1/3] arm: dts: imx8mm: Sync with Linux 6.3
by Fabio Estevam 18 Oct '23

18 Oct '23

From: Fabio Estevam <festevam(a)denx.de> Sync imx8mm.dtsi with Linux 6.3. The motivation for doing this sync was a bug when doing "ums 0 mmc 1" on imx8mm-evk. It worked well for the first time, but after doing a CTRL+C and launching the ums again, the command did not work. Adam Ford suggested to sync imx8mm.dtsi with the Linux dts, as there was a recent USB power domain reorganization there. After syncing the imx8mm.dtsi with Linux, the ums command works without problem after a CTRL+C. Suggested-by: Adam Ford <aford173(a)gmail.com> Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- arch/arm/dts/imx8mm.dtsi | 52 +++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/arch/arm/dts/imx8mm.dtsi b/arch/arm/dts/imx8mm.dtsi index afb90f59c83c..31f4548f85cf 100644 --- a/arch/arm/dts/imx8mm.dtsi +++ b/arch/arm/dts/imx8mm.dtsi @@ -139,6 +139,7 @@ A53_L2: l2-cache0 { compatible = "cache"; cache-level = <2>; + cache-unified; cache-size = <0x80000>; cache-line-size = <64>; cache-sets = <512>; @@ -276,6 +277,7 @@ assigned-clocks = <&clk IMX8MM_CLK_USB_PHY_REF>; assigned-clock-parents = <&clk IMX8MM_SYS_PLL1_100M>; clock-names = "main_clk"; + power-domains = <&pgc_otg1>; }; usbphynop2: usbphynop2 { @@ -285,6 +287,7 @@ assigned-clocks = <&clk IMX8MM_CLK_USB_PHY_REF>; assigned-clock-parents = <&clk IMX8MM_SYS_PLL1_100M>; clock-names = "main_clk"; + power-domains = <&pgc_otg2>; }; soc: soc@0 { @@ -493,6 +496,8 @@ compatible = "fsl,imx8mm-tmu"; reg = <0x30260000 0x10000>; clocks = <&clk IMX8MM_CLK_TMU_ROOT>; + nvmem-cells = <&tmu_calib>; + nvmem-cell-names = "calib"; #thermal-sensor-cells = <0>; }; @@ -547,8 +552,8 @@ reg = <0x30330000 0x10000>; }; - gpr: iomuxc-gpr@30340000 { - compatible = "fsl,imx8mm-iomuxc-gpr", "fsl,imx6q-iomuxc-gpr", "syscon"; + gpr: syscon@30340000 { + compatible = "fsl,imx8mm-iomuxc-gpr", "syscon"; reg = <0x30340000 0x10000>; }; @@ -560,22 +565,40 @@ #address-cells = <1>; #size-cells = <1>; - imx8mm_uid: unique-id@410 { + /* + * The register address below maps to the MX8M + * Fusemap Description Table entries this way. + * Assuming + * reg = <ADDR SIZE>; + * then + * Fuse Address = (ADDR * 4) + 0x400 + * Note that if SIZE is greater than 4, then + * each subsequent fuse is located at offset + * +0x10 in Fusemap Description Table (e.g. + * reg = <0x4 0x8> describes fuses 0x410 and + * 0x420). + */ + imx8mm_uid: unique-id@4 { /* 0x410-0x420 */ reg = <0x4 0x8>; }; - cpu_speed_grade: speed-grade@10 { + cpu_speed_grade: speed-grade@10 { /* 0x440 */ reg = <0x10 4>; }; - fec_mac_address: mac-address@90 { + tmu_calib: calib@3c { /* 0x4f0 */ + reg = <0x3c 4>; + }; + + fec_mac_address: mac-address@90 { /* 0x640 */ reg = <0x90 6>; }; }; - anatop: anatop@30360000 { - compatible = "fsl,imx8mm-anatop", "syscon"; + anatop: clock-controller@30360000 { + compatible = "fsl,imx8mm-anatop"; reg = <0x30360000 0x10000>; + #clock-cells = <1>; }; snvs: snvs@30370000 { @@ -674,13 +697,11 @@ pgc_otg1: power-domain@2 { #power-domain-cells = <0>; reg = <IMX8MM_POWER_DOMAIN_OTG1>; - power-domains = <&pgc_hsiomix>; }; pgc_otg2: power-domain@3 { #power-domain-cells = <0>; reg = <IMX8MM_POWER_DOMAIN_OTG2>; - power-domains = <&pgc_hsiomix>; }; pgc_gpumix: power-domain@4 { @@ -1186,7 +1207,7 @@ assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_500M>; phys = <&usbphynop1>; fsl,usbmisc = <&usbmisc1 0>; - power-domains = <&pgc_otg1>; + power-domains = <&pgc_hsiomix>; status = "disabled"; }; @@ -1206,7 +1227,7 @@ assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_500M>; phys = <&usbphynop2>; fsl,usbmisc = <&usbmisc2 0>; - power-domains = <&pgc_otg2>; + power-domains = <&pgc_hsiomix>; status = "disabled"; }; @@ -1238,16 +1259,15 @@ <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; #dma-cells = <1>; dma-channels = <4>; clocks = <&clk IMX8MM_CLK_NAND_USDHC_BUS_RAWNAND_CLK>; }; - gpmi: nand-controller@33002000{ + gpmi: nand-controller@33002000 { compatible = "fsl,imx8mm-gpmi-nand", "fsl,imx7d-gpmi-nand"; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; reg = <0x33002000 0x2000>, <0x33004000 0x4000>; reg-names = "gpmi-nand", "bch"; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; @@ -1282,6 +1302,10 @@ <0 0 0 4 &gic GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; fsl,max-link-speed = <2>; linux,pci-domain = <0>; + clocks = <&clk IMX8MM_CLK_PCIE1_ROOT>, + <&clk IMX8MM_CLK_PCIE1_PHY>, + <&clk IMX8MM_CLK_PCIE1_AUX>; + clock-names = "pcie", "pcie_bus", "pcie_aux"; power-domains = <&pgc_pcie>; resets = <&src IMX8MQ_RESET_PCIE_CTRL_APPS_EN>, <&src IMX8MQ_RESET_PCIE_CTRL_APPS_TURNOFF>; -- 2.34.1

5 46