Skip to content

Commit 17c4fc3

Browse files
aeglrafaeljw
aegl
authored and
rafaeljw
committed
intel_idle: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent c3f38fa commit 17c4fc3

File tree

1 file changed

+58
-58
lines changed

1 file changed

+58
-58
lines changed

‎drivers/idle/intel_idle.c‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,53 +1494,53 @@ static const struct idle_cpu idle_cpu_srf __initconst = {
14941494
};
14951495

14961496
static const struct x86_cpu_id intel_idle_ids[] __initconst = {
1497-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP, &idle_cpu_nhx),
1498-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM, &idle_cpu_nehalem),
1499-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_G, &idle_cpu_nehalem),
1500-
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE, &idle_cpu_nehalem),
1501-
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP, &idle_cpu_nhx),
1502-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX, &idle_cpu_nhx),
1503-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_BONNELL, &idle_cpu_atom),
1504-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_BONNELL_MID, &idle_cpu_lincroft),
1505-
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX, &idle_cpu_nhx),
1506-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &idle_cpu_snb),
1507-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &idle_cpu_snx),
1508-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL, &idle_cpu_atom),
1509-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &idle_cpu_byt),
1510-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &idle_cpu_tangier),
1511-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &idle_cpu_cht),
1512-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &idle_cpu_ivb),
1513-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &idle_cpu_ivt),
1514-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &idle_cpu_hsw),
1515-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &idle_cpu_hsx),
1516-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &idle_cpu_hsw),
1517-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &idle_cpu_hsw),
1518-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D, &idle_cpu_avn),
1519-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &idle_cpu_bdw),
1520-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &idle_cpu_bdw),
1521-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &idle_cpu_bdx),
1522-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &idle_cpu_bdx),
1523-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &idle_cpu_skl),
1524-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &idle_cpu_skl),
1525-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &idle_cpu_skl),
1526-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &idle_cpu_skl),
1527-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &idle_cpu_skx),
1528-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &idle_cpu_icx),
1529-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &idle_cpu_icx),
1530-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &idle_cpu_adl),
1531-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &idle_cpu_adl_l),
1532-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &idle_cpu_mtl_l),
1533-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, &idle_cpu_gmt),
1534-
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &idle_cpu_spr),
1535-
X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &idle_cpu_spr),
1536-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &idle_cpu_knl),
1537-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &idle_cpu_knl),
1538-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &idle_cpu_bxt),
1539-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &idle_cpu_bxt),
1540-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &idle_cpu_dnv),
1541-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &idle_cpu_snr),
1542-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT, &idle_cpu_grr),
1543-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, &idle_cpu_srf),
1497+
X86_MATCH_VFM(INTEL_NEHALEM_EP, &idle_cpu_nhx),
1498+
X86_MATCH_VFM(INTEL_NEHALEM, &idle_cpu_nehalem),
1499+
X86_MATCH_VFM(INTEL_NEHALEM_G, &idle_cpu_nehalem),
1500+
X86_MATCH_VFM(INTEL_WESTMERE, &idle_cpu_nehalem),
1501+
X86_MATCH_VFM(INTEL_WESTMERE_EP, &idle_cpu_nhx),
1502+
X86_MATCH_VFM(INTEL_NEHALEM_EX, &idle_cpu_nhx),
1503+
X86_MATCH_VFM(INTEL_ATOM_BONNELL, &idle_cpu_atom),
1504+
X86_MATCH_VFM(INTEL_ATOM_BONNELL_MID, &idle_cpu_lincroft),
1505+
X86_MATCH_VFM(INTEL_WESTMERE_EX, &idle_cpu_nhx),
1506+
X86_MATCH_VFM(INTEL_SANDYBRIDGE, &idle_cpu_snb),
1507+
X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &idle_cpu_snx),
1508+
X86_MATCH_VFM(INTEL_ATOM_SALTWELL, &idle_cpu_atom),
1509+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, &idle_cpu_byt),
1510+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &idle_cpu_tangier),
1511+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT, &idle_cpu_cht),
1512+
X86_MATCH_VFM(INTEL_IVYBRIDGE, &idle_cpu_ivb),
1513+
X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &idle_cpu_ivt),
1514+
X86_MATCH_VFM(INTEL_HASWELL, &idle_cpu_hsw),
1515+
X86_MATCH_VFM(INTEL_HASWELL_X, &idle_cpu_hsx),
1516+
X86_MATCH_VFM(INTEL_HASWELL_L, &idle_cpu_hsw),
1517+
X86_MATCH_VFM(INTEL_HASWELL_G, &idle_cpu_hsw),
1518+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_D, &idle_cpu_avn),
1519+
X86_MATCH_VFM(INTEL_BROADWELL, &idle_cpu_bdw),
1520+
X86_MATCH_VFM(INTEL_BROADWELL_G, &idle_cpu_bdw),
1521+
X86_MATCH_VFM(INTEL_BROADWELL_X, &idle_cpu_bdx),
1522+
X86_MATCH_VFM(INTEL_BROADWELL_D, &idle_cpu_bdx),
1523+
X86_MATCH_VFM(INTEL_SKYLAKE_L, &idle_cpu_skl),
1524+
X86_MATCH_VFM(INTEL_SKYLAKE, &idle_cpu_skl),
1525+
X86_MATCH_VFM(INTEL_KABYLAKE_L, &idle_cpu_skl),
1526+
X86_MATCH_VFM(INTEL_KABYLAKE, &idle_cpu_skl),
1527+
X86_MATCH_VFM(INTEL_SKYLAKE_X, &idle_cpu_skx),
1528+
X86_MATCH_VFM(INTEL_ICELAKE_X, &idle_cpu_icx),
1529+
X86_MATCH_VFM(INTEL_ICELAKE_D, &idle_cpu_icx),
1530+
X86_MATCH_VFM(INTEL_ALDERLAKE, &idle_cpu_adl),
1531+
X86_MATCH_VFM(INTEL_ALDERLAKE_L, &idle_cpu_adl_l),
1532+
X86_MATCH_VFM(INTEL_METEORLAKE_L, &idle_cpu_mtl_l),
1533+
X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, &idle_cpu_gmt),
1534+
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &idle_cpu_spr),
1535+
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &idle_cpu_spr),
1536+
X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &idle_cpu_knl),
1537+
X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &idle_cpu_knl),
1538+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &idle_cpu_bxt),
1539+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &idle_cpu_bxt),
1540+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &idle_cpu_dnv),
1541+
X86_MATCH_VFM(INTEL_ATOM_TREMONT_D, &idle_cpu_snr),
1542+
X86_MATCH_VFM(INTEL_ATOM_CRESTMONT, &idle_cpu_grr),
1543+
X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &idle_cpu_srf),
15441544
{}
15451545
};
15461546

@@ -1990,27 +1990,27 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
19901990
{
19911991
int cstate;
19921992

1993-
switch (boot_cpu_data.x86_model) {
1994-
case INTEL_FAM6_IVYBRIDGE_X:
1993+
switch (boot_cpu_data.x86_vfm) {
1994+
case INTEL_IVYBRIDGE_X:
19951995
ivt_idle_state_table_update();
19961996
break;
1997-
case INTEL_FAM6_ATOM_GOLDMONT:
1998-
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
1997+
case INTEL_ATOM_GOLDMONT:
1998+
case INTEL_ATOM_GOLDMONT_PLUS:
19991999
bxt_idle_state_table_update();
20002000
break;
2001-
case INTEL_FAM6_SKYLAKE:
2001+
case INTEL_SKYLAKE:
20022002
sklh_idle_state_table_update();
20032003
break;
2004-
case INTEL_FAM6_SKYLAKE_X:
2004+
case INTEL_SKYLAKE_X:
20052005
skx_idle_state_table_update();
20062006
break;
2007-
case INTEL_FAM6_SAPPHIRERAPIDS_X:
2008-
case INTEL_FAM6_EMERALDRAPIDS_X:
2007+
case INTEL_SAPPHIRERAPIDS_X:
2008+
case INTEL_EMERALDRAPIDS_X:
20092009
spr_idle_state_table_update();
20102010
break;
2011-
case INTEL_FAM6_ALDERLAKE:
2012-
case INTEL_FAM6_ALDERLAKE_L:
2013-
case INTEL_FAM6_ATOM_GRACEMONT:
2011+
case INTEL_ALDERLAKE:
2012+
case INTEL_ALDERLAKE_L:
2013+
case INTEL_ATOM_GRACEMONT:
20142014
adl_idle_state_table_update();
20152015
break;
20162016
}

0 commit comments

Comments
 (0)