Skip to content

Commit b9064fb

Browse files
aeglrafaeljw
aegl
authored and
rafaeljw
committed
powercap: intel_rapl: Switch to new Intel CPU model defines
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> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 4b32e5e commit b9064fb

File tree

1 file changed

+60
-60
lines changed

1 file changed

+60
-60
lines changed

‎drivers/powercap/intel_rapl_common.c‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,66 +1222,66 @@ static const struct rapl_defaults rapl_defaults_amd = {
12221222
};
12231223

12241224
static const struct x86_cpu_id rapl_ids[] __initconst = {
1225-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &rapl_defaults_core),
1226-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &rapl_defaults_core),
1227-
1228-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &rapl_defaults_core),
1229-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &rapl_defaults_core),
1230-
1231-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &rapl_defaults_core),
1232-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &rapl_defaults_core),
1233-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &rapl_defaults_core),
1234-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &rapl_defaults_hsw_server),
1235-
1236-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &rapl_defaults_core),
1237-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &rapl_defaults_core),
1238-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &rapl_defaults_core),
1239-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &rapl_defaults_hsw_server),
1240-
1241-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &rapl_defaults_core),
1242-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &rapl_defaults_core),
1243-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &rapl_defaults_hsw_server),
1244-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &rapl_defaults_core),
1245-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &rapl_defaults_core),
1246-
X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &rapl_defaults_core),
1247-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &rapl_defaults_core),
1248-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &rapl_defaults_core),
1249-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, &rapl_defaults_core),
1250-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &rapl_defaults_hsw_server),
1251-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &rapl_defaults_hsw_server),
1252-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &rapl_defaults_core),
1253-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &rapl_defaults_core),
1254-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &rapl_defaults_core),
1255-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &rapl_defaults_core),
1256-
X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core),
1257-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core),
1258-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &rapl_defaults_core),
1259-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, &rapl_defaults_core),
1260-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core),
1261-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &rapl_defaults_core),
1262-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &rapl_defaults_core),
1263-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &rapl_defaults_core),
1264-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &rapl_defaults_core),
1265-
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
1266-
X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &rapl_defaults_spr_server),
1267-
X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, &rapl_defaults_core),
1268-
X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, &rapl_defaults_core),
1269-
X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, &rapl_defaults_core),
1270-
X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),
1271-
1272-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),
1273-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &rapl_defaults_cht),
1274-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &rapl_defaults_tng),
1275-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT_MID, &rapl_defaults_ann),
1276-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &rapl_defaults_core),
1277-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &rapl_defaults_core),
1278-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &rapl_defaults_core),
1279-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &rapl_defaults_core),
1280-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &rapl_defaults_core),
1281-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L, &rapl_defaults_core),
1282-
1283-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &rapl_defaults_hsw_server),
1284-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &rapl_defaults_hsw_server),
1225+
X86_MATCH_VFM(INTEL_SANDYBRIDGE, &rapl_defaults_core),
1226+
X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &rapl_defaults_core),
1227+
1228+
X86_MATCH_VFM(INTEL_IVYBRIDGE, &rapl_defaults_core),
1229+
X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &rapl_defaults_core),
1230+
1231+
X86_MATCH_VFM(INTEL_HASWELL, &rapl_defaults_core),
1232+
X86_MATCH_VFM(INTEL_HASWELL_L, &rapl_defaults_core),
1233+
X86_MATCH_VFM(INTEL_HASWELL_G, &rapl_defaults_core),
1234+
X86_MATCH_VFM(INTEL_HASWELL_X, &rapl_defaults_hsw_server),
1235+
1236+
X86_MATCH_VFM(INTEL_BROADWELL, &rapl_defaults_core),
1237+
X86_MATCH_VFM(INTEL_BROADWELL_G, &rapl_defaults_core),
1238+
X86_MATCH_VFM(INTEL_BROADWELL_D, &rapl_defaults_core),
1239+
X86_MATCH_VFM(INTEL_BROADWELL_X, &rapl_defaults_hsw_server),
1240+
1241+
X86_MATCH_VFM(INTEL_SKYLAKE, &rapl_defaults_core),
1242+
X86_MATCH_VFM(INTEL_SKYLAKE_L, &rapl_defaults_core),
1243+
X86_MATCH_VFM(INTEL_SKYLAKE_X, &rapl_defaults_hsw_server),
1244+
X86_MATCH_VFM(INTEL_KABYLAKE_L, &rapl_defaults_core),
1245+
X86_MATCH_VFM(INTEL_KABYLAKE, &rapl_defaults_core),
1246+
X86_MATCH_VFM(INTEL_CANNONLAKE_L, &rapl_defaults_core),
1247+
X86_MATCH_VFM(INTEL_ICELAKE_L, &rapl_defaults_core),
1248+
X86_MATCH_VFM(INTEL_ICELAKE, &rapl_defaults_core),
1249+
X86_MATCH_VFM(INTEL_ICELAKE_NNPI, &rapl_defaults_core),
1250+
X86_MATCH_VFM(INTEL_ICELAKE_X, &rapl_defaults_hsw_server),
1251+
X86_MATCH_VFM(INTEL_ICELAKE_D, &rapl_defaults_hsw_server),
1252+
X86_MATCH_VFM(INTEL_COMETLAKE_L, &rapl_defaults_core),
1253+
X86_MATCH_VFM(INTEL_COMETLAKE, &rapl_defaults_core),
1254+
X86_MATCH_VFM(INTEL_TIGERLAKE_L, &rapl_defaults_core),
1255+
X86_MATCH_VFM(INTEL_TIGERLAKE, &rapl_defaults_core),
1256+
X86_MATCH_VFM(INTEL_ROCKETLAKE, &rapl_defaults_core),
1257+
X86_MATCH_VFM(INTEL_ALDERLAKE, &rapl_defaults_core),
1258+
X86_MATCH_VFM(INTEL_ALDERLAKE_L, &rapl_defaults_core),
1259+
X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, &rapl_defaults_core),
1260+
X86_MATCH_VFM(INTEL_RAPTORLAKE, &rapl_defaults_core),
1261+
X86_MATCH_VFM(INTEL_RAPTORLAKE_P, &rapl_defaults_core),
1262+
X86_MATCH_VFM(INTEL_RAPTORLAKE_S, &rapl_defaults_core),
1263+
X86_MATCH_VFM(INTEL_METEORLAKE, &rapl_defaults_core),
1264+
X86_MATCH_VFM(INTEL_METEORLAKE_L, &rapl_defaults_core),
1265+
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
1266+
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &rapl_defaults_spr_server),
1267+
X86_MATCH_VFM(INTEL_LUNARLAKE_M, &rapl_defaults_core),
1268+
X86_MATCH_VFM(INTEL_ARROWLAKE_H, &rapl_defaults_core),
1269+
X86_MATCH_VFM(INTEL_ARROWLAKE, &rapl_defaults_core),
1270+
X86_MATCH_VFM(INTEL_LAKEFIELD, &rapl_defaults_core),
1271+
1272+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, &rapl_defaults_byt),
1273+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT, &rapl_defaults_cht),
1274+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &rapl_defaults_tng),
1275+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT_MID, &rapl_defaults_ann),
1276+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &rapl_defaults_core),
1277+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &rapl_defaults_core),
1278+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &rapl_defaults_core),
1279+
X86_MATCH_VFM(INTEL_ATOM_TREMONT, &rapl_defaults_core),
1280+
X86_MATCH_VFM(INTEL_ATOM_TREMONT_D, &rapl_defaults_core),
1281+
X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, &rapl_defaults_core),
1282+
1283+
X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &rapl_defaults_hsw_server),
1284+
X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &rapl_defaults_hsw_server),
12851285

12861286
X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd),
12871287
X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_amd),

0 commit comments

Comments
 (0)