From nobody Sat Feb 7 21:08:14 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 61BD23563C5 for ; Wed, 21 Jan 2026 06:04:59 +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=1768975499; cv=none; b=exgS8AMEeFddlcu7io4tL42GtbVexLUjDKBadEYseWmY90m/S6gRpNyRPXFo/fm1+wRAi+3+j89ZclQggIrTVrO1lZaYkg+K1VplGHFrInkIoSgLbcZ637O9to3csdrJbeDAZ0Z/c+bpUf0VqIgeiWH1gf/ejzJQiCVKAclO5vI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768975499; c=relaxed/simple; bh=pgdDW7ireEglwKas2aLd68lH+FyAl9F3znhco8U5X7k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jJYSRCWkQZMQx6x4WZH0Xv4hjPFadCLD5AhFyg7F6Nln8COB/AGFKJrg/h+VSIQXD+FuWgfSXU36CxUrSis5FL4Q/1wkalF6stDxKQEpSJULG8ThS6kahkviVwKPsJrS8KFG5zkoKWMqYDp5BI3UODMqZ80/mL1E0EoOe9dWxKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lAgKcyL4; 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="lAgKcyL4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6283BC16AAE; Wed, 21 Jan 2026 06:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768975498; bh=pgdDW7ireEglwKas2aLd68lH+FyAl9F3znhco8U5X7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lAgKcyL4g4DOaBVyaFDlqPh6K+GAbveGmqR6f8yDvhSqR9muPJlfKCdEZLuUX6NuM m7bwqDcFZ2zjc6zkM+PKCzUtBxy0qLa3OJMa8N1i5CphDDJCThGaqYO/bTGa+C8Efx XZVLfABLjm5TOe3d03iFgKif6qJOTR4b6zeNXSW2BupI1Qp71+dN56K3kSlmT+jhJO j/vbpAEWCULx2Xs7XYcHOSMtTHfp14KLMiwrcs4US9UpIQ/aFfh5oZVz/hzsacHAkA ucamO3AOyIr/xrGhOBmfGFUhALBQh1LWwREhhQUexM4LdefDw/VhWes4I5mbYm/W3R p86fSMu5nuYlQ== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v4 1/6] firmware: dmi: Correct an indexing error in dmi.h Date: Wed, 21 Jan 2026 00:04:26 -0600 Message-ID: <20260121060431.432350-2-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121060431.432350-1-superm1@kernel.org> References: <20260121060431.432350-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 Sat Feb 7 21:08:14 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 0A1A537E317 for ; Wed, 21 Jan 2026 06:05:00 +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=1768975501; cv=none; b=aISJzlLhrruBrLNxIZYHJBblFZi8SuqnotoCvLB6llk4choK9ycMceoI/ns1f4vIVF0wt3oeOj67oyFLzVy4sMxY9adTIJFVGJoYD3zClt+3TVxiIB9Qr89JLyplsJqXrzj5mTz18A/36gBoKDJXJBc8DcdasdOK+T79ePnGpUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768975501; c=relaxed/simple; bh=84Y6ThfIpAkKLwZ9CuqzVP+MukiAI1efPplzFkCqGRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sbFXNmPpHaiAmQKdqQ1Ay1nrzt+Ekscs+Ybci49pMgig5WmLBknvurzTxF/kulqBPcLWy3xshx+N+HWe1zuxmPt/ziBGRFIE+xGgI7ejpeRx64pphb3oQ2eBdWZEe8BS5yz234ZusbrZ6K7YoocA76pTrL5HpOd0zhz6RoaTVMI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mzNEWZNX; 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="mzNEWZNX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30E07C19422; Wed, 21 Jan 2026 06:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768975499; bh=84Y6ThfIpAkKLwZ9CuqzVP+MukiAI1efPplzFkCqGRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzNEWZNXueFwj66FGBT5u+6Xwmw5R+FKg3B6gcCOlz107g1knLPFR1Wsy3CDZDV9s S+TVVB0CSBKS/xt2XhwRaGZ/k8T/S/bFYHG6U6RNr5szuV9pzE3xFKr1HYri08qmaW iyaucLVnjUj4eRFtIGLWM/ytBKfTX1WdCCJ887ayuwIRyhZwfWrG2vCp8GmxbkgRT/ TlkIazEB7IaNhdOZNLfm/xKvijaoUvfqougFAGJp4KSZvRr3INpobvLOtUoQYlcYLq gDjgko503Z5j4qeBd4g9AJxfgpb/BJa9DqCA61wXf6pJDydTVY177M7WlTB18cXv5Q eBws5C3wy1XQQ== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" , Jean Delvare Subject: [PATCH v4 2/6] firmware: dmi: Adjust dmi_decode() to use enums Date: Wed, 21 Jan 2026 00:04:27 -0600 Message-ID: <20260121060431.432350-3-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121060431.432350-1-superm1@kernel.org> References: <20260121060431.432350-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 Sat Feb 7 21:08:14 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 90631436379 for ; Wed, 21 Jan 2026 06:05:02 +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=1768975502; cv=none; b=q/OWPEtXCn/fX8rG4KYkCrfAiF+lfGsFDGqVVyqLK4jgIdqWGBXAcr0zvu8IsWw0Quf8FPsvwAy7XD13vDnFkra6JiORSg24X33HjQXWu3YaV9fUunCUAuPGfWI0FVer2bCZ/S0ilDVWO6AzX8G65m7KFfifLffO7qpqENbNweE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768975502; c=relaxed/simple; bh=HsahEGOfghkqXDvpH4GSCdRv6YxjSq13gpl5vhVL1Kw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JHUV0Ht/SP8sFIYV370UvQ66pXQH3ceRxBGLPuVRglEh5QgRNY+6CeLCwl4q7nR5b0p7III1eL7cTXwO3C5BOU9PJII3uPpLepKbSG5IJ+qG3HRxYA3YsFOqcrCMhbb+6QwhTjrU7CGxuoSg+iXPODURR4qARiO9OXr4LpvNKM0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QAgZZZYA; 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="QAgZZZYA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A372C19424; Wed, 21 Jan 2026 06:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768975500; bh=HsahEGOfghkqXDvpH4GSCdRv6YxjSq13gpl5vhVL1Kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QAgZZZYAlcAllLuWD/x7VayoQGQfdJCXs3jaNt1b8YaVf2aZjhCHL2QBh9zCd051b SsdZ2vMXUbB1vsh3ZTQUmhPF+5x70WjWL9NXhiy40NvDo11YVqBoeRMfIWzz8dBwPn x8AfpLfCVx3nXZBKVOA1NJ9bArVpNHEPVsrsrMhjQai0wCpNWYSzpw4M1fLnUvdFFg P6xXT+0gBvnAXn2Doyk7qAmrMSVojDRqL9beVQOz5flWpN5qXfn7Zrqn8BRsD11h4Q Pmjx4hSS0YRtAQAA4RR9bRLrJptcvRE6WlEayT+SPBkeacM7M3LRxiWUeasGm7BN9g lY4hHTy8fkrgg== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" , Jean Delvare Subject: [PATCH v4 3/6] firmware: dmi: Add missing DMI entry types Date: Wed, 21 Jan 2026 00:04:28 -0600 Message-ID: <20260121060431.432350-4-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121060431.432350-1-superm1@kernel.org> References: <20260121060431.432350-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 Sat Feb 7 21:08:14 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 4C8B9438FE2 for ; Wed, 21 Jan 2026 06:05:02 +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=1768975503; cv=none; b=DqWo+rdIRye6ang5dOULU4arVZQwypO4RPwMYeCSswfMw5C77K3Wu6GbJEyZuxqkN0Cbyb9G9YMTs+iyDAqBGEjHE5DlXslbUvs+Z2PVPmNvPSWEXQ11GICO5/4ppwGos840i0XMMVtLGhdRn9ugxdncZzLyo5uTgPSzDuKB9Hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768975503; c=relaxed/simple; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AW2W1sTOWxC4WCpUzVha4GFfwOzHtLGnDaiim/CcVY7czT+/0ogT1jAJtJ/sT+/2UZ1FBa/o21P1eoS0Nt/ABo9majlF0sd9FJOYdvSCB4v/rIyuea1GVM7hmh5a8Vf6DP6c6AXIkjsWvbkhfCgMQTZgNpTMIa8SHXB+nWxSxLs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RT+LtOlU; 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="RT+LtOlU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05C57C116D0; Wed, 21 Jan 2026 06:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768975501; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RT+LtOlUP2xLPBS2ZP4Mho37lcsRz9ShGAtjKD7Vq6fy8sUGnSK2sevgpQhew+Zjh jC06EG4vuc+uGQyrR837cyVegPcBxOadRYZRqVZgFg35u7x4INpc+8MvZ2Zh5/dd2r KBMhJo830hI+cY0EyWEORztQLqFgogx2hgxKW4rSB4kk7mlnFGryef4Rfn7Un25OfU ddgM0kx6R4Ujb9pJpDpTdONy6xcAtXiaewLbC4GNcL9wFa23tzwHEWZkhpvsUtBwK2 FTdMQsPNJfrPzO73yOtDXgWu2SPCFw96V47kyDKnC3Ht3ia6hu6Hm+4oJYEvSdR13Y kBjpQOUQxEZxg== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v4 4/6] firmware: dmi: Add pr_fmt() for dmi_scan.c Date: Wed, 21 Jan 2026 00:04:29 -0600 Message-ID: <20260121060431.432350-5-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121060431.432350-1-superm1@kernel.org> References: <20260121060431.432350-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 Sat Feb 7 21:08:14 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 4859E438FE0 for ; Wed, 21 Jan 2026 06:05:03 +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=1768975503; cv=none; b=puUqb1XahQxTP4wJHgaJegKM9OFajvH4goMYts2kneXGlLS3Bbhiw+f3n/HYp5fFwdFd88gYo2Y+7GI0QhG7/3F9Pk9MfDGPcyASpWWSmHJ8EZ+VMwdXdVeynRqnuXh2hH0Hxtuyl8EyzMesHTZQVjzP7CcRJAylTRRbOABp52Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768975503; c=relaxed/simple; bh=R5rMtvoUfTO70/tlcTd16DMGAGByrbP/zrXT0GKetFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HGyi8uvPT6Lp/QYT7ZGBXrReBBWiaF5gtbAOD5Y+3wiLrLBpXa6/LDFHPvHSD1IUKS0aCcwSeME8zD9rceSuunU0DsZ2j+mWmZTNAHSpWTrp156Sfgd43iRvZGWLcRK0q4cieRU+pLAxglMZpASxauej0zzYlYWiJCsXvPMaiIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KgAoa44s; 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="KgAoa44s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C72FEC16AAE; Wed, 21 Jan 2026 06:05:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768975502; bh=R5rMtvoUfTO70/tlcTd16DMGAGByrbP/zrXT0GKetFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KgAoa44s5om2wnqq9NiBQoHrrc720Mb6P9hF/7CL8D/vhsBL4bj2oVOUyPtF6W0qu AWt8WKZQiUZpzq1WhbYj6HBJKK3WmksbpgzP+sxXXaqs7HcMG5Q3p1MAvYGo+ojDsb BCbYaSpX4FsAh6umgMj7xz2swj4srWzMpBaY5lbpDInOcYWsxQM+pMU4er/Iea/yQb A0qS1umbiUh5837DB68ojf2Ohxs/m7/5eW4wra33ftvh7Aq9ZWrvVGjCy6Io5DCj24 bgE6/i/P+/tIboXAKVvb0ThzQjOzlHMqKqPdEp3rljw2TUqAUaZ7kQxhLjFHD1uhoq 8Lx+GPG8xgEBA== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v4 5/6] x86/CPU/AMD: Prefix messages with x86/amd Date: Wed, 21 Jan 2026 00:04:30 -0600 Message-ID: <20260121060431.432350-6-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121060431.432350-1-superm1@kernel.org> References: <20260121060431.432350-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" To clarify which messages come from arch/x86/kernel/cpu/amd.c add a prefix to all messages instead of just the previous reset reason. Reviewed-by: Yazen Ghannam Signed-off-by: Mario Limonciello (AMD) --- v3: * add tag, put in it's own series --- arch/x86/kernel/cpu/amd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index bc94ff1e250ad..c19c4ee74dd1f 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only +#define pr_fmt(fmt) "x86/amd: " fmt + #include #include #include @@ -1396,7 +1398,7 @@ static __init int print_s5_reset_status_mmio(void) continue; =20 if (s5_reset_reason_txt[i]) { - pr_info("x86/amd: Previous system reset reason [0x%08x]: %s\n", + pr_info("Previous system reset reason [0x%08x]: %s\n", value, s5_reset_reason_txt[i]); } } --=20 2.43.0 From nobody Sat Feb 7 21:08:14 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 A89A3426D2C for ; Wed, 21 Jan 2026 06:05:05 +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=1768975505; cv=none; b=VvHVpxqRt8JuwYBu4PuyBaTFgpCZWXPoBq9gPRBdNscEc/Pa4m31icYOvZAbjWbRD9JbG054QqXi5y9WHlNa9CFWnCec+k6XH0I8I3a0bhh3D7KDWhov14tqEEzHoCfSlo6AndYTlUksQhwPUII7v0eeTAlSlg3gSscadtT1ufo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768975505; c=relaxed/simple; bh=powX5qshlVD3KzRGse6aP4ltmvXPXseA9Sa6X0BByQk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iSIxMSndk8KTzu06l4bBGUR8gFxrS1pyYs49Y9r6IBRoj6wlmo75AfqvtOq1ZRmE+OddXEdJXUo11eBTwFFMrNAlxtbJ8ErRSQz2zqU9fHiV6isRs/14Qbfac+heH/PX8l4yUZmShNVDzLRcELm/DzPq/i6SbxaA1uV7SPf56xk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fQ4AnxjW; 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="fQ4AnxjW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92E3AC19425; Wed, 21 Jan 2026 06:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768975503; bh=powX5qshlVD3KzRGse6aP4ltmvXPXseA9Sa6X0BByQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQ4AnxjWGgZPg10zG+mbYY1rP6Oiz9IT3V5L+KXnVUDmlGofgqdMXAY4OGcSkyhLo ymT3lV3MmO+nS/8ee08Bg1dW+7czVb2IztZ8F9psmZDTXQn2NXX2diRsHcJEeLSaQJ qEAP9p7VzwR8zNBBgEj80ortf+nv+2+vuFaaRhINvLIqRfFal1a8MairpoTSA8TuAI U426iXiC8mlvelk6yGVwZL9sSHrOn+EiX7tSsczji7X6uP7B/YJVw/K1TSoEujV+Bg YyPL9hsDaCSLbomJ/Lj9M4BecPabGtl2kLSpjvumC3m6TOzfykhYu/t6WXT5pZPau9 fYlSRqbTCXKVA== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v4 6/6] x86/CPU/AMD: Print AGESA string from DMI additional information entry Date: Wed, 21 Jan 2026 00:04:31 -0600 Message-ID: <20260121060431.432350-7-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121060431.432350-1-superm1@kernel.org> References: <20260121060431.432350-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)" --- v4: * New patch (based upon older versions though) --- arch/x86/kernel/cpu/amd.c | 53 +++++++++++++++++++++++++++++++++++++ drivers/firmware/dmi_scan.c | 3 ++- include/linux/dmi.h | 18 +++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index c19c4ee74dd1f..5cd60855a85b0 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -3,6 +3,7 @@ =20 #include #include +#include #include #include #include @@ -1406,3 +1407,55 @@ static __init int print_s5_reset_status_mmio(void) return 0; } late_initcall(print_s5_reset_status_mmio); + +static void __init amd_dmi_scan_additional(const struct dmi_header *d, voi= d *p) +{ + struct dmi_a_info *info =3D (struct dmi_a_info *)d; + void *next, *end; + + /* + * DMI Additional Info table has a 'count' field. But it's not very + * helpful since the entries are variable length. So don't use it. + */ + if (info->header.type !=3D DMI_ENTRY_ADDITIONAL || + info->header.length < DMI_A_INFO_MIN_SIZE) + return; + + /* + * Get the first entry. + * The minimum table size guarantees at least one entry is present. + */ + 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); + + /* Only one AGESA string is expected. */ + if (!strncmp(string_ptr, "AGESA", 5)) { + pr_info("%s\n", string_ptr); + break; + } + + next +=3D entry->length; + } while (end - next >=3D DMI_A_INFO_ENT_MIN_SIZE); +} + +static __init int print_dmi_agesa(void) +{ + dmi_walk(amd_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..b7865fa387ccb 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 dmi_empty_s= tring; } =20 #endif =20 --=20 2.43.0