From: Tony Luck <tony.luck@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Uros Bizjak <ubizjak@gmail.com>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Arnd Bergmann <arnd@arndb.de>, Tony Luck <tony.luck@intel.com>,
Mateusz Guzik <mjguzik@gmail.com>,
Thomas Renninger <trenn@suse.de>, Andi Kleen <ak@linux.intel.com>,
linux-kernel@vger.kernel.org, patches@lists.linux.dev,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Subject: [PATCH v6 45/49] powercap: intel_rapl: Switch to new Intel CPU model defines
Date: Mon, 20 May 2024 15:46:16 -0700 [thread overview]
Message-ID: <20240520224620.9480-46-tony.luck@intel.com> (raw)
In-Reply-To: <20240520224620.9480-1-tony.luck@intel.com>
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/powercap/intel_rapl_common.c | 120 +++++++++++++--------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index aac0744011a3..3cffa6c79538 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1222,66 +1222,66 @@ static const struct rapl_defaults rapl_defaults_amd = {
};
static const struct x86_cpu_id rapl_ids[] __initconst = {
- X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &rapl_defaults_core),
-
- X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &rapl_defaults_core),
-
- X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &rapl_defaults_hsw_server),
-
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &rapl_defaults_hsw_server),
-
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &rapl_defaults_hsw_server),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &rapl_defaults_hsw_server),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &rapl_defaults_hsw_server),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
- X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &rapl_defaults_spr_server),
- X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),
-
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &rapl_defaults_cht),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &rapl_defaults_tng),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT_MID, &rapl_defaults_ann),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &rapl_defaults_core),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L, &rapl_defaults_core),
-
- X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &rapl_defaults_hsw_server),
- X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &rapl_defaults_hsw_server),
+ X86_MATCH_VFM(INTEL_SANDYBRIDGE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &rapl_defaults_core),
+
+ X86_MATCH_VFM(INTEL_IVYBRIDGE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &rapl_defaults_core),
+
+ X86_MATCH_VFM(INTEL_HASWELL, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_HASWELL_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_HASWELL_G, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_HASWELL_X, &rapl_defaults_hsw_server),
+
+ X86_MATCH_VFM(INTEL_BROADWELL, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_BROADWELL_G, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_BROADWELL_D, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_BROADWELL_X, &rapl_defaults_hsw_server),
+
+ X86_MATCH_VFM(INTEL_SKYLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_SKYLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_SKYLAKE_X, &rapl_defaults_hsw_server),
+ X86_MATCH_VFM(INTEL_KABYLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_KABYLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_CANNONLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ICELAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ICELAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ICELAKE_NNPI, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ICELAKE_X, &rapl_defaults_hsw_server),
+ X86_MATCH_VFM(INTEL_ICELAKE_D, &rapl_defaults_hsw_server),
+ X86_MATCH_VFM(INTEL_COMETLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_COMETLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_TIGERLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_TIGERLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ROCKETLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ALDERLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ALDERLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE_P, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE_S, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_METEORLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_METEORLAKE_L, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
+ X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &rapl_defaults_spr_server),
+ X86_MATCH_VFM(INTEL_LUNARLAKE_M, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ARROWLAKE_H, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ARROWLAKE, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_LAKEFIELD, &rapl_defaults_core),
+
+ X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, &rapl_defaults_byt),
+ X86_MATCH_VFM(INTEL_ATOM_AIRMONT, &rapl_defaults_cht),
+ X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &rapl_defaults_tng),
+ X86_MATCH_VFM(INTEL_ATOM_AIRMONT_MID, &rapl_defaults_ann),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ATOM_TREMONT, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ATOM_TREMONT_D, &rapl_defaults_core),
+ X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, &rapl_defaults_core),
+
+ X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &rapl_defaults_hsw_server),
+ X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &rapl_defaults_hsw_server),
X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd),
X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_amd),
--
2.45.0
next prev parent reply other threads:[~2024-05-20 22:46 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-20 22:45 [PATCH v6 00/49] New Intel CPUID families Tony Luck
2024-05-20 22:45 ` [PATCH v6 01/49] crypto: x86/aes-xts - Switch to new Intel CPU model defines Tony Luck
2024-05-21 17:22 ` Borislav Petkov
2024-05-21 17:36 ` Eric Biggers
2024-05-22 3:32 ` Herbert Xu
2024-05-22 9:47 ` [tip: x86/urgent] crypto: x86/aes-xts - switch " tip-bot2 for Tony Luck
2024-05-20 22:45 ` [PATCH v6 02/49] x86/cpu: Fix x86_match_cpu() to match just X86_VENDOR_INTEL Tony Luck
2024-05-21 7:49 ` Borislav Petkov
2024-05-21 15:48 ` Tony Luck
2024-05-21 17:18 ` Borislav Petkov
2024-05-20 22:45 ` [PATCH v6 03/49] tpm: Switch to new Intel CPU model defines Tony Luck
2024-05-20 22:45 ` [PATCH v6 04/49] platform/x86/intel/ifs: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 05/49] media: atomisp: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 06/49] ASoC: Intel: avs: es8336: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 07/49] platform/x86: intel_scu_wdt: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 08/49] KVM: x86/pmu: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 09/49] KVM: VMX: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 10/49] cpufreq: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 11/49] intel_idle: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 12/49] PCI: PM: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 13/49] powercap: intel_rapl: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 14/49] ASoC: Intel: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 15/49] thermal: intel: intel_tcc_cooling: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 16/49] x86/platform/intel-mid: " Tony Luck
2024-05-21 14:12 ` Andy Shevchenko
2024-05-21 16:10 ` [PATCH v6.1 " Tony Luck
2024-05-21 16:17 ` Andy Shevchenko
2024-05-20 22:45 ` [PATCH v6 17/49] platform/x86: intel_speed_select_if: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 18/49] platform/x86: intel-uncore-freq: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 19/49] platform/x86: intel_ips: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 20/49] platform/x86: intel_telemetry: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 21/49] platform/x86: intel: telemetry: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 22/49] platform/x86: intel_turbo_max_3: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 23/49] platform/x86: p2sb: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 24/49] platform/x86/intel: pmc: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 25/49] platform/x86/intel/pmc: " Tony Luck
2024-05-20 22:45 ` [PATCH v6 26/49] crypto: x86/poly1305 - " Tony Luck
2024-05-20 22:45 ` [PATCH v6 27/49] crypto: x86/twofish " Tony Luck
2024-05-20 22:45 ` [PATCH v6 28/49] x86/cpu/intel: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 29/49] x86/PCI: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 30/49] x86/virt/tdx: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 31/49] perf/x86/intel: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 32/49] x86/platform/atom: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 33/49] x86/cpu: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 34/49] x86/boot: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 35/49] EDAC/i10nm: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 36/49] EDAC, pnd2: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 37/49] EDAC/sb_edac: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 38/49] EDAC/skx: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 39/49] extcon: axp288: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 40/49] ACPI: LPSS: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 41/49] ACPI: x86: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 42/49] cpufreq: intel_pstate: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 43/49] perf/x86/rapl: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 44/49] platform/x86: ISST: " Tony Luck
2024-05-20 22:46 ` Tony Luck [this message]
2024-05-20 22:46 ` [PATCH v6 46/49] tools/power/turbostat: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 47/49] peci, hwmon: " Tony Luck
2024-05-20 22:46 ` [PATCH v6 48/49] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Tony Luck
2024-05-20 22:46 ` [PATCH v6 49/49] x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines Tony Luck
2024-05-21 8:32 ` [PATCH v6 00/49] New Intel CPUID families Borislav Petkov
2024-05-21 15:21 ` Luck, Tony
2024-05-28 17:34 ` Tony Luck
2024-06-04 23:29 ` Sean Christopherson
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=20240520224620.9480-46-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=ak@linux.intel.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mjguzik@gmail.com \
--cc=patches@lists.linux.dev \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rick.p.edgecombe@intel.com \
--cc=tglx@linutronix.de \
--cc=trenn@suse.de \
--cc=ubizjak@gmail.com \
--cc=x86@kernel.org \
/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