[PATCH 1/2] Move FCH header to a location accessible by all archs

[PATCH 1/2] Move FCH header to a location accessible by all archs

[Mario Limonciello]

From: Mario Limonciello <mario.limonciello@amd.com>

A new header fch.h was created to store registers used by different AMD
drivers.  This header was included by i2c-piix4 in
commit 624b0d5696a8 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH
definitions to <asm/amd/fch.h>"). To prevent compile failures on non-x86
archs i2c-piix4 was set to only compile on x86 by commit 7e173eb82ae9717
("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
This was not a good decision because loongarch and mips both actually
support i2c-piix4 and set it enabled in the defconfig.

Move the header to a location accessible by all architectures.

Fixes: 624b0d5696a89 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH definitions to <asm/amd/fch.h>")
Suggested-by: Hans de Goede <hansg@kernel.org>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 arch/x86/kernel/cpu/amd.c                                       | 2 +-
 drivers/i2c/busses/i2c-piix4.c                                  | 2 +-
 drivers/platform/x86/amd/pmc/pmc-quirks.c                       | 2 +-
 .../asm/amd/fch.h => include/linux/platform_data/x86/amd-fch.h  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/x86/include/asm/amd/fch.h => include/linux/platform_data/x86/amd-fch.h (100%)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 93da466dfe2cb..9543d5de4e7d6 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -9,7 +9,7 @@
 #include <linux/sched/clock.h>
 #include <linux/random.h>
 #include <linux/topology.h>
-#include <asm/amd/fch.h>
+#include <linux/platform_data/x86/amd-fch.h>
 #include <asm/processor.h>
 #include <asm/apic.h>
 #include <asm/cacheinfo.h>
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 9d3a4dc2bd60c..ac3bb550303fe 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -34,7 +34,7 @@
 #include <linux/dmi.h>
 #include <linux/acpi.h>
 #include <linux/io.h>
-#include <asm/amd/fch.h>
+#include <linux/platform_data/x86/amd-fch.h>
 
 #include "i2c-piix4.h"
 
diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
index 5c7c01f66cde0..6648fe0dce537 100644
--- a/drivers/platform/x86/amd/pmc/pmc-quirks.c
+++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c
@@ -11,7 +11,7 @@
 #include <linux/dmi.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
-#include <asm/amd/fch.h>
+#include <linux/platform_data/x86/amd-fch.h>
 
 #include "pmc.h"
 
diff --git a/arch/x86/include/asm/amd/fch.h b/include/linux/platform_data/x86/amd-fch.h
similarity index 100%
rename from arch/x86/include/asm/amd/fch.h
rename to include/linux/platform_data/x86/amd-fch.h
-- 
2.43.0

[PATCH 2/2] i2c: Re-enable piix4 driver on non-x86

[Mario Limonciello]

From: Mario Limonciello <mario.limonciello@amd.com>

loongarch and mips both support hardware that uses the i2c-piix4 driver.
It should not be restricted to x86, so drop the x86 dependency.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Closes: https://lore.kernel.org/all/CAMuHMdVPQLjOox5sMp34Z5MTwKv2WOpHa=MpZr8hWG22fQKcjw@mail.gmail.com/
Fixes: 7e173eb82ae97175 ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/i2c/busses/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 48c5ab8320090..3be623735ca8a 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -200,7 +200,7 @@ config I2C_ISMT
 
 config I2C_PIIX4
 	tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
-	depends on PCI && HAS_IOPORT && X86
+	depends on PCI && HAS_IOPORT
 	select I2C_SMBUS
 	help
 	  If you say yes to this option, support will be included for the Intel
-- 
2.43.0

Re: [PATCH 2/2] i2c: Re-enable piix4 driver on non-x86

[Andi Shyti]

Hi Mario,

On Tue, Jun 10, 2025 at 03:58:17PM -0500, Mario Limonciello wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> loongarch and mips both support hardware that uses the i2c-piix4 driver.
> It should not be restricted to x86, so drop the x86 dependency.
> 
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Closes: https://lore.kernel.org/all/CAMuHMdVPQLjOox5sMp34Z5MTwKv2WOpHa=MpZr8hWG22fQKcjw@mail.gmail.com/
> Fixes: 7e173eb82ae97175 ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>  drivers/i2c/busses/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 48c5ab8320090..3be623735ca8a 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -200,7 +200,7 @@ config I2C_ISMT
>  
>  config I2C_PIIX4
>  	tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
> -	depends on PCI && HAS_IOPORT && X86
> +	depends on PCI && HAS_IOPORT

mmmhhh... OK.

Acked-by: Andi Shyti <andi.shyti@kernel.org>

Andi

>  	select I2C_SMBUS
>  	help
>  	  If you say yes to this option, support will be included for the Intel
> -- 
> 2.43.0
> 

Re: [PATCH 1/2] Move FCH header to a location accessible by all archs

[Hans de Goede]

Hi,

On 10-Jun-25 10:58 PM, Mario Limonciello wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> A new header fch.h was created to store registers used by different AMD
> drivers.  This header was included by i2c-piix4 in
> commit 624b0d5696a8 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH
> definitions to <asm/amd/fch.h>"). To prevent compile failures on non-x86
> archs i2c-piix4 was set to only compile on x86 by commit 7e173eb82ae9717
> ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
> This was not a good decision because loongarch and mips both actually
> support i2c-piix4 and set it enabled in the defconfig.
> 
> Move the header to a location accessible by all architectures.
> 
> Fixes: 624b0d5696a89 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH definitions to <asm/amd/fch.h>")
> Suggested-by: Hans de Goede <hansg@kernel.org>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hansg@kernel.org>

Regards,

Hans



> ---
>  arch/x86/kernel/cpu/amd.c                                       | 2 +-
>  drivers/i2c/busses/i2c-piix4.c                                  | 2 +-
>  drivers/platform/x86/amd/pmc/pmc-quirks.c                       | 2 +-
>  .../asm/amd/fch.h => include/linux/platform_data/x86/amd-fch.h  | 0
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename arch/x86/include/asm/amd/fch.h => include/linux/platform_data/x86/amd-fch.h (100%)
> 
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 93da466dfe2cb..9543d5de4e7d6 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -9,7 +9,7 @@
>  #include <linux/sched/clock.h>
>  #include <linux/random.h>
>  #include <linux/topology.h>
> -#include <asm/amd/fch.h>
> +#include <linux/platform_data/x86/amd-fch.h>
>  #include <asm/processor.h>
>  #include <asm/apic.h>
>  #include <asm/cacheinfo.h>
> diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
> index 9d3a4dc2bd60c..ac3bb550303fe 100644
> --- a/drivers/i2c/busses/i2c-piix4.c
> +++ b/drivers/i2c/busses/i2c-piix4.c
> @@ -34,7 +34,7 @@
>  #include <linux/dmi.h>
>  #include <linux/acpi.h>
>  #include <linux/io.h>
> -#include <asm/amd/fch.h>
> +#include <linux/platform_data/x86/amd-fch.h>
>  
>  #include "i2c-piix4.h"
>  
> diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
> index 5c7c01f66cde0..6648fe0dce537 100644
> --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c
> +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c
> @@ -11,7 +11,7 @@
>  #include <linux/dmi.h>
>  #include <linux/io.h>
>  #include <linux/ioport.h>
> -#include <asm/amd/fch.h>
> +#include <linux/platform_data/x86/amd-fch.h>
>  
>  #include "pmc.h"
>  
> diff --git a/arch/x86/include/asm/amd/fch.h b/include/linux/platform_data/x86/amd-fch.h
> similarity index 100%
> rename from arch/x86/include/asm/amd/fch.h
> rename to include/linux/platform_data/x86/amd-fch.h

Re: [PATCH 2/2] i2c: Re-enable piix4 driver on non-x86

[Hans de Goede]

Hi,

On 10-Jun-25 10:58 PM, Mario Limonciello wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> loongarch and mips both support hardware that uses the i2c-piix4 driver.
> It should not be restricted to x86, so drop the x86 dependency.
> 
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Closes: https://lore.kernel.org/all/CAMuHMdVPQLjOox5sMp34Z5MTwKv2WOpHa=MpZr8hWG22fQKcjw@mail.gmail.com/
> Fixes: 7e173eb82ae97175 ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hansg@kernel.org>

Regards,

Hans



> ---
>  drivers/i2c/busses/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 48c5ab8320090..3be623735ca8a 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -200,7 +200,7 @@ config I2C_ISMT
>  
>  config I2C_PIIX4
>  	tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
> -	depends on PCI && HAS_IOPORT && X86
> +	depends on PCI && HAS_IOPORT
>  	select I2C_SMBUS
>  	help
>  	  If you say yes to this option, support will be included for the Intel

Re: [PATCH 1/2] Move FCH header to a location accessible by all archs

[Andi Shyti]

Hi,

On Thu, Jun 12, 2025 at 10:36:31AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 10-Jun-25 10:58 PM, Mario Limonciello wrote:
> > From: Mario Limonciello <mario.limonciello@amd.com>
> > 
> > A new header fch.h was created to store registers used by different AMD
> > drivers.  This header was included by i2c-piix4 in
> > commit 624b0d5696a8 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH
> > definitions to <asm/amd/fch.h>"). To prevent compile failures on non-x86
> > archs i2c-piix4 was set to only compile on x86 by commit 7e173eb82ae9717
> > ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
> > This was not a good decision because loongarch and mips both actually
> > support i2c-piix4 and set it enabled in the defconfig.
> > 
> > Move the header to a location accessible by all architectures.
> > 
> > Fixes: 624b0d5696a89 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH definitions to <asm/amd/fch.h>")
> > Suggested-by: Hans de Goede <hansg@kernel.org>
> > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> 
> Thanks, patch looks good to me:
> 
> Reviewed-by: Hans de Goede <hansg@kernel.org>

I don't see this series in yet. I thought you were taking it,
shall I take it through i2c?

Andi

Re: [PATCH 1/2] Move FCH header to a location accessible by all archs

[Ilpo Järvinen]

On Wed, 25 Jun 2025, Andi Shyti wrote:

> Hi,
> 
> On Thu, Jun 12, 2025 at 10:36:31AM +0200, Hans de Goede wrote:
> > Hi,
> > 
> > On 10-Jun-25 10:58 PM, Mario Limonciello wrote:
> > > From: Mario Limonciello <mario.limonciello@amd.com>
> > > 
> > > A new header fch.h was created to store registers used by different AMD
> > > drivers.  This header was included by i2c-piix4 in
> > > commit 624b0d5696a8 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH
> > > definitions to <asm/amd/fch.h>"). To prevent compile failures on non-x86
> > > archs i2c-piix4 was set to only compile on x86 by commit 7e173eb82ae9717
> > > ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on CONFIG_X86").
> > > This was not a good decision because loongarch and mips both actually
> > > support i2c-piix4 and set it enabled in the defconfig.
> > > 
> > > Move the header to a location accessible by all architectures.
> > > 
> > > Fixes: 624b0d5696a89 ("i2c: piix4, x86/platform: Move the SB800 PIIX4 FCH definitions to <asm/amd/fch.h>")
> > > Suggested-by: Hans de Goede <hansg@kernel.org>
> > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> > 
> > Thanks, patch looks good to me:
> > 
> > Reviewed-by: Hans de Goede <hansg@kernel.org>
> 
> I don't see this series in yet. I thought you were taking it,
> shall I take it through i2c?

I'm sorry I seem to have missed this inquiry until now. I thought x86 
would handle it this but apparently they haven't.

(I'm the primary person handling pdx86 patches, not Hans any more).

I can take this now.

-- 
 i.