mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Mario Limonciello" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Mario Limonciello <mario.limonciello@amd.com>,
	Ingo Molnar <mingo@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
	Hans de Goede <hdegoede@redhat.com>,
	ilpo.jarvinen@linux.intel.com,
	Shyam Sundar S K <Shyam-sundar.S-k@amd.com>,
	Yazen Ghannam <yazen.ghannam@amd.com>,
	platform-driver-x86@vger.kernel.org, x86@kernel.org,
	linux-kernel@vger.kernel.org
Subject: [tip: x86/platform] platform/x86/amd/pmc: Use FCH_PM_BASE definition
Date: Thu, 24 Apr 2025 16:24:22 -0000	[thread overview]
Message-ID: <174551186263.31282.837973831112893685.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250422234830.2840784-5-superm1@kernel.org>

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@amd.com>
AuthorDate:    Tue, 22 Apr 2025 18:48:29 -05:00
Committer:     Ingo Molnar <mingo@kernel.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@amd.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: platform-driver-x86@vger.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 = {

  reply	other threads:[~2025-04-24 16:24 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-22 23:48 [PATCH v5 0/5] AMD Zen debugging documentation Mario Limonciello
2025-04-22 23:48 ` [PATCH v5 1/5] Documentation: Add AMD Zen debugging document Mario Limonciello
2025-05-02  9:36   ` [tip: x86/platform] " tip-bot2 for Mario Limonciello
2025-04-22 23:48 ` [PATCH v5 2/5] i2c: piix4: Depends on X86 Mario Limonciello
2025-04-24 16:24   ` [tip: x86/platform] i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86 tip-bot2 for Mario Limonciello
2025-04-25 11:18   ` [PATCH v5 2/5] i2c: piix4: Depends on X86 Andi Shyti
2025-04-26  9:42     ` Ingo Molnar
2025-04-28 18:18       ` Andi Shyti
2025-04-26  9:57   ` [tip: x86/platform] i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86 tip-bot2 for Mario Limonciello
2025-06-10  9:16   ` [PATCH v5 2/5] i2c: piix4: Depends on X86 Geert Uytterhoeven
2025-06-10  9:24     ` Huacai Chen
2025-06-10 14:12       ` Mario Limonciello
2025-06-10 14:53         ` Hans de Goede
2025-06-10 14:55           ` Hans de Goede
2025-06-10 16:59             ` Geert Uytterhoeven
2025-06-10 18:52               ` Hans de Goede
2025-04-22 23:48 ` [PATCH v5 3/5] i2c: piix4: Move SB800_PIIX4_FCH_PM_ADDR definition to amd/fch.h Mario Limonciello
2025-04-24 16:24   ` [tip: x86/platform] i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH definitions to <asm/amd/fch.h> tip-bot2 for Mario Limonciello
2025-04-25 11:18   ` [PATCH v5 3/5] i2c: piix4: Move SB800_PIIX4_FCH_PM_ADDR definition to amd/fch.h Andi Shyti
2025-04-26  9:57   ` [tip: x86/platform] i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH definitions to <asm/amd/fch.h> tip-bot2 for Mario Limonciello
2025-04-22 23:48 ` [PATCH v5 4/5] platform/x86/amd: pmc: use FCH_PM_BASE definition Mario Limonciello
2025-04-24 16:24   ` tip-bot2 for Mario Limonciello [this message]
2025-04-26  9:56   ` [tip: x86/platform] platform/x86/amd/pmc: Use " tip-bot2 for Mario Limonciello
2025-04-29 14:39   ` [PATCH v5 4/5] platform/x86/amd: pmc: use " Ilpo Järvinen
2025-04-22 23:48 ` [PATCH v5 5/5] x86/CPU/AMD: Print the reason for the last reset Mario Limonciello
2025-04-30 19:03   ` Borislav Petkov
2025-04-30 19:05     ` Mario Limonciello
2025-04-30 19:10       ` Borislav Petkov
2025-04-30 19:17         ` Mario Limonciello
2025-04-30 19:25           ` Borislav Petkov
2025-04-30 19:32             ` Mario Limonciello
2025-04-30 19:38               ` Borislav Petkov
2025-05-01  8:31               ` Borislav Petkov
2025-05-04  6:38                 ` Ingo Molnar
2025-05-02  9:36   ` [tip: x86/platform] " tip-bot2 for Yazen Ghannam
2025-05-04  6:37     ` Ingo Molnar
2025-05-04  7:03       ` [PATCH] x86/CPU/AMD: Clean up the last-reset printing code a bit Ingo Molnar
2025-05-04  9:52         ` Borislav Petkov
2025-05-04 18:08           ` Mario Limonciello
2025-05-05  5:32         ` [tip: x86/platform] " tip-bot2 for Ingo Molnar
2025-05-05 14:12   ` [tip: x86/platform] x86/CPU/AMD: Print the reason for the last reset tip-bot2 for Yazen Ghannam
2025-04-23 15:02 ` [PATCH v5 0/5] AMD Zen debugging documentation Jonathan Corbet
2025-04-28 16:14   ` Mario Limonciello
2025-04-24 15:58 ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=174551186263.31282.837973831112893685.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=Shyam-sundar.S-k@amd.com \
    --cc=hdegoede@redhat.com \
    --cc=hpa@zytor.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=mingo@kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=x86@kernel.org \
    --cc=yazen.ghannam@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®