Re: [PATCH v3 54/74] x86/cpu/vfm: Update drivers/platform/x86/intel/ifs/core.c

Joseph, Jithu
2024-04-16T23:29:55Z

On 4/16/2024 2:22 PM, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
> drivers/platform/x86/intel/ifs/core.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
> index 7b11198d85a1..33412a584836 100644
> --- a/drivers/platform/x86/intel/ifs/core.c
> +++ b/drivers/platform/x86/intel/ifs/core.c
> @@ -11,16 +11,15 @@
>
> #include "ifs.h"
>
> -#define X86_MATCH(model, array_gen) \
> - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \
> - INTEL_FAM6_##model, X86_FEATURE_CORE_CAPABILITIES, array_gen)
> +#define X86_MATCH(vfm, array_gen) \
> + X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_CORE_CAPABILITIES, array_gen)
>
> static const struct x86_cpu_id ifs_cpu_ids[] __initconst = {
> - X86_MATCH(SAPPHIRERAPIDS_X, ARRAY_GEN0),
> - X86_MATCH(EMERALDRAPIDS_X, ARRAY_GEN0),
> - X86_MATCH(GRANITERAPIDS_X, ARRAY_GEN0),
> - X86_MATCH(GRANITERAPIDS_D, ARRAY_GEN0),
> - X86_MATCH(ATOM_CRESTMONT_X, ARRAY_GEN1),
> + X86_MATCH(INTEL_SAPPHIRERAPIDS_X, ARRAY_GEN0),
> + X86_MATCH(INTEL_EMERALDRAPIDS_X, ARRAY_GEN0),
> + X86_MATCH(INTEL_GRANITERAPIDS_X, ARRAY_GEN0),
> + X86_MATCH(INTEL_GRANITERAPIDS_D, ARRAY_GEN0),
> + X86_MATCH(INTEL_ATOM_CRESTMONT_X, ARRAY_GEN1),
> {}
> };
> MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids);

Looks good to me:

Reviewed-by: Jithu Joseph <jithu.joseph@intel.com>

Jithu