| Message ID | 20240416212253.9989-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> > --- > drivers/thermal/intel/intel_tcc_cooling.c | 30 +++++++++++------------ > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/thermal/intel/intel_tcc_cooling.c b/drivers/thermal/intel/intel_tcc_cooling.c > index 6c392147e6d1..63696e7d7b3c 100644 > --- a/drivers/thermal/intel/intel_tcc_cooling.c > +++ b/drivers/thermal/intel/intel_tcc_cooling.c > @@ -49,21 +49,21 @@ static const struct thermal_cooling_device_ops tcc_cooling_ops = { > }; > > static const struct x86_cpu_id tcc_ids[] __initconst = { > - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL), > + X86_MATCH_VFM(INTEL_SKYLAKE, NULL), > + X86_MATCH_VFM(INTEL_SKYLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_KABYLAKE, NULL), > + X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_ICELAKE, NULL), > + X86_MATCH_VFM(INTEL_ICELAKE_L, NULL), > + X86_MATCH_VFM(INTEL_TIGERLAKE, NULL), > + X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_COMETLAKE, NULL), > + X86_MATCH_VFM(INTEL_ALDERLAKE, NULL), > + X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, NULL), > + X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL), > + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL), > + X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL), > {} > }; > > -- > 2.44.0 >
diff --git a/drivers/thermal/intel/intel_tcc_cooling.c b/drivers/thermal/intel/intel_tcc_cooling.c index 6c392147e6d1..63696e7d7b3c 100644 --- a/drivers/thermal/intel/intel_tcc_cooling.c +++ b/drivers/thermal/intel/intel_tcc_cooling.c @@ -49,21 +49,21 @@ static const struct thermal_cooling_device_ops tcc_cooling_ops = { }; static const struct x86_cpu_id tcc_ids[] __initconst = { - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL), + X86_MATCH_VFM(INTEL_SKYLAKE, NULL), + X86_MATCH_VFM(INTEL_SKYLAKE_L, NULL), + X86_MATCH_VFM(INTEL_KABYLAKE, NULL), + X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ICELAKE, NULL), + X86_MATCH_VFM(INTEL_ICELAKE_L, NULL), + X86_MATCH_VFM(INTEL_TIGERLAKE, NULL), + X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL), + X86_MATCH_VFM(INTEL_COMETLAKE, NULL), + X86_MATCH_VFM(INTEL_ALDERLAKE, NULL), + X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL), {} };
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <tony.luck@intel.com> --- drivers/thermal/intel/intel_tcc_cooling.c | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)