From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Tony Luck <tony.luck@intel.com>
Cc: linux-kernel@vger.kernel.org,
Jacob Pan <jacob.jun.pan@linux.intel.com>,
Len Brown <lenb@kernel.org>,
linux-pm@vger.kernel.org, patches@lists.linux.dev
Subject: Re: [PATCH v3 51/74] x86/cpu/vfm: Update drivers/idle/intel_idle.c
Date: Wed, 17 Apr 2024 10:24:18 +0200 [thread overview]
Message-ID: <CAJZ5v0jf-O8b-CU8TJZLgitD5DSmQLp5dD0+eutY_xj=ZFua2Q@mail.gmail.com> (raw)
In-Reply-To: <20240416212218.9624-1-tony.luck@intel.com>
On Tue, Apr 16, 2024 at 11:31 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/idle/intel_idle.c | 116 +++++++++++++++++++-------------------
> 1 file changed, 58 insertions(+), 58 deletions(-)
>
> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> index e486027f8b07..9aab7abc2ae9 100644
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@ -1494,53 +1494,53 @@ static const struct idle_cpu idle_cpu_srf __initconst = {
> };
>
> static const struct x86_cpu_id intel_idle_ids[] __initconst = {
> - X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP, &idle_cpu_nhx),
> - X86_MATCH_INTEL_FAM6_MODEL(NEHALEM, &idle_cpu_nehalem),
> - X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_G, &idle_cpu_nehalem),
> - X86_MATCH_INTEL_FAM6_MODEL(WESTMERE, &idle_cpu_nehalem),
> - X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP, &idle_cpu_nhx),
> - X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX, &idle_cpu_nhx),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_BONNELL, &idle_cpu_atom),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_BONNELL_MID, &idle_cpu_lincroft),
> - X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX, &idle_cpu_nhx),
> - X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &idle_cpu_snb),
> - X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &idle_cpu_snx),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL, &idle_cpu_atom),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &idle_cpu_byt),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &idle_cpu_tangier),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &idle_cpu_cht),
> - X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &idle_cpu_ivb),
> - X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &idle_cpu_ivt),
> - X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &idle_cpu_hsw),
> - X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &idle_cpu_hsx),
> - X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &idle_cpu_hsw),
> - X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &idle_cpu_hsw),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D, &idle_cpu_avn),
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &idle_cpu_bdw),
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &idle_cpu_bdw),
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &idle_cpu_bdx),
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &idle_cpu_bdx),
> - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &idle_cpu_skl),
> - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &idle_cpu_skl),
> - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &idle_cpu_skl),
> - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &idle_cpu_skl),
> - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &idle_cpu_skx),
> - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &idle_cpu_icx),
> - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &idle_cpu_icx),
> - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &idle_cpu_adl),
> - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &idle_cpu_adl_l),
> - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &idle_cpu_mtl_l),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, &idle_cpu_gmt),
> - X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &idle_cpu_spr),
> - X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &idle_cpu_spr),
> - X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &idle_cpu_knl),
> - X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &idle_cpu_knl),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &idle_cpu_bxt),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &idle_cpu_bxt),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &idle_cpu_dnv),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &idle_cpu_snr),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT, &idle_cpu_grr),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, &idle_cpu_srf),
> + X86_MATCH_VFM(INTEL_NEHALEM_EP, &idle_cpu_nhx),
> + X86_MATCH_VFM(INTEL_NEHALEM, &idle_cpu_nehalem),
> + X86_MATCH_VFM(INTEL_NEHALEM_G, &idle_cpu_nehalem),
> + X86_MATCH_VFM(INTEL_WESTMERE, &idle_cpu_nehalem),
> + X86_MATCH_VFM(INTEL_WESTMERE_EP, &idle_cpu_nhx),
> + X86_MATCH_VFM(INTEL_NEHALEM_EX, &idle_cpu_nhx),
> + X86_MATCH_VFM(INTEL_ATOM_BONNELL, &idle_cpu_atom),
> + X86_MATCH_VFM(INTEL_ATOM_BONNELL_MID, &idle_cpu_lincroft),
> + X86_MATCH_VFM(INTEL_WESTMERE_EX, &idle_cpu_nhx),
> + X86_MATCH_VFM(INTEL_SANDYBRIDGE, &idle_cpu_snb),
> + X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &idle_cpu_snx),
> + X86_MATCH_VFM(INTEL_ATOM_SALTWELL, &idle_cpu_atom),
> + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, &idle_cpu_byt),
> + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &idle_cpu_tangier),
> + X86_MATCH_VFM(INTEL_ATOM_AIRMONT, &idle_cpu_cht),
> + X86_MATCH_VFM(INTEL_IVYBRIDGE, &idle_cpu_ivb),
> + X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &idle_cpu_ivt),
> + X86_MATCH_VFM(INTEL_HASWELL, &idle_cpu_hsw),
> + X86_MATCH_VFM(INTEL_HASWELL_X, &idle_cpu_hsx),
> + X86_MATCH_VFM(INTEL_HASWELL_L, &idle_cpu_hsw),
> + X86_MATCH_VFM(INTEL_HASWELL_G, &idle_cpu_hsw),
> + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_D, &idle_cpu_avn),
> + X86_MATCH_VFM(INTEL_BROADWELL, &idle_cpu_bdw),
> + X86_MATCH_VFM(INTEL_BROADWELL_G, &idle_cpu_bdw),
> + X86_MATCH_VFM(INTEL_BROADWELL_X, &idle_cpu_bdx),
> + X86_MATCH_VFM(INTEL_BROADWELL_D, &idle_cpu_bdx),
> + X86_MATCH_VFM(INTEL_SKYLAKE_L, &idle_cpu_skl),
> + X86_MATCH_VFM(INTEL_SKYLAKE, &idle_cpu_skl),
> + X86_MATCH_VFM(INTEL_KABYLAKE_L, &idle_cpu_skl),
> + X86_MATCH_VFM(INTEL_KABYLAKE, &idle_cpu_skl),
> + X86_MATCH_VFM(INTEL_SKYLAKE_X, &idle_cpu_skx),
> + X86_MATCH_VFM(INTEL_ICELAKE_X, &idle_cpu_icx),
> + X86_MATCH_VFM(INTEL_ICELAKE_D, &idle_cpu_icx),
> + X86_MATCH_VFM(INTEL_ALDERLAKE, &idle_cpu_adl),
> + X86_MATCH_VFM(INTEL_ALDERLAKE_L, &idle_cpu_adl_l),
> + X86_MATCH_VFM(INTEL_METEORLAKE_L, &idle_cpu_mtl_l),
> + X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, &idle_cpu_gmt),
> + X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &idle_cpu_spr),
> + X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &idle_cpu_spr),
> + X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &idle_cpu_knl),
> + X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &idle_cpu_knl),
> + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &idle_cpu_bxt),
> + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &idle_cpu_bxt),
> + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &idle_cpu_dnv),
> + X86_MATCH_VFM(INTEL_ATOM_TREMONT_D, &idle_cpu_snr),
> + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT, &idle_cpu_grr),
> + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &idle_cpu_srf),
> {}
> };
>
> @@ -1990,27 +1990,27 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
> {
> int cstate;
>
> - switch (boot_cpu_data.x86_model) {
> - case INTEL_FAM6_IVYBRIDGE_X:
> + switch (boot_cpu_data.x86_vfm) {
> + case INTEL_IVYBRIDGE_X:
> ivt_idle_state_table_update();
> break;
> - case INTEL_FAM6_ATOM_GOLDMONT:
> - case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
> + case INTEL_ATOM_GOLDMONT:
> + case INTEL_ATOM_GOLDMONT_PLUS:
> bxt_idle_state_table_update();
> break;
> - case INTEL_FAM6_SKYLAKE:
> + case INTEL_SKYLAKE:
> sklh_idle_state_table_update();
> break;
> - case INTEL_FAM6_SKYLAKE_X:
> + case INTEL_SKYLAKE_X:
> skx_idle_state_table_update();
> break;
> - case INTEL_FAM6_SAPPHIRERAPIDS_X:
> - case INTEL_FAM6_EMERALDRAPIDS_X:
> + case INTEL_SAPPHIRERAPIDS_X:
> + case INTEL_EMERALDRAPIDS_X:
> spr_idle_state_table_update();
> break;
> - case INTEL_FAM6_ALDERLAKE:
> - case INTEL_FAM6_ALDERLAKE_L:
> - case INTEL_FAM6_ATOM_GRACEMONT:
> + case INTEL_ALDERLAKE:
> + case INTEL_ALDERLAKE_L:
> + case INTEL_ATOM_GRACEMONT:
> adl_idle_state_table_update();
> break;
> }
> --
> 2.44.0
>
>
next prev parent reply other threads:[~2024-04-17 8:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240416211941.9369-1-tony.luck@intel.com>
2024-04-16 21:22 ` [PATCH v3 43/74] x86/cpu/vfm: Update drivers/cpufreq/intel_pstate.c Tony Luck
2024-04-17 8:20 ` Rafael J. Wysocki
2024-04-16 21:22 ` [PATCH v3 44/74] x86/cpu/vfm: Update drivers/cpufreq/speedstep-centrino.c Tony Luck
2024-04-17 8:21 ` Rafael J. Wysocki
2024-04-16 21:22 ` [PATCH v3 51/74] x86/cpu/vfm: Update drivers/idle/intel_idle.c Tony Luck
2024-04-17 8:24 ` Rafael J. Wysocki [this message]
2024-04-16 21:22 ` [PATCH v3 66/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_common.c Tony Luck
2024-04-17 8:21 ` Rafael J. Wysocki
2024-04-16 21:22 ` [PATCH v3 67/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_msr.c Tony Luck
2024-04-17 8:22 ` Rafael J. Wysocki
2024-04-16 21:22 ` [PATCH v3 69/74] x86/cpu/vfm: Update intel_soc_dts_thermal.c Tony Luck
2024-04-17 8:23 ` Rafael J. Wysocki
2024-04-16 21:22 ` [PATCH v3 70/74] x86/cpu/vfm: Update drivers/thermal/intel/intel_tcc_cooling.c Tony Luck
2024-04-17 8:23 ` Rafael J. Wysocki
2024-04-16 21:23 ` [PATCH v3 72/74] x86/cpu/vfm: Update tools/power/x86/turbostat/turbostat.c Tony Luck
2024-04-17 8:24 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJZ5v0jf-O8b-CU8TJZLgitD5DSmQLp5dD0+eutY_xj=ZFua2Q@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=jacob.jun.pan@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=patches@lists.linux.dev \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).