From nobody Sun Jun 14 08:37:10 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 0AF05358399; Wed, 1 Apr 2026 19:34:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775072073; cv=none; b=ZLoPOyBf0RgMf0B9TxrGqTho11HiuDIV7p1JF3+gvms+XfBzOT6Rj/iyYZRCliXVEk+Oye1dYPLzRzsgZiJKnA2tq/0tesLxLK/93sSmyw5LwRlT7UFezhZhnuQnc5r07XJnH86HRRBO4XXy7WRnJM2In9mweC9KBbFDkgUeyps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775072073; c=relaxed/simple; bh=lkwOmDFcG9pfLaFs2q33Sgb5O9JH5XzEJk6PmTX/8sY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=uQ9xyfDK3/6IIkyJEgkJ2AmpqtEEsxAWRogxyWrkGV79HO9zpn9CC1X6qaiTdjZ9luVR0zoFbsva7sbtx3sEuUUgfwV+OYWYc8U5REm3qaLQ8nIKs/4eLoLHY9OhWGh2y5jqDN3qrEDY3SPb0w26OjeZojYkqR5oGLeKieLSmFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=rFVdIYM0; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=xkSIjDEY; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="rFVdIYM0"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="xkSIjDEY" Date: Wed, 01 Apr 2026 19:34:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775072070; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/PSwMetzbafUuT1yVD5U0JsQqBM51UrgYwmEhwLnobo=; b=rFVdIYM0lwfE+INMY2KoGvZyp/Mc7swTcxeXVXLLD1HmUeGc3XMi72lv2bqE6tGG+phnjx FOd18eP6kGpQp1E5MvGV8iivxhgHLegdXzdcahle2aVl3Z8qd7WnOtiwChatbE/E++hJoZ 7U3FssH2Afg26dkwOSa4IjGYG3bpEDJqdovsZ/+P8qghARie56fSuPxegbYRaPtVch3jFP H9mg3d4BZh1HqdO134/A4+d/s4ZQO8nocyHbZZaaIxxEKZBg1gZEHgB+nVbAtqUt0ICGq5 jDOQKRTmM9uahi9MLhkNN4LyO02sOkJkQMJrTgBq1jr3CBecuTHM6j+SA5Rp+A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775072070; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/PSwMetzbafUuT1yVD5U0JsQqBM51UrgYwmEhwLnobo=; b=xkSIjDEYTe1oLH1w9aS32fjuOKzDUVNDgfiVd/NfJY8cFu7s7Q8IuHimEZdS1mTQGyylXK H4MiISXEvL+egwCg== From: "tip-bot2 for Yazen Ghannam" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/CPU/AMD: Print AGESA string from DMI additional information entry Cc: Yazen Ghannam , "Mario Limonciello (AMD)" , "Borislav Petkov (AMD)" , Jean Delvare , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260307141024.819807-6-superm1@kernel.org> References: <20260307141024.819807-6-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177507206879.1647592.11505342846111682486.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/platform branch of tip: Commit-ID: bc91133e260c8113c1119073c03b93c12aa41738 Gitweb: https://git.kernel.org/tip/bc91133e260c8113c1119073c03b93c12= aa41738 Author: Yazen Ghannam AuthorDate: Sat, 07 Mar 2026 08:10:24 -06:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 01 Apr 2026 20:54:16 +02:00 x86/CPU/AMD: Print AGESA string from DMI additional information entry Type 40 entries (Additional Information) are summarized in section 7.41 as part of the SMBIOS specification. Generally, these entries aren't interest= ing 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 f= ind and print the AGESA string. Do so in AMD code, since the use case is AMD-specific. [ bp: Match only "AGESA". ] Signed-off-by: Yazen Ghannam Co-developed-by: "Mario Limonciello (AMD)" Signed-off-by: "Mario Limonciello (AMD)" Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Jean Delvare Link: https://patch.msgid.link/20260307141024.819807-6-superm1@kernel.org --- 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 09de584..33b740c 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", 5)) { + pr_info("AGESA: %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(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 ed6235a..a3f7dab 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 2eedf44..c8700e6 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