linux-kernel - [tip: x86/platform] platform/x86/amd/pmc: Use FCH_PM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <174551186263.31282.837973831112893685.tip-bot2@tip-bot2>
Date: Thu, 24 Apr 2025 16:24:22 -0000
From: "tip-bot2 for Mario Limonciello" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Mario Limonciello <mario.limonciello@....com>,
 Ingo Molnar <mingo@...nel.org>, "H. Peter Anvin" <hpa@...or.com>,
 Hans de Goede <hdegoede@...hat.com>, ilpo.jarvinen@...ux.intel.com,
 Shyam Sundar S K <Shyam-sundar.S-k@....com>,
 Yazen Ghannam <yazen.ghannam@....com>, platform-driver-x86@...r.kernel.org,
 x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/platform] platform/x86/amd/pmc: Use FCH_PM_BASE definition

The following commit has been merged into the x86/platform branch of tip:

Commit-ID:     0fbe08e78dfd4a680806132673c520f0fc5f84d9
Gitweb:        https://git.kernel.org/tip/0fbe08e78dfd4a680806132673c520f0fc5f84d9
Author:        Mario Limonciello <mario.limonciello@....com>
AuthorDate:    Tue, 22 Apr 2025 18:48:29 -05:00
Committer:     Ingo Molnar <mingo@...nel.org>
CommitterDate: Thu, 24 Apr 2025 17:55:18 +02:00

platform/x86/amd/pmc: Use FCH_PM_BASE definition

The s2idle MMIO quirk uses a scratch register in the FCH.
Adjust the code to clarify that.

Signed-off-by: Mario Limonciello <mario.limonciello@....com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Hans de Goede <hdegoede@...hat.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc: Shyam Sundar S K <Shyam-sundar.S-k@....com>
Cc: Yazen Ghannam <yazen.ghannam@....com>
Cc: platform-driver-x86@...r.kernel.org
Link: https://lore.kernel.org/r/20250422234830.2840784-5-superm1@kernel.org
---
 arch/x86/include/asm/amd/fch.h            | 1 +
 drivers/platform/x86/amd/pmc/pmc-quirks.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/amd/fch.h b/arch/x86/include/asm/amd/fch.h
index 28972bd..01ee15b 100644
--- a/arch/x86/include/asm/amd/fch.h
+++ b/arch/x86/include/asm/amd/fch.h
@@ -7,5 +7,6 @@
 /* Register offsets from PM base: */
 #define FCH_PM_DECODEEN			0x00
 #define FCH_PM_DECODEEN_SMBUS0SEL	GENMASK(20, 19)
+#define FCH_PM_SCRATCH			0x80
 
 #endif /* _ASM_X86_AMD_FCH_H_ */
diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
index b4f4972..b706b1f 100644
--- a/drivers/platform/x86/amd/pmc/pmc-quirks.c
+++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c
@@ -11,6 +11,7 @@
 #include <linux/dmi.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <asm/amd/fch.h>
 
 #include "pmc.h"
 
@@ -20,7 +21,7 @@ struct quirk_entry {
 };
 
 static struct quirk_entry quirk_s2idle_bug = {
-	.s2idle_bug_mmio = 0xfed80380,
+	.s2idle_bug_mmio = FCH_PM_BASE + FCH_PM_SCRATCH,
 };
 
 static struct quirk_entry quirk_spurious_8042 = {