* [PATCH 1/7] ACPI: mipi-disco-img: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:15 ` sashiko-bot
2026-11-11 23:48 ` [PATCH 2/7] drm/i915: " Pavel Popov
` (5 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.
<asm/intel-family.h> is included by <asm/cpu_device_id.h>. The CPU
match table still needs CONFIG_X86 for the INTEL_* model defines.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
drivers/acpi/mipi-disco-img.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c
index ea4bffe3c02..3d841d2bdfd 100644
--- a/drivers/acpi/mipi-disco-img.c
+++ b/drivers/acpi/mipi-disco-img.c
@@ -30,6 +30,8 @@
#include <media/v4l2-fwnode.h>
+#include <asm/cpu_device_id.h>
+
#include "internal.h"
static LIST_HEAD(acpi_mipi_crs_csi2_list);
@@ -724,9 +726,6 @@ void acpi_mipi_crs_csi2_cleanup(void)
}
#ifdef CONFIG_X86
-#include <asm/cpu_device_id.h>
-#include <asm/intel-family.h>
-
/* CPU matches for Dell generations with broken ACPI MIPI DISCO info */
static const struct x86_cpu_id dell_broken_mipi_disco_cpu_gens[] = {
X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 2/7] drm/i915: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
2026-11-11 23:48 ` [PATCH 1/7] ACPI: mipi-disco-img: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:17 ` sashiko-bot
2026-11-12 4:41 ` Raag Jadav
2026-11-11 23:48 ` [PATCH 3/7] drm/amdgpu: " Pavel Popov
` (4 subsequent siblings)
6 siblings, 2 replies; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.
<asm/intel-family.h> is included by <asm/cpu_device_id.h>. The CPU
match table still needs CONFIG_X86 for the INTEL_* model defines.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
drivers/gpu/drm/i915/intel_cpu_info.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_cpu_info.c b/drivers/gpu/drm/i915/intel_cpu_info.c
index e52d0ac713a..a6b46cc841a 100644
--- a/drivers/gpu/drm/i915/intel_cpu_info.c
+++ b/drivers/gpu/drm/i915/intel_cpu_info.c
@@ -6,12 +6,11 @@
* intel_device_info.h by having a separate file.
*/
+#include <asm/cpu_device_id.h>
+
#include "intel_cpu_info.h"
#ifdef CONFIG_X86
-#include <asm/cpu_device_id.h>
-#include <asm/intel-family.h>
-
static const struct x86_cpu_id g8_cpu_ids[] = {
X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 2/7] drm/i915: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 ` [PATCH 2/7] drm/i915: " Pavel Popov
@ 2026-11-12 0:17 ` sashiko-bot
2026-11-12 4:41 ` Raag Jadav
1 sibling, 0 replies; 19+ messages in thread
From: sashiko-bot @ 2026-11-12 0:17 UTC (permalink / raw)
To: Pavel Popov; +Cc: linux-pci
> <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> CONFIG_X86 around the include is no longer needed.
>
> <asm/intel-family.h> is included by <asm/cpu_device_id.h>. The CPU
> match table still needs CONFIG_X86 for the INTEL_* model defines.
>
> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261111234821.4814-1-pavel.e.popov@intel.com?part=2
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/7] drm/i915: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 ` [PATCH 2/7] drm/i915: " Pavel Popov
2026-11-12 0:17 ` sashiko-bot
@ 2026-11-12 4:41 ` Raag Jadav
1 sibling, 0 replies; 19+ messages in thread
From: Raag Jadav @ 2026-11-12 4:41 UTC (permalink / raw)
To: Pavel Popov
Cc: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu, Leon Romanovsky, Bjorn Helgaas,
Logan Gunthorpe, Arnd Bergmann, Len Brown, Sakari Ailus,
Jason Gunthorpe, David Airlie, Simona Vetter, David S . Miller,
x86, linux-acpi, linux-pm, intel-gfx, amd-gfx, dri-devel,
platform-driver-x86, linux-integrity, linux-crypto, linux-arch,
linux-pci, linux-kernel, andriy.shevchenko
Cc: Andy
On Wed, Nov 11, 2026 at 04:48:15PM -0700, Pavel Popov wrote:
> <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> CONFIG_X86 around the include is no longer needed.
>
> <asm/intel-family.h> is included by <asm/cpu_device_id.h>. The CPU
> match table still needs CONFIG_X86 for the INTEL_* model defines.
>
> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
Reviewed-by: Raag Jadav <raag.jadav@intel.com>
> ---
> Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
> it is in mainline.
>
> [1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
>
> drivers/gpu/drm/i915/intel_cpu_info.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_cpu_info.c b/drivers/gpu/drm/i915/intel_cpu_info.c
> index e52d0ac713a..a6b46cc841a 100644
> --- a/drivers/gpu/drm/i915/intel_cpu_info.c
> +++ b/drivers/gpu/drm/i915/intel_cpu_info.c
> @@ -6,12 +6,11 @@
> * intel_device_info.h by having a separate file.
> */
>
> +#include <asm/cpu_device_id.h>
> +
> #include "intel_cpu_info.h"
>
> #ifdef CONFIG_X86
> -#include <asm/cpu_device_id.h>
> -#include <asm/intel-family.h>
> -
> static const struct x86_cpu_id g8_cpu_ids[] = {
> X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
> X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
> --
> 2.54.0
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/7] drm/amdgpu: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
2026-11-11 23:48 ` [PATCH 1/7] ACPI: mipi-disco-img: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
2026-11-11 23:48 ` [PATCH 2/7] drm/i915: " Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:20 ` sashiko-bot
2026-11-11 23:48 ` [PATCH 4/7] cpufreq: ondemand: " Pavel Popov
` (3 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.
<asm/intel-family.h> is included by <asm/cpu_device_id.h>.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 19a566187df..fc4e7273630 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -88,10 +88,7 @@
#include <drm/drm_drv.h>
-#if IS_ENABLED(CONFIG_X86)
-#include <asm/intel-family.h>
#include <asm/cpu_device_id.h>
-#endif
MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");
MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 4/7] cpufreq: ondemand: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
` (2 preceding siblings ...)
2026-11-11 23:48 ` [PATCH 3/7] drm/amdgpu: " Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:24 ` sashiko-bot
2026-11-12 3:22 ` Zhongqiu Han
2026-11-11 23:48 ` [PATCH 5/7] platform/x86: Include <asm/cpu_device_id.h> unconditionally in soc.h Pavel Popov
` (2 subsequent siblings)
6 siblings, 2 replies; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.
od_should_io_be_busy() still needs CONFIG_X86 for boot_cpu_data.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
drivers/cpufreq/cpufreq_ondemand.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/cpufreq_ondemand.h b/drivers/cpufreq/cpufreq_ondemand.h
index 2ca8f1aaf2e..0e33865f9d3 100644
--- a/drivers/cpufreq/cpufreq_ondemand.h
+++ b/drivers/cpufreq/cpufreq_ondemand.h
@@ -6,6 +6,8 @@
* Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
*/
+#include <asm/cpu_device_id.h>
+
#include "cpufreq_governor.h"
struct od_policy_dbs_info {
@@ -26,8 +28,6 @@ struct od_dbs_tuners {
};
#ifdef CONFIG_X86
-#include <asm/cpu_device_id.h>
-
/*
* Not all CPUs want IO time to be accounted as busy; this depends on
* how efficient idling at a higher frequency/voltage is.
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 4/7] cpufreq: ondemand: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 ` [PATCH 4/7] cpufreq: ondemand: " Pavel Popov
@ 2026-11-12 0:24 ` sashiko-bot
2026-11-12 3:22 ` Zhongqiu Han
1 sibling, 0 replies; 19+ messages in thread
From: sashiko-bot @ 2026-11-12 0:24 UTC (permalink / raw)
To: Pavel Popov; +Cc: linux-pci
> <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> CONFIG_X86 around the include is no longer needed.
>
> od_should_io_be_busy() still needs CONFIG_X86 for boot_cpu_data.
>
> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261111234821.4814-1-pavel.e.popov@intel.com?part=4
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 4/7] cpufreq: ondemand: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 ` [PATCH 4/7] cpufreq: ondemand: " Pavel Popov
2026-11-12 0:24 ` sashiko-bot
@ 2026-11-12 3:22 ` Zhongqiu Han
1 sibling, 0 replies; 19+ messages in thread
From: Zhongqiu Han @ 2026-11-12 3:22 UTC (permalink / raw)
To: Pavel Popov, Rafael J. Wysocki, Viresh Kumar, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher,
Christian König, Hans de Goede, Ilpo Järvinen,
Peter Huewe, Jarkko Sakkinen, Tom Lendacky, Herbert Xu
Cc: Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe, Arnd Bergmann,
Len Brown, Sakari Ailus, Jason Gunthorpe, David Airlie,
Simona Vetter, David S . Miller, x86, linux-acpi, linux-pm,
intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel, Zhongqiu Han
On 11/12/2026 7:48 AM, Pavel Popov wrote:
> <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> CONFIG_X86 around the include is no longer needed.
>
> od_should_io_be_busy() still needs CONFIG_X86 for boot_cpu_data.
>
> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
> ---
> Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
> it is in mainline.
Yeah, this patch strictly depends on [1] (series patch 1/3) being in
mainline first; otherwise non-x86 builds break.
Reviewed-by: Zhongqiu Han <zhongqiu.han@oss.qualcomm.com>
>
> [1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
>
> drivers/cpufreq/cpufreq_ondemand.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/cpufreq_ondemand.h b/drivers/cpufreq/cpufreq_ondemand.h
> index 2ca8f1aaf2e..0e33865f9d3 100644
> --- a/drivers/cpufreq/cpufreq_ondemand.h
> +++ b/drivers/cpufreq/cpufreq_ondemand.h
> @@ -6,6 +6,8 @@
> * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> */
>
> +#include <asm/cpu_device_id.h>
> +
> #include "cpufreq_governor.h"
>
> struct od_policy_dbs_info {
> @@ -26,8 +28,6 @@ struct od_dbs_tuners {
> };
>
> #ifdef CONFIG_X86
> -#include <asm/cpu_device_id.h>
> -
> /*
> * Not all CPUs want IO time to be accounted as busy; this depends on
> * how efficient idling at a higher frequency/voltage is.
--
Thx and BRs,
Zhongqiu Han
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 5/7] platform/x86: Include <asm/cpu_device_id.h> unconditionally in soc.h
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
` (3 preceding siblings ...)
2026-11-11 23:48 ` [PATCH 4/7] cpufreq: ondemand: " Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:27 ` sashiko-bot
2026-11-11 23:48 ` [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
2026-11-11 23:48 ` [PATCH 7/7] crypto: ccp - Drop unused <asm/cpu_device_id.h> include Pavel Popov
6 siblings, 1 reply; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed. The include of
<linux/device-id/x86_cpu.h>, which is generic, moves out of the
#ifdef as well.
The soc_intel_is_*() helpers still need CONFIG_X86 for the INTEL_*
model defines.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
include/linux/platform_data/x86/soc.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h
index a6a6b313dfa..ee696e576a0 100644
--- a/include/linux/platform_data/x86/soc.h
+++ b/include/linux/platform_data/x86/soc.h
@@ -9,13 +9,12 @@
#define __PLATFORM_DATA_X86_SOC_H
#include <linux/types.h>
-
-#if IS_ENABLED(CONFIG_X86)
-
#include <linux/device-id/x86_cpu.h>
#include <asm/cpu_device_id.h>
+#if IS_ENABLED(CONFIG_X86)
+
#define SOC_INTEL_IS_CPU(soc, type) \
static inline bool soc_intel_is_##soc(void) \
{ \
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
` (4 preceding siblings ...)
2026-11-11 23:48 ` [PATCH 5/7] platform/x86: Include <asm/cpu_device_id.h> unconditionally in soc.h Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:29 ` sashiko-bot
2026-11-12 0:40 ` Jarkko Sakkinen
2026-11-11 23:48 ` [PATCH 7/7] crypto: ccp - Drop unused <asm/cpu_device_id.h> include Pavel Popov
6 siblings, 2 replies; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
drivers/char/tpm/tpm.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index fa554c5ad80..ad1534aa00c 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -28,9 +28,7 @@
#include <linux/tpm.h>
#include <linux/tpm_eventlog.h>
-#ifdef CONFIG_X86
#include <asm/cpu_device_id.h>
-#endif
#define TPM_MINOR 224 /* officially assigned */
#define TPM_NUM_DEVICES 65536
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 ` [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
@ 2026-11-12 0:29 ` sashiko-bot
2026-11-12 0:40 ` Jarkko Sakkinen
1 sibling, 0 replies; 19+ messages in thread
From: sashiko-bot @ 2026-11-12 0:29 UTC (permalink / raw)
To: Pavel Popov; +Cc: linux-pci
> <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> CONFIG_X86 around the include is no longer needed.
>
> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261111234821.4814-1-pavel.e.popov@intel.com?part=6
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally
2026-11-11 23:48 ` [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
2026-11-12 0:29 ` sashiko-bot
@ 2026-11-12 0:40 ` Jarkko Sakkinen
2026-11-12 1:22 ` Popov, Pavel E
1 sibling, 1 reply; 19+ messages in thread
From: Jarkko Sakkinen @ 2026-11-12 0:40 UTC (permalink / raw)
To: Pavel Popov
Cc: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Tom Lendacky,
Herbert Xu, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
On Wed, Nov 11, 2026 at 04:48:19PM -0700, Pavel Popov wrote:
> <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> CONFIG_X86 around the include is no longer needed.
>
> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Are these expected to be picked separately by subsystems?
Br, Jarkko
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally
2026-11-12 0:40 ` Jarkko Sakkinen
@ 2026-11-12 1:22 ` Popov, Pavel E
0 siblings, 0 replies; 19+ messages in thread
From: Popov, Pavel E @ 2026-11-12 1:22 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Vivi, Rodrigo, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Tom Lendacky,
Herbert Xu, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86@kernel.org,
linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org,
intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org,
platform-driver-x86@vger.kernel.org,
linux-integrity@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-arch@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
>
> Are these expected to be picked separately by subsystems?
Yes, each through its own subsystem tree, once [1] is in mainline.
The tpm patch does not build on non-x86 before that.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
Thanks,
Pavel
> -----Original Message-----
> From: Jarkko Sakkinen <jarkko@kernel.org>
> Sent: Wednesday, November 11, 2026 5:40 PM
> To: Popov, Pavel E <pavel.e.popov@intel.com>
> Cc: Rafael J. Wysocki <rafael@kernel.org>; Viresh Kumar
> <viresh.kumar@linaro.org>; Jani Nikula <jani.nikula@linux.intel.com>; Joonas
> Lahtinen <joonas.lahtinen@linux.intel.com>; Vivi, Rodrigo
> <rodrigo.vivi@intel.com>; Tvrtko Ursulin <tursulin@ursulin.net>; Alex Deucher
> <alexander.deucher@amd.com>; Christian König
> <christian.koenig@amd.com>; Hans de Goede <hansg@kernel.org>; Ilpo
> Järvinen <ilpo.jarvinen@linux.intel.com>; Peter Huewe
> <peterhuewe@gmx.de>; Tom Lendacky <thomas.lendacky@amd.com>;
> Herbert Xu <herbert@gondor.apana.org.au>; Leon Romanovsky
> <leon@kernel.org>; Bjorn Helgaas <bhelgaas@google.com>; Logan Gunthorpe
> <logang@deltatee.com>; Arnd Bergmann <arnd@arndb.de>; Len Brown
> <lenb@kernel.org>; Sakari Ailus <sakari.ailus@linux.intel.com>; Jason
> Gunthorpe <jgg@ziepe.ca>; David Airlie <airlied@gmail.com>; Simona Vetter
> <simona@ffwll.ch>; David S . Miller <davem@davemloft.net>;
> x86@kernel.org; linux-acpi@vger.kernel.org; linux-pm@vger.kernel.org; intel-
> gfx@lists.freedesktop.org; amd-gfx@lists.freedesktop.org; dri-
> devel@lists.freedesktop.org; platform-driver-x86@vger.kernel.org; linux-
> integrity@vger.kernel.org; linux-crypto@vger.kernel.org; linux-
> arch@vger.kernel.org; linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally
>
> On Wed, Nov 11, 2026 at 04:48:19PM -0700, Pavel Popov wrote:
> > <asm/cpu_device_id.h> now has a generic version, so the #ifdef
> > CONFIG_X86 around the include is no longer needed.
> >
> > Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
>
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
>
> Are these expected to be picked separately by subsystems?
>
> Br, Jarkko
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 7/7] crypto: ccp - Drop unused <asm/cpu_device_id.h> include
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
` (5 preceding siblings ...)
2026-11-11 23:48 ` [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
@ 2026-11-11 23:48 ` Pavel Popov
2026-11-12 0:30 ` sashiko-bot
6 siblings, 1 reply; 19+ messages in thread
From: Pavel Popov @ 2026-11-11 23:48 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König,
Hans de Goede, Ilpo Järvinen, Peter Huewe, Jarkko Sakkinen,
Tom Lendacky, Herbert Xu
Cc: Pavel Popov, Leon Romanovsky, Bjorn Helgaas, Logan Gunthorpe,
Arnd Bergmann, Len Brown, Sakari Ailus, Jason Gunthorpe,
David Airlie, Simona Vetter, David S . Miller, x86, linux-acpi,
linux-pm, intel-gfx, amd-gfx, dri-devel, platform-driver-x86,
linux-integrity, linux-crypto, linux-arch, linux-pci,
linux-kernel
Nothing in ccp-dev.c uses <asm/cpu_device_id.h>; the CPU match table
it was included for is long gone. Drop the include and the #ifdef
CONFIG_X86 around it.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
drivers/crypto/ccp/ccp-dev.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c
index 41d9bdac95d..017e7a6551f 100644
--- a/drivers/crypto/ccp/ccp-dev.c
+++ b/drivers/crypto/ccp/ccp-dev.c
@@ -21,9 +21,6 @@
#include <linux/hw_random.h>
#include <linux/cpu.h>
#include <linux/atomic.h>
-#ifdef CONFIG_X86
-#include <asm/cpu_device_id.h>
-#endif
#include <linux/ccp.h>
#include "ccp-dev.h"
--
2.54.0
^ permalink raw reply related [flat|nested] 19+ messages in thread