September 2021 - U-Boot

[RFC PATCH] RFC: Replace CONFIG_SYS_BAUDRATE_TABLE by board and UART driver rounding functions
by Pali Rohár 06 Apr '22

06 Apr '22

Add new functions which returns the nearest baudrate and use them instead of hardcoded and incomplete CONFIG_SYS_BAUDRATE_TABLE compile time option. Add implementation of rounding function for serial_mvebu_a3700 driver and also for A3720 Espressobin board which has integrated pl2303 USB<->UART converter, which basically limits baudrates which can user set. Completely remove CONFIG_SYS_BAUDRATE_TABLE defines from all A3720 boards as now with rounding functions it is not used anymore. NOTE: This is just an example how to kill CONFIG_SYS_BAUDRATE_TABLE compile time definitions. I tested it that it works on A3720 Turris Mox board. I have not tested A3720 Espressobin board yet. More discussion on this approach is required, so take this just as RFC change. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- board/Marvell/mvebu_armada-37xx/board.c | 28 ++++++++++ drivers/serial/serial-uclass.c | 71 +++++++++++++++++++++---- drivers/serial/serial_mvebu_a3700.c | 39 ++++++++++++++ include/configs/mvebu_armada-37xx.h | 8 --- include/configs/turris_mox.h | 8 --- include/serial.h | 24 +++++++++ 6 files changed, 152 insertions(+), 26 deletions(-) diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index fdc873b1952f..0cd9ea6a1515 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -435,3 +435,31 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; } #endif + +int board_round_baudrate(int baudrate) +{ + /* + * Espressobin has on-board pl2303 connected to A3720 UART. + * So calculate the final real baudrate supported by pl2303. + * Code from linux kernel function pl2303_encode_baud_rate_divisor() + * Exact formula is: baudrate = 12M * 32 / (mantissa * 4^exponent) + */ + unsigned int baseline, mantissa, exponent; + + baseline = 12000000 * 32; + mantissa = baseline / baudrate; + if (mantissa == 0) + mantissa = 1; + exponent = 0; + while (mantissa >= 512) { + if (exponent < 7) { + mantissa >>= 2; + exponent++; + } else { + mantissa = 511; + break; + } + } + + return (baseline / mantissa) >> (exponent << 1); +} diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 8171b17faf88..0d725ed764e6 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -299,6 +299,20 @@ int serial_tstc(void) return _serial_tstc(gd->cur_serial_dev); } +int serial_round_baudrate(int baudrate) +{ + struct dm_serial_ops *ops; + + if (!gd->cur_serial_dev) + return 0; + + ops = serial_get_ops(gd->cur_serial_dev); + if (!ops->round_baudrate) + return 0; + + return ops->round_baudrate(gd->cur_serial_dev, baudrate); +} + void serial_setbrg(void) { struct dm_serial_ops *ops; @@ -378,6 +392,11 @@ static int serial_stub_tstc(struct stdio_dev *sdev) } #endif +int __weak board_round_baudrate(int baudrate) +{ + return 0; +} + /** * on_baudrate() - Update the actual baudrate when the env var changes * @@ -388,6 +407,8 @@ static int on_baudrate(const char *name, const char *value, enum env_op op, { int i; int baudrate; + int real_baudrate; + int board_baudrate; switch (op) { case env_op_create: @@ -397,20 +418,50 @@ static int on_baudrate(const char *name, const char *value, enum env_op op, */ baudrate = dectoul(value, NULL); - /* Not actually changing */ - if (gd->baudrate == baudrate) - return 0; + real_baudrate = serial_round_baudrate(baudrate); - for (i = 0; i < ARRAY_SIZE(baudrate_table); ++i) { - if (baudrate == baudrate_table[i]) - break; - } - if (i == ARRAY_SIZE(baudrate_table)) { - if ((flags & H_FORCE) == 0) + if (real_baudrate) { + /* Baudrate is supported if is within 3% tolerance */ + if (100 * real_baudrate < baudrate * (100 - 3) || + 100 * real_baudrate > baudrate * (100 + 3)) { printf("## Baudrate %d bps not supported\n", baudrate); - return 1; + return 1; + } + baudrate = real_baudrate; + } else { + /* + * If round_baudrate() callback is unsupported then + * check supported baudrate against baudrate_table[] + */ + for (i = 0; i < ARRAY_SIZE(baudrate_table); ++i) { + if (baudrate == baudrate_table[i]) + break; + } + if (i == ARRAY_SIZE(baudrate_table)) { + if ((flags & H_FORCE) == 0) + printf("## Baudrate %d bps not supported\n", + baudrate); + return 1; + } + } + + board_baudrate = board_round_baudrate(baudrate); + + if (board_baudrate) { + /* Baudrate is supported if is within 3% tolerance */ + if (100 * board_baudrate < baudrate * (100 - 3) || + 100 * board_baudrate > baudrate * (100 + 3)) { + printf("## Baudrate %d bps not supported by the board\n", + baudrate); + return 1; + } } + + /* Not actually changing */ + if (gd->baudrate == baudrate) + return 0; + if ((flags & H_INTERACTIVE) != 0) { printf("## Switch baudrate to %d bps and press ENTER ...\n", baudrate); diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index 8dc4e5880e6b..d8bf3e97c486 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -147,6 +147,44 @@ static int mvebu_serial_setbrg(struct udevice *dev, int baudrate) return 0; } +static int mvebu_serial_round_baudrate(struct udevice *dev, int baudrate) +{ + struct mvebu_plat *plat = dev_get_plat(dev); + u32 divider, d1, d2, m; + + m = 16; + d1 = d2 = 1; + divider = DIV_ROUND_CLOSEST(plat->tbg_rate, baudrate * d1 * d2 * m); + + if (divider < 1) + divider = 1; + else if (divider > 1023) { + d1 = 6; + divider = DIV_ROUND_CLOSEST(plat->tbg_rate, + baudrate * d1 * d2 * m); + if (divider < 1) + divider = 1; + else if (divider > 1023) { + d2 = 6; + divider = DIV_ROUND_CLOSEST(plat->tbg_rate, + baudrate * d1 * d2 * m); + if (divider < 1) + divider = 1; + else if (divider > 1023) { + m = 63; + divider = DIV_ROUND_CLOSEST(plat->tbg_rate, + baudrate * d1 * d2 * m); + if (divider < 1) + divider = 1; + else if (divider > 1023) + divider = 1023; + } + } + } + + return DIV_ROUND_CLOSEST(plat->tbg_rate, d1 * d2 * m * divider); +} + static int mvebu_serial_probe(struct udevice *dev) { struct mvebu_plat *plat = dev_get_plat(dev); @@ -335,6 +373,7 @@ static const struct dm_serial_ops mvebu_serial_ops = { .pending = mvebu_serial_pending, .getc = mvebu_serial_getc, .setbrg = mvebu_serial_setbrg, + .round_baudrate = mvebu_serial_round_baudrate, }; static const struct udevice_id mvebu_serial_ids[] = { diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index c8c34d7d92dd..6f7279f2ae4a 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -17,14 +17,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Increase max gunzip size */ -#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \ - 9600, 19200, 38400, 57600, 115200, \ - 230400, 460800, 500000, 576000, \ - 921600, 1000000, 1152000, 1500000, \ - 2000000, 2500000, 3000000, 3500000, \ - 4000000, 4500000, 5000000, 5500000, \ - 6000000 } - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 671283982356..03813613e193 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -22,14 +22,6 @@ /* auto boot */ -#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \ - 9600, 19200, 38400, 57600, 115200, \ - 230400, 460800, 500000, 576000, \ - 921600, 1000000, 1152000, 1500000, \ - 2000000, 2500000, 3000000, 3500000, \ - 4000000, 4500000, 5000000, 5500000, \ - 6000000 } - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/serial.h b/include/serial.h index 6d1e62c6770c..5e8a7501b9a6 100644 --- a/include/serial.h +++ b/include/serial.h @@ -176,6 +176,30 @@ struct dm_serial_ops { * @return 0 if OK, -ve on error */ int (*setbrg)(struct udevice *dev, int baudrate); + /** + * round_baudrate() - Return the nearest available baudrate + * + * Return the exact baudrate value which would be set by setbrg() + * if is called with this @baudrate argument. So this function + * should return the nearest available baudrate. + * + * This function must not change baudrate generator. Its purpose + * is just to test if particular baudrate value is supported + * and to calculate baudrate tolerance. + * + * Caller may specify number 0 to retrieve the smallest possible + * supported baudrate and INT_MAX number to retrive the highest + * possible supported baudrate. + * + * Returning zero value is same as if this function is not + * implemented at all. Meaning that driver cannot predict what is + * the real final baudrate value. + * + * @dev: Device pointer + * @baudrate: Baudrate to round + * @return real baudrate value (see above) + */ + int (*round_baudrate)(struct udevice *dev, int baudrate); /** * getc() - Read a character and return it * -- 2.20.1

2 4

[RESEND PATCH v2 0/3] sunxi: Improve automatic eMMC boot partition support
by Andre Przywara 06 Apr '22

06 Apr '22

(resent to also include forgotten U-Boot list) The Allwinner BootROM supports loading the SPL from eMMC boot partitions, but so far the SPL support for this case was a bit lacking, as it was a compile time decision, and even required a manual config change. This actually got accidentally fixed in v2021.04 (c0b417b2f1a3 "sunxi: support loading with SPL > 32KB"), but still some gaps remain: When just enabling an eMMC boot partition, but having no bootable code there, the BROM will just continue with booting from the user data partition, but U-Boot does not detect this and will try to load U-Boot proper from that boot partition. This series fixes this, by replicating the BROMs decisions in the SPL, to decide on the partition to continue loading from. Patch 1/3 prepares a generic function to take an extra argument, while patch 2/3 implements the actual algorithm. As this now allows to always have eMMC boot support on, patch 3/3 just activates this for a number of boards I could test it on. I'd like to encourage other people to test this on boards with eMMC, to enable this in the respective defconfig, maybe even centrally. Some more details on eMMC boot partition support and how to install U-Boot in there can be found in the linux-sunxi Wiki: http://linux-sunxi.org/Bootable_eMMC Cheers, Andre Changelog v1 .. v2: - drop patch 1/5 (bugfix): already merged - drop patch 3/5, as it was obsoleted by c0b417b2f1a3 - remove check for 32KB SPL limit (not applicable for H6 and beyond) - remove extra sector offset adjustment (obsoleted by c0b417b2f1a3) Andre Przywara (3): spl: mmc: extend spl_mmc_boot_mode() to take mmc argument sunxi: eMMC: Improve automatic boot source detection sunxi: defconfig: enable eMMC boot partition support arch/arm/mach-imx/spl.c | 2 +- arch/arm/mach-k3/am6_init.c | 2 +- arch/arm/mach-k3/j721e_init.c | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- arch/arm/mach-rockchip/spl.c | 2 +- arch/arm/mach-socfpga/spl_a10.c | 2 +- arch/arm/mach-socfpga/spl_gen5.c | 2 +- arch/arm/mach-stm32mp/spl.c | 2 +- arch/arm/mach-sunxi/board.c | 80 ++++++++++++++++++++++ arch/arm/mach-uniphier/mmc-boot-mode.c | 5 +- common/spl/spl_mmc.c | 4 +- configs/bananapi_m64_defconfig | 1 + configs/emlid_neutis_n5_devboard_defconfig | 1 + configs/pine64-lts_defconfig | 1 + configs/pine_h64_defconfig | 1 + include/spl.h | 3 +- 16 files changed, 97 insertions(+), 15 deletions(-) -- 2.17.5

3 7

[PATCH v2 0/4] mkimage: sunxi_egon: add riscv support
by Icenowy Zheng 06 Apr '22

06 Apr '22

This patchset tries to make mkimage -T sunxi_egon to be able to generate an eGON.BT0 image for Allwinner RISC-V SoCs (e.g. D1). In addition, to keep the compatibility, it will still consider the architecture to be ARM when no architecture is specified. Icenowy Zheng (4): mkimage: add a flag to describe whether -A is specified mkimage: sunxi_egon: refactor for multi-architecture support mkimage: sunxi_egon: add support for riscv sunxi: specify architecture when generating SPL boot image scripts/Makefile.spl | 2 +- tools/imagetool.h | 1 + tools/mkimage.c | 1 + tools/sunxi_egon.c | 86 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 82 insertions(+), 8 deletions(-) -- 2.30.2

5 16

[PATCH 0/3] efi_loader: setting boot device
by Heinrich Schuchardt 04 Apr '22

04 Apr '22

Up to now the bootefi command uses the last file loaded to determine the boot partition. This has led to user irritation when the fdt has been loaded from another partition after the EFI binary. Before setting the boot device from a loaded file check if it is a PE-COFF image. The first patch carves out the test function. The second make use of the PE-COFF check. The third add the display of the boot device and file path for easier testing. Heinrich Schuchardt (3): efi_loader: print boot device and file path in helloworld efi_loader: carve out efi_check_pe() efi_loader: setting boot device cmd/bootefi.c | 14 ++- doc/uefi/uefi.rst | 11 +- fs/fs.c | 3 +- include/efi_loader.h | 8 +- lib/efi_loader/efi_image_loader.c | 80 ++++++++------ lib/efi_loader/helloworld.c | 167 ++++++++++++++++++++++++------ net/tftp.c | 9 +- 7 files changed, 211 insertions(+), 81 deletions(-) -- 2.29.2

4 18

[PATCH] ARM: dts: colibri-imx6ull: fix mac address passing
by Francesco Dolcini 01 Apr '22

01 Apr '22

colibri-imx6ull ethernet device is fec2, while the optional secondary ethernet is fec1, update the ethernet aliases in the .dts file so that ethaddr is set to fec2 and eth1addr to fec1. Without this change the ethernet interfaces have a different mac address between Linux and U-Boot. Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index b7bf79f28c..104207be97 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -8,6 +8,12 @@ #include "imx6ull.dtsi" / { + /* Ethernet aliases to ensure correct MAC addresses */ + aliases { + ethernet0 = &fec2; + ethernet1 = &fec1; + }; + chosen { stdout-path = &uart1; }; -- 2.25.1

4 12

[PATCH v2 0/9] efi: Various tidy-ups and drop the default
by Simon Glass 28 Mar '22

28 Mar '22

It has come to light that EFI_LOADER adds an extraordinary amount of code to U-Boot. For example, with nokia_rx51 the size delta is about 90KB. About 170 boards explicitly disable the option, but is is clear that many more could, thus saving image size and boot time. The current situation is affecting U-Boot's image as a svelt bootloader. EFI_LOADER is required by EBBR, a new boot standard which aims to bring in UEFI protocols to U-Boot. But EBRR is not required for booting. U-Boot already provides support for FIT, the 'bootm' command and a suitable hand-off to Linux. EBRR has made the decision to create a parallel infrastructure, e.g. does not use FIT, nor U-Boot's signing infrastructure. EBBR should be truly optional, enabled only by boards that use it. Most don't use it but it is enabled anyway. The default boot path should be one that makes use of the existing U-Boot support. To try to retify this situation, this series adds a new Kconfig option for EBBR so that the naming is more explicit. Then EFI_LOADER is updated to depend on it. The final patch makes EBBR optional. For now, only sandbox enables EBBR. Other boards can be added as needed, presumably by distributions that require it. Another approach would be to add 'CONFIG_EBBR=y' to the .config before building, in the build system. That might be more friendly to U-Boot users. This series also fixes a minor issue noticed during testing. Changes in v2: - Update commit message - Update commit message to be clearer - Drop 'struct blk_desc' - Move all header inclusions to the top - Split out new patch to make EFI_LOADER depend on DM and OF_CONTROL - Note the approximate size of this feature in the help - Split out new patch to create an option for EBBR Simon Glass (9): configs: Resync with savedefconfig Makefile: Drop include/asm directory as well as symlink disk: Tidy up #ifdefs in part_efi Use LIB_UUID with ACPIGEN and FS_BTRFS Allow efi_loader header to be included always lib: Create a new Kconfig option for charset conversion Make EFI_LOADER depend on DM and OF_CONTROL Add an option for EBBR efi: Make EBBR optional Makefile | 2 +- common/Kconfig.boot | 16 ++ configs/am335x_igep003x_defconfig | 1 - configs/am335x_pdu001_defconfig | 1 - configs/am64x_evm_a53_defconfig | 31 ++- configs/apalis-imx8_defconfig | 1 - configs/apalis-imx8x_defconfig | 1 - configs/aristainetos2c_defconfig | 1 - configs/aristainetos2ccslb_defconfig | 1 - ...edev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - configs/bcm7260_defconfig | 1 - configs/bcm7445_defconfig | 1 - configs/bcm963158_ram_defconfig | 1 - configs/bcm968580xref_ram_defconfig | 1 - configs/bitmain_antminer_s9_defconfig | 1 - configs/bk4r1_defconfig | 1 - configs/brppt1_mmc_defconfig | 1 - configs/brppt1_nand_defconfig | 1 - configs/brppt1_spi_defconfig | 1 - configs/brppt2_defconfig | 1 - configs/brsmarc1_defconfig | 1 - configs/brxre1_defconfig | 1 - configs/cgtqmx8_defconfig | 1 - configs/chromebook_coral_defconfig | 1 - configs/chromebook_link_defconfig | 1 - configs/colibri-imx8x_defconfig | 1 - configs/colibri_vf_defconfig | 1 - configs/controlcenterdc_defconfig | 1 - configs/crs305-1g-4s-bit_defconfig | 1 - configs/crs305-1g-4s_defconfig | 1 - configs/crs326-24g-2s-bit_defconfig | 1 - configs/crs326-24g-2s_defconfig | 1 - configs/crs328-4c-20s-4s-bit_defconfig | 1 - configs/crs328-4c-20s-4s_defconfig | 1 - configs/deneb_defconfig | 1 - configs/draco_defconfig | 2 +- configs/dragonboard820c_defconfig | 1 - configs/efi-x86_app_defconfig | 1 - configs/etamin_defconfig | 2 +- configs/evb-ast2600_defconfig | 1 - configs/evb-px30_defconfig | 1 - configs/evb-rk3308_defconfig | 1 - configs/evb-rk3568_defconfig | 2 +- configs/firefly-px30_defconfig | 1 - configs/ge_bx50v3_defconfig | 1 - configs/giedi_defconfig | 1 - configs/grpeach_defconfig | 1 - configs/imx8mm-cl-iot-gate_defconfig | 8 - configs/imx8qm_mek_defconfig | 1 - configs/imx8qm_rom7720_a1_4G_defconfig | 1 - configs/imx8qxp_mek_defconfig | 1 - configs/j7200_evm_r5_defconfig | 15 +- configs/j721e_evm_r5_defconfig | 13 +- configs/kontron_sl28_defconfig | 2 - configs/kp_imx53_defconfig | 1 - configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1028aqds_tfa_defconfig | 1 - configs/ls1028aqds_tfa_lpuart_defconfig | 1 - configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1028ardb_tfa_defconfig | 1 - configs/ls1043aqds_defconfig | 1 - configs/ls1043aqds_lpuart_defconfig | 1 - configs/ls1043aqds_nand_defconfig | 1 - configs/ls1043aqds_nor_ddr3_defconfig | 1 - configs/ls1043aqds_qspi_defconfig | 1 - configs/ls1043aqds_sdcard_ifc_defconfig | 1 - configs/ls1043aqds_sdcard_qspi_defconfig | 1 - configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1043aqds_tfa_defconfig | 1 - configs/ls1043ardb_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_defconfig | 1 - configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_nand_defconfig | 1 - .../ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_sdcard_defconfig | 1 - configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_tfa_defconfig | 1 - configs/ls1046aqds_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_defconfig | 1 - configs/ls1046aqds_lpuart_defconfig | 1 - configs/ls1046aqds_nand_defconfig | 1 - configs/ls1046aqds_qspi_defconfig | 1 - configs/ls1046aqds_sdcard_ifc_defconfig | 1 - configs/ls1046aqds_sdcard_qspi_defconfig | 1 - configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_tfa_defconfig | 1 - configs/ls1046ardb_emmc_defconfig | 1 - configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 - configs/ls1046ardb_qspi_defconfig | 1 - configs/ls1046ardb_qspi_spl_defconfig | 1 - .../ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 - configs/ls1046ardb_sdcard_defconfig | 1 - configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1046ardb_tfa_defconfig | 1 - configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 - configs/ls1088aqds_qspi_defconfig | 1 - configs/ls1088aqds_tfa_defconfig | 1 - configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 - configs/ls1088ardb_qspi_defconfig | 1 - configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1088ardb_tfa_defconfig | 1 - configs/ls2080aqds_SECURE_BOOT_defconfig | 1 - configs/ls2080aqds_defconfig | 1 - configs/ls2080aqds_nand_defconfig | 1 - configs/ls2080aqds_qspi_defconfig | 1 - configs/ls2080aqds_sdcard_defconfig | 1 - configs/ls2080ardb_SECURE_BOOT_defconfig | 1 - configs/ls2080ardb_defconfig | 1 - configs/ls2080ardb_nand_defconfig | 1 - configs/ls2081ardb_defconfig | 1 - configs/ls2088aqds_tfa_defconfig | 1 - configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 - configs/ls2088ardb_qspi_defconfig | 1 - configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls2088ardb_tfa_defconfig | 1 - configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/lx2160aqds_tfa_defconfig | 1 - configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/lx2160ardb_tfa_defconfig | 1 - configs/lx2160ardb_tfa_stmm_defconfig | 4 - configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/lx2162aqds_tfa_defconfig | 1 - .../lx2162aqds_tfa_verified_boot_defconfig | 1 - configs/mt7623n_bpir2_defconfig | 1 - configs/mt7629_rfb_defconfig | 1 - configs/mt8183_pumpkin_defconfig | 1 - configs/mt8516_pumpkin_defconfig | 1 - configs/mvebu_puzzle-m801-88f8040_defconfig | 1 - configs/mx6memcal_defconfig | 1 - configs/octeontx2_95xx_defconfig | 1 - configs/octeontx2_96xx_defconfig | 1 - configs/octeontx_81xx_defconfig | 1 - configs/octeontx_83xx_defconfig | 1 - configs/omap4_sdp4430_defconfig | 1 - configs/opos6uldev_defconfig | 1 - configs/pcm052_defconfig | 1 - configs/phycore-am335x-r2-regor_defconfig | 1 - configs/phycore-am335x-r2-wega_defconfig | 1 - configs/pxm2_defconfig | 2 +- configs/qemu-riscv32_defconfig | 2 - configs/qemu-riscv32_smode_defconfig | 2 - configs/qemu-riscv64_defconfig | 2 - configs/qemu-riscv64_smode_defconfig | 2 - configs/qemu-x86_64_defconfig | 2 - configs/qemu-x86_defconfig | 2 - configs/qemu_arm64_defconfig | 2 - configs/qemu_arm_defconfig | 2 - configs/r8a779a0_falcon_defconfig | 3 +- configs/rastaban_defconfig | 2 +- configs/roc-cc-rk3308_defconfig | 1 - configs/rock-pi-n10-rk3399pro_defconfig | 1 - configs/rock-pi-n8-rk3288_defconfig | 1 - configs/rut_defconfig | 2 +- configs/sama5d27_wlsom1_ek_mmc_defconfig | 1 - .../sama5d27_wlsom1_ek_qspiflash_defconfig | 1 - configs/sama5d2_icp_mmc_defconfig | 1 - configs/sama7g5ek_mmc1_defconfig | 1 - configs/sama7g5ek_mmc_defconfig | 1 - configs/sandbox64_defconfig | 9 - configs/sandbox_defconfig | 9 - configs/sandbox_flattree_defconfig | 2 - configs/sandbox_noinst_defconfig | 2 - configs/sandbox_spl_defconfig | 2 - configs/sipeed_maix_bitm_defconfig | 1 - configs/sipeed_maix_smode_defconfig | 1 - configs/socfpga_de1_soc_defconfig | 1 - configs/somlabs_visionsom_6ull_defconfig | 1 - configs/stemmy_defconfig | 1 - configs/stm32mp15_basic_defconfig | 3 - configs/stm32mp15_trusted_defconfig | 3 - configs/tbs2910_defconfig | 1 - configs/thuban_defconfig | 2 +- configs/tools-only_defconfig | 1 - configs/vf610twr_defconfig | 1 - configs/vf610twr_nand_defconfig | 1 - configs/xenguest_arm64_defconfig | 1 - configs/xilinx_versal_mini_defconfig | 1 - configs/xilinx_versal_mini_emmc0_defconfig | 1 - configs/xilinx_versal_mini_emmc1_defconfig | 1 - configs/xilinx_versal_virt_defconfig | 2 - configs/xilinx_zynqmp_mini_defconfig | 1 - configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - configs/xilinx_zynqmp_mini_nand_defconfig | 1 - .../xilinx_zynqmp_mini_nand_single_defconfig | 1 - configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - configs/xilinx_zynqmp_r5_defconfig | 1 - configs/xilinx_zynqmp_virt_defconfig | 9 - configs/zynq_cse_nand_defconfig | 1 - configs/zynq_cse_nor_defconfig | 1 - configs/zynq_cse_qspi_defconfig | 1 - disk/part_efi.c | 11 +- drivers/core/Kconfig | 1 + fs/btrfs/Kconfig | 1 + include/efi_loader.h | 187 +++++++++--------- lib/Kconfig | 8 + lib/Makefile | 2 +- lib/efi_loader/Kconfig | 5 +- 198 files changed, 160 insertions(+), 378 deletions(-) -- 2.32.0.93.g670b81a890-goog

4 35

[PATCH 0/8] imx8mm: Add serial download support
by Fabio Estevam 28 Mar '22

28 Mar '22

This series brings USB gadget support for i.MX8MM and allows the usage of the Serial Download Protocol, which is a convenient way for loading U-Boot via the 'uuu' tool and and flashing the eMMC via the U-Boot 'ums' command. Tested on imx8mm-evk and imx7s-warp. Fabio Estevam (4): usb: ehci-mx6: Allow building SDP for imx8mm imx8mm_evk: Add an entry for USB boot imx8mm_evk: Add Serial Download Protocol support doc: imx8mm_evk: Add instructions for eMMC boot Frieder Schrempf (2): imx8mm: Fix USB reg addresses for i.MX8MM clock_imx8mm: Add enable_usboh3_clk() for i.MX8MM Tim Harvey (2): usb: ehci-mx6: move mode set/detect to probe usb: ehci-mx6: add IMX8MM and IMX8MN OTG support arch/arm/include/asm/arch-imx8m/clock.h | 1 + arch/arm/include/asm/arch-imx8m/imx-regs.h | 11 ++++ arch/arm/mach-imx/imx8m/clock_imx8mm.c | 16 ++++++ board/freescale/imx8mm_evk/spl.c | 2 + configs/imx8mm_evk_defconfig | 19 +++++++ doc/board/freescale/imx8mm_evk.rst | 42 +++++++++++++-- drivers/usb/host/ehci-mx6.c | 62 ++++++++++------------ 7 files changed, 114 insertions(+), 39 deletions(-) -- 2.25.1

8 24

Re: QEMU NUMA and U-Boot
by Heinrich Schuchardt 23 Mar '22

23 Mar '22

On 7/6/21 6:13 PM, François Ozog wrote: > Hi Heinrich, U-Boot 2021-07rc5 does not take into account memory > description when using Qemu 5.2 NUMA configuration to adapt memory map > (kernel_addr_r...): > > -smp 4 \ > -m 8G,slots=2,maxmem=16G \ > -object memory-backend-ram,size=4G,id=m0 \ > -object memory-backend-ram,size=4G,id=m1 \ > -numa node,cpus=0-1,nodeid=0,memdev=m0 \ > -numa node,cpus=2-3,nodeid=1,memdev=m1 > > kernel_addr_r is still 0x4040000 and thus you can't use it to bootefi. > > fdt addr 0x13ede6de0; fdt print > > Displays fdt while I think it should not. > > If I load the kernel at dram.start, the load works but not boot > > U-Boot 2021.07 (Jul 06 2021 - 13:26:43 +0000) > > > DRAM:4 GiB > > Flash: 64 MiB > > Loading Environment from Flash... OK > > In:pl011@9000000 > > Out: pl011@9000000 > > Err: pl011@9000000 > > Net: eth0: virtio-net#32 > > Hit any key to stop autoboot:0 > > => > > => bdinfo > > boot_params = 0x0000000000000000 > > DRAM bank = 0x0000000000000000 > > -> start= 0x0000000140000000 > > -> size = 0x0000000100000000 > > flashstart= 0x0000000000000000 > > flashsize = 0x0000000004000000 > > flashoffset = 0x00000000000bc990 > > baudrate= 115200 bps > > relocaddr = 0x000000013ff27000 > > reloc off = 0x000000013ff27000 > > Build = 64-bit > > current eth = virtio-net#32 > > ethaddr = 52:52:52:52:52:52 > > IP addr = <NULL> > > fdt_blob= 0x000000013ede6de0 > > new_fdt = 0x000000013ede6de0 > > fdt_size= 0x0000000000100000 > > lmb_dump_all: > > memory.cnt= 0x1 > > memory.reg[0x0].base = 0x140000000 > > .size = 0x100000000 > > > reserved.cnt= 0x0 > > arch_number = 0x0000000000000000 > > TLB addr= 0x000000013fff0000 > > irq_sp= 0x000000013ede6dd0 > > sp start= 0x000000013ede6dd0 > > Early malloc usage: 3a8 / 2000 > > => load virtio 0:1 0x140000000 /oskit.efi > > 853424 bytes read in 1 ms (813.9 MiB/s) > > => bootefi0x140000000 0x13ede6dd0 > > ERROR: Failed to register WaitForKey event > > Setting OsIndications failed > > Error: Cannot initialize UEFI sub-system, r = 9 > > > I think there is a need to calculate memory map based on previous > firmware (TFA, QEMU can be considered as previous frimware) information > (DT or blob_list). > > What do you think ? > > Cheers > > FF > > -- > > François-Frédéric Ozog | /Director Business Development/ > T: +33.67221.6485 > francois.ozog(a)linaro.org <mailto:francois.ozog@linaro.org> | Skype: ffozog > > The kernel load address is hard coded here: include/configs/qemu-arm.h:41: "kernel_addr_r=0x40400000\0" \ bdinfo shows: DRAM start = 0x140000000 DRAM size = 0x100000000 fdt addr $fdt_addr fdt printf shows two memory areas. One at 40000000, one at 140000000. Your use case is well beyond the typical U-Boot usage. So I guess it will be up to Linaro to provide the necessary patches: * determine the active CPU * determine the RAM assigned to the active CPU according to the numa-node-id in the device-tree * make sure that U-Boot only uses the memory of the active CPU internally * make sure that the UEFI memory map contains a compliant description * possibly, dynamically set up the environment variables +CC Tuomas Tynkkynen (maintainer for qemu_arm64_defconfig) Best regards Heinrich

4 12

[PATCH] mtd: mxs_nand: default to legacy bch and rename to modern bch option
by Sean Nyekjaer 22 Mar '22

22 Mar '22

Linux kernel defaults to use legacy bch setting, this was creating a mismatch between U-boot and Linux default settings. Fixes: 51cdf83eea ("mtd: gpmi: provide the option to use legacy bch geometry") Signed-off-by: Sean Nyekjaer <sean(a)geanix.com> --- drivers/mtd/nand/raw/mxs_nand.c | 2 +- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 +- include/mxs_nand.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index e6bbfac4d6..49795e20d2 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -1119,7 +1119,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) } if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) && - mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) { + mtd->oobsize < 1024) || !nand_info->modern_bch_geometry) { dev_warn(mtd->dev, "use legacy bch geometry\n"); return mxs_nand_legacy_calc_ecc_layout(geo, mtd); } diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index 878796d555..bbb7396324 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -92,7 +92,7 @@ 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"); + info->modern_bch_geometry = dev_read_bool(dev, "fsl,modern-bch-geometry"); if (IS_ENABLED(CONFIG_CLK) && IS_ENABLED(CONFIG_IMX8)) { /* Assigned clock already set clock */ diff --git a/include/mxs_nand.h b/include/mxs_nand.h index c0cefaca90..7e254d6b31 100644 --- a/include/mxs_nand.h +++ b/include/mxs_nand.h @@ -43,8 +43,8 @@ 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; + /* modern bch geometry flag */ + bool modern_bch_geometry; int cur_chip; uint32_t cmd_queue_len; -- 2.31.0

6 12

[PATCH v2 0/3] malloc: Enable profiling dlmalloc with valgrind
by Sean Anderson 22 Mar '22

22 Mar '22

This series adds support for running valgrind against U-Boot's internal malloc. This allows for much more useful reports to be generated. Changes in v2: - Fix one branch of rEALLOc missing a VALGRING_*_BLOCK call - Add some additional suppressions for cALLOc and rEALLOc - Simplify calloc clearing logic - Drop incorrect sbrk patch Sean Anderson (3): Add valgrind headers to U-Boot malloc: Annotate allocator for valgrind doc: sandbox: Document how to run sandbox with valgrind Kconfig | 14 + Licenses/README | 1 + Licenses/bzip2-1.0.6.txt | 30 + common/dlmalloc.c | 35 +- common/malloc_simple.c | 10 + doc/arch/sandbox.rst | 14 +- include/malloc.h | 4 + include/valgrind/memcheck.h | 251 ++ include/valgrind/valgrind.h | 7106 +++++++++++++++++++++++++++++++++++ scripts/u-boot.supp | 53 + 10 files changed, 7513 insertions(+), 5 deletions(-) create mode 100644 Licenses/bzip2-1.0.6.txt create mode 100644 include/valgrind/memcheck.h create mode 100644 include/valgrind/valgrind.h create mode 100644 scripts/u-boot.supp -- 2.31.0

3 8