Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2000269/?format=api
{ "id": 2000269, "url": "http://patchwork.ozlabs.org/api/patches/2000269/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/4b15546c745a160cad76e563a7ddedf68bbeda2c.1729577070.git.jan.kiszka@siemens.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<4b15546c745a160cad76e563a7ddedf68bbeda2c.1729577070.git.jan.kiszka@siemens.com>", "list_archive_url": null, "date": "2024-10-22T06:04:30", "name": "[v2,13/13] board: siemens: iot2050: Use sysinfo for board initialization", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "d2a52fc4f1a024980d2a788851f80e8556d236a5", "submitter": { "id": 710, "url": "http://patchwork.ozlabs.org/api/people/710/?format=api", "name": "Jan Kiszka", "email": "jan.kiszka@siemens.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/4b15546c745a160cad76e563a7ddedf68bbeda2c.1729577070.git.jan.kiszka@siemens.com/mbox/", "series": [ { "id": 429111, "url": "http://patchwork.ozlabs.org/api/series/429111/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=429111", "date": "2024-10-22T06:04:17", "name": "boards: siemens: iot2050: SM variant, sysinfo support, fixes & cleanups", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/429111/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2000269/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2000269/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=siemens.com header.i=jan.kiszka@siemens.com\n header.a=rsa-sha256 header.s=fm1 header.b=MG6k8aXy;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=siemens.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n secure) header.d=siemens.com header.i=jan.kiszka@siemens.com\n header.b=\"MG6k8aXy\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=siemens.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=jan.kiszka@siemens.com" ], "Received": [ "from phobos.denx.de (phobos.denx.de [85.214.62.61])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4XXhX206bRz1xwf\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 22 Oct 2024 17:06:41 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 0A25F892D5;\n\tTue, 22 Oct 2024 08:04:45 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 771E588EFB; Tue, 22 Oct 2024 08:04:40 +0200 (CEST)", "from mta-64-228.siemens.flowmailer.net\n (mta-64-228.siemens.flowmailer.net [185.136.64.228])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 3F16188F82\n for <u-boot@lists.denx.de>; Tue, 22 Oct 2024 08:04:35 +0200 (CEST)", "by mta-64-228.siemens.flowmailer.net with ESMTPSA id\n 202410220604340c71802f7e97bb359b for <u-boot@lists.denx.de>;\n Tue, 22 Oct 2024 08:04:34 +0200" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED,\n SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1;\n d=siemens.com; i=jan.kiszka@siemens.com;\n h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To;\n bh=tV4DrDemqUcN6H5XpWpN2fo3oAli/E+sxNjfyERGKUA=;\n b=MG6k8aXy67exlVaqHIVukF2iTSBWIlSq02lXmq2l/T3ZrM5TyT3p2K7f6cpngENHI7OCOr\n DntoVC6PHap2wmDUzXuAWgVm204z9lSxP9S09xQ8gYABTdz4ZapxWhW9doJfBwSyGC24a05E\n g8DFr4zP+H5XowpjoYbI636FNzq0qwpCpiZbU19MhryK8O7+fSvrfiWvkfOpnAi6xx5pARxr\n YjoONzdp/2qyry9bDeQMiztguVOp2QpgQN36mfUCLUP1tKPspVw9DTEMSlhA8wH9IKml6UOR\n +y8iAv+ZgEU1iG16r9LLhZmJC8C7O3NFOD9M2kt8zJNtrYs8MJRgJRRA==;", "From": "Jan Kiszka <jan.kiszka@siemens.com>", "To": "U-Boot Mailing List <u-boot@lists.denx.de>", "Cc": "Bryan Brattlof <bb@ti.com>,\n\tNishanth Menon <nm@ti.com>", "Subject": "[PATCH v2 13/13] board: siemens: iot2050: Use sysinfo for board\n initialization", "Date": "Tue, 22 Oct 2024 08:04:30 +0200", "Message-ID": "\n <4b15546c745a160cad76e563a7ddedf68bbeda2c.1729577070.git.jan.kiszka@siemens.com>", "In-Reply-To": "<cover.1729577070.git.jan.kiszka@siemens.com>", "References": "<cover.1729577070.git.jan.kiszka@siemens.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Flowmailer-Platform": "Siemens", "Feedback-ID": "519:519-294854:519-21489:flowmailer", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "From: Li Hua Qian <huaqian.li@siemens.com>\n\nDrop the info structure parsing of the board in favor of our new sysinfo\ndriver to avoid code duplication.\n\nSigned-off-by: Baocheng Su <baocheng.su@siemens.com>\nSigned-off-by: Li Hua Qian <huaqian.li@siemens.com>\n[Jan: rebasing, split-up, cleanup]\nSigned-off-by: Jan Kiszka <jan.kiszka@siemens.com>\n---\n arch/arm/mach-k3/am65x/Kconfig | 2 +\n board/siemens/iot2050/board.c | 142 +++++++++++++++++++--------------\n configs/iot2050_defconfig | 1 -\n 3 files changed, 82 insertions(+), 63 deletions(-)", "diff": "diff --git a/arch/arm/mach-k3/am65x/Kconfig b/arch/arm/mach-k3/am65x/Kconfig\nindex f17b641e136..88c6be33a7b 100644\n--- a/arch/arm/mach-k3/am65x/Kconfig\n+++ b/arch/arm/mach-k3/am65x/Kconfig\n@@ -34,6 +34,8 @@ config TARGET_IOT2050_A53\n \tselect BOARD_LATE_INIT\n \tselect SYS_DISABLE_DCACHE_OPS\n \tselect BINMAN\n+\tselect SYSINFO\n+\tselect SPL_SYSINFO if SPL\n \thelp\n \t This builds U-Boot for the IOT2050 devices.\n \ndiff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c\nindex e6bedc38917..c355f5bd3fd 100644\n--- a/board/siemens/iot2050/board.c\n+++ b/board/siemens/iot2050/board.c\n@@ -21,32 +21,12 @@\n #include <spl.h>\n #include <version.h>\n #include <linux/delay.h>\n+#include <linux/string.h>\n #include <asm/arch/hardware.h>\n #include <asm/gpio.h>\n #include <asm/io.h>\n \n-#define IOT2050_INFO_MAGIC\t\t0x20502050\n-\n-struct iot2050_info {\n-\tu32 magic;\n-\tu16 size;\n-\tchar name[20 + 1];\n-\tchar serial[16 + 1];\n-\tchar mlfb[18 + 1];\n-\tchar uuid[32 + 1];\n-\tchar a5e[18 + 1];\n-\tu8 mac_addr_cnt;\n-\tu8 mac_addr[8][ARP_HLEN];\n-\tchar seboot_version[40 + 1];\n-\tu8 padding[3];\n-\tu32 ddr_size_mb;\n-} __packed;\n-\n-/*\n- * Scratch SRAM (available before DDR RAM) contains extracted EEPROM data.\n- */\n-#define IOT2050_INFO_DATA ((struct iot2050_info *) \\\n-\t\t\t TI_SRAM_SCRATCH_BOARD_EEPROM_START)\n+#include \"../../../../drivers/sysinfo/iot2050.h\"\n \n DECLARE_GLOBAL_DATA_PTR;\n \n@@ -117,6 +97,8 @@ static const char *m2_connector_mode_name[] = {\n \n static enum m2_connector_mode connector_mode;\n \n+static char iot2050_board_name[21];\n+\n #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)\n static void *connector_overlay;\n static u32 connector_overlay_size;\n@@ -149,37 +131,57 @@ static void set_pinvalue(const char *gpio_name, const char *label, int value)\n \tdm_gpio_set_value(&gpio, value);\n }\n \n+static bool setup_sysinfo(struct udevice **sysinfo_ptr)\n+{\n+\tif (sysinfo_get(sysinfo_ptr)) {\n+\t\tpr_err(\"Could not find sysinfo device.\\n\");\n+\t\treturn false;\n+\t}\n+\tif (sysinfo_detect(*sysinfo_ptr)) {\n+\t\tpr_err(\"Board info parsing error\\n\");\n+\t\treturn false;\n+\t}\n+\treturn true;\n+}\n+\n+static void get_board_name(void)\n+{\n+\tstruct udevice *sysinfo;\n+\n+\tif (iot2050_board_name[0] != 0)\n+\t\treturn;\n+\n+\tif (!setup_sysinfo(&sysinfo))\n+\t\treturn;\n+\n+\tsysinfo_get_str(sysinfo, BOARD_NAME, sizeof(iot2050_board_name),\n+\t\t\tiot2050_board_name);\n+}\n+\n static bool board_is_advanced(void)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n \n-\treturn info->magic == IOT2050_INFO_MAGIC &&\n-\t\tstrstr((char *)info->name, \"IOT2050-ADVANCED\") != NULL;\n+\tget_board_name();\n+\treturn strstr(iot2050_board_name, \"IOT2050-ADVANCED\") != NULL;\n }\n \n static bool board_is_pg1(void)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n-\n-\treturn info->magic == IOT2050_INFO_MAGIC &&\n-\t\t(strcmp((char *)info->name, \"IOT2050-BASIC\") == 0 ||\n-\t\t strcmp((char *)info->name, \"IOT2050-ADVANCED\") == 0);\n+\tget_board_name();\n+\treturn strcmp(iot2050_board_name, \"IOT2050-BASIC\") == 0 ||\n+\t strcmp(iot2050_board_name, \"IOT2050-ADVANCED\") == 0;\n }\n \n static bool board_is_m2(void)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n-\n-\treturn info->magic == IOT2050_INFO_MAGIC &&\n-\t\tstrcmp((char *)info->name, \"IOT2050-ADVANCED-M2\") == 0;\n+\tget_board_name();\n+\treturn strcmp(iot2050_board_name, \"IOT2050-ADVANCED-M2\") == 0;\n }\n \n static bool board_is_sm(void)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n-\n-\treturn info->magic == IOT2050_INFO_MAGIC &&\n-\t\tstrcmp((char *)info->name, \"IOT2050-ADVANCED-SM\") == 0;\n+\tget_board_name();\n+\treturn strcmp(iot2050_board_name, \"IOT2050-ADVANCED-SM\") == 0;\n }\n \n static void remove_mmc1_target(void)\n@@ -206,33 +208,40 @@ static void enable_pcie_connector_power(void)\n \n void set_board_info_env(void)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n-\tu8 __maybe_unused mac_cnt;\n+\tstruct udevice *sysinfo;\n \tconst char *fdtfile;\n+\tchar buf[41];\n \n-\tif (info->magic != IOT2050_INFO_MAGIC) {\n-\t\tpr_err(\"IOT2050: Board info parsing error!\\n\");\n+\tif (env_get(\"board_uuid\"))\n \t\treturn;\n-\t}\n \n-\tif (env_get(\"board_uuid\"))\n+\tif (!setup_sysinfo(&sysinfo))\n \t\treturn;\n \n-\tenv_set(\"board_name\", info->name);\n-\tenv_set(\"board_serial\", info->serial);\n-\tenv_set(\"mlfb\", info->mlfb);\n-\tenv_set(\"board_uuid\", info->uuid);\n-\tenv_set(\"board_a5e\", info->a5e);\n+\tif (sysinfo_get_str(sysinfo, BOARD_NAME, sizeof(buf), buf) == 0)\n+\t\tenv_set(\"board_name\", buf);\n+\tif (sysinfo_get_str(sysinfo, BOARD_SERIAL, sizeof(buf), buf) == 0)\n+\t\tenv_set(\"board_serial\", buf);\n+\tif (sysinfo_get_str(sysinfo, BOARD_MLFB, sizeof(buf), buf) == 0)\n+\t\tenv_set(\"mlfb\", buf);\n+\tif (sysinfo_get_str(sysinfo, BOARD_UUID, sizeof(buf), buf) == 0)\n+\t\tenv_set(\"board_uuid\", buf);\n+\tif (sysinfo_get_str(sysinfo, BOARD_A5E, sizeof(buf), buf) == 0)\n+\t\tenv_set(\"board_a5e\", buf);\n+\tif (sysinfo_get_str(sysinfo, BOARD_SEBOOT_VER, sizeof(buf), buf) == 0)\n+\t\tenv_set(\"seboot_version\", buf);\n \tenv_set(\"fw_version\", PLAIN_VERSION);\n-\tenv_set(\"seboot_version\", info->seboot_version);\n \n \tif (IS_ENABLED(CONFIG_NET)) {\n+\t\tint mac_cnt, n;\n+\n+\t\tsysinfo_get_int(sysinfo, BOARD_MAC_ADDR_CNT, &mac_cnt);\n \t\t/* set MAC addresses to ensure forwarding to the OS */\n-\t\tfor (mac_cnt = 0; mac_cnt < info->mac_addr_cnt; mac_cnt++) {\n-\t\t\tif (is_valid_ethaddr(info->mac_addr[mac_cnt]))\n-\t\t\t\teth_env_set_enetaddr_by_index(\"eth\",\n-\t\t\t\t\t\t\t mac_cnt + 1,\n-\t\t\t\t\t\t\t info->mac_addr[mac_cnt]);\n+\t\tfor (n = 0; n < mac_cnt; n++) {\n+\t\t\tsysinfo_get_str(sysinfo, BOARD_MAC_ADDR_START + n,\n+\t\t\t\t\tsizeof(buf), buf);\n+\t\t\tif (is_valid_ethaddr(buf))\n+\t\t\t\teth_env_set_enetaddr_by_index(\"eth\", n + 1, buf);\n \t\t}\n \t}\n \n@@ -288,7 +297,7 @@ static void do_overlay_prepare(const char *overlay_path)\n \treturn;\n \n fit_error:\n-\tpr_err(\"M.2 device tree overlay %s not available,\\n\", overlay_path);\n+\tpr_err(\"M.2 device tree overlay %s not available.\\n\", overlay_path);\n #endif\n }\n \n@@ -362,8 +371,17 @@ int board_init(void)\n \n int dram_init(void)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n-\tgd->ram_size = ((phys_size_t)(info->ddr_size_mb)) << 20;\n+\tstruct udevice *sysinfo;\n+\tchar buf[10];\n+\n+\tif (!setup_sysinfo(&sysinfo))\n+\t\treturn -ENODEV;\n+\n+\tsysinfo_get_str(sysinfo, BOARD_DDR_SIZE, sizeof(buf), buf);\n+\n+\tu32 ddr_size_mb = *((u32 *)buf);\n+\n+\tgd->ram_size = ((phys_size_t)(ddr_size_mb)) << 20;\n \n \treturn 0;\n }\n@@ -405,18 +423,18 @@ int dram_init_banksize(void)\n #ifdef CONFIG_SPL_LOAD_FIT\n int board_fit_config_name_match(const char *name)\n {\n-\tstruct iot2050_info *info = IOT2050_INFO_DATA;\n \tchar upper_name[32];\n \n+\tget_board_name();\n+\n \t/* skip the prefix \"ti/k3-am65x8-\" */\n \tname += 13;\n \n-\tif (info->magic != IOT2050_INFO_MAGIC ||\n-\t strlen(name) >= sizeof(upper_name))\n+\tif (strlen(name) >= sizeof(upper_name))\n \t\treturn -1;\n \n \tstr_to_upper(name, upper_name, sizeof(upper_name));\n-\tif (!strcmp(upper_name, (char *)info->name))\n+\tif (!strcmp(upper_name, iot2050_board_name))\n \t\treturn 0;\n \n \treturn -1;\ndiff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig\nindex 574e232d119..2624f0cb573 100644\n--- a/configs/iot2050_defconfig\n+++ b/configs/iot2050_defconfig\n@@ -141,7 +141,6 @@ CONFIG_SOC_TI=y\n CONFIG_SPI=y\n CONFIG_DM_SPI=y\n CONFIG_CADENCE_QSPI=y\n-CONFIG_SYSINFO=y\n CONFIG_SYSRESET=y\n CONFIG_SPL_SYSRESET=y\n CONFIG_SYSRESET_TI_SCI=y\n", "prefixes": [ "v2", "13/13" ] }