|
@@ -724,6 +724,50 @@ static struct cpuidle_state atom_cstates[] = {
|
|
{
|
|
{
|
|
.enter = NULL }
|
|
.enter = NULL }
|
|
};
|
|
};
|
|
|
|
+static struct cpuidle_state tangier_cstates[] = {
|
|
|
|
+ {
|
|
|
|
+ .name = "C1-TNG",
|
|
|
|
+ .desc = "MWAIT 0x00",
|
|
|
|
+ .flags = MWAIT2flg(0x00),
|
|
|
|
+ .exit_latency = 1,
|
|
|
|
+ .target_residency = 4,
|
|
|
|
+ .enter = &intel_idle,
|
|
|
|
+ .enter_freeze = intel_idle_freeze, },
|
|
|
|
+ {
|
|
|
|
+ .name = "C4-TNG",
|
|
|
|
+ .desc = "MWAIT 0x30",
|
|
|
|
+ .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
|
|
+ .exit_latency = 100,
|
|
|
|
+ .target_residency = 400,
|
|
|
|
+ .enter = &intel_idle,
|
|
|
|
+ .enter_freeze = intel_idle_freeze, },
|
|
|
|
+ {
|
|
|
|
+ .name = "C6-TNG",
|
|
|
|
+ .desc = "MWAIT 0x52",
|
|
|
|
+ .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
|
|
+ .exit_latency = 140,
|
|
|
|
+ .target_residency = 560,
|
|
|
|
+ .enter = &intel_idle,
|
|
|
|
+ .enter_freeze = intel_idle_freeze, },
|
|
|
|
+ {
|
|
|
|
+ .name = "C7-TNG",
|
|
|
|
+ .desc = "MWAIT 0x60",
|
|
|
|
+ .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
|
|
+ .exit_latency = 1200,
|
|
|
|
+ .target_residency = 4000,
|
|
|
|
+ .enter = &intel_idle,
|
|
|
|
+ .enter_freeze = intel_idle_freeze, },
|
|
|
|
+ {
|
|
|
|
+ .name = "C9-TNG",
|
|
|
|
+ .desc = "MWAIT 0x64",
|
|
|
|
+ .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
|
|
+ .exit_latency = 10000,
|
|
|
|
+ .target_residency = 20000,
|
|
|
|
+ .enter = &intel_idle,
|
|
|
|
+ .enter_freeze = intel_idle_freeze, },
|
|
|
|
+ {
|
|
|
|
+ .enter = NULL }
|
|
|
|
+};
|
|
static struct cpuidle_state avn_cstates[] = {
|
|
static struct cpuidle_state avn_cstates[] = {
|
|
{
|
|
{
|
|
.name = "C1-AVN",
|
|
.name = "C1-AVN",
|
|
@@ -978,6 +1022,10 @@ static const struct idle_cpu idle_cpu_atom = {
|
|
.state_table = atom_cstates,
|
|
.state_table = atom_cstates,
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+static const struct idle_cpu idle_cpu_tangier = {
|
|
|
|
+ .state_table = tangier_cstates,
|
|
|
|
+};
|
|
|
|
+
|
|
static const struct idle_cpu idle_cpu_lincroft = {
|
|
static const struct idle_cpu idle_cpu_lincroft = {
|
|
.state_table = atom_cstates,
|
|
.state_table = atom_cstates,
|
|
.auto_demotion_disable_flags = ATM_LNC_C6_AUTO_DEMOTE,
|
|
.auto_demotion_disable_flags = ATM_LNC_C6_AUTO_DEMOTE,
|
|
@@ -1066,6 +1114,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
|
|
ICPU(INTEL_FAM6_SANDYBRIDGE_X, idle_cpu_snb),
|
|
ICPU(INTEL_FAM6_SANDYBRIDGE_X, idle_cpu_snb),
|
|
ICPU(INTEL_FAM6_ATOM_CEDARVIEW, idle_cpu_atom),
|
|
ICPU(INTEL_FAM6_ATOM_CEDARVIEW, idle_cpu_atom),
|
|
ICPU(INTEL_FAM6_ATOM_SILVERMONT1, idle_cpu_byt),
|
|
ICPU(INTEL_FAM6_ATOM_SILVERMONT1, idle_cpu_byt),
|
|
|
|
+ ICPU(INTEL_FAM6_ATOM_MERRIFIELD, idle_cpu_tangier),
|
|
ICPU(INTEL_FAM6_ATOM_AIRMONT, idle_cpu_cht),
|
|
ICPU(INTEL_FAM6_ATOM_AIRMONT, idle_cpu_cht),
|
|
ICPU(INTEL_FAM6_IVYBRIDGE, idle_cpu_ivb),
|
|
ICPU(INTEL_FAM6_IVYBRIDGE, idle_cpu_ivb),
|
|
ICPU(INTEL_FAM6_IVYBRIDGE_X, idle_cpu_ivt),
|
|
ICPU(INTEL_FAM6_IVYBRIDGE_X, idle_cpu_ivt),
|