Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196440/?format=api
{ "id": 2196440, "url": "http://patchwork.ozlabs.org/api/patches/2196440/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260213225254.2544596-3-raymondmaoca@gmail.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": "<20260213225254.2544596-3-raymondmaoca@gmail.com>", "list_archive_url": null, "date": "2026-02-13T22:52:47", "name": "[v6,2/6] smbios: add support for dynamic generation of Type 9 system slot tables", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "8435c0ede97641de41051003c40fb0f4c65bd051", "submitter": { "id": 91989, "url": "http://patchwork.ozlabs.org/api/people/91989/?format=api", "name": "Raymond Mao", "email": "raymondmaoca@gmail.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/20260213225254.2544596-3-raymondmaoca@gmail.com/mbox/", "series": [ { "id": 492145, "url": "http://patchwork.ozlabs.org/api/series/492145/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=492145", "date": "2026-02-13T22:52:45", "name": "Implement all missing SMBIOS types required by distro tooling", "version": 6, "mbox": "http://patchwork.ozlabs.org/series/492145/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196440/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196440/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 unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20230601 header.b=XPFjnngK;\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=none dis=none) header.from=gmail.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 unprotected) header.d=gmail.com header.i=@gmail.com header.b=\"XPFjnngK\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=gmail.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=raymondmaoca@gmail.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)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fCSBk5sNHz1xvS\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 14 Feb 2026 09:53:34 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 01D7483DEC;\n\tFri, 13 Feb 2026 23:53:27 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id 89EB983E0E; Fri, 13 Feb 2026 23:53:26 +0100 (CET)", "from mail-qt1-x835.google.com (mail-qt1-x835.google.com\n [IPv6:2607:f8b0:4864:20::835])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id CAB9B83DCB\n for <u-boot@lists.denx.de>; Fri, 13 Feb 2026 23:53:23 +0100 (CET)", "by mail-qt1-x835.google.com with SMTP id\n d75a77b69052e-506251815a3so13773741cf.0\n for <u-boot@lists.denx.de>; Fri, 13 Feb 2026 14:53:23 -0800 (PST)", "from ubuntu.localdomain (174-138-202-16.cpe.distributel.net.\n [174.138.202.16]) by smtp.gmail.com with ESMTPSA id\n d75a77b69052e-506847ed9c4sm72845731cf.8.2026.02.13.14.53.21\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 13 Feb 2026 14:53:22 -0800 (PST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD,FREEMAIL_FROM,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=no\n autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20230601; t=1771023202; x=1771628002; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=DuDUOafNx/E8anciZi4sVmpoIDW5wu67NS0N+fdz5Jw=;\n b=XPFjnngKTa6aDMSPFzm+3yaSYMvWxploIeopfyd/p5acfAZkYA5fvbXneamPB9gkyn\n av+nnhhbF1MLgtYLgej8FMTJVAiZJ6/I32famX6dduq9u6tVZ0O2QeljV2L07I22Gxdv\n /UXlZ4UqviGmjAbqeSXN1mo8nwyNNSV+loOdBr3PrX90BPmyDyuqKJMzNC+FwmC/JSrT\n 2CH4RjE7c0m3aYDV3I2d8k1n+l6fb8wGdGANNkuh5JJujDXVFaP0n8yMkVp7qFhRimsg\n U5N134ClCqgpZAKMn7m4sEe+k3p7d/5TmHW5BDxQhQdGFzqowHQhrUb33SMXwYGYCRHQ\n fbzQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1771023202; x=1771628002;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=DuDUOafNx/E8anciZi4sVmpoIDW5wu67NS0N+fdz5Jw=;\n b=YaUhf2soX1hIF3TzaonViVrFPKq3J5Np8yUc1Nr4Bt+l7K1BIPpK6w2oTBCYC8+BZB\n kFN6+8i3sUzX+Xuk8DJ3AK7IXXtCY1WcZRghLUrpOsJ9nuw84nBJQb3DrboZ1K0BcBWA\n j27uEGt1pofD+wXK47hfdXCw24tkYL53bMiB6AdzeErLfWVenGeUvCNxvBL5OjARPP43\n Vq6xhIsiKGXMncPQXHT9jaF/R7hXqpdBPVaYvtuyba57hPhj3hKCttyof0ZErEWUqRad\n y0lA2cdP8EqYIz9PfOd7N/OtK6Vg9d3AekGfRtIsKC+iEMFjXy+JOYQ8PWbSMkcJdjLb\n YxRw==", "X-Gm-Message-State": "AOJu0Yxxhg/YLdVLRcwKX6ppNFJ4a9pl3CZU/umYwbGP1bqIFwSe7pzR\n HR8nbztwgs9Mkkw/TIseiWJhCoPxm6fjPDdepjlplfTEPR8Oh2RvtYe7/++zdg==", "X-Gm-Gg": "AZuq6aLu0pVF05IzOv21xcZsAbUrtbWKj54NPVn6cqKJ+eotOOLH9QixHuWw7a2RQ5N\n cwfwYutvpYRFiNLmhlAHtQDHVCT/5EGpyYjCyYtdeGJxWESJFKCvrHSe3Tg6q7/8/H7/ME5bFmH\n lWysHFmlXS9p+MRr/a3gc3OGD7tFacwZoKWgtpv4tDDS96NYEEmSFdux1HH6KVgko8+49320xQ7\n Hl4SUOqp9N1xlvKsBDNbM6YWK4YdE8FgQytBtBMbxCjCbpUT+CqBZQwr/yWVCvFzu6iKaQgZRX5\n qFfI/HFIHf+/kPfn70r9RWuAWMEpsN1xGuA2TWLExCvwRW6ZV5xs8Az6aQ91gJfXaEIUDqQSTiX\n zNNY+cNrf2au0WabvuTOLJVfv8aHbmfnP250PtxnCrUlV1I4tiIDt94pY7YL9BFAJ3BxFrubPYT\n sIMS4yeBuzVCdvMyv4JkUEOrO4++v4HFNDlq8FF/12DN5wUBgh5e5ES/yD6AgO8Bqb+XBapy9Bl\n VNh2Oq07zY=", "X-Received": "by 2002:ac8:5ac9:0:b0:4ee:4a8b:d9f6 with SMTP id\n d75a77b69052e-506a8356172mr45478111cf.59.1771023202315;\n Fri, 13 Feb 2026 14:53:22 -0800 (PST)", "From": "Raymond Mao <raymondmaoca@gmail.com>", "To": "u-boot@lists.denx.de", "Cc": "Raymond Mao <raymondmaoca@gmail.com>, Tom Rini <trini@konsulko.com>,\n Mark Kettenis <kettenis@openbsd.org>,\n Heinrich Schuchardt <xypron.glpk@gmx.de>,\n Ilias Apalodimas <ilias.apalodimas@linaro.org>,\n Baocheng Su <baocheng.su@siemens.com>, Jan Kiszka <jan.kiszka@siemens.com>,\n Li Hua Qian <huaqian.li@siemens.com>,\n Samuel Holland <samuel.holland@sifive.com>", "Subject": "[PATCH v6 2/6] smbios: add support for dynamic generation of Type 9\n system slot tables", "Date": "Fri, 13 Feb 2026 17:52:47 -0500", "Message-Id": "<20260213225254.2544596-3-raymondmaoca@gmail.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20260213225254.2544596-1-raymondmaoca@gmail.com>", "References": "<20260213225254.2544596-1-raymondmaoca@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "This commit introduces support for generating SMBIOS Type 9 (System Slot)\ntables using a hybrid approach:\n\n1. Explicit Device Tree definitions:\n Child node under '/smbios/smbios/system-slot' will be interpreted as\n individual slot definitions.\n - Each child represents a slot (e.g., isa, pcmcia, etc.).\n - Properties follow the SMBIOS specification using lowercase\n hyphen-separated names such as 'slot-type', 'slot-id',\n 'segment-group-number', 'bus-number', 'slot-information', etc.\n - This approach allows full customization of each system slot and is\n especially suitable for platforms with well-defined slot topology.\n\n2. Automatic detection fallback:\n If child node under '/smbios/smbios/system-slot' does not exist, the\n implementation will scan the entire device tree for nodes whose\n 'device_type' matches known slot-related types (\"pci\", \"isa\", \"pcmcia\",\n etc.).\n - When a match is found, default values or heuristics are applied to\n populate to the System Slot table.\n - This mode is useful for platforms that lack explicit SMBIOS nodes\n but still expose slot topology via standard DT conventions.\n\nTogether, two approaches ensure that SMBIOS Type 9 entries are available\nwhether explicitly described or automatically derived.\n\nSigned-off-by: Raymond Mao <raymondmaoca@gmail.com>\n---\nChanges in v2:\n- Reuse sysinfo_to_dt and convert_sysinfo_to_dt() for mapping SMBIOS properties to DT.\nChanges in v3:\n- Update subject and commit message.\n- Abstract helper functions and add callback for writing subnodes.\nChanges in v4:\n- Refine the commit message.\nChanges in v5:\n- None.\nChanges in v6:\n- None.\n\n arch/arm/dts/smbios_generic.dtsi | 3 +\n cmd/smbios.c | 114 ++++++++++++\n include/smbios.h | 45 +++++\n include/smbios_def.h | 89 +++++++++\n lib/smbios.c | 301 ++++++++++++++++++++++++++++++-\n 5 files changed, 549 insertions(+), 3 deletions(-)", "diff": "diff --git a/arch/arm/dts/smbios_generic.dtsi b/arch/arm/dts/smbios_generic.dtsi\nindex fc168317c9e..4463dade217 100644\n--- a/arch/arm/dts/smbios_generic.dtsi\n+++ b/arch/arm/dts/smbios_generic.dtsi\n@@ -77,6 +77,9 @@\n \t\t\t\t\t\t SMBIOS_CACHE_OP_WB)>;\n \t\t\t\t};\n \t\t\t};\n+\n+\t\t\tsystem-slot {\n+\t\t\t};\n \t\t};\n \t};\n };\ndiff --git a/cmd/smbios.c b/cmd/smbios.c\nindex ed419f19028..f9b62e66229 100644\n--- a/cmd/smbios.c\n+++ b/cmd/smbios.c\n@@ -119,6 +119,55 @@ static const struct str_lookup_table associativity_strings[] = {\n \n };\n \n+static const struct str_lookup_table slot_type_strings[] = {\n+\t{ SMBIOS_SYSSLOT_TYPE_OTHER,\t\t\"Other\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_UNKNOWN,\t\t\"Unknown\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_ISA,\t\t\"ISA\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCI,\t\t\"PCI\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCMCIA,\t\t\"PC Card (PCMCIA)\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIE,\t\t\"PCI Express\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIEGEN2,\t\t\"PCI Express Gen 2\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIEGEN3,\t\t\"PCI Express Gen 3\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIEGEN3X16,\t\"PCI Express Gen 3 x16\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIEGEN4,\t\t\"PCI Express Gen 4\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIEGEN4X8,\t\"PCI Express Gen 4 x8\" },\n+\t{ SMBIOS_SYSSLOT_TYPE_PCIEGEN4X16,\t\"PCI Express Gen 4 x16\" },\n+};\n+\n+static const struct str_lookup_table slot_bus_width_strings[] = {\n+\t{ SMBIOS_SYSSLOT_WIDTH_OTHER,\t\"Other\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_UNKNOWN,\t\"Unknown\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_8BIT,\t\"8 bit\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_16BIT,\t\"16 bit\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_32BIT,\t\"32 bit\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_64BIT,\t\"64 bit\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_128BIT,\t\"128 bit \" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_1X,\t\"1x or x1\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_2X,\t\"2x or x2\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_4X,\t\"4x or x4\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_8X,\t\"8x or x8\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_12X,\t\"12x or x12\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_16X,\t\"16x or x16\" },\n+\t{ SMBIOS_SYSSLOT_WIDTH_32X,\t\"32x or x32\" },\n+};\n+\n+static const struct str_lookup_table slot_usage_strings[] = {\n+\t{ SMBIOS_SYSSLOT_USAGE_OTHER,\t\t\"Other\" },\n+\t{ SMBIOS_SYSSLOT_USAGE_UNKNOWN,\t\t\"Unknown\" },\n+\t{ SMBIOS_SYSSLOT_USAGE_AVAILABLE,\t\"Available\" },\n+\t{ SMBIOS_SYSSLOT_USAGE_INUSE,\t\t\"In use\" },\n+\t{ SMBIOS_SYSSLOT_USAGE_NA,\t\t\"Unavailable\" },\n+};\n+\n+static const struct str_lookup_table slot_length_strings[] = {\n+\t{ SMBIOS_SYSSLOT_LENG_OTHER,\t\"Other\" },\n+\t{ SMBIOS_SYSSLOT_LENG_UNKNOWN,\t\"Unknown\" },\n+\t{ SMBIOS_SYSSLOT_LENG_SHORT,\t\"Short Length\" },\n+\t{ SMBIOS_SYSSLOT_LENG_LONG,\t\"Long Length\" },\n+\t{ SMBIOS_SYSSLOT_LENG_2_5INDRV,\t\"2.5 inch drive form factor\" },\n+\t{ SMBIOS_SYSSLOT_LENG_3_5INDRV,\t\"3.5 inch drive form factor\" },\n+};\n+\n /**\n * smbios_get_string() - get SMBIOS string from table\n *\n@@ -403,6 +452,68 @@ static void smbios_print_type7(struct smbios_type7 *table)\n \tprintf(\"\\tInstalled Cache Size 2: 0x%08x\\n\", table->inst_size2.data);\n }\n \n+static void smbios_print_type9(struct smbios_type9 *table)\n+{\n+\tint i;\n+\tu8 *addr = (u8 *)table +\n+\t\t offsetof(struct smbios_type9, slot_information);\n+\n+\tprintf(\"System Slots:\\n\");\n+\tsmbios_print_str(\"Socket Designation\", table,\n+\t\t\t table->socket_design);\n+\tsmbios_print_lookup_str(slot_type_strings,\n+\t\t\t\ttable->slot_type,\n+\t\t\t\tARRAY_SIZE(slot_type_strings),\n+\t\t\t\t\"Slot Type\");\n+\tsmbios_print_lookup_str(slot_bus_width_strings,\n+\t\t\t\ttable->slot_data_bus_width,\n+\t\t\t\tARRAY_SIZE(slot_bus_width_strings),\n+\t\t\t\t\"Slot Data Bus Width\");\n+\tsmbios_print_lookup_str(slot_usage_strings,\n+\t\t\t\ttable->current_usage,\n+\t\t\t\tARRAY_SIZE(slot_usage_strings),\n+\t\t\t\t\"Current Usage\");\n+\tsmbios_print_lookup_str(slot_length_strings,\n+\t\t\t\ttable->slot_length,\n+\t\t\t\tARRAY_SIZE(slot_length_strings),\n+\t\t\t\t\"Slot Length\");\n+\tprintf(\"\\tSlot ID: 0x%04x\\n\", table->slot_id);\n+\tprintf(\"\\tSlot Characteristics 1: 0x%04x\\n\",\n+\t table->slot_characteristics_1);\n+\tprintf(\"\\tSlot Characteristics 2: 0x%04x\\n\",\n+\t table->slot_characteristics_2);\n+\tprintf(\"\\tSegment Group Number (Base): 0x%04x\\n\",\n+\t table->segment_group_number);\n+\tprintf(\"\\tBus Number (Base): 0x%04x\\n\", table->bus_number);\n+\tprintf(\"\\tDevice/Function Number (Base): 0x%04x\\n\",\n+\t table->device_function_number.data);\n+\tprintf(\"\\tData Bus Width (Base): 0x%04x\\n\",\n+\t table->electrical_bus_width);\n+\tprintf(\"\\tPeer (S/B/D/F/Width) grouping count: 0x%04x\\n\",\n+\t table->peer_grouping_count);\n+\tprintf(\"\\tPeer (S/B/D/F/Width) groups:\\n\");\n+\tfor (i = 0; i < table->peer_grouping_count; i++) {\n+\t\tprintf(\"\\t\\tPeer group[%03d]:\\n\", i);\n+\t\tif (CONFIG_IS_ENABLED(HEXDUMP))\n+\t\t\tprint_hex_dump(\"\\t\\t\", DUMP_PREFIX_OFFSET, 16, 1, addr,\n+\t\t\t\t SMBIOS_TYPE9_PGROUP_SIZE, false);\n+\t\taddr += SMBIOS_TYPE9_PGROUP_SIZE;\n+\t}\n+\tprintf(\"\\n\");\n+\n+\t/* table->slot_information */\n+\tprintf(\"\\tSlot Information: 0x%04x\\n\", *addr);\n+\t/* table->slot_physical_width */\n+\taddr += sizeof(table->slot_information);\n+\tprintf(\"\\tSlot Physical Width: 0x%04x\\n\", *addr);\n+\t/* table->slot_pitch */\n+\taddr += sizeof(table->slot_physical_width);\n+\tprintf(\"\\tSlot Pitch: 0x%04x\\n\", *(u16 *)addr);\n+\t/* table->slot_height */\n+\taddr += sizeof(table->slot_pitch);\n+\tprintf(\"\\tSlot Height: 0x%04x\\n\", *addr);\n+}\n+\n static void smbios_print_type127(struct smbios_type127 *table)\n {\n \tprintf(\"End Of Table\\n\");\n@@ -482,6 +593,9 @@ static int do_smbios(struct cmd_tbl *cmdtp, int flag, int argc,\n \t\tcase SMBIOS_CACHE_INFORMATION:\n \t\t\tsmbios_print_type7((struct smbios_type7 *)pos);\n \t\t\tbreak;\n+\t\tcase SMBIOS_SYSTEM_SLOTS:\n+\t\t\tsmbios_print_type9((struct smbios_type9 *)pos);\n+\t\t\tbreak;\n \t\tcase SMBIOS_END_OF_TABLE:\n \t\t\tsmbios_print_type127((struct smbios_type127 *)pos);\n \t\t\tbreak;\ndiff --git a/include/smbios.h b/include/smbios.h\nindex f2f7483bce5..752a25250d3 100644\n--- a/include/smbios.h\n+++ b/include/smbios.h\n@@ -264,6 +264,51 @@ struct __packed smbios_type7 {\n \tchar eos[SMBIOS_STRUCT_EOS_BYTES];\n };\n \n+#define SMBIOS_TYPE9_PGROUP_SIZE 5\n+\n+struct pci_attr_lookup_table {\n+\tconst char *str;\n+\tu8 slot_type;\n+\tu8 data_bus_width;\n+\tu8 slot_length;\n+\tu8 chara1;\n+\tu8 chara2;\n+};\n+\n+union dev_func_num {\n+\tstruct {\n+\t\tu8 dev_num:5;\n+\t\tu8 func_num:3;\n+\t} fields;\n+\tu8 data;\n+};\n+\n+struct __packed smbios_type9 {\n+\tstruct smbios_header hdr;\n+\tu8 socket_design;\n+\tu8 slot_type;\n+\tu8 slot_data_bus_width;\n+\tu8 current_usage;\n+\tu8 slot_length;\n+\tu16 slot_id;\n+\tu8 slot_characteristics_1;\n+\tu8 slot_characteristics_2;\n+\tu16 segment_group_number;\n+\tu8 bus_number;\n+\tunion dev_func_num device_function_number;\n+\tu8 electrical_bus_width;\n+\tu8 peer_grouping_count;\n+\t/*\n+\t * Dynamic bytes will be inserted here to store peer_groups.\n+\t * length is equal to 'peer_grouping_count' * 5\n+\t */\n+\tu8 slot_information;\n+\tu8 slot_physical_width;\n+\tu16 slot_pitch;\n+\tu8 slot_height;\n+\tchar eos[SMBIOS_STRUCT_EOS_BYTES];\n+};\n+\n struct __packed smbios_type32 {\n \tu8 type;\n \tu8 length;\ndiff --git a/include/smbios_def.h b/include/smbios_def.h\nindex 81c5781217f..ef9cb02ed25 100644\n--- a/include/smbios_def.h\n+++ b/include/smbios_def.h\n@@ -191,4 +191,93 @@\n #define SMBIOS_CACHE_ASSOC_64WAY\t13\n #define SMBIOS_CACHE_ASSOC_20WAY\t14\n \n+/*\n+ * System Slot\n+ */\n+\n+/* Slot Type */\n+#define SMBIOS_SYSSLOT_TYPE_OTHER\t1\n+#define SMBIOS_SYSSLOT_TYPE_UNKNOWN\t2\n+#define SMBIOS_SYSSLOT_TYPE_ISA\t\t3\t/* ISA */\n+#define SMBIOS_SYSSLOT_TYPE_PCI\t\t6\t/* PCI */\n+#define SMBIOS_SYSSLOT_TYPE_PCMCIA\t7\t/* PCMCIA */\n+#define SMBIOS_SYSSLOT_TYPE_PCIE\t0xa5\t/* PCI Express */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEX1\t0xa6\t/* PCI Express x1 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEX2\t0xa7\t/* PCI Express x2 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEX4\t0xa8\t/* PCI Express x4 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEX8\t0xa9\t/* PCI Express x8 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEX16\t0xaa\t/* PCI Express x16 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN2\t0xab\t/* PCI Express Gen 2 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN2X1\t0xac\t/* PCI Express Gen 2 x1 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN2X2\t0xad\t/* PCI Express Gen 2 x2 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN2X4\t0xae\t/* PCI Express Gen 2 x4 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN2X8\t0xaf\t/* PCI Express Gen 2 x8 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN2X16\t0xb0\t/* PCI Express Gen 2 x16 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN3\t0xb1\t/* PCI Express Gen 3 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN3X1\t0xb2\t/* PCI Express Gen 3 x1 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN3X2\t0xb3\t/* PCI Express Gen 3 x2 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN3X4\t0xb4\t/* PCI Express Gen 3 x4 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN3X8\t0xb5\t/* PCI Express Gen 3 x8 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN3X16\t0xb6\t/* PCI Express Gen 3 x16 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN4\t0xb8\t/* PCI Express Gen 4 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN4X1\t0xb9\t/* PCI Express Gen 4 x1 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN4X2\t0xba\t/* PCI Express Gen 4 x2 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN4X4\t0xbb\t/* PCI Express Gen 4 x4 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN4X8\t0xbc\t/* PCI Express Gen 4 x8 */\n+#define SMBIOS_SYSSLOT_TYPE_PCIEGEN4X16\t0xbd\t/* PCI Express Gen 4 x16 */\n+\n+/* Slot Data Bus Width */\n+#define SMBIOS_SYSSLOT_WIDTH_OTHER\t1\n+#define SMBIOS_SYSSLOT_WIDTH_UNKNOWN\t2\n+#define SMBIOS_SYSSLOT_WIDTH_8BIT\t3\n+#define SMBIOS_SYSSLOT_WIDTH_16BIT\t4\n+#define SMBIOS_SYSSLOT_WIDTH_32BIT\t5\n+#define SMBIOS_SYSSLOT_WIDTH_64BIT\t6\n+#define SMBIOS_SYSSLOT_WIDTH_128BIT\t7\n+#define SMBIOS_SYSSLOT_WIDTH_1X\t\t8\n+#define SMBIOS_SYSSLOT_WIDTH_2X\t\t9\n+#define SMBIOS_SYSSLOT_WIDTH_4X\t\t10\n+#define SMBIOS_SYSSLOT_WIDTH_8X\t\t11\n+#define SMBIOS_SYSSLOT_WIDTH_12X\t12\n+#define SMBIOS_SYSSLOT_WIDTH_16X\t13\n+#define SMBIOS_SYSSLOT_WIDTH_32X\t14\n+\n+/* Current Usage */\n+#define SMBIOS_SYSSLOT_USAGE_OTHER\t1\n+#define SMBIOS_SYSSLOT_USAGE_UNKNOWN\t2\n+#define SMBIOS_SYSSLOT_USAGE_AVAILABLE\t3\n+#define SMBIOS_SYSSLOT_USAGE_INUSE\t4\n+#define SMBIOS_SYSSLOT_USAGE_NA\t\t5\n+\n+/* Slot Length */\n+#define SMBIOS_SYSSLOT_LENG_OTHER\t1\n+#define SMBIOS_SYSSLOT_LENG_UNKNOWN\t2\n+#define SMBIOS_SYSSLOT_LENG_SHORT\t3\n+#define SMBIOS_SYSSLOT_LENG_LONG\t4\n+#define SMBIOS_SYSSLOT_LENG_2_5INDRV\t5\n+#define SMBIOS_SYSSLOT_LENG_3_5INDRV\t6\n+\n+/* Slot Characteristics 1 */\n+#define SMBIOS_SYSSLOT_CHAR_UND\t\t1 /* BIT(0) */\n+#define SMBIOS_SYSSLOT_CHAR_5V\t\t2 /* BIT(1) */\n+#define SMBIOS_SYSSLOT_CHAR_3_3V\t4 /* BIT(2) */\n+#define SMBIOS_SYSSLOT_CHAR_SHARED\t8 /* BIT(3) */\n+#define SMBIOS_SYSSLOT_CHAR_PCCARD16\t16 /* BIT(4) */\n+#define SMBIOS_SYSSLOT_CHAR_PCCARDBUS\t32 /* BIT(5) */\n+#define SMBIOS_SYSSLOT_CHAR_PCCARDZV\t64 /* BIT(6) */\n+#define SMBIOS_SYSSLOT_CHAR_PCCARDMRR\t0x80 /* BIT(7) */\n+\n+/* Slot Characteristics 2 */\n+#define SMBIOS_SYSSLOT_CHAR_PCIPME\t1 /* BIT(0) */\n+#define SMBIOS_SYSSLOT_CHAR_HOTPLUG\t2 /* BIT(1) */\n+#define SMBIOS_SYSSLOT_CHAR_PCISMB\t4 /* BIT(2) */\n+#define SMBIOS_SYSSLOT_CHAR_PCIBIF\t8 /* BIT(3) */\n+#define SMBIOS_SYSSLOT_CHAR_ASYNCRM\t16 /* BIT(4) */\n+#define SMBIOS_SYSSLOT_CHAR_FBCXL1\t32 /* BIT(5) */\n+#define SMBIOS_SYSSLOT_CHAR_FBCXL2\t64 /* BIT(6) */\n+#define SMBIOS_SYSSLOT_CHAR_FBCXL3\t0x80 /* BIT(7) */\n+\n+/* Slot segment group number */\n+#define SMBIOS_SYSSLOT_SGGNUM_UND\t0\n+\n #endif /* _SMBIOS_DEF_H_ */\ndiff --git a/lib/smbios.c b/lib/smbios.c\nindex 85508c06547..caeb309294d 100644\n--- a/lib/smbios.c\n+++ b/lib/smbios.c\n@@ -66,11 +66,47 @@ struct map_sysinfo {\n \n static const struct map_sysinfo sysinfo_to_dt[] = {\n \t{ .si_node = \"system\", .si_str = \"product\", .dt_str = \"model\", 2 },\n-\t{ .si_node = \"system\", .si_str = \"manufacturer\", .dt_str = \"compatible\", 1 },\n-\t{ .si_node = \"baseboard\", .si_str = \"product\", .dt_str = \"model\", 2 },\n-\t{ .si_node = \"baseboard\", .si_str = \"manufacturer\", .dt_str = \"compatible\", 1 },\n+\t{ .si_node = \"system\", .si_str = \"manufacturer\",\n+\t .dt_str = \"compatible\", 1 },\n+\t{ .si_node = \"baseboard\", .si_str = \"product\",\n+\t .dt_str = \"model\", 2 },\n+\t{ .si_node = \"baseboard\", .si_str = \"manufacturer\",\n+\t .dt_str = \"compatible\", 1 },\n+\t{ .si_node = \"system-slot\", .si_str = \"slot-type\",\n+\t .dt_str = \"device_type\", 0},\n+\t{ .si_node = \"system-slot\", .si_str = \"segment-group-number\",\n+\t .dt_str = \"linux,pci-domain\", 0},\n };\n \n+#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE)\n+static const struct pci_attr_lookup_table pci_attr[] = {\n+\t{ \"pci-host-ecam-generic\", SMBIOS_SYSSLOT_TYPE_PCIE,\n+\t SMBIOS_SYSSLOT_WIDTH_8X, SMBIOS_SYSSLOT_LENG_LONG,\n+\t SMBIOS_SYSSLOT_CHAR_3_3V, SMBIOS_SYSSLOT_CHAR_PCIPME },\n+\t{ \"pci-host-cam-generic\", SMBIOS_SYSSLOT_TYPE_PCI,\n+\t SMBIOS_SYSSLOT_WIDTH_32BIT, SMBIOS_SYSSLOT_LENG_SHORT,\n+\t SMBIOS_SYSSLOT_CHAR_5V | SMBIOS_SYSSLOT_CHAR_3_3V,\n+\t SMBIOS_SYSSLOT_CHAR_PCIPME },\n+\t{ \"pci-host-thunder-ecam\", SMBIOS_SYSSLOT_TYPE_PCIEGEN3,\n+\t SMBIOS_SYSSLOT_WIDTH_8X, SMBIOS_SYSSLOT_LENG_LONG,\n+\t SMBIOS_SYSSLOT_CHAR_3_3V,\n+\t SMBIOS_SYSSLOT_CHAR_PCIPME | SMBIOS_SYSSLOT_CHAR_HOTPLUG },\n+\t{ \"pci-host-octeontx-ecam\", SMBIOS_SYSSLOT_TYPE_PCIEGEN3X16,\n+\t SMBIOS_SYSSLOT_WIDTH_16X, SMBIOS_SYSSLOT_LENG_LONG,\n+\t SMBIOS_SYSSLOT_CHAR_3_3V,\n+\t SMBIOS_SYSSLOT_CHAR_PCIPME | SMBIOS_SYSSLOT_CHAR_HOTPLUG },\n+\t{ \"pci-host-thunder-pem\", SMBIOS_SYSSLOT_TYPE_PCIEGEN4X8,\n+\t SMBIOS_SYSSLOT_WIDTH_8X, SMBIOS_SYSSLOT_LENG_LONG,\n+\t SMBIOS_SYSSLOT_CHAR_3_3V,\n+\t SMBIOS_SYSSLOT_CHAR_PCIPME | SMBIOS_SYSSLOT_CHAR_HOTPLUG },\n+\t{ \"pci-host-octeontx2-pem\", SMBIOS_SYSSLOT_TYPE_PCIEGEN4X16,\n+\t SMBIOS_SYSSLOT_WIDTH_16X, SMBIOS_SYSSLOT_LENG_LONG,\n+\t SMBIOS_SYSSLOT_CHAR_3_3V,\n+\t SMBIOS_SYSSLOT_CHAR_PCIPME | SMBIOS_SYSSLOT_CHAR_HOTPLUG |\n+\t SMBIOS_SYSSLOT_CHAR_PCIBIF },\n+};\n+#endif\n+\n /**\n * struct smbios_ctx - context for writing SMBIOS tables\n *\n@@ -95,6 +131,10 @@ struct smbios_ctx {\n \tchar *last_str;\n };\n \n+typedef int (*smbios_write_subnode)(ulong *current, int handle,\n+\t\t\t\t struct smbios_ctx *ctx, int idx,\n+\t\t\t\t int type);\n+\n /**\n * Function prototype to write a specific type of SMBIOS structure\n *\n@@ -222,6 +262,7 @@ static int smbios_get_val_si(struct smbios_ctx * __maybe_unused ctx,\n {\n #if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE)\n \tint val;\n+\tconst struct map_sysinfo *nprop;\n \n \tif (!ctx->dev)\n \t\treturn val_def;\n@@ -240,6 +281,11 @@ static int smbios_get_val_si(struct smbios_ctx * __maybe_unused ctx,\n \t */\n \tif (!ofnode_read_u32(ofnode_root(), prop, &val))\n \t\treturn val;\n+\n+\t/* If the node is still missing, try with the mapping values */\n+\tnprop = convert_sysinfo_to_dt(ctx->subnode_name, prop);\n+\tif (!ofnode_read_u32(ofnode_root(), nprop->dt_str, &val))\n+\t\treturn val;\n #endif\n \treturn val_def;\n }\n@@ -859,6 +905,252 @@ static int smbios_write_type7(ulong *current, int *handle,\n \treturn len;\n }\n \n+static int smbios_scan_subnodes(ulong *current, struct smbios_ctx *ctx,\n+\t\t\t\tint *handle, smbios_write_subnode cb, int type)\n+{\n+\tofnode child;\n+\tint i;\n+\tint hdl_base = *handle;\n+\tint len = 0;\n+\tstruct smbios_ctx ctx_bak;\n+\n+\tmemcpy(&ctx_bak, ctx, sizeof(ctx_bak));\n+\n+\tfor (i = 0, child = ofnode_first_subnode(ctx->node);\n+\t ofnode_valid(child); child = ofnode_next_subnode(child), i++) {\n+\t\tctx->node = child;\n+\t\t*handle = hdl_base + i;\n+\t\tlen += cb(current, *handle, ctx, i, type);\n+\t\tmemcpy(ctx, &ctx_bak, sizeof(*ctx));\n+\t}\n+\n+\treturn len;\n+}\n+\n+static void smbios_lookup_pci_attr(struct smbios_ctx *ctx,\n+\t\t\t\t struct smbios_type9 *t)\n+{\n+\tconst char *compatible;\n+\tu32 addr_cells, size_cells, total_cells;\n+\tconst fdt32_t *reg;\n+\tint reglen;\n+\tint i;\n+\n+\t/* default attributes */\n+\tt->slot_type = SMBIOS_SYSSLOT_TYPE_PCI;\n+\tt->slot_data_bus_width = SMBIOS_SYSSLOT_WIDTH_UNKNOWN;\n+\tt->slot_characteristics_1 = SMBIOS_SYSSLOT_CHAR_UND;\n+\tt->current_usage = SMBIOS_SYSSLOT_USAGE_UNKNOWN;\n+\tt->slot_length = SMBIOS_SYSSLOT_LENG_UNKNOWN;\n+\tt->segment_group_number = smbios_get_val_si(ctx, \"segment-group-number\",\n+\t\t\t\t\t\t SYSID_NONE,\n+\t\t\t\t\t\t SMBIOS_SYSSLOT_SGGNUM_UND);\n+\n+\t/*\n+\t * Get #address-cells and #size-cells dynamically\n+\t * Default 3 for #address-cells and 2 for #size-cells\n+\t */\n+\taddr_cells = ofnode_read_u32_default(ctx->node, \"#address-cells\", 3);\n+\tsize_cells = ofnode_read_u32_default(ctx->node, \"#size-cells\", 2);\n+\ttotal_cells = addr_cells + size_cells;\n+\n+\t/* Read property 'reg' from the node */\n+\treg = ofnode_read_prop(ctx->node, \"reg\", ®len);\n+\tif (reg && reglen > addr_cells * sizeof(*reg)) {\n+\t\t/* First address-cell: Bus Number */\n+\t\tif (addr_cells >= 1)\n+\t\t\tt->bus_number = fdt32_to_cpu(reg[0]);\n+\t\t/* Second address-cell: Device/Function */\n+\t\tif (addr_cells >= 2)\n+\t\t\tt->device_function_number.data = fdt32_to_cpu(reg[1]);\n+\t\t/*\n+\t\t * Third address-cell 'Register Offset' and the following\n+\t\t * size-cell bytes are not useful for SMBIOS type 9, just\n+\t\t * ignore them.\n+\t\t */\n+\t\t/*\n+\t\t * As neither PCI IRQ Routing Table ($PIRQ) nor FDT\n+\t\t * property to represent a Slot ID, try to derive a\n+\t\t * Slot ID programmatically.\n+\t\t */\n+\t\tt->slot_id = t->device_function_number.fields.dev_num |\n+\t\t\t (t->bus_number << 5);\n+\t}\n+\n+\t/* Read 'compatible' property */\n+\tcompatible = ofnode_read_string(ctx->node, \"compatible\");\n+\tif (!compatible)\n+\t\treturn;\n+\n+\tfor (i = 0; i < ARRAY_SIZE(pci_attr); i++) {\n+\t\tif (strstr(compatible, pci_attr[i].str)) {\n+\t\t\tt->slot_type = pci_attr[i].slot_type;\n+\t\t\tt->slot_data_bus_width = pci_attr[i].data_bus_width;\n+\t\t\tt->slot_length = pci_attr[i].slot_length;\n+\t\t\tt->slot_characteristics_1 = pci_attr[i].chara1;\n+\t\t\tt->slot_characteristics_2 = pci_attr[i].chara2;\n+\t\t\t/* mark it as in-use arbitrarily */\n+\t\t\tt->current_usage = SMBIOS_SYSSLOT_USAGE_INUSE;\n+\t\t\treturn;\n+\t\t}\n+\t}\n+}\n+\n+static void smbios_write_type9_fields(struct smbios_ctx *ctx,\n+\t\t\t\t struct smbios_type9 *t)\n+{\n+\tt->slot_type = smbios_get_val_si(ctx, \"slot-type\", SYSID_NONE,\n+\t\t\t\t\t SMBIOS_SYSSLOT_TYPE_UNKNOWN);\n+\tt->slot_data_bus_width =\n+\t\tsmbios_get_val_si(ctx, \"data-bus-width\",\n+\t\t\t\t SYSID_NONE, SMBIOS_SYSSLOT_WIDTH_UNKNOWN);\n+\tt->current_usage = smbios_get_val_si(ctx, \"current-usage\", SYSID_NONE,\n+\t\t\t\t\t SMBIOS_SYSSLOT_USAGE_UNKNOWN);\n+\tt->slot_length = smbios_get_val_si(ctx, \"slot-length\", SYSID_NONE,\n+\t\t\t\t\t SMBIOS_SYSSLOT_LENG_UNKNOWN);\n+\tt->slot_id = smbios_get_val_si(ctx, \"slot-id\", SYSID_NONE, 0);\n+\tt->slot_characteristics_1 =\n+\t\tsmbios_get_val_si(ctx, \"slot-characteristics-1\", SYSID_NONE,\n+\t\t\t\t SMBIOS_SYSSLOT_CHAR_UND);\n+\tt->slot_characteristics_2 = smbios_get_val_si(ctx,\n+\t\t\t\t\t\t \"slot-characteristics-2\",\n+\t\t\t\t\t\t SYSID_NONE, 0);\n+\tt->segment_group_number = smbios_get_val_si(ctx, \"segment-group-number\",\n+\t\t\t\t\t\t SYSID_NONE, 0);\n+\tt->bus_number = smbios_get_val_si(ctx, \"bus-number\", SYSID_NONE, 0);\n+\tt->device_function_number.data =\n+\t\tsmbios_get_val_si(ctx, \"device-function-number\", SYSID_NONE, 0);\n+}\n+\n+static int smbios_write_type9_1slot(ulong *current, int handle,\n+\t\t\t\t struct smbios_ctx *ctx,\n+\t\t\t\t int __maybe_unused idx, int devtype)\n+{\n+\tstruct smbios_type9 *t;\n+\tint len = sizeof(*t);\n+\tu8 pgroups_cnt;\n+\tu8 *eos_addr;\n+\tsize_t pgroups_size;\n+\tvoid *wp;\n+\n+\tpgroups_cnt = smbios_get_val_si(ctx, \"peer-grouping-count\",\n+\t\t\t\t\tSYSID_NONE, 0);\n+\tpgroups_size = pgroups_cnt * SMBIOS_TYPE9_PGROUP_SIZE;\n+\n+\t/*\n+\t * reserve the space for the dynamic bytes of peer_groups.\n+\t * TODO:\n+\t * peer_groups = <peer_grouping_count> * SMBIOS_TYPE9_PGROUP_SIZE\n+\t */\n+\tlen += pgroups_size;\n+\n+\tt = map_sysmem(*current, len);\n+\tmemset(t, 0, len);\n+\n+\tfill_smbios_header(t, SMBIOS_SYSTEM_SLOTS, len, handle);\n+\n+\t/* eos is at the end of the structure */\n+\teos_addr = (u8 *)t + len - sizeof(t->eos);\n+\tsmbios_set_eos(ctx, eos_addr);\n+\n+\t/* Write the general fields */\n+\tt->peer_grouping_count = pgroups_cnt;\n+\tt->socket_design = smbios_add_prop_si(ctx, \"socket-design\", SYSID_NONE,\n+\t\t\t\t\t NULL);\n+\tt->electrical_bus_width = smbios_get_val_si(ctx, \"data-bus-width\",\n+\t\t\t\t\t\t SYSID_NONE, 0);\n+\n+\t/* skip the reserved peer groups and write the following fields from eos */\n+\t/* t->slot_height */\n+\twp = eos_addr - sizeof(t->slot_height);\n+\t*((u8 *)wp) = smbios_get_val_si(ctx, \"slot-height\", SYSID_NONE, 0);\n+\t/* t->slot_pitch */\n+\twp -= sizeof(t->slot_pitch);\n+\t*((u16 *)wp) = smbios_get_val_si(ctx, \"slot-pitch\", SYSID_NONE, 0);\n+\t/* t->slot_physical_width */\n+\twp -= sizeof(t->slot_physical_width);\n+\t*((u8 *)wp) = smbios_get_val_si(ctx, \"slot-physical-width\", SYSID_NONE, 0);\n+\t/* t->slot_information */\n+\twp -= sizeof(t->slot_information);\n+\t*((u8 *)wp) = smbios_get_val_si(ctx, \"slot-information\", SYSID_NONE, 0);\n+\n+\t/* For PCI, some fields can be extracted from FDT node */\n+\tif (devtype == SMBIOS_SYSSLOT_TYPE_PCI)\n+\t\t/* Populate PCI attributes from existing PCI properties */\n+\t\tsmbios_lookup_pci_attr(ctx, t);\n+\telse if (devtype == SMBIOS_SYSSLOT_TYPE_UNKNOWN) {\n+\t\t/* Properties that expected in smbios subnode 'system-slot' */\n+\t\tsmbios_write_type9_fields(ctx, t);\n+\t}\n+\tlen = t->hdr.length + smbios_string_table_len(ctx);\n+\t*current += len;\n+\tunmap_sysmem(t);\n+\n+\treturn len;\n+}\n+\n+static int smbios_scan_slot_type(ulong *current, int *handle,\n+\t\t\t\t struct smbios_ctx *ctx)\n+{\n+\tint i = 0;\n+\tstruct smbios_ctx ctx_bak;\n+\tofnode child;\n+\tconst struct map_sysinfo *prop;\n+\tint hdl_base = *handle;\n+\tint len = 0;\n+\n+\tmemcpy(&ctx_bak, ctx, sizeof(ctx_bak));\n+\tprop = convert_sysinfo_to_dt(ctx->subnode_name, \"slot-type\");\n+\tfor (child = ofnode_first_subnode(ofnode_root()); ofnode_valid(child);\n+\t child = ofnode_next_subnode(child)) {\n+\t\tconst char *dev_type_str;\n+\t\tu8 dev_type = SMBIOS_SYSSLOT_TYPE_UNKNOWN;\n+\n+\t\tdev_type_str = ofnode_read_string(child, prop->dt_str);\n+\t\tif (!dev_type_str)\n+\t\t\tcontinue;\n+\n+\t\tif (!strcmp(dev_type_str, \"pci\"))\n+\t\t\tdev_type = SMBIOS_SYSSLOT_TYPE_PCI;\n+\t\telse if (!strcmp(dev_type_str, \"isa\"))\n+\t\t\tdev_type = SMBIOS_SYSSLOT_TYPE_ISA;\n+\t\telse if (!strcmp(dev_type_str, \"pcmcia\"))\n+\t\t\tdev_type = SMBIOS_SYSSLOT_TYPE_PCMCIA;\n+\t\telse\n+\t\t\tcontinue;\n+\n+\t\t*handle = hdl_base + i;\n+\t\tctx->node = child;\n+\t\tlen += smbios_write_type9_1slot(current, *handle, ctx, 0,\n+\t\t\t\t\t\tdev_type);\n+\t\tmemcpy(ctx, &ctx_bak, sizeof(*ctx));\n+\t\ti++;\n+\t}\n+\n+\treturn len;\n+}\n+\n+static int smbios_write_type9(ulong *current, int *handle,\n+\t\t\t struct smbios_ctx *ctx)\n+{\n+\tint len;\n+\n+\t/* TODO: Get system slot information via pci subsystem */\n+\tif (!IS_ENABLED(CONFIG_OF_CONTROL))\n+\t\treturn 0;\t/* Error, return 0-length */\n+\n+\tlen = smbios_scan_subnodes(current, ctx, handle,\n+\t\t\t\t smbios_write_type9_1slot,\n+\t\t\t\t SMBIOS_SYSSLOT_TYPE_UNKNOWN);\n+\tif (len)\n+\t\treturn len;\n+\n+\t/* if no subnode under 'system-slot', try scan the entire FDT */\n+\tlen = smbios_scan_slot_type(current, handle, ctx);\n+\n+\treturn len;\n+}\n+\n #endif /* #if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE) */\n \n static int smbios_write_type32(ulong *current, int *handle,\n@@ -905,6 +1197,9 @@ static struct smbios_write_method smbios_write_funcs[] = {\n \t{ smbios_write_type7, \"cache\", },\n #endif\n \t{ smbios_write_type4, \"processor\"},\n+#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE)\n+\t{ smbios_write_type9, \"system-slot\"},\n+#endif\n \t{ smbios_write_type32, },\n \t{ smbios_write_type127 },\n };\n", "prefixes": [ "v6", "2/6" ] }