date:20231222

Re: [PATCH v2 04/16] treewide: Make arch-specific bootm code depend on BOOTM

2023-12-22 Thread Angelo Dureghello


Hi Simon,

Acked-by: Angelo Dureghello 

On 15/12/23 5:19 AM, Simon Glass wrote:

Allow these functions to be compiled in when CONFIG_BOOTM is enabled,
even if CONFIG_CMD_BOOTM is not.

Signed-off-by: Simon Glass 
---

(no changes since v1)

  arch/arc/lib/Makefile| 2 +-
  arch/arm/lib/Makefile| 2 +-
  arch/m68k/lib/Makefile   | 2 +-
  arch/microblaze/lib/Makefile | 2 +-
  arch/mips/lib/Makefile   | 2 +-
  arch/nios2/lib/Makefile  | 2 +-
  arch/powerpc/lib/Makefile| 2 +-
  arch/riscv/lib/Makefile  | 2 +-
  arch/sandbox/lib/Makefile| 2 +-
  arch/sh/lib/Makefile | 2 +-
  arch/x86/lib/Makefile| 2 +-
  arch/xtensa/lib/Makefile | 2 +-
  12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile
index 0eb44bcf33d0..bde1c3d8af3a 100644
--- a/arch/arc/lib/Makefile
+++ b/arch/arc/lib/Makefile
@@ -12,6 +12,6 @@ obj-y += reset.o
  obj-y += ints_low.o
  obj-y += init_helpers.o
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  
  lib-$(CONFIG_USE_PRIVATE_LIBGCC) += _millicodethunk.o libgcc2.o

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index b1bcd3746625..b20a467f684c 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -31,7 +31,7 @@ endif
  obj-$(CONFIG_CPU_V7M) += cmd_boot.o
  obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
  obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
  else
  obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 6e1fd938f526..5ccd9545cb5c 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -8,7 +8,7 @@
  lib-$(CONFIG_USE_PRIVATE_LIBGCC) += lshrdi3.o muldi3.o ashldi3.o ashrdi3.o
  
  obj-y	+= bdinfo.o

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += cache.o
  obj-y += interrupts.o
  obj-y += time.o
diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index dfd8135f4f25..2f234825f804 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -3,6 +3,6 @@
  # (C) Copyright 2003-2006
  # Wolfgang Denk, DENX Software Engineering, w...@denx.de.
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BDI) += bdinfo.o
  obj-y += muldi3.o
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 9ee1fcb5c702..f8e162c53b58 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -10,7 +10,7 @@ obj-y += reloc.o
  obj-y += stack.o
  obj-y += traps.o
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_GO) += boot.o
  obj-$(CONFIG_SPL_BUILD) += spl.o
  
diff --git a/arch/nios2/lib/Makefile b/arch/nios2/lib/Makefile

index a9f3c7100e72..68a5ca007d55 100644
--- a/arch/nios2/lib/Makefile
+++ b/arch/nios2/lib/Makefile
@@ -4,5 +4,5 @@
  # Wolfgang Denk, DENX Software Engineering, w...@denx.de.
  
  obj-y	+= cache.o

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += libgcc.o
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index bb819dcbb6cc..dcce9834927d 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -34,7 +34,7 @@ obj-y += ticks.o
  endif
  obj-y += reloc.o
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += cache.o
  obj-y += extable.o
  obj-y += interrupts.o
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 9a05b662fd63..0b2c88db6bad 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -6,7 +6,7 @@
  # Copyright (C) 2017 Andes Technology Corporation
  # Rick Chen, Andes Technology Corporation 
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
  obj-$(CONFIG_CMD_GO) += boot.o
  obj-y += cache.o
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index a2bc5a7ee60f..c4924b23c832 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -7,5 +7,5 @@
  
  obj-y	+= fdt_fixup.o interrupts.o sections.o

  obj-$(CONFIG_PCI) += pci_io.o
-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTZ) += bootm.o
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index e7520a328d54..8c3c30293a3c 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -6,7 +6,7 @@
  extra-y   += start.o
  
  obj-y	+= board.o

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += time.o
  obj-$(CONFIG_CMD_SH_ZIMAGEBOOT) += zimageboot.o
  
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile

index 8fc35e1b51ea..94aa335ede4c 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_X86_32BIT_INIT) += string.o
  endif
  
  ifndef CONFIG_SPL_BUILD

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONF

Re: [PATCH 04/14] treewide: Make arch-specific bootm code depend on BOOTM

2023-12-22 Thread Angelo Dureghello


Hi Simon,

Acked-by: Angelo Dureghello 

On 04/12/23 1:31 AM, Simon Glass wrote:

Allow these functions to be compiled in when CONFIG_BOOTM is enabled,
even if CONFIG_CMD_BOOTM is not.

Signed-off-by: Simon Glass 
---

  arch/arc/lib/Makefile| 2 +-
  arch/arm/lib/Makefile| 2 +-
  arch/m68k/lib/Makefile   | 2 +-
  arch/microblaze/lib/Makefile | 2 +-
  arch/mips/lib/Makefile   | 2 +-
  arch/nios2/lib/Makefile  | 2 +-
  arch/powerpc/lib/Makefile| 2 +-
  arch/riscv/lib/Makefile  | 2 +-
  arch/sandbox/lib/Makefile| 2 +-
  arch/sh/lib/Makefile | 2 +-
  arch/x86/lib/Makefile| 2 +-
  arch/xtensa/lib/Makefile | 2 +-
  12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile
index 0eb44bcf33d0..bde1c3d8af3a 100644
--- a/arch/arc/lib/Makefile
+++ b/arch/arc/lib/Makefile
@@ -12,6 +12,6 @@ obj-y += reset.o
  obj-y += ints_low.o
  obj-y += init_helpers.o
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  
  lib-$(CONFIG_USE_PRIVATE_LIBGCC) += _millicodethunk.o libgcc2.o

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index b1bcd3746625..b20a467f684c 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -31,7 +31,7 @@ endif
  obj-$(CONFIG_CPU_V7M) += cmd_boot.o
  obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
  obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
  else
  obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 6e1fd938f526..5ccd9545cb5c 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -8,7 +8,7 @@
  lib-$(CONFIG_USE_PRIVATE_LIBGCC) += lshrdi3.o muldi3.o ashldi3.o ashrdi3.o
  
  obj-y	+= bdinfo.o

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += cache.o
  obj-y += interrupts.o
  obj-y += time.o
diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index dfd8135f4f25..2f234825f804 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -3,6 +3,6 @@
  # (C) Copyright 2003-2006
  # Wolfgang Denk, DENX Software Engineering, w...@denx.de.
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BDI) += bdinfo.o
  obj-y += muldi3.o
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 9ee1fcb5c702..f8e162c53b58 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -10,7 +10,7 @@ obj-y += reloc.o
  obj-y += stack.o
  obj-y += traps.o
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_GO) += boot.o
  obj-$(CONFIG_SPL_BUILD) += spl.o
  
diff --git a/arch/nios2/lib/Makefile b/arch/nios2/lib/Makefile

index a9f3c7100e72..68a5ca007d55 100644
--- a/arch/nios2/lib/Makefile
+++ b/arch/nios2/lib/Makefile
@@ -4,5 +4,5 @@
  # Wolfgang Denk, DENX Software Engineering, w...@denx.de.
  
  obj-y	+= cache.o

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += libgcc.o
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index bb819dcbb6cc..dcce9834927d 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -34,7 +34,7 @@ obj-y += ticks.o
  endif
  obj-y += reloc.o
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += cache.o
  obj-y += extable.o
  obj-y += interrupts.o
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 9a05b662fd63..0b2c88db6bad 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -6,7 +6,7 @@
  # Copyright (C) 2017 Andes Technology Corporation
  # Rick Chen, Andes Technology Corporation 
  
-obj-$(CONFIG_CMD_BOOTM) += bootm.o

+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
  obj-$(CONFIG_CMD_GO) += boot.o
  obj-y += cache.o
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index a2bc5a7ee60f..c4924b23c832 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -7,5 +7,5 @@
  
  obj-y	+= fdt_fixup.o interrupts.o sections.o

  obj-$(CONFIG_PCI) += pci_io.o
-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-$(CONFIG_CMD_BOOTZ) += bootm.o
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index e7520a328d54..8c3c30293a3c 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -6,7 +6,7 @@
  extra-y   += start.o
  
  obj-y	+= board.o

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o
  obj-y += time.o
  obj-$(CONFIG_CMD_SH_ZIMAGEBOOT) += zimageboot.o
  
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile

index 8fc35e1b51ea..94aa335ede4c 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_X86_32BIT_INIT) += string.o
  endif
  
  ifndef CONFIG_SPL_BUILD

-obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_BOOTM) += bootm.o

[PATCH v1] Kconfig: boot: Imply BOOTSTD_DEFAULT when BOOTSTD_FULL=y

2023-12-22 Thread Shantur Rathore

We need BOOTSTD_DEFAULT when BOOTSTD_FULL is selected.

Signed-off-by: Shantur Rathore 
---

 boot/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/Kconfig b/boot/Kconfig
index 9f5b8a0cb2..fc96aadb27 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -426,6 +426,7 @@ config VPL_BOOTSTD
 config BOOTSTD_FULL
bool "Enhanced features for standard boot"
default y if SANDBOX
+   imply BOOTSTD_DEFAULTS
help
  This enables various useful features for standard boot, which are not
  essential for operation:
-- 
2.40.1

[PATCH] board: rockchip: Add support for FriendlyARM NanoPi R2C Plus

2023-12-22 Thread Tianling Shen

The NanoPi R2C Plus is a small variant of NanoPi R2C with a on-board
eMMC flash (8G) included.

The device tree is taken from the kernel v6.5.

Signed-off-by: Tianling Shen 
---
 arch/arm/dts/Makefile |   1 +
 .../dts/rk3328-nanopi-r2c-plus-u-boot.dtsi|   9 ++
 arch/arm/dts/rk3328-nanopi-r2c-plus.dts   |  33 +
 board/rockchip/evb_rk3328/MAINTAINERS |   6 +
 configs/nanopi-r2c-plus-rk3328_defconfig  | 114 ++
 5 files changed, 163 insertions(+)
 create mode 100644 arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3328-nanopi-r2c-plus.dts
 create mode 100644 configs/nanopi-r2c-plus-rk3328_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 9d28a485bec..6909f95e084 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -126,6 +126,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
rk3328-evb.dtb \
rk3328-nanopi-r2c.dtb \
+   rk3328-nanopi-r2c-plus.dtb \
rk3328-nanopi-r2s.dtb \
rk3328-orangepi-r1-plus.dtb \
rk3328-orangepi-r1-plus-lts.dtb \
diff --git a/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi 
b/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
new file mode 100644
index 000..f8adb9e5e1f
--- /dev/null
+++ b/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rk3328-nanopi-r2c-u-boot.dtsi"
+
+/ {
+   chosen {
+   u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+   };
+};
diff --git a/arch/arm/dts/rk3328-nanopi-r2c-plus.dts 
b/arch/arm/dts/rk3328-nanopi-r2c-plus.dts
new file mode 100644
index 000..16a1958e457
--- /dev/null
+++ b/arch/arm/dts/rk3328-nanopi-r2c-plus.dts
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
+ * (http://www.friendlyarm.com)
+ *
+ * Copyright (c) 2023 Tianling Shen 
+ */
+
+/dts-v1/;
+#include "rk3328-nanopi-r2c.dts"
+
+/ {
+   model = "FriendlyElec NanoPi R2C Plus";
+   compatible = "friendlyarm,nanopi-r2c-plus", "rockchip,rk3328";
+
+   aliases {
+   mmc1 = &emmc;
+   };
+};
+
+&emmc {
+   bus-width = <8>;
+   cap-mmc-highspeed;
+   max-frequency = <15000>;
+   mmc-ddr-1_8v;
+   mmc-hs200-1_8v;
+   non-removable;
+   pinctrl-names = "default";
+   pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
+   vmmc-supply = <&vcc_io_33>;
+   vqmmc-supply = <&vcc18_emmc>;
+   status = "okay";
+};
diff --git a/board/rockchip/evb_rk3328/MAINTAINERS 
b/board/rockchip/evb_rk3328/MAINTAINERS
index 8a19eb373d0..5fc114a63f6 100644
--- a/board/rockchip/evb_rk3328/MAINTAINERS
+++ b/board/rockchip/evb_rk3328/MAINTAINERS
@@ -11,6 +11,12 @@ S:  Maintained
 F:  configs/nanopi-r2c-rk3328_defconfig
 F:  arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi
 
+NANOPI-R2C-PLUS-RK3328
+M:  Tianling Shen 
+S:  Maintained
+F:  configs/nanopi-r2c-plus-rk3328_defconfig
+F:  arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
+
 NANOPI-R2S-RK3328
 M:  David Bauer 
 S:  Maintained
diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig 
b/configs/nanopi-r2c-plus-rk3328_defconfig
new file mode 100644
index 000..320ed8b434a
--- /dev/null
+++ b/configs/nanopi-r2c-plus-rk3328_defconfig
@@ -0,0 +1,114 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=2400
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_TEXT_BASE=0x0020
+CONFIG_SPL_GPIO=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x30
+CONFIG_SF_DEFAULT_SPEED=2000
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2c-plus"
+CONFIG_DM_RESET=y
+CONFIG_ROCKCHIP_RK3328=y
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC=y
+CONFIG_SPL_STACK_R_ADDR=0x60
+CONFIG_SPL_STACK=0x40
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
+CONFIG_DEBUG_UART_BASE=0xFF13
+CONFIG_DEBUG_UART_CLOCK=2400
+CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c-plus.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_SPL_MAX_SIZE=0x4
+CONFIG_SPL_PAD_TO=0x7f8000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x200
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_I2C=y
+CONFIG_SPL_POWER=y
+CONFIG_SPL_ATF=y
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
+CONFIG_TPL_SYS_MALLOC_SIMPLE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TIME=y
+CONFIG_SPL_OF_CONTROL

[PATCH v2 1/1] lib: smbios: remove redundant next_header()

2023-12-22 Thread Heinrich Schuchardt

next_header() and get_next_header() only differ in how the const attribute
is used. One function taking a const parameter and returning a non-const is
good enough.

Signed-off-by: Heinrich Schuchardt 
Reviewed-by: Ilias Apalodimas 
---
v2:
remove Fixes tag as the code redundancy is not an actual bug
---
 lib/smbios-parser.c | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/smbios-parser.c b/lib/smbios-parser.c
index b578c30840..f4de350e6e 100644
--- a/lib/smbios-parser.c
+++ b/lib/smbios-parser.c
@@ -50,14 +50,7 @@ static u8 *find_next_header(u8 *pos)
return pos;
 }

-static struct smbios_header *get_next_header(struct smbios_header *curr)
-{
-   u8 *pos = ((u8 *)curr) + curr->length;
-
-   return (struct smbios_header *)find_next_header(pos);
-}
-
-static const struct smbios_header *next_header(const struct smbios_header 
*curr)
+static struct smbios_header *get_next_header(const struct smbios_header *curr)
 {
u8 *pos = ((u8 *)curr) + curr->length;

@@ -73,7 +66,7 @@ const struct smbios_header *smbios_header(const struct 
smbios_entry *entry, int
if (header->type == type)
return header;

-   header = next_header(header);
+   header = get_next_header(header);
}

return NULL;
--
2.43.0

[PATCH v2 2/2] smbios: copy QEMU tables

2023-12-22 Thread Heinrich Schuchardt

From: Heinrich Schuchardt 

QEMU provides SMBIOS tables with detailed information. We should not try to
replicate them in U-Boot.

If we want to inform about U-Boot, we can add a Firmware Inventory
Information (type 45) table in future.

Signed-off-by: Heinrich Schuchardt 
---
v2:
fix parsing of SMBIOS anchor
enable copying on x86 and 32bit ARM/RISC-V
---
 arch/x86/lib/tables.c   |   2 +-
 drivers/misc/Kconfig|   7 ++
 drivers/misc/Makefile   |   1 +
 drivers/misc/qfw_smbios.c   | 197 
 lib/efi_loader/efi_smbios.c |   4 +-
 5 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 drivers/misc/qfw_smbios.c

diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 5b5070f7ca..914d9de0cb 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -61,7 +61,7 @@ static struct table_info table_list[] = {
 #ifdef CONFIG_GENERATE_ACPI_TABLE
{ "acpi", write_acpi_tables, BLOBLISTT_ACPI_TABLES, 0x1, 0x1000},
 #endif
-#ifdef CONFIG_GENERATE_SMBIOS_TABLE
+#if defined(CONFIG_GENERATE_SMBIOS_TABLE) && !defined(CONFIG_QFW_SMBIOS)
{ "smbios", write_smbios_table, BLOBLISTT_SMBIOS_TABLES, 0x1000, 0x100},
 #endif
 };
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index e8e4400516..d2536c54e0 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -561,6 +561,13 @@ config QFW_MMIO
  Hidden option to enable MMIO QEMU fw_cfg interface. This will be
  selected by the appropriate QEMU board.

+config QFW_SMBIOS
+   bool
+   default y
+   depends on QFW && SMBIOS && !SANDBOX
+   help
+ Hidden option to read SMBIOS tables from QEMU.
+
 config I2C_EEPROM
bool "Enable driver for generic I2C-attached EEPROMs"
depends on MISC
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index cda701d38e..64bea92f51 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -66,6 +66,7 @@ obj-y += qfw.o
 obj-$(CONFIG_QFW_ACPI) += qfw_acpi.o
 obj-$(CONFIG_QFW_PIO) += qfw_pio.o
 obj-$(CONFIG_QFW_MMIO) += qfw_mmio.o
+obj-$(CONFIG_QFW_SMBIOS) += qfw_smbios.o
 obj-$(CONFIG_SANDBOX) += qfw_sandbox.o
 endif
 obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o
diff --git a/drivers/misc/qfw_smbios.c b/drivers/misc/qfw_smbios.c
new file mode 100644
index 00..9019345783
--- /dev/null
+++ b/drivers/misc/qfw_smbios.c
@@ -0,0 +1,197 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2023 Heinrich Schuchardt 
+ */
+
+#define LOG_CATEGORY UCLASS_QFW
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+ * qfw_load_smbios_table() - load a QEMU firmware file
+ *
+ * @dev:   QEMU firmware device
+ * @size:  parameter to return the size of the loaded table
+ * @name:  name of the table to load
+ * Return: address of the loaded table, NULL on error
+ */
+static void *qfw_load_smbios_table(struct udevice *dev, uint32_t *size,
+  char *name)
+{
+   struct fw_file *file;
+   struct bios_linker_entry *table;
+
+   file = qfw_find_file(dev, name);
+   if (!file) {
+   log_debug("Can't find %s\n", name);
+   return NULL;
+   }
+
+   *size = be32_to_cpu(file->cfg.size);
+
+   table = malloc(*size);
+   if (!table) {
+   log_err("Out of memory\n");
+   return NULL;
+   }
+
+   qfw_read_entry(dev, be16_to_cpu(file->cfg.select), *size, table);
+
+   return table;
+}
+
+/**
+ * qfw_parse_smbios_anchor() - parse QEMU's SMBIOS anchor
+ *
+ * @dev:   QEMU firmware device
+ * @entry: SMBIOS 3 structure to be filled from QEMU's anchor
+ * Return: 0 for success, -ve on error
+ */
+static int qfw_parse_smbios_anchor(struct udevice *dev,
+  struct smbios3_entry *entry)
+{
+   void *table;
+   uint32_t size;
+   struct smbios_entry *entry2;
+   struct smbios3_entry *entry3;
+   const char smbios_sig[] = "_SM_";
+   const char smbios3_sig[] = "_SM3_";
+   int ret = 0;
+
+   table = qfw_load_smbios_table(dev, &size, "etc/smbios/smbios-anchor");
+   if (!table)
+   return -ENOMEM;
+   if (!memcmp(table, smbios3_sig, sizeof(smbios3_sig) - 1)) {
+   entry3 = table;
+   if (entry3->length != sizeof(struct smbios3_entry)) {
+   ret = -ENOENT;
+   goto out;
+   }
+   memcpy(entry, entry3, sizeof(struct smbios3_entry));
+   } else if (!memcmp(table, smbios_sig, sizeof(smbios_sig) - 1)) {
+   entry2 = table;
+   if (entry2->length != sizeof(struct smbios_entry)) {
+   ret = -ENOENT;
+   goto out;
+   }
+   memset(entry, 0, sizeof(struct smbios3_entry));
+   me

[PATCH v2 1/2] smbios: SMBIOS 3.0 (64-bit) Entry Point structure

2023-12-22 Thread Heinrich Schuchardt

From: Heinrich Schuchardt 

Add definition of the SMBIOS 3.0 (64-bit) Entry Point structure.

Signed-off-by: Heinrich Schuchardt 
---
v2:
no change
---
 include/smbios.h | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/include/smbios.h b/include/smbios.h
index c9df2706f5..e601283d29 100644
--- a/include/smbios.h
+++ b/include/smbios.h
@@ -54,6 +54,32 @@ struct __packed smbios_entry {
u8 bcd_rev;
 };

+/**
+ * struct smbios3_entry - SMBIOS 3.0 (64-bit) Entry Point structure
+ */
+struct __packed smbios3_entry {
+   /** @anchor: anchor string */
+   u8 anchor[5];
+   /** @checksum: checksum of the entry point structure */
+   u8 checksum;
+   /** @length: length of the entry point structure */
+   u8 length;
+   /** @major_ver: major version of the SMBIOS specification */
+   u8 major_ver;
+   /** @minor_ver: minor version of the SMBIOS specification */
+   u8 minor_ver;
+   /** @docrev: revision of the SMBIOS specification */
+   u8 doc_rev;
+   /** @entry_point_rev: revision of the entry point structure */
+   u8 entry_point_rev;
+   /** @reserved: reserved */
+   u8 reserved;
+   /** maximum size of SMBIOS table */
+   u32 max_struct_size;
+   /** @struct_table_address: 64-bit physical starting address */
+   u64 struct_table_address;
+};
+
 /* BIOS characteristics */
 #define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7)
 #define BIOS_CHARACTERISTICS_UPGRADEABLE   (1 << 11)
--
2.43.0

[PATCH v2 0/2] smbios: copy QEMU tables

2023-12-22 Thread Heinrich Schuchardt

QEMU provides SMBIOS tables with detailed information. We should not try to
replicate them in U-Boot.

With this series we add code to copy the QEMU generated SMBIOS tables to
RAM. efi_smbios_register() later installs the SMBIOS table as EFI
configuration table for the OS to pick it up.

If we want to inform about U-Boot, we can add a Firmware Inventory
Information (type 45) table in future.

With 32bit ARM I did not see a correct SMBIOS table being transferred. We
need to check if our code in qfw_read_entry() is 32bit compliant.

For providing SMBIOS support in QEMU for RISC-V I have sent a patch
upstream:

[PATCH 1/1] target/riscv: SMBIOS support for RISC-V virt machine
https://lore.kernel.org/qemu-riscv/9183a3fb-b9f7-470c-b9a6-8d8cc6dce...@canonical.com/T/#t

Currently we have a predefined constant TABLE_SIZE = SZ_4K in
lib/efi_loader/efi_smbios.c. We should strive to refactor the code in
future to provide the length of the SMBIOS tables in global data. But
that is beyond the scope of this series.

Further we should find a matainer for drivers/misc/qfw*. It would be
plausible to add it to 'ACPI' maintenance.

A test via a new SMBIOS command is supplied in

[PATCH 0/5] cmd: provide command to display SMBIOS information
https://lore.kernel.org/u-boot/20231223004429.247301-1-xypron.g...@gmx.de/T/#t

v2:
fix parsing of SMBIOS anchor
enable copying on x86 and 32bit ARM/RISC-V

Heinrich Schuchardt (2):
smbios: SMBIOS 3.0 (64-bit) Entry Point structure
smbios: copy QEMU tables

--
2.43.0

[PATCH 5/5] test: unit test for smbios command

2023-12-22 Thread Heinrich Schuchardt

Provide a unit test for the smbios command.

Provide different test functions for QEMU, sandbox, and other systems.

Signed-off-by: Heinrich Schuchardt 
---
 test/py/tests/test_smbios.py | 47 
 1 file changed, 47 insertions(+)
 create mode 100644 test/py/tests/test_smbios.py

diff --git a/test/py/tests/test_smbios.py b/test/py/tests/test_smbios.py
new file mode 100644
index 00..86d8d07539
--- /dev/null
+++ b/test/py/tests/test_smbios.py
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+"""Test smbios command"""
+
+import pytest
+
+@pytest.mark.buildconfigspec('cmd_smbios')
+@pytest.mark.notbuildconfigspec('qfw_smbios')
+@pytest.mark.notbuildconfigspec('sandbox')
+def test_cmd_smbios(u_boot_console):
+"""Run the smbios command"""
+output = u_boot_console.run_command('smbios')
+assert 'DMI type 0,' in output
+assert 'String 1: U-Boot' in output
+assert 'DMI type 1,' in output
+assert 'DMI type 2,' in output
+assert 'DMI type 3,' in output
+assert 'DMI type 4,' in output
+assert 'DMI type 127,' in output
+
+@pytest.mark.buildconfigspec('cmd_smbios')
+@pytest.mark.buildconfigspec('qfw_smbios')
+@pytest.mark.notbuildconfigspec('sandbox')
+# TODO:
+# QEMU v8.2.0 lacks SMBIOS support for RISC-V
+# Once support is available in our Docker image we can remove the constraint.
+@pytest.mark.notbuildconfigspec('riscv')
+def test_cmd_smbios_qemu(u_boot_console):
+"""Run the smbios command on QEMU"""
+output = u_boot_console.run_command('smbios')
+assert 'DMI type 1,' in output
+assert 'Manufacturer: QEMU' in output
+assert 'DMI type 127,' in output
+
+@pytest.mark.buildconfigspec('cmd_smbios')
+@pytest.mark.buildconfigspec('sandbox')
+def test_cmd_smbios_sandbox(u_boot_console):
+"""Run the smbios command on the sandbox"""
+output = u_boot_console.run_command('smbios')
+assert 'DMI type 0,' in output
+assert 'String 1: U-Boot' in output
+assert 'DMI type 1,' in output
+assert 'Manufacturer: sandbox' in output
+assert 'DMI type 2,' in output
+assert 'DMI type 3,' in output
+assert 'DMI type 4,' in output
+assert 'DMI type 127,' in output
--
2.43.0

[PATCH 3/5] cmd: provide command to display SMBIOS information

2023-12-22 Thread Heinrich Schuchardt

U-Boot can either generated an SMBIOS table or copy it from a prior boot
stage, e.g. QEMU.

Provide a command to display the SMBIOS information.

Currently only type 1 and 2 are translated to human readable text.
Other types may be added later. Currently only a hexdump and the list of
strings is provided for these.

Signed-off-by: Heinrich Schuchardt 
---
 cmd/Kconfig  |   7 ++
 cmd/Makefile |   1 +
 cmd/smbios.c | 191 +++
 3 files changed, 199 insertions(+)
 create mode 100644 cmd/smbios.c

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 5a7678f0ac..580aeec8ee 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -206,6 +206,13 @@ config CMD_SBI
help
  Display information about the SBI implementation.

+config CMD_SMBIOS
+   bool "smbios"
+   depends on SMBIOS
+   default y
+   help
+ Display the SMBIOS information.
+
 endmenu

 menu "Boot commands"
diff --git a/cmd/Makefile b/cmd/Makefile
index 5ed0e4011d..8a5dfd8ca9 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -168,6 +168,7 @@ obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
 obj-$(CONFIG_CMD_SETEXPR_FMT) += printf.o
 obj-$(CONFIG_CMD_SPI) += spi.o
 obj-$(CONFIG_CMD_STRINGS) += strings.o
+obj-$(CONFIG_CMD_SMBIOS) += smbios.o
 obj-$(CONFIG_CMD_SMC) += smccc.o
 obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o
 obj-$(CONFIG_CMD_STACKPROTECTOR_TEST) += stackprot_test.o
diff --git a/cmd/smbios.c b/cmd/smbios.c
new file mode 100644
index 00..63f908e92c
--- /dev/null
+++ b/cmd/smbios.c
@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * The 'smbios' command displays information from the SMBIOS table.
+ *
+ * Copyright (c) 2023, Heinrich Schuchardt 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+ * smbios_get_string() - get SMBIOS string from table
+ *
+ * @table: SMBIOS table
+ * @index: index of the string
+ * Return: address of string, may point to empty string
+ */
+static const char *smbios_get_string(void *table, int index)
+{
+   const char *str = (char *)table +
+ ((struct smbios_header *)table)->length;
+
+   if (!*str)
+   ++str;
+   for (--index; *str && index; --index)
+   str += strlen(str) + 1;
+
+   return str;
+}
+
+static struct smbios_header *next_table(struct smbios_header *table)
+{
+   const char *str;
+
+   if (table->type == SMBIOS_END_OF_TABLE)
+   return NULL;
+
+   str = smbios_get_string(table, 0);
+   return (struct smbios_header *)(++str);
+}
+
+static void smbios_print_generic(struct smbios_header *table)
+{
+   char *str = (char *)table + table->length;
+
+   if (CONFIG_IS_ENABLED(HEXDUMP)) {
+   printf("Header and Data:\n");
+   print_hex_dump("\t", DUMP_PREFIX_OFFSET, 16, 1,
+  table, table->length, false);
+   }
+   if (*str) {
+   printf("Strings:\n");
+   for (int index = 1; *str; ++index) {
+   printf("\tString %u: %s\n", index, str);
+   str += strlen(str) + 1;
+   }
+   }
+}
+
+void smbios_print_str(const char *label, void *table, u8 index)
+{
+   printf("\t%s: %s\n", label, smbios_get_string(table, index));
+}
+
+static void smbios_print_type1(struct smbios_type1 *table)
+{
+   printf("System Information\n");
+   smbios_print_str("Manufacturer", table, table->manufacturer);
+   smbios_print_str("Product Name", table, table->product_name);
+   smbios_print_str("Version", table, table->version);
+   smbios_print_str("Serial Number", table, table->serial_number);
+   if (table->length >= 0x19) {
+   printf("\tUUID %pUl\n", table->uuid);
+   smbios_print_str("Wake Up Type", table, table->serial_number);
+   }
+   if (table->length >= 0x1b) {
+   smbios_print_str("Serial Number", table, table->serial_number);
+   smbios_print_str("SKU Number", table, table->sku_number);
+   }
+}
+
+static void smbios_print_type2(struct smbios_type2 *table)
+{
+   u16 *handle;
+
+   printf("Base Board Information\n");
+   smbios_print_str("Manufacturer", table, table->manufacturer);
+   smbios_print_str("Product Name", table, table->product_name);
+   smbios_print_str("Version", table, table->version);
+   smbios_print_str("Serial Number", table, table->serial_number);
+   smbios_print_str("Asset Tag", table, table->asset_tag_number);
+   printf("\tFeature Flags: 0x%2x\n", table->feature_flags);
+   smbios_print_str("Chassis Location", table, table->chassis_location);
+   printf("\tChassis Handle: 0x%2x\n", table->chassis_handle);
+   smbios_print_str("Board Type", table, table->board_type);
+   printf("\tContained Object Handles: ");
+   handle = (void *)table->eos;
+   for (int i = 0; i < table->number_cont

[PATCH 4/5] doc: man-page for smbios command

2023-12-22 Thread Heinrich Schuchardt

Provide a man-page for the smbios command.

Signed-off-by: Heinrich Schuchardt 
---
 doc/usage/cmd/smbios.rst | 93 
 doc/usage/index.rst  |  1 +
 2 files changed, 94 insertions(+)
 create mode 100644 doc/usage/cmd/smbios.rst

diff --git a/doc/usage/cmd/smbios.rst b/doc/usage/cmd/smbios.rst
new file mode 100644
index 00..1ffd706d7d
--- /dev/null
+++ b/doc/usage/cmd/smbios.rst
@@ -0,0 +1,93 @@
+.. SPDX-License-Identifier: GPL-2.0-or-later:
+
+smbios command
+==
+
+Synopsis
+
+
+::
+
+smbios
+
+Description
+---
+
+The smbios command displays information from the SMBIOS tables.
+
+Examples
+
+
+The example below shows an example output of the smbios command.
+
+::
+
+=> smbios
+SMBIOS 2.8.0 present.
+8 structures occupying 81 bytes
+Table at 0x6d35018
+
+Handle 0x0100, DMI type 1, 27 bytes at 0x6d35018
+System Information
+Manufacturer: QEMU
+Product Name: Standard PC (i440FX + PIIX, 1996)
+Version: pc-i440fx-2.5
+Serial Number:
+UUID ----
+Wake Up Type:
+Serial Number:
+SKU Number:
+
+Handle 0x0300, DMI type 3, 22 bytes at 0x6d35069
+Header and Data:
+: 03 16 00 03 01 01 02 00 00 03 03 03 02 00 00 00
+0010: 00 00 00 00 00 00
+Strings:
+String 1: QEMU
+String 2: pc-i440fx-2.5
+
+Handle 0x0400, DMI type 4, 42 bytes at 0x6d35093
+Header and Data:
+: 04 2a 00 04 01 03 01 02 63 06 00 00 fd ab 81 07
+0010: 03 00 00 00 d0 07 d0 07 41 01 ff ff ff ff ff ff
+0020: 00 00 00 01 01 01 02 00 01 00
+Strings:
+String 1: CPU 0
+String 2: QEMU
+String 3: pc-i440fx-2.5
+
+Handle 0x1000, DMI type 16, 23 bytes at 0x6d350d7
+Header and Data:
+: 10 17 00 10 01 03 06 00 00 02 00 fe ff 01 00 00
+0010: 00 00 00 00 00 00 00
+
+Handle 0x1100, DMI type 17, 40 bytes at 0x6d350f0
+Header and Data:
+: 11 28 00 11 00 10 fe ff ff ff ff ff 80 00 09 00
+0010: 01 00 07 02 00 00 00 02 00 00 00 00 00 00 00 00
+0020: 00 00 00 00 00 00 00 00
+Strings:
+String 1: DIMM 0
+String 2: QEMU
+
+Handle 0x1300, DMI type 19, 31 bytes at 0x6d35125
+Header and Data:
+: 13 1f 00 13 00 00 00 00 ff ff 01 00 00 10 01 00
+0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+
+Handle 0x2000, DMI type 32, 11 bytes at 0x6d35146
+Header and Data:
+: 20 0b 00 20 00 00 00 00 00 00 00
+
+Handle 0x7f00, DMI type 127, 4 bytes at 0x6d35153
+End Of Table
+
+Configuration
+-
+
+The command is only available if CONFIG_CMD_SMBIOS=y.
+
+Return value
+
+
+The return value $? is 0 (true) on success, 1 (false) otherwise.
diff --git a/doc/usage/index.rst b/doc/usage/index.rst
index 1a626c03c2..eb2b2311f8 100644
--- a/doc/usage/index.rst
+++ b/doc/usage/index.rst
@@ -102,6 +102,7 @@ Shell commands
cmd/size
cmd/sleep
cmd/sm
+   cmd/smbios
cmd/sound
cmd/source
cmd/temperature
--
2.43.0

[PATCH 2/5] smbios: type2: contained object handles

2023-12-22 Thread Heinrich Schuchardt

The type 2 structure must include information about the contained objects.
It is fine to set the number of contained object handles to 0.

Add the missing field.

Fixes: 721e992a8af5 ("x86: Add SMBIOS table support")
Signed-off-by: Heinrich Schuchardt 
---
 include/smbios.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/smbios.h b/include/smbios.h
index e601283d29..88c19ae062 100644
--- a/include/smbios.h
+++ b/include/smbios.h
@@ -139,6 +139,7 @@ struct __packed smbios_type2 {
u8 chassis_location;
u16 chassis_handle;
u8 board_type;
+   u8 number_contained_objects;
char eos[SMBIOS_STRUCT_EOS_BYTES];
 };

--
2.43.0

[PATCH 1/5] smbios: correct definition of gd_smbios_start() macro

2023-12-22 Thread Heinrich Schuchardt

gd_smbios_start() currently points to a non-existent field.
It should return the field written by gd_set_smbios_start().

Fixes: 50834884a815 ("Record the position of the SMBIOS tables")
Signed-off-by: Heinrich Schuchardt 
---
 include/asm-generic/global_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/asm-generic/global_data.h 
b/include/asm-generic/global_data.h
index e8c6412e3f..c1f7818817 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -553,7 +553,7 @@ static_assert(sizeof(struct global_data) == GD_SIZE);
 #endif

 #ifdef CONFIG_SMBIOS
-#define gd_smbios_start()  gd->smbios_start
+#define gd_smbios_start()  gd->arch.smbios_start
 #define gd_set_smbios_start(addr)  gd->arch.smbios_start = addr
 #else
 #define gd_smbios_start()  0UL
--
2.43.0

[PATCH 0/5] cmd: provide command to display SMBIOS information

2023-12-22 Thread Heinrich Schuchardt

U-Boot may supply an SMBIOS table or they may be copied from QEMU.

Provide a command to display the SMBIOS information.

Currently only type 1 and 2 are translated to human readable text.
Other types may be added later. Currently only a hexdump and the list of
strings is provided for these.

The following prerequisites had to be fixed:

* The definition of SMBIOS type 2 lacked a field.

Heinrich Schuchardt (5):
  smbios: correct definition of gd_smbios_start() macro
  smbios: type2: contained object handles
  cmd: provide command to display SMBIOS information
  doc: man-page for smbios command
  test: unit test for smbios command

 cmd/Kconfig   |   7 ++
 cmd/Makefile  |   1 +
 cmd/smbios.c  | 191 ++
 doc/usage/cmd/smbios.rst  |  93 +++
 doc/usage/index.rst   |   1 +
 include/asm-generic/global_data.h |   2 +-
 include/smbios.h  |   1 +
 test/py/tests/test_smbios.py  |  47 
 8 files changed, 342 insertions(+), 1 deletion(-)
 create mode 100644 cmd/smbios.c
 create mode 100644 doc/usage/cmd/smbios.rst
 create mode 100644 test/py/tests/test_smbios.py

--
2.43.0

Re: [PATCH v3] arch: arm: Kconfig: Enable BOOTSTD_FULL for Rockchip SoCs

2023-12-22 Thread Shantur Rathore

Hi,

On Fri, Dec 22, 2023 at 12:09 PM Shantur Rathore  wrote:
>
> On Fri, Dec 22, 2023 at 12:07 PM Tom Rini  wrote:
> >
> > On Fri, Dec 22, 2023 at 12:05:39PM +, Shantur Rathore wrote:
> > > Hi all,
> > >
> > > On Mon, Dec 11, 2023 at 6:27 PM Tom Rini  wrote:
> > > >
> > > > On Mon, Dec 11, 2023 at 11:22:45AM -0700, Simon Glass wrote:
> > > > > Hi Tom,
> > > > [snip]
> > > > > > I think in hind-sight too much stuff is omitted without 
> > > > > > BOOTSTD_FULL.
> > > > > > The option itself then enables other stuff too by default, but some
> > > > > > parts of the bootflow command itself should be visible even without 
> > > > > > FULL
> > > > > > to make things easier on the user.
> > > > >
> > > > > At the time the goal was to avoid growth compared to the distro
> > > > > scripts. We could perhaps add some more things in with BOOTSTD_FULL
> > > > > but still have it as an option?
> > > >
> > > > Right. But now that we've tried this, some of the feedback has been that
> > > > it's just too minimal right now. Like looking at the help message for
> > > > bootflow, list and info should probably always be available. And maybe
> > > > the flags for "scan" should be re-thought? Too late to change things now
> > > > but "bootflow scan -b" should maybe how it's always been for "scan and
> > > > boot".
> > >
> > > What would be the preferred approach for this patch?
> > > Is it to update the default capabilities of bootflow or we can have this 
> > > patch?
> >
> > Well, I don't see a problem with just adding this to the platforms which
> > enable BOOTSTD_FULL until we can rework what's included/excluded by that
> > flag, and there's an issue filed for it now.
> >
> > --
> > Tom
>
> Great,  can we have this merged in please then [0]
>
> [0] - 
> https://patchwork.ozlabs.org/project/uboot/patch/20231119172310.1307942-...@shantur.com/
>

I tried this patch over the next branch and it failed to build.

Sent v4 here :
https://patchwork.ozlabs.org/project/uboot/patch/2023134358.563121-...@shantur.com/

Regards,
Shantur

[PATCH v4] arch: arm: Kconfig: Enable BOOTSTD_FULL for Rockchip SoCs

2023-12-22 Thread Shantur Rathore

Rockchip SoCs can support wide range of bootflows.
Without full bootflow commands, it can be difficult to
figure out issues if any, hence enable by default.

Reviewed-by: Simon Glass 

Signed-off-by: Shantur Rathore 
---

Changes in v4:
- Replace BOOTSTD_DEFAULT with BOOTSTD_FULL as previous version
didn't work on next

 arch/arm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d812685c98..a0265b36ad 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1985,7 +1985,7 @@ config ARCH_ROCKCHIP
imply ADC
imply CMD_DM
imply DEBUG_UART_BOARD_INIT
-   imply BOOTSTD_DEFAULTS
+   imply BOOTSTD_FULL
imply FAT_WRITE
imply SARADC_ROCKCHIP
imply SPL_SYSRESET
-- 
2.40.1

[PATCH v3 9/9] qemu-arm: get FDT from bloblist

2023-12-22 Thread Raymond Mao

Get devicetree from a bloblist if it exists.
If not, fallback to get FDT from the specified memory address.

Signed-off-by: Raymond Mao 
---
Changes in v2
- Refactor of board_fdt_blob_setup().

 board/emulation/qemu-arm/qemu-arm.c | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/board/emulation/qemu-arm/qemu-arm.c 
b/board/emulation/qemu-arm/qemu-arm.c
index e225011bf0..d326668caf 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -149,9 +149,17 @@ int dram_init_banksize(void)
 
 void *board_fdt_blob_setup(int *err)
 {
+   void *fdt = NULL;
*err = 0;
-   /* QEMU loads a generated DTB for us at the start of RAM. */
-   return (void *)CFG_SYS_SDRAM_BASE;
+
+   /* Check if a DTB exists in bloblist */
+   if (IS_ENABLED(CONFIG_BLOBLIST) && !bloblist_maybe_init())
+   fdt = bloblist_find(BLOBLISTT_CONTROL_FDT, 0);
+   if (!fdt)
+   /* QEMU loads a generated DTB for us at the start of RAM. */
+   return (void *)CFG_SYS_SDRAM_BASE;
+
+   return fdt;
 }
 
 int board_bloblist_from_boot_arg(unsigned long addr, unsigned long size)
-- 
2.25.1

[PATCH v3 8/9] fdt: update the document and Kconfig description

2023-12-22 Thread Raymond Mao

Update the document and Kconfig to describe the behavior of board
specific custom functions when CONFIG_OF_BOARD is defined.

Signed-off-by: Raymond Mao 
---
 doc/develop/devicetree/control.rst | 6 +++---
 dts/Kconfig| 7 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/develop/devicetree/control.rst 
b/doc/develop/devicetree/control.rst
index cbb65c9b17..e061f4e812 100644
--- a/doc/develop/devicetree/control.rst
+++ b/doc/develop/devicetree/control.rst
@@ -104,9 +104,9 @@ in u-boot.bin so you can still just flash u-boot.bin onto 
your board. If you are
 using CONFIG_SPL_FRAMEWORK, then u-boot.img will be built to include the device
 tree binary.
 
-If CONFIG_OF_BOARD is defined, a board-specific routine will provide the
-devicetree at runtime, for example if an earlier bootloader stage creates
-it and passes it to U-Boot.
+If CONFIG_OF_BOARD is defined, board-specific routines will provide the
+bloblist and devicetree at runtime, for example if an earlier bootloader stage
+creates it and passes it to U-Boot.
 
 If CONFIG_SANDBOX is defined, then it will be read from a file on
 startup. Use the -d flag to U-Boot to specify the file to read, -D for the
diff --git a/dts/Kconfig b/dts/Kconfig
index 00c0aeff89..12d61dc748 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -110,8 +110,11 @@ config OF_BOARD
default y if SANDBOX || OF_HAS_PRIOR_STAGE
help
  If this option is enabled, the device tree is provided at runtime by
- a custom function called board_fdt_blob_setup(). The board must
- implement this function if it wishes to provide special behaviour.
+ a custom function called board_fdt_blob_setup().
+ If this option is enabled, bloblist is provided at runtime by a
+ custom function called board_bloblist_from_boot_arg().
+ The board must implement these functions if it wishes to provide
+ special behaviour.
 
  With this option, the device tree build by U-Boot may be overridden or
  ignored. See OF_HAS_PRIOR_STAGE.
-- 
2.25.1

[PATCH v3 7/9] bloblist: Load the bloblist from the previous loader

2023-12-22 Thread Raymond Mao

During bloblist initialization, when CONFIG_OF_BOARD is defined,
invoke the platform custom function to load the bloblist via boot
arguments from the previous loader.
If the bloblist exists, copy it into the fixed bloblist memory region.

Signed-off-by: Raymond Mao 
---
 common/bloblist.c  | 47 --
 include/bloblist.h | 16 
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/common/bloblist.c b/common/bloblist.c
index 5ad1db137a..e66afcde64 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -492,31 +492,38 @@ int bloblist_init(void)
bool fixed = IS_ENABLED(CONFIG_BLOBLIST_FIXED);
int ret = -ENOENT;
ulong addr, size;
-   bool expected;
-
-   /**
-* We don't expect to find an existing bloblist in the first phase of
-* U-Boot that runs. Also we have no way to receive the address of an
-* allocated bloblist from a previous stage, so it must be at a fixed
+   /*
+* If U-Boot is not in the first phase, an existing bloblist must be
+* at a fixed address.
+*/
+   bool from_addr = fixed && !u_boot_first_phase();
+   /*
+* If U-Boot is in the first phase that a board specific routine should
+* install the bloblist passed from previous loader to this fixed
 * address.
 */
-   expected = fixed && !u_boot_first_phase();
+   bool from_board = fixed && IS_ENABLED(CONFIG_OF_BOARD) &&
+ u_boot_first_phase();
+
if (spl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST))
-   expected = false;
+   from_addr = false;
if (fixed)
addr = IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
  CONFIG_BLOBLIST_ADDR);
size = CONFIG_BLOBLIST_SIZE;
-   if (expected) {
+
+   if (from_board)
+   ret = board_bloblist_from_boot_arg(addr, size);
+   else if (from_addr)
ret = bloblist_check(addr, size);
-   if (ret) {
-   log_warning("Expected bloblist at %lx not found 
(err=%d)\n",
-   addr, ret);
-   } else {
-   /* Get the real size, if it is not what we expected */
-   size = gd->bloblist->total_size;
-   }
-   }
+
+   if (ret)
+   log_warning("Bloblist at %lx not found (err=%d)\n",
+   addr, ret);
+   else
+   /* Get the real size */
+   size = gd->bloblist->total_size;
+
if (ret) {
if (CONFIG_IS_ENABLED(BLOBLIST_ALLOC)) {
void *ptr = memalign(BLOBLIST_ALIGN, size);
@@ -525,7 +532,8 @@ int bloblist_init(void)
return log_msg_ret("alloc", -ENOMEM);
addr = map_to_sysmem(ptr);
} else if (!fixed) {
-   return log_msg_ret("!fixed", ret);
+   return log_msg_ret("BLOBLIST_FIXED is not enabled",
+  ret);
}
log_debug("Creating new bloblist size %lx at %lx\n", size,
  addr);
@@ -538,6 +546,9 @@ int bloblist_init(void)
return log_msg_ret("ini", ret);
gd->flags |= GD_FLG_BLOBLIST_READY;
 
+   bloblist_show_stats();
+   bloblist_show_list();
+
return 0;
 }
 
diff --git a/include/bloblist.h b/include/bloblist.h
index c1dab11f78..2f4246576e 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -445,6 +445,22 @@ int bloblist_reloc(void *to, uint to_size);
  */
 int bloblist_init(void);
 
+#if (IS_ENABLED(CONFIG_ARCH_QEMU) && IS_ENABLED(CONFIG_ARM))
+/* Board custom function for qemu-arm */
+int board_bloblist_from_boot_arg(unsigned long addr, unsigned long size);
+#else
+/*
+ * A board need to implement this custom function if it needs to retrieve
+ * bloblist from a previous loader
+ */
+static inline
+int board_bloblist_from_boot_arg(unsigned long __always_unused addr,
+unsigned long __always_unused size)
+{
+   return -1;
+}
+#endif
+
 #if CONFIG_IS_ENABLED(BLOBLIST)
 /**
  * bloblist_maybe_init() - Init the bloblist system if not already done
-- 
2.25.1

[PATCH v3 6/9] qemu-arm: Get bloblist from boot arguments

2023-12-22 Thread Raymond Mao

Add platform custom function to get bloblist from boot arguments.
Check whether boot arguments aligns with the register conventions
defined in FW Handoff spec v0.9.
Add bloblist related options into qemu default config.

Signed-off-by: Raymond Mao 
---
Changes in v2
- Remove low level code for copying boot arguments.
- Refactor board_fdt_blob_setup() and remove direct access of gd->bloblist.
Changes in v3
- Optimize board_bloblist_from_boot_arg().

 board/emulation/qemu-arm/qemu-arm.c | 30 +
 configs/qemu_arm64_defconfig|  3 +++
 2 files changed, 33 insertions(+)

diff --git a/board/emulation/qemu-arm/qemu-arm.c 
b/board/emulation/qemu-arm/qemu-arm.c
index 942f1fff57..e225011bf0 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -4,6 +4,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -102,6 +103,15 @@ static struct mm_region qemu_arm64_mem_map[] = {
 struct mm_region *mem_map = qemu_arm64_mem_map;
 #endif
 
+/*
+ * Boot parameters saved from start.S
+ * saved_args[0]: FDT base address
+ * saved_args[1]: Bloblist signature
+ * saved_args[2]: must be 0
+ * saved_args[3]: Bloblist base address
+ */
+extern unsigned long saved_args[];
+
 int board_init(void)
 {
return 0;
@@ -144,6 +154,26 @@ void *board_fdt_blob_setup(int *err)
return (void *)CFG_SYS_SDRAM_BASE;
 }
 
+int board_bloblist_from_boot_arg(unsigned long addr, unsigned long size)
+{
+   int ret = -ENOENT;
+
+   if (!IS_ENABLED(CONFIG_OF_BOARD) || !IS_ENABLED(CONFIG_BLOBLIST))
+   return -ENOENT;
+
+   ret = bloblist_check(saved_args[3], size);
+   if (ret)
+   return ret;
+
+   /* Check the register conventions */
+   ret = bloblist_check_reg_conv(saved_args[0], saved_args[2]);
+   if (!ret)
+   /* Relocate the bloblist to the fixed address */
+   ret = bloblist_reloc((void *)addr, CONFIG_BLOBLIST_SIZE);
+
+   return ret;
+}
+
 void enable_caches(void)
 {
 icache_enable();
diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
index c010c25a92..418f48001c 100644
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -69,3 +69,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_PCI=y
 CONFIG_SEMIHOSTING=y
 CONFIG_TPM=y
+CONFIG_BLOBLIST=y
+CONFIG_BLOBLIST_ADDR=0x40004000
+CONFIG_BLOBLIST_SIZE=0x4000
-- 
2.25.1

[PATCH v3 5/9] arm: armv8: save boot arguments

2023-12-22 Thread Raymond Mao

Save boot arguments x[0-3] into an array for handover of bloblist from
previous boot stage.

Signed-off-by: Raymond Mao 
---
Changes in v2
- New patch file created for v2.

 arch/arm/cpu/armv8/start.S | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S
index 6cc1d26e5e..8e704f590e 100644
--- a/arch/arm/cpu/armv8/start.S
+++ b/arch/arm/cpu/armv8/start.S
@@ -370,5 +370,19 @@ ENTRY(c_runtime_cpu_setup)
 ENDPROC(c_runtime_cpu_setup)
 
 WEAK(save_boot_params)
+#if (IS_ENABLED(CONFIG_OF_BOARD) && IS_ENABLED(CONFIG_BLOBLIST))
+   adr x9, saved_args
+   stp x0, x1, [x9]
+   /* Increment the address by 16 bytes for the next pair of values */
+   stp x2, x3, [x9, #16]
+#endif
b   save_boot_params_ret/* back to my caller */
 ENDPROC(save_boot_params)
+
+.section .data
+.global saved_args
+saved_args:
+   .rept 4
+   .xword 0
+   .endr
+END(saved_args)
-- 
2.25.1

[PATCH v3 4/9] arm: armv7: save boot arguments

2023-12-22 Thread Raymond Mao

Save boot arguments r[0-3] into an array for handover of bloblist from
previous boot stage.

Signed-off-by: Raymond Mao 
---
Changes in v2
- New patch file created for v2.
Changes in v3
- Swap value of r0 with r2.

 arch/arm/cpu/armv7/start.S | 13 +
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 69e281b086..2ca63ca32c 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -152,9 +152,22 @@ ENDPROC(c_runtime_cpu_setup)
  *
  */
 WEAK(save_boot_params)
+#if (IS_ENABLED(CONFIG_OF_BOARD) && IS_ENABLED(CONFIG_BLOBLIST))
+   ldr r12, =saved_args
+   /* Intentionally swapping r0 with r2 */
+   stm r12, {r2, r1, r0, r3}
+#endif
b   save_boot_params_ret@ back to my caller
 ENDPROC(save_boot_params)
 
+.section .data
+.global saved_args
+saved_args:
+   .rept 4
+   .word 0
+   .endr
+END(saved_args)
+
 #ifdef CONFIG_ARMV7_LPAE
 WEAK(switch_to_hypervisor)
b   switch_to_hypervisor_ret
-- 
2.25.1

[PATCH v3 3/9] bloblist: refactor of bloblist_reloc()

2023-12-22 Thread Raymond Mao

The current bloblist pointer and size can be retrieved from global
data, so we don't need to pass them from the function arguments.
This change also help to remove all external access of gd->bloblist
outside of bloblist module.

Signed-off-by: Raymond Mao 
---
Changes in v2
- New patch file created for v2.
Changes in v3
- Check the space size before copying the bloblist.
- Add return code of bloblist_reloc().

 common/bloblist.c  | 10 --
 common/board_f.c   |  8 ++--
 include/bloblist.h |  8 
 test/bloblist.c|  6 ++
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/bloblist.c b/common/bloblist.c
index db3fbb20cf..5ad1db137a 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -472,13 +472,19 @@ void bloblist_show_list(void)
}
 }
 
-void bloblist_reloc(void *to, uint to_size, void *from, uint from_size)
+int bloblist_reloc(void *to, uint to_size)
 {
struct bloblist_hdr *hdr;
 
-   memcpy(to, from, from_size);
+   if (to_size < gd->bloblist->total_size)
+   return -ENOSPC;
+
+   memcpy(to, gd->bloblist, gd->bloblist->total_size);
hdr = to;
hdr->total_size = to_size;
+   gd->bloblist = to;
+
+   return 0;
 }
 
 int bloblist_init(void)
diff --git a/common/board_f.c b/common/board_f.c
index d4d7d01f8f..00b0430889 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -676,13 +676,9 @@ static int reloc_bloblist(void)
return 0;
}
if (gd->new_bloblist) {
-   int size = CONFIG_BLOBLIST_SIZE;
-
debug("Copying bloblist from %p to %p, size %x\n",
- gd->bloblist, gd->new_bloblist, size);
-   bloblist_reloc(gd->new_bloblist, CONFIG_BLOBLIST_SIZE_RELOC,
-  gd->bloblist, size);
-   gd->bloblist = gd->new_bloblist;
+ gd->bloblist, gd->new_bloblist, gd->bloblist->total_size);
+   bloblist_reloc(gd->new_bloblist, CONFIG_BLOBLIST_SIZE_RELOC);
}
 #endif
 
diff --git a/include/bloblist.h b/include/bloblist.h
index bd32e38a06..c1dab11f78 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -418,11 +418,11 @@ const char *bloblist_tag_name(enum bloblist_tag_t tag);
  * bloblist_reloc() - Relocate the bloblist and optionally resize it
  *
  * @to: Pointer to new bloblist location (must not overlap old location)
- * @to_size: New size for bloblist (must be larger than from_size)
- * @from: Pointer to bloblist to relocate
- * @from_size: Size of bloblist to relocate
+ * @to_size: New size for bloblist
+ * Return: 0 if OK, -ENOSPC if the new size is small than the bloblist total
+ *size.
  */
-void bloblist_reloc(void *to, uint to_size, void *from, uint from_size);
+int bloblist_reloc(void *to, uint to_size);
 
 /**
  * bloblist_init() - Init the bloblist system with a single bloblist
diff --git a/test/bloblist.c b/test/bloblist.c
index 7dab9addf8..1c60bbac36 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -376,13 +376,12 @@ static int bloblist_test_reloc(struct unit_test_state 
*uts)
 {
const uint large_size = TEST_BLOBLIST_SIZE;
const uint small_size = 0x20;
-   void *old_ptr, *new_ptr;
+   void *new_ptr;
void *blob1, *blob2;
ulong new_addr;
ulong new_size;
 
ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0, 0));
-   old_ptr = map_sysmem(TEST_ADDR, TEST_BLOBLIST_SIZE);
 
/* Add one blob and then one that won't fit */
blob1 = bloblist_add(TEST_TAG, small_size, 0);
@@ -394,8 +393,7 @@ static int bloblist_test_reloc(struct unit_test_state *uts)
new_addr = TEST_ADDR + TEST_BLOBLIST_SIZE;
new_size = TEST_BLOBLIST_SIZE + 0x100;
new_ptr = map_sysmem(new_addr, TEST_BLOBLIST_SIZE);
-   bloblist_reloc(new_ptr, new_size, old_ptr, TEST_BLOBLIST_SIZE);
-   gd->bloblist = new_ptr;
+   ut_assertok(bloblist_reloc(new_ptr, new_size));
 
/* Check the old blob is there and that we can now add the bigger one */
ut_assertnonnull(bloblist_find(TEST_TAG, small_size));
-- 
2.25.1

[PATCH v3 2/9] bloblist: check bloblist with specified buffer size

2023-12-22 Thread Raymond Mao

Instead of expecting the bloblist total size to be the same as the
pre-allocated buffer size, practically we are more interested in
whether the pre-allocated buffer size is bigger than the bloblist
total size.

Signed-off-by: Raymond Mao 
Reviewed-by: Ilias Apalodimas 
---
Changes in v2
- New patch file created for v2.

 common/bloblist.c | 2 +-
 test/bloblist.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/bloblist.c b/common/bloblist.c
index ba17dd851a..db3fbb20cf 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -384,7 +384,7 @@ int bloblist_check(ulong addr, uint size)
return log_msg_ret("Bad magic", -ENOENT);
if (hdr->version != BLOBLIST_VERSION)
return log_msg_ret("Bad version", -EPROTONOSUPPORT);
-   if (!hdr->total_size || (size && hdr->total_size != size))
+   if (!hdr->total_size || (size && hdr->total_size > size))
return log_msg_ret("Bad total size", -EFBIG);
if (hdr->used_size > hdr->total_size)
return log_msg_ret("Bad used size", -ENOENT);
diff --git a/test/bloblist.c b/test/bloblist.c
index 17d9dd03d0..7dab9addf8 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -207,7 +207,7 @@ static int bloblist_test_checksum(struct unit_test_state 
*uts)
hdr->flags++;
 
hdr->total_size--;
-   ut_asserteq(-EFBIG, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+   ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
hdr->total_size++;
 
hdr->spare++;
-- 
2.25.1

[PATCH v3 1/9] bloblist: add API to check the register conventions

2023-12-22 Thread Raymond Mao

Add bloblist_check_reg_conv() to check whether the bloblist is compliant
to the register conventions defined in Firmware Handoff specification.
This API can be used for all Arm platforms.

Signed-off-by: Raymond Mao 
---
Changes in v2
- Refactor of bloblist_check_reg_conv().
Changes in v3
- bloblist_check_reg_conv() returns -ENOENT if OF_BOARD is disabled.

 common/bloblist.c  | 13 +
 include/bloblist.h | 12 
 2 files changed, 25 insertions(+)

diff --git a/common/bloblist.c b/common/bloblist.c
index 625e480f6b..ba17dd851a 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -542,3 +542,16 @@ int bloblist_maybe_init(void)
 
return 0;
 }
+
+int bloblist_check_reg_conv(ulong rfdt, ulong rzero)
+{
+   if (!IS_ENABLED(CONFIG_OF_BOARD))
+   return -ENOENT;
+
+   if (rzero || rfdt != (ulong)bloblist_find(BLOBLISTT_CONTROL_FDT, 0)) {
+   gd->bloblist = NULL;  /* Reset the gd bloblist pointer */
+   return -EIO;
+   }
+
+   return 0;
+}
diff --git a/include/bloblist.h b/include/bloblist.h
index 84fc943819..bd32e38a06 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -461,4 +461,16 @@ static inline int bloblist_maybe_init(void)
 }
 #endif /* BLOBLIST */
 
+/**
+ * bloblist_check_reg_conv() - Check whether the bloblist is compliant to
+ *the register conventions according to the
+ *Firmware Handoff spec.
+ *
+ * @rfdt:  Register that holds the FDT base address.
+ * @rzero: Register that must be zero.
+ * Return: 0 if OK, -EIO if the bloblist is not compliant to the register
+ *conventions, -ENOENT if OF_BOARD is disabled.
+ */
+int bloblist_check_reg_conv(ulong rfdt, ulong rzero);
+
 #endif /* __BLOBLIST_H */
-- 
2.25.1

[PATCH v3 0/9] Handoff bloblist from previous boot stage

2023-12-22 Thread Raymond Mao

This patch set depends on another series:
"[PATCH v3 00/14] Support Firmware Handoff spec via bloblist".

This patch set implements Qemu-Arm platform custom functions to retrieve
the bloblist (aka. Transfer List) from previous loader via boot arguments
when CONFIG_OF_BOARD option is enabled and all boot arguments are compliant
to the register conventions defined in the Firmware Handoff spec v0.9.

Qemu-Arm platform custom function will load the FDT from the bloblist if it
exists.
Otherwise it fallbacks to get the FDT from the specified memory address.

If a platform vendor wish to have different behaviors for loading bloblist
or FDT from the previous boot stage, it is required to implement the custom
functions board_bloblist_from_boot_arg() and board_fdt_blob_setup().

Raymond Mao (9):
  bloblist: add API to check the register conventions
  bloblist: check bloblist with specified buffer size
  bloblist: refactor of bloblist_reloc()
  arm: armv7: save boot arguments
  arm: armv8: save boot arguments
  qemu-arm: Get bloblist from boot arguments
  bloblist: Load the bloblist from the previous loader
  fdt: update the document and Kconfig description
  qemu-arm: get FDT from bloblist

 arch/arm/cpu/armv7/start.S  | 13 ++
 arch/arm/cpu/armv8/start.S  | 14 ++
 board/emulation/qemu-arm/qemu-arm.c | 42 -
 common/bloblist.c   | 72 -
 common/board_f.c|  8 +---
 configs/qemu_arm64_defconfig|  3 ++
 doc/develop/devicetree/control.rst  |  6 +--
 dts/Kconfig |  7 ++-
 include/bloblist.h  | 36 +--
 test/bloblist.c |  8 ++--
 10 files changed, 166 insertions(+), 43 deletions(-)

-- 
2.25.1

Re: [PATCH v13 15/24] cli: add modern hush as parser for run_command*()

2023-12-22 Thread Tom Rini

On Fri, Dec 22, 2023 at 10:10:42PM +0100, Francis Laniel wrote:
> Hi!
> 
> 
> Le vendredi 22 décembre 2023, 22:02:35 CET Francis Laniel a écrit :
> > Enables using, in code, modern hush as parser for run_command function
> > family. It also enables the command run to be used by CLI user of modern
> > hush.
> > 
> > Reviewed-by: Simon Glass 
> > Signed-off-by: Francis Laniel 
[snip]
> > diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
> > index a9b555c779..104f49deef 100644
> > --- a/test/boot/bootflow.c
> > +++ b/test/boot/bootflow.c
> > @@ -710,7 +710,21 @@ static int bootflow_scan_menu_boot(struct
> > unit_test_state *uts) ut_assert_skip_to_line("(2 bootflows, 2 valid)");
> > 
> > ut_assert_nextline("Selected: Armbian");
> > -   ut_assert_skip_to_line("Boot failed (err=-14)");
> > +
> > +   if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
> > +   /*
> > +* With old hush, despite booti failing to boot, i.e. returning
> > +* CMD_RET_FAILURE, run_command() returns 0 which leads 
> bootflow_boot(),
> > as + * we are using bootmeth_script here, to return -EFAULT.
> > +*/
> > +   ut_assert_skip_to_line("Boot failed (err=-14)");
> > +   } else if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
> > +   /*
> > +* While with modern one, run_command() propagates 
> CMD_RET_FAILURE
> > returned +   * by booti, so we get 1 here.
> > +*/
> > +   ut_assert_skip_to_line("Boot failed (err=1)");
> > +   }
> 
> I would like to give a bit of context here.
> With the following patch:
> diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py
> index c169c835e3..cc5adda0a3 100644
> --- a/test/py/tests/test_ut.py
> +++ b/test/py/tests/test_ut.py
> @@ -173,7 +173,7 @@ else
> fi
>  fi
>  booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
> -
> +echo $?
>  # Recompile with:
>  # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
>  ''' % (mmc_dev)
> We can easily see that booti is failing while running the test:
> $ ./test/py/test.py -o log_cli=true -s --build -v -k 
> 'test_ut[ut_bootstd_bootflow_scan_menu_boot'
> ...
> Aborting!
> Failed to load '/boot/dtb/rockchip/overlay/-fixup.scr'
> 1
> 
> The problem with old hush, is that the 1 returned here, which corresponds to 
> CMD_RET_FAILURE, is not propagated as the return value of run_command().
> So, this lead the -EFAULT branch here to be taken:
> int bootflow_boot(struct bootflow *bflow)
> {
>   /* ... */
> 
>   ret = bootmeth_boot(bflow->method, bflow);
>   if (ret)
>   return log_msg_ret("boot", ret);
> 
>   /*
>* internal error, should not get here since we should have booted
>* something or returned an error
>*/
> 
>   return log_msg_ret("end", -EFAULT);
> }
> 
> With modern hush, CMD_RET_FAILURE is propagated as the return value of 
> run_command().
> As a consequence, we return with log_mst_ret("boot", 1), which leaded to this 
> test to fail.
> The above modification consists in adapting the expected output to the 
> current 
> shell flavor.
> I think this is the good thing to do, as I find modern hush behavior better 
> than the old one, i.e. it propagates CMD_RET_FAILURE as return of 
> run_command().

Oh very nice, thanks for digging in to this and explaining!

-- 
Tom


signature.asc
Description: PGP signature

1 2 >

1 - 100 of 114 matches

Mail list logo