intel_idle: Fixed C6 state on Avoton/Rangeley processors

Bockholdt Arne · rafaeljw · commit 22e580d07f65 · 2013-11-28T14:35:26.000+01:00
Corrected the MWAIT flag for C-State C6 on Intel Avoton/Rangeley processors.

Signed-off-by: Arne Bockholdt &lt;linux-kernel@bockholdt.com&gt;
Acked-by: Len Brown &lt;len.brown@intel.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
@@ -329,7 +329,7 @@ static struct cpuidle_state atom_cstates[] __initdata = {
 	{
 		.enter = NULL }
 };
-static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = {
+static struct cpuidle_state avn_cstates[] __initdata = {
 	{
 		.name = "C1-AVN",
 		.desc = "MWAIT 0x00",
@@ -340,7 +340,7 @@ static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = {
 	{
 		.name = "C6-AVN",
 		.desc = "MWAIT 0x51",
-		.flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+		.flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 15,
 		.target_residency = 45,
 		.enter = &intel_idle },

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ static struct cpuidle_state atom_cstates[] __initdata = {`
`329`	`329`	`{`
`330`	`330`	`.enter = NULL }`
`331`	`331`	`};`
`332`		`-static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = {`
	`332`	`+static struct cpuidle_state avn_cstates[] __initdata = {`
`333`	`333`	`{`
`334`	`334`	`.name = "C1-AVN",`
`335`	`335`	`.desc = "MWAIT 0x00",`
`@@ -340,7 +340,7 @@ static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = {`
`340`	`340`	`{`
`341`	`341`	`.name = "C6-AVN",`
`342`	`342`	`.desc = "MWAIT 0x51",`
`343`		`- .flags = MWAIT2flg(0x58) \| CPUIDLE_FLAG_TIME_VALID \| CPUIDLE_FLAG_TLB_FLUSHED,`
	`343`	`+ .flags = MWAIT2flg(0x51) \| CPUIDLE_FLAG_TIME_VALID \| CPUIDLE_FLAG_TLB_FLUSHED,`
`344`	`344`	`.exit_latency = 15,`
`345`	`345`	`.target_residency = 45,`
`346`	`346`	`.enter = &intel_idle },`