From nobody Sun Jun 14 08:59:14 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 02457364958; Wed, 1 Apr 2026 19:34:32 +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=1775072074; cv=none; b=cnlZOWSkZ7yQU10iweowH3sl/OzsuYevvd/umgV7JRCZ7lkovGpPJ502Ku8p3g69xumHkWs9mh3NRFEQ6MowpCGZdspELRuKs0EAPqo04iBY7ZPwmMr5dqE1587XxS2ywUSZA1WUmDdx1+XEmNIGgV/hLgtyRtlSR6Ms9/G3ydE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775072074; c=relaxed/simple; bh=+ETYolzHNbI4WxDX9Z3zRIuiAA9liHVsNdWrrUi9hnI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=I49s9kselXeHTN+soSmjN+IAWxjAG9GM9vX76mqsGxnDBlf4dQbRDHTrHcW3NCS7oW+AfQ4iR9UfAoSZCc7FXE3d9Tlaw4CeR5xNaT9cSpcd6QHvDFZGuwlWogXp5mi9VkBM36T4PNExDlr8wnaivkgKKWdfT0WHV0rBHCr43zg= 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=dx/Y2eGG; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=/BUAIRvc; 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="dx/Y2eGG"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="/BUAIRvc" Date: Wed, 01 Apr 2026 19:34:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775072071; 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=eCGGh7Jp2k8U4gKGbOs3J/q0GL9Gz7UCeTrPdXroZB4=; b=dx/Y2eGG5MfmTRPILw2xZQ8W/O9KVQ+JQmzlxQvGIjr2U3CAEsi/g8eeUUnoVuB54krw5m c91tCFbi2NQD0eX1+1pkfIMMofrbdyhMZNnPg10sJQpTjVGIkpnu9Rs/Xmy/QdCMfJjAOt 0D4avbdMDbfuOZtOuh8um5/be0YMhMpubSWZCjzqb+VfR2djrDKQjYxccqkgGdqfbQknGQ nTo8ciZk1RZjQ9cN23SQjW/Pz7WTIrk6o2EJYk50ifSvsqqqq3T8EhtoEBq2zawHW4o7sA vbV+nMJvI+vbUsILIVrmI3lZWS1aK1CUbAY8PnbZ9e1l6L+GgskcQkrQ/5Nm/Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775072071; 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=eCGGh7Jp2k8U4gKGbOs3J/q0GL9Gz7UCeTrPdXroZB4=; b=/BUAIRvcyAqKch5Vap7JP3dcFZTNA1LRh6uWfSVDELOcZ2T33f12KgYpkDnyze9ThCpZ0z tDBZUNpWD9i/oJAg== From: "tip-bot2 for Mario Limonciello (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] firmware: dmi: Add pr_fmt() for dmi_scan.c Cc: "Mario Limonciello (AMD)" , "Borislav Petkov (AMD)" , Jean Delvare , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260307141024.819807-5-superm1@kernel.org> References: <20260307141024.819807-5-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: <177507207020.1647592.3536601918241553703.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: da55ebe166d71c8c6925c5cfd77fc74bed40aaef Gitweb: https://git.kernel.org/tip/da55ebe166d71c8c6925c5cfd77fc74be= d40aaef Author: Mario Limonciello (AMD) AuthorDate: Sat, 07 Mar 2026 08:10:23 -06:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 01 Apr 2026 20:54:16 +02:00 firmware: dmi: Add pr_fmt() for dmi_scan.c 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) Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Jean Delvare Link: https://patch.msgid.link/20260307141024.819807-5-superm1@kernel.org --- 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 80aded4..ed6235a 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); }