| Message ID | 20240416212250.9969-1-tony.luck@intel.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | None | expand |
On Tue, Apr 16, 2024 at 11:22 PM Tony Luck <tony.luck@intel.com> wrote: > > New CPU #defines encode vendor and family as well as model. > > Signed-off-by: Tony Luck <tony.luck@intel.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > include/linux/platform_data/x86/soc.h | 12 ++++++------ > drivers/thermal/intel/intel_soc_dts_thermal.c | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h > index a5705189e2ac..f981907a5cb0 100644 > --- a/include/linux/platform_data/x86/soc.h > +++ b/include/linux/platform_data/x86/soc.h > @@ -20,7 +20,7 @@ > static inline bool soc_intel_is_##soc(void) \ > { \ > static const struct x86_cpu_id soc##_cpu_ids[] = { \ > - X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ > + X86_MATCH_VFM(type, NULL), \ > {} \ > }; \ > const struct x86_cpu_id *id; \ > @@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \ > return false; \ > } > > -SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); > -SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); > -SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); > -SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); > -SOC_INTEL_IS_CPU(cml, KABYLAKE_L); > +SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT); > +SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT); > +SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT); > +SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS); > +SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L); > > #undef SOC_INTEL_IS_CPU > > diff --git a/drivers/thermal/intel/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c > index 9c825c6e1f38..718c6326eaf4 100644 > --- a/drivers/thermal/intel/intel_soc_dts_thermal.c > +++ b/drivers/thermal/intel/intel_soc_dts_thermal.c > @@ -36,7 +36,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) > } > > static const struct x86_cpu_id soc_thermal_ids[] = { > - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), > + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), > {} > }; > MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids); > -- > 2.44.0 >
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h index a5705189e2ac..f981907a5cb0 100644 --- a/include/linux/platform_data/x86/soc.h +++ b/include/linux/platform_data/x86/soc.h @@ -20,7 +20,7 @@ static inline bool soc_intel_is_##soc(void) \ { \ static const struct x86_cpu_id soc##_cpu_ids[] = { \ - X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ + X86_MATCH_VFM(type, NULL), \ {} \ }; \ const struct x86_cpu_id *id; \ @@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \ return false; \ } -SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); -SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); -SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); -SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); -SOC_INTEL_IS_CPU(cml, KABYLAKE_L); +SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT); +SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT); +SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT); +SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS); +SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L); #undef SOC_INTEL_IS_CPU diff --git a/drivers/thermal/intel/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c index 9c825c6e1f38..718c6326eaf4 100644 --- a/drivers/thermal/intel/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel/intel_soc_dts_thermal.c @@ -36,7 +36,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) } static const struct x86_cpu_id soc_thermal_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), {} }; MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids);
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <tony.luck@intel.com> --- include/linux/platform_data/x86/soc.h | 12 ++++++------ drivers/thermal/intel/intel_soc_dts_thermal.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)