linux-kernel - Re: [PATCH v4 65/71] platform/x86: intel-uncore-freq: Switch to new Intel CPU model defines

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <23fc6b57a5749b37b13afcf4424c0166ec3f51a5.camel@linux.intel.com>
Date: Thu, 25 Apr 2024 05:34:01 -0700
From: srinivas pandruvada <srinivas.pandruvada@...ux.intel.com>
To: Tony Luck <tony.luck@...el.com>, Borislav Petkov <bp@...en8.de>, Hans de
 Goede <hdegoede@...hat.com>, Ilpo Järvinen
 <ilpo.jarvinen@...ux.intel.com>
Cc: platform-driver-x86@...r.kernel.org, linux-kernel@...r.kernel.org, 
	patches@...ts.linux.dev
Subject: Re: [PATCH v4 65/71] platform/x86: intel-uncore-freq: Switch to new
 Intel CPU model defines

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@...el.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>

> ---
>  .../intel/uncore-frequency/uncore-frequency.c | 56 +++++++++--------
> --
>  1 file changed, 28 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-
> frequency.c b/drivers/platform/x86/intel/uncore-frequency/uncore-
> frequency.c
> index b89c0dda9e5d..b80feaf5828f 100644
> --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
> +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
> @@ -197,34 +197,34 @@ static struct notifier_block uncore_pm_nb = {
>  };
>  
>  static const struct x86_cpu_id intel_uncore_cpu_ids[] = {
> -       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,   NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,   NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,   NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, 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_INTEL_FAM6_MODEL(METEORLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, NULL),
> -       X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, NULL),
> +       X86_MATCH_VFM(INTEL_BROADWELL_G,        NULL),
> +       X86_MATCH_VFM(INTEL_BROADWELL_X,        NULL),
> +       X86_MATCH_VFM(INTEL_BROADWELL_D,        NULL),
> +       X86_MATCH_VFM(INTEL_SKYLAKE_X,  NULL),
> +       X86_MATCH_VFM(INTEL_ICELAKE_X,  NULL),
> +       X86_MATCH_VFM(INTEL_ICELAKE_D,  NULL),
> +       X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
> +       X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, NULL),
> +       X86_MATCH_VFM(INTEL_KABYLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_COMETLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_COMETLAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_CANNONLAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_ICELAKE, NULL),
> +       X86_MATCH_VFM(INTEL_ICELAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_ROCKETLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
> +       X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
> +       X86_MATCH_VFM(INTEL_METEORLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL),
> +       X86_MATCH_VFM(INTEL_ARROWLAKE, NULL),
> +       X86_MATCH_VFM(INTEL_ARROWLAKE_H, NULL),
> +       X86_MATCH_VFM(INTEL_LUNARLAKE_M, NULL),
>         {}
>  };
>  MODULE_DEVICE_TABLE(x86cpu, intel_uncore_cpu_ids);