Re: [PATCH v3 66/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_common.c

From: Rafael J. Wysocki
Date: Wed Apr 17 2024 - 04:22:20 EST

Next message: Rafael J. Wysocki: "Re: [PATCH v3 67/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_msr.c"
Previous message: Saurabh Singh Sengar: "Re: [PATCH] tools: hv: suppress the invalid warning for packed member alignment"
In reply to: Tony Luck: "[PATCH v3 66/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_common.c"
Next in thread: Tony Luck: "[PATCH v3 67/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_msr.c"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Tue, Apr 16, 2024 at 11:22 PM Tony Luck <tony.luck@xxxxxxxxx> wrote:
>
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

> ---
> drivers/powercap/intel_rapl_common.c | 118 +++++++++++++--------------
> 1 file changed, 59 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index a28d54fd5222..59c36ea55712 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -1220,65 +1220,65 @@ 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, &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, &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.44.0
>

Next message: Rafael J. Wysocki: "Re: [PATCH v3 67/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_msr.c"
Previous message: Saurabh Singh Sengar: "Re: [PATCH] tools: hv: suppress the invalid warning for packed member alignment"
In reply to: Tony Luck: "[PATCH v3 66/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_common.c"
Next in thread: Tony Luck: "[PATCH v3 67/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_msr.c"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]