| Message ID | 20240424181539.42311-1-tony.luck@intel.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | None | expand |
On Wed, 2024-04-24 at 11:15 -0700, Tony Luck wrote: > New CPU #defines encode vendor and family as well as model. > > Signed-off-by: Tony Luck <tony.luck@intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> But we added new CPU model here, which is targeted for 6.10-rc1. So there will be merge issues. > --- > drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c > b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c > index 08df9494603c..96f3b221b6c8 100644 > --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c > +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c > @@ -719,8 +719,8 @@ static struct miscdevice isst_if_char_driver = { > }; > > static const struct x86_cpu_id hpm_cpu_ids[] = { > - X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL), > + X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, NULL), > + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, NULL), > {} > }; >
>> New CPU #defines encode vendor and family as well as model. >> >> Signed-off-by: Tony Luck <tony.luck@intel.com> > > Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Thanks. > But we added new CPU model here, which is targeted for 6.10-rc1. So > there will be merge issues. Yup. This is the second patch that was created before some new CPU was added. I expect there will be more before this is all over. I'll be mopping those up post 6.10-rc1 -Tony
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c index 08df9494603c..96f3b221b6c8 100644 --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c @@ -719,8 +719,8 @@ static struct miscdevice isst_if_char_driver = { }; static const struct x86_cpu_id hpm_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL), + X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, NULL), + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, NULL), {} };
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <tony.luck@intel.com> --- drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)