[PATCH v3 5/5] board: siemens: iot2050: Use sysinfo for board initialization
Jan Kiszka
jan.kiszka at siemens.com
Thu Feb 13 20:00:23 CET 2025
On 10.02.25 14:05, Baocheng Su wrote:
> Drop the info structure parsing of the board in favor of our new sysinfo
> driver to avoid code duplication.
>
> Signed-off-by: Baocheng Su <baocheng.su at siemens.com>
> Signed-off-by: Li Hua Qian <huaqian.li at siemens.com>
> [Jan: rebasing, split-up, cleanup]
> Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
>
> ---
>
> Changes in v3:
> - reworked to align with the sysinfo driver updates
>
> arch/arm/mach-k3/am65x/Kconfig | 2 +
> board/siemens/iot2050/board.c | 142 +++++++++++++++++++--------------
> configs/iot2050_defconfig | 1 -
> 3 files changed, 82 insertions(+), 63 deletions(-)
>
> diff --git a/arch/arm/mach-k3/am65x/Kconfig b/arch/arm/mach-k3/am65x/Kconfig
> index 72a8298aebf9..056ae118c9e7 100644
> --- a/arch/arm/mach-k3/am65x/Kconfig
> +++ b/arch/arm/mach-k3/am65x/Kconfig
> @@ -35,6 +35,8 @@ config TARGET_IOT2050_A53
> select BOARD_LATE_INIT
> select SYS_DISABLE_DCACHE_OPS
> select BINMAN
> + select SYSINFO
> + select SPL_SYSINFO if SPL
> help
> This builds U-Boot for the IOT2050 devices.
>
> diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c
> index e6bedc389173..d827f728a08c 100644
> --- a/board/siemens/iot2050/board.c
> +++ b/board/siemens/iot2050/board.c
> @@ -25,28 +25,7 @@
> #include <asm/gpio.h>
> #include <asm/io.h>
>
> -#define IOT2050_INFO_MAGIC 0x20502050
> -
> -struct iot2050_info {
> - u32 magic;
> - u16 size;
> - char name[20 + 1];
> - char serial[16 + 1];
> - char mlfb[18 + 1];
> - char uuid[32 + 1];
> - char a5e[18 + 1];
> - u8 mac_addr_cnt;
> - u8 mac_addr[8][ARP_HLEN];
> - char seboot_version[40 + 1];
> - u8 padding[3];
> - u32 ddr_size_mb;
> -} __packed;
> -
> -/*
> - * Scratch SRAM (available before DDR RAM) contains extracted EEPROM data.
> - */
> -#define IOT2050_INFO_DATA ((struct iot2050_info *) \
> - TI_SRAM_SCRATCH_BOARD_EEPROM_START)
> +#include "../../../../drivers/sysinfo/iot2050.h"
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -117,6 +96,8 @@ static const char *m2_connector_mode_name[] = {
>
> static enum m2_connector_mode connector_mode;
>
> +static char iot2050_board_name[21];
> +
> #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
> static void *connector_overlay;
> static u32 connector_overlay_size;
> @@ -149,37 +130,57 @@ static void set_pinvalue(const char *gpio_name, const char *label, int value)
> dm_gpio_set_value(&gpio, value);
> }
>
> +static bool setup_sysinfo(struct udevice **sysinfo_ptr)
> +{
> + if (sysinfo_get(sysinfo_ptr)) {
> + pr_err("Could not find sysinfo device.\n");
> + return false;
> + }
> + if (sysinfo_detect(*sysinfo_ptr)) {
> + pr_err("Board info parsing error\n");
> + return false;
> + }
> + return true;
> +}
> +
> +static void get_board_name(void)
> +{
> + struct udevice *sysinfo;
> +
> + if (iot2050_board_name[0] != 0)
> + return;
> +
> + if (!setup_sysinfo(&sysinfo))
> + return;
> +
> + sysinfo_get_str(sysinfo, BOARD_NAME, sizeof(iot2050_board_name),
> + iot2050_board_name);
> +}
> +
> static bool board_is_advanced(void)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
>
> - return info->magic == IOT2050_INFO_MAGIC &&
> - strstr((char *)info->name, "IOT2050-ADVANCED") != NULL;
> + get_board_name();
> + return strstr(iot2050_board_name, "IOT2050-ADVANCED") != NULL;
> }
>
> static bool board_is_pg1(void)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
> -
> - return info->magic == IOT2050_INFO_MAGIC &&
> - (strcmp((char *)info->name, "IOT2050-BASIC") == 0 ||
> - strcmp((char *)info->name, "IOT2050-ADVANCED") == 0);
> + get_board_name();
> + return strcmp(iot2050_board_name, "IOT2050-BASIC") == 0 ||
> + strcmp(iot2050_board_name, "IOT2050-ADVANCED") == 0;
> }
>
> static bool board_is_m2(void)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
> -
> - return info->magic == IOT2050_INFO_MAGIC &&
> - strcmp((char *)info->name, "IOT2050-ADVANCED-M2") == 0;
> + get_board_name();
> + return strcmp(iot2050_board_name, "IOT2050-ADVANCED-M2") == 0;
> }
>
> static bool board_is_sm(void)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
> -
> - return info->magic == IOT2050_INFO_MAGIC &&
> - strcmp((char *)info->name, "IOT2050-ADVANCED-SM") == 0;
> + get_board_name();
> + return strcmp(iot2050_board_name, "IOT2050-ADVANCED-SM") == 0;
> }
>
> static void remove_mmc1_target(void)
> @@ -206,33 +207,43 @@ static void enable_pcie_connector_power(void)
>
> void set_board_info_env(void)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
> - u8 __maybe_unused mac_cnt;
> + struct udevice *sysinfo;
> const char *fdtfile;
> + char buf[41];
>
> - if (info->magic != IOT2050_INFO_MAGIC) {
> - pr_err("IOT2050: Board info parsing error!\n");
> + if (env_get("board_uuid"))
> return;
> - }
>
> - if (env_get("board_uuid"))
> + if (!setup_sysinfo(&sysinfo))
> return;
>
> - env_set("board_name", info->name);
> - env_set("board_serial", info->serial);
> - env_set("mlfb", info->mlfb);
> - env_set("board_uuid", info->uuid);
> - env_set("board_a5e", info->a5e);
> + if (sysinfo_get_str(sysinfo, BOARD_NAME, sizeof(buf), buf) == 0)
> + env_set("board_name", buf);
> + if (sysinfo_get_str(sysinfo, SYSID_SM_SYSTEM_SERIAL, sizeof(buf), buf) == 0)
> + env_set("board_serial", buf);
> + if (sysinfo_get_str(sysinfo, BOARD_MLFB, sizeof(buf), buf) == 0)
> + env_set("mlfb", buf);
> + if (sysinfo_get_str(sysinfo, BOARD_UUID, sizeof(buf), buf) == 0)
> + env_set("board_uuid", buf);
> + if (sysinfo_get_str(sysinfo, BOARD_A5E, sizeof(buf), buf) == 0)
> + env_set("board_a5e", buf);
> + if (sysinfo_get_str(sysinfo, BOARD_SEBOOT_VER, sizeof(buf), buf) == 0)
> + env_set("seboot_version", buf);
> env_set("fw_version", PLAIN_VERSION);
> - env_set("seboot_version", info->seboot_version);
>
> if (IS_ENABLED(CONFIG_NET)) {
> + int mac_cnt;
> +
> + mac_cnt = sysinfo_get_item_count(sysinfo, SYSID_BOARD_MAC_ADDR);
> /* set MAC addresses to ensure forwarding to the OS */
> - for (mac_cnt = 0; mac_cnt < info->mac_addr_cnt; mac_cnt++) {
> - if (is_valid_ethaddr(info->mac_addr[mac_cnt]))
> - eth_env_set_enetaddr_by_index("eth",
> - mac_cnt + 1,
> - info->mac_addr[mac_cnt]);
> + for (int i = 0; i < mac_cnt; i++) {
> + u8 *mac = NULL;
> + size_t bytes = 0;
> +
> + sysinfo_get_data_by_index(sysinfo, SYSID_BOARD_MAC_ADDR,
> + i, (void **)&mac, &bytes);
> + if (bytes == ARP_HLEN && is_valid_ethaddr(mac))
> + eth_env_set_enetaddr_by_index("eth", i + 1, mac);
> }
> }
>
> @@ -288,7 +299,7 @@ static void do_overlay_prepare(const char *overlay_path)
> return;
>
> fit_error:
> - pr_err("M.2 device tree overlay %s not available,\n", overlay_path);
> + pr_err("M.2 device tree overlay %s not available.\n", overlay_path);
> #endif
> }
>
> @@ -362,8 +373,15 @@ int board_init(void)
>
> int dram_init(void)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
> - gd->ram_size = ((phys_size_t)(info->ddr_size_mb)) << 20;
> + struct udevice *sysinfo;
> + u32 ddr_size_mb;
> +
> + if (!setup_sysinfo(&sysinfo))
> + return -ENODEV;
> +
> + sysinfo_get_int(sysinfo, SYSID_BOARD_RAM_SIZE_MB, &ddr_size_mb);
> +
> + gd->ram_size = ((phys_size_t)(ddr_size_mb)) << 20;
>
> return 0;
> }
> @@ -405,18 +423,18 @@ int dram_init_banksize(void)
> #ifdef CONFIG_SPL_LOAD_FIT
> int board_fit_config_name_match(const char *name)
> {
> - struct iot2050_info *info = IOT2050_INFO_DATA;
> char upper_name[32];
>
> + get_board_name();
> +
> /* skip the prefix "ti/k3-am65x8-" */
> name += 13;
>
> - if (info->magic != IOT2050_INFO_MAGIC ||
> - strlen(name) >= sizeof(upper_name))
> + if (strlen(name) >= sizeof(upper_name))
> return -1;
>
> str_to_upper(name, upper_name, sizeof(upper_name));
> - if (!strcmp(upper_name, (char *)info->name))
> + if (!strcmp(upper_name, iot2050_board_name))
> return 0;
>
> return -1;
> diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig
> index 934552bcfd24..2d5f18e5bd40 100644
> --- a/configs/iot2050_defconfig
> +++ b/configs/iot2050_defconfig
> @@ -140,7 +140,6 @@ CONFIG_SOC_TI=y
> CONFIG_SPI=y
> CONFIG_DM_SPI=y
> CONFIG_CADENCE_QSPI=y
> -CONFIG_SYSINFO=y
Maybe you just skip enabling this in patch 4, then you don't need to
remove it right after this again.
Jan
> CONFIG_SYSRESET=y
> CONFIG_SPL_SYSRESET=y
> CONFIG_SYSRESET_TI_SCI=y
--
Siemens AG, Foundational Technologies
Linux Expert Center
More information about the U-Boot
mailing list