From nobody Fri Apr 3 10:51:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAE0D2E11C7 for ; Sat, 7 Mar 2026 14:10:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892631; cv=none; b=bPZMfNXhX7pVomiubaraN2Gtj2lFUiYEHceXU6YMK6L2qQUBu34R44ZO2e22xH8HhOlnnxOSg0agOkz2boSYRy3sSoX2CUnZHUqBXgoeKBYgcIXvIfwEZRaCZAyN0Q/PuS3mIucsv61nAZKTHJqaHTO04m3LVFBYZseIhuYfcPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892631; c=relaxed/simple; bh=pgdDW7ireEglwKas2aLd68lH+FyAl9F3znhco8U5X7k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lQjDcUb4GPe4JbFD59D62hUE7Swoh6KNBYrxK3P+EQxW35/69NAmD6hu56FgvJgrHNVrXQyZ5hcM5FaBdpDesiex7YZ7a8unPDF2D+Zy4g/RDXewD1jRVF8vlG61ovHzx3jM2EI39sgrowCjCiq9bQ/nCwFlCCyF+dmQ2EpA+58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bA7TE79K; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bA7TE79K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34D3DC2BC86; Sat, 7 Mar 2026 14:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772892631; bh=pgdDW7ireEglwKas2aLd68lH+FyAl9F3znhco8U5X7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bA7TE79KV10qHDuEr/dGFFDMz/FC0RJ1B01blUTrgisKGiHPrmPJMXHNtsR4H+lTq YQSaUNuGzvXOfb/WVOm377bhHBhwiUeB7YnyyjHJhQE127a7lhoByH8UcAfyQahIHq ky+pl/Izbed4MSFLitiwLNXrloJ9T+88wCCV+FVoq78rizw8DcSS49QiNMayGd4eEZ nozCv3uRl/6mhx8pnGkyMsNzHcp0n00HO1UU6ATPTU2Q1n0EC3m8Aj/MIFvkXeKFUw 2Husm5SEO8dz+lmpd1/SEn6cckzXwSowz8tiv1QI/adlINc4OLCEg7WEraFdDiYjkJ WH0GvJcjRsRYQ== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v6 1/5] firmware: dmi: Correct an indexing error in dmi.h Date: Sat, 7 Mar 2026 08:10:20 -0600 Message-ID: <20260307141024.819807-2-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260307141024.819807-1-superm1@kernel.org> References: <20260307141024.819807-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The entries later in `enum dmi_entry_type` don't match the SMBIOS specification. The entry for type 33: `64-Bit Memory Error Information` is not present and thus the index for all later entries is incorrect. Add the missing type 33 entry. Fixes: 93c890dbe5287 ("firmware: Add DMI entry types to the headers") Link: https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_= 3.4.0a.pdf Reviewed-by: Yazen Ghannam Signed-off-by: Mario Limonciello (AMD) --- v3: * Rename to DMI_ENTRY_64_MEM_ERROR (Jean) --- include/linux/dmi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 927f8a8b7a1dd..32b2529a73301 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -60,6 +60,7 @@ enum dmi_entry_type { DMI_ENTRY_OOB_REMOTE_ACCESS, DMI_ENTRY_BIS_ENTRY, DMI_ENTRY_SYSTEM_BOOT, + DMI_ENTRY_64_MEM_ERROR, DMI_ENTRY_MGMT_DEV, DMI_ENTRY_MGMT_DEV_COMPONENT, DMI_ENTRY_MGMT_DEV_THRES, --=20 2.43.0 From nobody Fri Apr 3 10:51:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E285D2E7BB6 for ; Sat, 7 Mar 2026 14:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892633; cv=none; b=OZw3SE5o19ZRjxglxogBMbk5bWvMSOgQzYo9tkzSnRloeBzpa7FthNz+PMma8QIprZ/gz12/To67CTUp/XGGDOsJUvF1PvcH9+y1MkRV7vRF/Spkowk2coAtqVfjM98GdXfHsjQQ+3hN0YyqEoMKmCa2b7wycARHoxu0FcDBRfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892633; c=relaxed/simple; bh=84Y6ThfIpAkKLwZ9CuqzVP+MukiAI1efPplzFkCqGRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KzhcGzv9JZmB5P7roWiNcGzg4/dDoEdK533EAxT/kjU5Eptm5T/nHBeU2/Ano1QwZ5130tLB2G4a8Hk6lQ9E69XYumDHMp9qcvEJ+4BW3ffoRplalhDKDH5epzJcO3QIBj3OBs9jgEDSWMnhat0ciZ0Py160uzxE6vne07ClE6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mG29qwMj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mG29qwMj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09480C2BC86; Sat, 7 Mar 2026 14:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772892632; bh=84Y6ThfIpAkKLwZ9CuqzVP+MukiAI1efPplzFkCqGRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mG29qwMjicNRk0nvxiT8IiFIOG90zJAcjy2R0VbySz5IqdD71rUv2XgccwCveTqMv 4D24SBShIizRUQUhxPWiVb24E+HCNoTRbrPJbBKrVy2vIR2e9ebMCP0rp1X4PgTPpD HLftlTQ5DO5tzwFeNcM04PFv/km01eWKSPkzpRhh3L3ARMDEUbKS+jmjTUzaxouHdF HnIpK9dOEu2AK1vzPFwjWxugQAkp5kVJUBCEriW9FXAlAq2W3DKhmowcSvsJkwZ2Xd xgbOgoPjYpvFYKbSVaa8pf/xK+i8ggbIKWoqrDMOSiLWI+aXSmVZrgpcwFbNCcDtz9 kmbI8IOcPQNyw== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" , Jean Delvare Subject: [PATCH v6 2/5] firmware: dmi: Adjust dmi_decode() to use enums Date: Sat, 7 Mar 2026 08:10:21 -0600 Message-ID: <20260307141024.819807-3-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260307141024.819807-1-superm1@kernel.org> References: <20260307141024.819807-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" dmi_decode() has hardcoded values with comments for each DMI entry type. The same information is already in dmi.h though, so drop the comments and use the definitions instead. Reviewed-by: Jean Delvare Reviewed-by: Yazen Ghannam Signed-off-by: Mario Limonciello (AMD) --- v3: * pick up tag (Jean) --- drivers/firmware/dmi_scan.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 70d39adf50dca..80aded4c778bc 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -484,14 +484,14 @@ static void __init dmi_memdev_walk(void) static void __init dmi_decode(const struct dmi_header *dm, void *dummy) { switch (dm->type) { - case 0: /* BIOS Information */ + case DMI_ENTRY_BIOS: dmi_save_ident(dm, DMI_BIOS_VENDOR, 4); dmi_save_ident(dm, DMI_BIOS_VERSION, 5); dmi_save_ident(dm, DMI_BIOS_DATE, 8); dmi_save_release(dm, DMI_BIOS_RELEASE, 21); dmi_save_release(dm, DMI_EC_FIRMWARE_RELEASE, 23); break; - case 1: /* System Information */ + case DMI_ENTRY_SYSTEM: dmi_save_ident(dm, DMI_SYS_VENDOR, 4); dmi_save_ident(dm, DMI_PRODUCT_NAME, 5); dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6); @@ -500,33 +500,33 @@ static void __init dmi_decode(const struct dmi_header= *dm, void *dummy) dmi_save_ident(dm, DMI_PRODUCT_SKU, 25); dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26); break; - case 2: /* Base Board Information */ + case DMI_ENTRY_BASEBOARD: dmi_save_ident(dm, DMI_BOARD_VENDOR, 4); dmi_save_ident(dm, DMI_BOARD_NAME, 5); dmi_save_ident(dm, DMI_BOARD_VERSION, 6); dmi_save_ident(dm, DMI_BOARD_SERIAL, 7); dmi_save_ident(dm, DMI_BOARD_ASSET_TAG, 8); break; - case 3: /* Chassis Information */ + case DMI_ENTRY_CHASSIS: dmi_save_ident(dm, DMI_CHASSIS_VENDOR, 4); dmi_save_type(dm, DMI_CHASSIS_TYPE, 5); dmi_save_ident(dm, DMI_CHASSIS_VERSION, 6); dmi_save_ident(dm, DMI_CHASSIS_SERIAL, 7); dmi_save_ident(dm, DMI_CHASSIS_ASSET_TAG, 8); break; - case 9: /* System Slots */ + case DMI_ENTRY_SYSTEM_SLOT: dmi_save_system_slot(dm); break; - case 10: /* Onboard Devices Information */ + case DMI_ENTRY_ONBOARD_DEVICE: dmi_save_devices(dm); break; - case 11: /* OEM Strings */ + case DMI_ENTRY_OEMSTRINGS: dmi_save_oem_strings_devices(dm); break; - case 38: /* IPMI Device Information */ + case DMI_ENTRY_IPMI_DEV: dmi_save_ipmi_device(dm); break; - case 41: /* Onboard Devices Extended Information */ + case DMI_ENTRY_ONBOARD_DEV_EXT: dmi_save_extended_devices(dm); } } --=20 2.43.0 From nobody Fri Apr 3 10:51:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8ECF2F6188 for ; Sat, 7 Mar 2026 14:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892633; cv=none; b=pv1t0IqKDvD8+PswwLVp92P8yKLvbesbAZn4Zyq3NhfleLC1o2ahLD1cEk+bnUKR9lu0Hb8Q7ik4o068QawGbea5U4eSSLfxaJN1zRwcE17v3GZ7F2A6Qvs+xJ3+ptzw0QdHIKm8jc1XY/QDIQPnjnFnhuRhMzfaDwNIk0UgSgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892633; c=relaxed/simple; bh=HsahEGOfghkqXDvpH4GSCdRv6YxjSq13gpl5vhVL1Kw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J+Fbt/7PJ0W26f8v9T3qz7lJU9mz6HAwtP6KkTZewsSOzwugMFnxw1bTL/XPnPoEO36/rSTGs7AxlwR6ZPI0ZWdYBBIT6JJQEMkhJ8vE+rJx+jeHWlcWv2It4mQVskhSejDV9dsyfpehuMiNQsBgN6ooSERcLtl0a70un5UMYdE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nRacDbEq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nRacDbEq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF6CEC19422; Sat, 7 Mar 2026 14:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772892633; bh=HsahEGOfghkqXDvpH4GSCdRv6YxjSq13gpl5vhVL1Kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nRacDbEqHzDLQTTHqfFI8G5KVF64JqOcULU54N97G5gX+vAhezjvlDs43v/sgilKb oIH695mMavCMP5bWDnHjUbv5Ef186m94Y3vbLjq90q6HyWdUJvBonohmhFH6PYsqEh RJ2osnijrFt7E5vn85jGLF9sneM47OsqOqvtlTUDIhspYpYrvoNJmXI5NudcRvyadG i3i/5x7me5OOzJdQbefikuve6U9zhIGJyf+LUvYEwBGv/T4yBQeqtZs7VGxRynNisw CJ7C5pxm/lkLBULCNJte90O6evJ8BLuJgPgVeAOCbLQ+jkeava3bQvAZYEpxCeLb0D eC40h/aQzpyrQ== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" , Jean Delvare Subject: [PATCH v6 3/5] firmware: dmi: Add missing DMI entry types Date: Sat, 7 Mar 2026 08:10:22 -0600 Message-ID: <20260307141024.819807-4-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260307141024.819807-1-superm1@kernel.org> References: <20260307141024.819807-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Type 43 through type 46 entry types are missing from the definitions in the dmi_entry_type enum. Link: https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_= 3.7.1.pdf Suggested-by: Yazen Ghannam Reviewed-by: Jean Delvare Reviewed-by: Yazen Ghannam Signed-off-by: Mario Limonciello (AMD) --- v4: * Add tag (Yazen) * Correct text (Yazen) v3: * Add tag (Jean) --- include/linux/dmi.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 32b2529a73301..2eedf44e68012 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -70,6 +70,10 @@ enum dmi_entry_type { DMI_ENTRY_ADDITIONAL, DMI_ENTRY_ONBOARD_DEV_EXT, DMI_ENTRY_MGMT_CONTROLLER_HOST, + DMI_ENTRY_TPM_DEVICE, + DMI_ENTRY_PROCESSOR_ADDITIONAL, + DMI_ENTRY_FIRMWARE_INVENTORY, + DMI_ENTRY_STRING_PROPERTY, DMI_ENTRY_INACTIVE =3D 126, DMI_ENTRY_END_OF_TABLE =3D 127, }; --=20 2.43.0 From nobody Fri Apr 3 10:51:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D072307AD6 for ; Sat, 7 Mar 2026 14:10:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892634; cv=none; b=oKlRviOM5Ql5UBEeeBcMwE7yPRiuF0qEJwOvjnvRiECvwfu75pDMT2cOqIfgb8nc0kdWcjXjvmWFSX5DjZNv5c56HqLp2zEhwIgHbKKUq9wZw5Fe/mrwcP2vmO/smg/6zhyoRL3bZBQbRhjWx1+XjihVj5nGlKZebJgsdv8mo1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892634; c=relaxed/simple; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hYCXLw7264xJaBD3rsIKJFcdI0DyX4nvbKH60z2IwdPPlOqMks/YkdSuss2ldFrLPJ4m/IF7ML5s+vgDKoYtZ7OGEqCsnnGaoYkC98ZoBd8m8uvWtuIX21P+sASXfRxRCqgeYL8/Q47VJs4XU0mKj9BSgT0RyR0an1KHPuV6TJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Aux89Agx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Aux89Agx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3BB4C2BC9E; Sat, 7 Mar 2026 14:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772892634; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aux89Agxdn2hyCZMhQSsgy2lB4Z3PxY4Q19nOL4P3Nh0EoOIqtlkBEuxvqi7SUKOw FglL6NLpYZcIwy6GnsED8zID/iP85th4vmZ8EngiPqjujACWqJ0trV/yq2xoPiVajq 3nCUKvoK88/D++quyDCWAdqa/3kBFbxA9Q3KVUS+T8kdI+YcYwcUYTPszh4Zt2UtK/ sO2u2b2kWS4A5SdX3Xxy9aD7H9RSAXWj8xGEM40IoZTUPEyTC5g7iA/cfzkwkBruLK QTIJFeelb7i3wDF4jT+FQAaadRGdtRNu2c1NMt6h1NMvOINvHIQB2PN1luez4z1GzU gR1+7zoIN1DKg== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v6 4/5] firmware: dmi: Add pr_fmt() for dmi_scan.c Date: Sat, 7 Mar 2026 08:10:23 -0600 Message-ID: <20260307141024.819807-5-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260307141024.819807-1-superm1@kernel.org> References: <20260307141024.819807-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Several prints inconsistently use DMI: or dmi: or nothing. To make it clear which prints come from dmi_scan.c, add a pr_fmt macro. Signed-off-by: Mario Limonciello (AMD) --- v4: * Adjust "DMI not present or invalid" message too (Yazen) --- drivers/firmware/dmi_scan.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 80aded4c778bc..ed6235ac576b6 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -1,4 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only + +#define pr_fmt(fmt) "DMI: " fmt + #include #include #include @@ -634,7 +637,7 @@ static int __init dmi_present(const u8 *buf) dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); } dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); - pr_info("DMI: %s\n", dmi_ids_string); + pr_info("%s\n", dmi_ids_string); return 0; } } @@ -663,7 +666,7 @@ static int __init dmi_smbios3_present(const u8 *buf) dmi_ver >> 16, (dmi_ver >> 8) & 0xFF, dmi_ver & 0xFF); dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); - pr_info("DMI: %s\n", dmi_ids_string); + pr_info("%s\n", dmi_ids_string); return 0; } } @@ -758,7 +761,7 @@ static void __init dmi_scan_machine(void) dmi_early_unmap(p, 0x10000); } error: - pr_info("DMI not present or invalid.\n"); + pr_info("not present or invalid.\n"); } =20 static __ro_after_init BIN_ATTR_SIMPLE_ADMIN_RO(smbios_entry_point); @@ -810,7 +813,7 @@ static int __init dmi_init(void) kobject_del(tables_kobj); kobject_put(tables_kobj); err: - pr_err("dmi: Firmware registration failed.\n"); + pr_err("Firmware registration failed.\n"); =20 return ret; } @@ -831,7 +834,7 @@ void __init dmi_setup(void) return; =20 dmi_memdev_walk(); - pr_info("DMI: Memory slots populated: %d/%d\n", + pr_info("Memory slots populated: %d/%d\n", dmi_memdev_populated_nr, dmi_memdev_nr); dump_stack_set_arch_desc("%s", dmi_ids_string); } --=20 2.43.0 From nobody Fri Apr 3 10:51:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B3F530F80C for ; Sat, 7 Mar 2026 14:10:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892635; cv=none; b=CpKH/sKR3t4+gI52ogSVdtmGB3OKryldJF4b1FgWGDbYt+N/s7b4GkUJ0TizRUQkTJEqB3jsYOZ7kHcdXku4Qr02s2njJV/sx+NcPVf+5IANrecLmGCx4WysfAJaB1IyeiRnHvuSmdlpNw4Ugl5LfxUtMS+MqbESo15E9EkT3kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892635; c=relaxed/simple; bh=bGtY6zAn83cYGnRqbpQR22ybZtt4cvWvzU8TZChJ2IY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qv54bJtTr6R0hE/4vxIAaWkwgVcdDPcm1c5/In/DMEz0SUG9TmMDBqCKI7ygTJZ7UDCWZ29Q7vbRYhkszwXfDd1o9I0b07bRwdFpS6YFMDoOEn1Q41VfcnyoIvH4PcVLsfLXxXJ7oQx1fIwbzcGZt1cAanhIajCgVW701pwBzb4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p625L08B; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p625L08B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F91EC2BC86; Sat, 7 Mar 2026 14:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772892635; bh=bGtY6zAn83cYGnRqbpQR22ybZtt4cvWvzU8TZChJ2IY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p625L08BJNtrm8MO/7Cfbf1xJsLw3/AUTXUolTtW8I5lXZSmHqWuyEZHPQzH22Oci aXDMyNH7iAiw7onk132ruaasCLqtXCyLCZ6g0pQ+4+8Pm35D/bFXOppNzRvITbr3FR l4jwYhMzIlGcQfeindKXLJPv6OmYdsz0PgAJUlfHsNew2OupyjQUIgbidx/6fDh39x Ji265FaLkrtN3gS+WqvtPxnMZ9hzLs+g3Kd4pH+GOj5RnQe4zsEmWI8gh/EmaxV44e hQCGmDSsWIYbgDec5VWYeS/iqFO36LeQlV8GrXYQ2FNVXdK11peJVx4ICn5zBU7wus TghPayNO/9Qxg== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v6 5/5] x86/CPU/AMD: Print AGESA string from DMI additional information entry Date: Sat, 7 Mar 2026 08:10:24 -0600 Message-ID: <20260307141024.819807-6-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260307141024.819807-1-superm1@kernel.org> References: <20260307141024.819807-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yazen Ghannam Type 40 entries (Additional Information) are summarized in section 7.41 as part of the SMBIOS specification. Generally, these entries aren't interesting to save. However on some AMD Zen systems, the AGESA version is stored here. This is useful to save to the kernel message logs for debugging. It can be used to cross-reference issues. Implement an iterator for the Additional Information entries. Use this to find and print the AGESA string. Do so in AMD code, since the use case is AMD-specific. Signed-off-by: Yazen Ghannam Co-developed-by: "Mario Limonciello (AMD)" Signed-off-by: "Mario Limonciello (AMD)" Reviewed-by: Jean Delvare --- v6: * rename print AGESA function (Boris) * check count explicitly * remove extra comments * Only print second half of string, look for full !V9 sentinel v5: * Return "" in !CONFIG_DMI case (LKP robot, Yazen) v4: * New patch (based upon older versions though) --- arch/x86/kernel/cpu/amd.c | 49 +++++++++++++++++++++++++++++++++++++ drivers/firmware/dmi_scan.c | 3 ++- include/linux/dmi.h | 18 ++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 09de584e4c8fa..f4d1b4ee155b3 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only #include #include +#include #include #include #include @@ -1380,3 +1381,51 @@ static __init int print_s5_reset_status_mmio(void) return 0; } late_initcall(print_s5_reset_status_mmio); + +static void __init dmi_scan_additional(const struct dmi_header *d, void *p) +{ + struct dmi_a_info *info =3D (struct dmi_a_info *)d; + void *next, *end; + + if (!IS_ENABLED(CONFIG_DMI)) + return; + + if (info->header.type !=3D DMI_ENTRY_ADDITIONAL || + info->header.length < DMI_A_INFO_MIN_SIZE || + info->count < 1) + return; + + next =3D (void *)(info + 1); + end =3D (void *)info + info->header.length; + + do { + struct dmi_a_info_entry *entry; + const char *string_ptr; + + entry =3D (struct dmi_a_info_entry *)next; + + /* + * Not much can be done to validate data. At least the entry + * length shouldn't be 0. + */ + if (!entry->length) + return; + + string_ptr =3D dmi_string_nosave(&info->header, entry->str_num); + + /* Sample string: AGESA!V9 StrixKrackanPI-FP8 1.1.0.0c */ + if (!strncmp(string_ptr, "AGESA!V9", 8) && strlen(string_ptr) > 9) { + pr_info("AGESA: %s\n", string_ptr + 9); + break; + } + + next +=3D entry->length; + } while (end - next >=3D DMI_A_INFO_ENT_MIN_SIZE); +} + +static __init int print_dmi_agesa(void) +{ + dmi_walk(dmi_scan_additional, NULL); + return 0; +} +late_initcall(print_dmi_agesa); diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index ed6235ac576b6..a3f7dabd49554 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -47,7 +47,7 @@ static struct dmi_memdev_info { static int dmi_memdev_nr; static int dmi_memdev_populated_nr __initdata; =20 -static const char * __init dmi_string_nosave(const struct dmi_header *dm, = u8 s) +const char *dmi_string_nosave(const struct dmi_header *dm, u8 s) { const u8 *bp =3D ((u8 *) dm) + dm->length; const u8 *nsp; @@ -66,6 +66,7 @@ static const char * __init dmi_string_nosave(const struct= dmi_header *dm, u8 s) =20 return dmi_empty_string; } +EXPORT_SYMBOL_GPL(dmi_string_nosave); =20 static const char * __init dmi_string(const struct dmi_header *dm, u8 s) { diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 2eedf44e68012..c8700e6a694d1 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -91,6 +91,21 @@ struct dmi_device { void *device_data; /* Type specific data */ }; =20 +#define DMI_A_INFO_ENT_MIN_SIZE 0x6 +struct dmi_a_info_entry { + u8 length; + u16 handle; + u8 offset; + u8 str_num; + u8 value[]; +} __packed; + +#define DMI_A_INFO_MIN_SIZE 0xB +struct dmi_a_info { + struct dmi_header header; + u8 count; +} __packed; + #ifdef CONFIG_DMI =20 struct dmi_dev_onboard { @@ -120,6 +135,7 @@ extern void dmi_memdev_name(u16 handle, const char **ba= nk, const char **device); extern u64 dmi_memdev_size(u16 handle); extern u8 dmi_memdev_type(u16 handle); extern u16 dmi_memdev_handle(int slot); +const char *dmi_string_nosave(const struct dmi_header *dm, u8 s); =20 #else =20 @@ -153,6 +169,8 @@ static inline u8 dmi_memdev_type(u16 handle) { return 0= x0; } static inline u16 dmi_memdev_handle(int slot) { return 0xffff; } static inline const struct dmi_system_id * dmi_first_match(const struct dmi_system_id *list) { return NULL; } +static inline const char * + dmi_string_nosave(const struct dmi_header *dm, u8 s) { return ""; } =20 #endif =20 --=20 2.43.0