From nobody Sat Feb 7 09:59:08 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 DEC842BE7AB for ; Fri, 23 Jan 2026 21:31:04 +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=1769203864; cv=none; b=hFIHfBVgYyYTQHswxEQvWSEEL0QpqSYJaH4BpQNzoOJVPbWjjStCCzXgP0n34v5r6DDnSaUR3573UGHeXKyeP7h7BvAHinBihFbzK2c2QqV1O/Ci5gHsT3AET3vbnJstHZfwqzKKGJ0+0gZDMFDKlxypcZ8anT0AsN7S7FMTrIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769203864; c=relaxed/simple; bh=pgdDW7ireEglwKas2aLd68lH+FyAl9F3znhco8U5X7k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nd/TYk+stTZqT9bqLVJlSiExe/0/RchMbRIF47PSVxpAAUnAhalrIeJkHzYjgdet78b5apWyIAxHZQ3Jb1Tz3wSSiSCt0JOrt7Lm4recmrwDh6fW9uzLgxNd/8bP1GGS58s3oTukU7Yjw4aXByta70kYaop5fIh2QlPqq2VDUnc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fWxWmrdo; 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="fWxWmrdo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE673C116D0; Fri, 23 Jan 2026 21:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769203864; bh=pgdDW7ireEglwKas2aLd68lH+FyAl9F3znhco8U5X7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fWxWmrdogaMl4PfQqhAchac5+6dfcbmLIpuI0HwNdyoTvVp16xqw2T5RMg0WTzrs3 hyo7vCKDDjltbsrseFAT4Net1+pTmyX1IYf9nEhuKWNHvggb2ELrccj+rhTa5spGp/ 2KSqhBWAM3Xjrc16Q2++Gc2IWn0ZOfECm2qFL3nQP04dCYy3nKOpgsR5LzZK+MjtRW HHR7Xv9ZTNPxTA94txCej7+1eX7oI58nV3GEB36EAsHjVo97+PyEInbenT5HOEh/ph XQLrzre2Z+fV+l8HQBiaKe4PHOar8+abvKJbG79PZ6w65cJe4nGrlghVR4epH9pLjB HodS/bBr7nZ1g== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v5 1/5] firmware: dmi: Correct an indexing error in dmi.h Date: Fri, 23 Jan 2026 15:30:52 -0600 Message-ID: <20260123213056.861317-2-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123213056.861317-1-superm1@kernel.org> References: <20260123213056.861317-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 09:59:08 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 AA3412F60CB for ; Fri, 23 Jan 2026 21:31: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=1769203865; cv=none; b=q7cNRnHhpc21aCMpJJXpRzcfRaEueP7ElgVRIAQtlqAIw0Puawq00TUd6w9ps7m0s83iuAaZzq6y+aXnm67v4V2svj6WzuAMmPHjUhKtVVe4/DvAWytz7Zc62U2n+0h5YzAO2vJ1hDvVLfQ8SxUhDorUTIjo/hLErlnQ0D8pIfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769203865; c=relaxed/simple; bh=84Y6ThfIpAkKLwZ9CuqzVP+MukiAI1efPplzFkCqGRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vp11m0isDUl9Au7n/TiK/k/paqvVdXR8ottWUfejnjrxXfDbAcqgFAs9JIW89COJ6U783lVxqu+unx60iPcH0tXrVo5IOj+NrIk85ZyglhDwSihP4ZDU+NFI3d298oho7Xw/1Xfrc0OfLn3EdRDiT9fq2siv7KSGLOvGl//5wWU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=StYsUb1t; 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="StYsUb1t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADC15C19424; Fri, 23 Jan 2026 21:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769203865; bh=84Y6ThfIpAkKLwZ9CuqzVP+MukiAI1efPplzFkCqGRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=StYsUb1tau9iOjpTLTd10NJgOhz6T4h3EBoAqrY+reBZE3EmOxy6Y1LmJuAEy16lb 3PuRF2tbPphQyfmT92Ack0Sgwf4D22bj/A2HmPWddUAhtzLHWlIK1H11nhVdDdVEA2 XpxYeGcn2Q7ij4ZOi92/BxXIkr5j+us5ny/X63VQ9Pr0yZhLfHlMmevo/FBdtpe9Xi AFTtd/bNGWdoU5SUuw2S7fiLe1GKAD/j9nCixRRavHFDVj/hdhlPSMi50BLWCM4Fmz Rbj5ZO9oU57pKEppdks5gZsi99ZN1/GDWnGmgrJ/IQ/IlbwaVTDs5llaAR9krP8KJB FAUQjC+SYILnA== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" , Jean Delvare Subject: [PATCH v5 2/5] firmware: dmi: Adjust dmi_decode() to use enums Date: Fri, 23 Jan 2026 15:30:53 -0600 Message-ID: <20260123213056.861317-3-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123213056.861317-1-superm1@kernel.org> References: <20260123213056.861317-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 09:59:08 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 B568C19D07A for ; Fri, 23 Jan 2026 21:31:06 +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=1769203866; cv=none; b=M6isE8WIk1RNdFzCp8/nwdU84vXEwV0197MDHYuKiI5XTK5Uxfn3eYmM1bofjJMYJjklAez2ktTfF42LpWaUnd/WOSHBqQOgF5fhpLG2AHuuMUHQi+lhXJ8nSp2NFeFb5WLiiEjddVoh7HBw1YIYQ3KZcOtHABTyzk4ag6BR7RU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769203866; c=relaxed/simple; bh=HsahEGOfghkqXDvpH4GSCdRv6YxjSq13gpl5vhVL1Kw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=foVd1cL2dkdNPt/QKOIVhp2JVery+53zgeYlTEnBqyNypRpZVi0hegSdE0ZY558AEJyz9fKWcDjShtnZsGnl79gL3EqBbcSBT0DKSfo0dQjRoRJEsPZL67QZZMHyrCACRj+RJSTiTK/oAMR1nbv5pDrrcwHY7yGvHtjg4Q37P8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=byncx2g6; 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="byncx2g6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99B77C19425; Fri, 23 Jan 2026 21:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769203866; bh=HsahEGOfghkqXDvpH4GSCdRv6YxjSq13gpl5vhVL1Kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=byncx2g61UC6BZGeq8v+M8NLdlNkk2uu5CV0KPZ66ogm3wNq2fqLBTgk0JLfl/2cG CVdEJAVfatJPHxWyNMl2qNVOnYTcJEWqrwWxpKXGCz58cHWJGez91FWplFEESFaN1R Ec919sT2+KHUnRGGT1rPLR2XRSP6kXhr/xjz85zwxPV2p8InwR5eBs8Voc4pBImbMH wrT5H9laDfSTZF+YejAjZpnCG/dduehw7jAliOUlL2eL/sni06ZhlCzuke2fofbd1r zB5/EPpWDdUTsrU4w0WmUE4ERQ+jwntk7nM5Y8FkTf9mwox4S7qR2AHGmtxTYiNuuK ivVpYTnMwFIbQ== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" , Jean Delvare Subject: [PATCH v5 3/5] firmware: dmi: Add missing DMI entry types Date: Fri, 23 Jan 2026 15:30:54 -0600 Message-ID: <20260123213056.861317-4-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123213056.861317-1-superm1@kernel.org> References: <20260123213056.861317-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 09:59:08 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 8169728489E for ; Fri, 23 Jan 2026 21:31:07 +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=1769203867; cv=none; b=Qf1T0JbOJISDZR7rpXx0OvJ1QN6/6FWcb6n5J7bpOi0EPLJitU//ooGFv5tKrI9+pzWNG496N7JJTUPlL37IMSZZ26UWoS7hTeiYL4l2IaqPcfbh14o/nMAiJM8ANtmVtaLoSytayLPTc3GWR7BijNHdNHxehJTGlZ459vx4Myo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769203867; c=relaxed/simple; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hsiqDkTKoOAxAn82GFkfuxcFMFjz/epUopVDkyCqrmjYDgBXrPEYMwwPC/KvKMe4r8XbK+evkjhAy7BNu+fXBN6mUCxL9tlRjeKldHiO9zKBmDlg/gWpsMUeqSSd7y3XwKvHrjx44ri0pP0shEez1myBcMfxL2XXSoefll4Tvbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ltDhyOjW; 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="ltDhyOjW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D55C9C19423; Fri, 23 Jan 2026 21:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769203867; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ltDhyOjWL1jvyV9NWkhfWV7aFDIpUvUZF4NDUKXb5SfZzycTcjqm4FH/zPDSKsMso QSqHjhdSLOF0EFWHU7epxvv8QySZqD+tLyP/NxZPJc93JzMF/2f8xeZjAhMvBbLiHm k710k0f0fOTGMObdF6aQo++w6jnyx0hQ2sSL1wF1bldoS0ZuDIO9xxAOxegVr3kH99 gGfltaEWYdX/CjKFkQO0xBfiS/CZUyaui03L49Z87ffksus08qlmTmDV90OEsLoqJK dV8YIbcpqUfCY0N8ufBKgvxrF7CSDK/Slvq30tDbI29z448yobXyqxzJ/H3WTRzftJ PnOUUWJqjnHNA== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v5 4/5] firmware: dmi: Add pr_fmt() for dmi_scan.c Date: Fri, 23 Jan 2026 15:30:55 -0600 Message-ID: <20260123213056.861317-5-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123213056.861317-1-superm1@kernel.org> References: <20260123213056.861317-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 09:59:08 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 949F02EDD45 for ; Fri, 23 Jan 2026 21:31:08 +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=1769203868; cv=none; b=cZw9jXg2Yt58Eq8FYAlzhzauFRG6YG9qB8yAfmo2yXt8p5O48tBM1HNMLx6rnUiiva8E5piwlIyVJTnKDSbxjysWHejUdGqyCVZbt3dYsX6vF/vdgkjuBXtWGqu47wfLqmgy5Y3/MY6xkP2YByZ/cATUCr13P7OAOvj1zdyTf10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769203868; c=relaxed/simple; bh=9GhVmE30ogo5YRy74mlJzUk+c2FDiswFFCSId7Ma0W8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fq2h52DWV6zeT2JWxXUIVVN07iCu6lag1yrAtxKKV2N8FUpuBBBGG4vSf+kNvYeVh2FGA7Cs9jfm3jWnbhoYUxpbkRwL32G8ahrwkCH+AEiwr62PtZi1C4oRaQvCw32sWR+A+mzlPiiep5TuMNoCyPjqWRCDGH+1VeuLA2jnhP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BpyE77+s; 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="BpyE77+s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3A14C4CEF1; Fri, 23 Jan 2026 21:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769203868; bh=9GhVmE30ogo5YRy74mlJzUk+c2FDiswFFCSId7Ma0W8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BpyE77+s2VBSQQ6NNvHlGtw60ctkQuxLYUKZPHP/E/TrsUkWXnjCuD1Id3RCfYHL0 oPtAIWaeam3eGArsqtPKd/ZXyGQciVxRvxQ/rRMUFweLU41XOfJxZoFE2z1g/vxCps Eoa8HKO1StHN4wVQT1RJNNXH9UEIi0pbryxQiLSnh6RMxqypC2W9CvB02ylbG9rfN4 bQZIYyHAgf6D6wQ0vzCxQaywaHMsTS5TsH0fPbqxz7HkrXizRyG+OJb3u/NXe4jTWU QJMRuudCYCs5e4wZschdCfAST/c1bnVNDljacGOALGtWvuEhIKGS2jkPSOGvcT2t8R ha4rLTkzoZP2g== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v5 5/5] x86/CPU/AMD: Print AGESA string from DMI additional information entry Date: Fri, 23 Jan 2026 15:30:56 -0600 Message-ID: <20260123213056.861317-6-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123213056.861317-1-superm1@kernel.org> References: <20260123213056.861317-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)" --- v5: * Return "" in !CONFIG_DMI case (LKP robot, Yazen) 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 bc94ff1e250ad..aa04a27aeb107 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 @@ -1404,3 +1405,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..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