diff mbox series

[v5,4/5] platform/x86/amd: pmc: use FCH_PM_BASE definition

Message ID 20250422234830.2840784-5-superm1@kernel.org
State New
Headers show
Series AMD Zen debugging documentation | expand

Commit Message

Mario Limonciello April 22, 2025, 11:48 p.m. UTC 
From: Mario Limonciello <mario.limonciello@amd.com>

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>
---
v5:
 * Move <asm> header after <linux> headers
v4:
 * Use fch.h instead
---
 arch/x86/include/asm/amd/fch.h            | 1 +
 drivers/platform/x86/amd/pmc/pmc-quirks.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Ilpo Järvinen April 29, 2025, 2:39 p.m. UTC | #1 
On Tue, 22 Apr 2025, Mario Limonciello wrote:

> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> 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>

This is quite trivial change, but here is this for completeness in case 
x86 maintainers want to have it:

Acked-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

--
 i.

> ---
> v5:
>  * Move <asm> header after <linux> headers
> v4:
>  * Use fch.h instead
> ---
>  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 a5fd91ff92df3..9b32e8a03193e 100644
> --- a/arch/x86/include/asm/amd/fch.h
> +++ b/arch/x86/include/asm/amd/fch.h
> @@ -8,5 +8,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
> diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
> index b4f49720c87f6..b706b1f4d94bf 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 = {
>
diff mbox series

Patch

diff --git a/arch/x86/include/asm/amd/fch.h b/arch/x86/include/asm/amd/fch.h
index a5fd91ff92df3..9b32e8a03193e 100644
--- a/arch/x86/include/asm/amd/fch.h
+++ b/arch/x86/include/asm/amd/fch.h
@@ -8,5 +8,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
diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
index b4f49720c87f6..b706b1f4d94bf 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 = {