@@ -, +, @@ 
   Enters Core C6 During an Interrupt Service Routine" errata.
   (which has over 800 comments!) that using a shell script which
   disables C6N and C6S through sysfs allows them to remove
   intel_idle.max_cstate=1 and still have a stable system which does
   use the C7 states for power-saving.
---
 drivers/idle/intel_idle.c | 2 ++
 1 file changed, 2 insertions(+)
--- a/drivers/idle/intel_idle.c	
+++ a/drivers/idle/intel_idle.c	
@@ -221,6 +221,7 @@ static struct cpuidle_state byt_cstates[] = {
 		.flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 300,
 		.target_residency = 275,
+		.disabled = true,
 		.enter = &intel_idle,
 		.enter_s2idle = intel_idle_s2idle, },
 	{
@@ -229,6 +230,7 @@ static struct cpuidle_state byt_cstates[] = {
 		.flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 500,
 		.target_residency = 560,
+		.disabled = true,
 		.enter = &intel_idle,
 		.enter_s2idle = intel_idle_s2idle, },
 	{
--