2 files changed, 40 insertions, 82 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index ed9a1cc690be..8b433cb08a33 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -28,19 +28,12 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/slab.h>
 #include <linux/acpi.h>
 #include <linux/dmi.h>
-#include <linux/moduleparam.h>
-#include <linux/sched.h>        /* need_resched() */
-#include <linux/pm_qos.h>
+#include <linux/sched.h>       /* need_resched() */
 #include <linux/clockchips.h>
 #include <linux/cpuidle.h>
-#include <linux/irqflags.h>
 
 /*
  * Include the apic definitions for x86 to have the APIC timer related defines
@@ -52,22 +45,14 @@
 #include <asm/apic.h>
 #endif
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
 #include <acpi/acpi_bus.h>
 #include <acpi/processor.h>
-#include <asm/processor.h>
 
 #define PREFIX "ACPI: "
 
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_idle");
-#define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
-#define C2_OVERHEAD                     1       /* 1us */
-#define C3_OVERHEAD                     1       /* 1us */
-#define PM_TIMER_TICKS_TO_US(p)         (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
 
 static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
 module_param(max_cstate, uint, 0000);
@@ -81,6 +66,8 @@ module_param(latency_factor, uint, 0644);
 
 static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device);
 
+static struct acpi_processor_cx *acpi_cstate[CPUIDLE_STATE_MAX];
+
 static int disabled_by_idle_boot_param(void)
 {
         return boot_option_idle_override == IDLE_POLL ||
@@ -736,8 +723,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
                 struct cpuidle_driver *drv, int index)
 {
         struct acpi_processor *pr;
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = acpi_cstate[index];
 
         pr = __this_cpu_read(processors);
 
@@ -760,8 +746,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
  */
 static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
 {
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = acpi_cstate[index];
 
         ACPI_FLUSH_CPU_CACHE();
 
@@ -791,8 +776,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                 struct cpuidle_driver *drv, int index)
 {
         struct acpi_processor *pr;
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = acpi_cstate[index];
 
         pr = __this_cpu_read(processors);
 
@@ -850,8 +834,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 struct cpuidle_driver *drv, int index)
 {
         struct acpi_processor *pr;
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
+        struct acpi_processor_cx *cx = acpi_cstate[index];
 
         pr = __this_cpu_read(processors);
 
@@ -943,13 +926,13 @@ struct cpuidle_driver acpi_idle_driver = {
  * device i.e. per-cpu data
  *
  * @pr: the ACPI processor
+ * @dev : the cpuidle device
  */
-static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
+static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
+                                           struct cpuidle_device *dev)
 {
         int i, count = CPUIDLE_DRIVER_STATE_START;
         struct acpi_processor_cx *cx;
-        struct cpuidle_state_usage *state_usage;
-        struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
 
         if (!pr->flags.power_setup_done)
                 return -EINVAL;
@@ -968,7 +951,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
 
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
                 cx = &pr->power.states[i];
-                state_usage = &dev->states_usage[count];
 
                 if (!cx->valid)
                         continue;
@@ -979,8 +961,7 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
                     !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
                         continue;
 #endif
-
-                cpuidle_set_statedata(state_usage, cx);
+                acpi_cstate[count] = cx;
 
                 count++;
                 if (count == CPUIDLE_STATE_MAX)
@@ -1104,7 +1085,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr)
         cpuidle_disable_device(dev);
         acpi_processor_get_power_info(pr);
         if (pr->flags.power) {
-                acpi_processor_setup_cpuidle_cx(pr);
+                acpi_processor_setup_cpuidle_cx(pr, dev);
                 ret = cpuidle_enable_device(dev);
         }
         cpuidle_resume_and_unlock();
@@ -1162,8 +1143,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
                                 continue;
                         acpi_processor_get_power_info(_pr);
                         if (_pr->flags.power) {
-                                acpi_processor_setup_cpuidle_cx(_pr);
                                 dev = per_cpu(acpi_cpuidle_device, cpu);
+                                acpi_processor_setup_cpuidle_cx(_pr, dev);
                                 cpuidle_enable_device(dev);
                         }
                 }
@@ -1232,7 +1213,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
                         return -ENOMEM;
                 per_cpu(acpi_cpuidle_device, pr->id) = dev;
 
-                acpi_processor_setup_cpuidle_cx(pr);
+                acpi_processor_setup_cpuidle_cx(pr, dev);
 
                 /* Register per-cpu cpuidle_device. Cpuidle driver
                  * must already be registered before registering device
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 2df9414a72f7..b2cf489ba3e1 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -109,6 +109,16 @@ static struct cpuidle_state *cpuidle_state_table;
 #define CPUIDLE_FLAG_TLB_FLUSHED        0x10000
 
 /*
+ * MWAIT takes an 8-bit "hint" in EAX "suggesting"
+ * the C-state (top nibble) and sub-state (bottom nibble)
+ * 0x00 means "MWAIT(C1)", 0x10 means "MWAIT(C2)" etc.
+ *
+ * We store the hint at the top of our "flags" for each state.
+ */
+#define flg2MWAIT(flags) (((flags) >> 24) & 0xFF)
+#define MWAIT2flg(eax) ((eax & 0xFF) << 24)
+
+/*
  * States are indexed by the cstate number,
  * which is also the index into the MWAIT hint array.
  * Thus C0 is a dummy.
@@ -118,21 +128,21 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = {
         { /* MWAIT C1 */
                 .name = "C1-NHM",
                 .desc = "MWAIT 0x00",
-                .flags = CPUIDLE_FLAG_TIME_VALID,
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
                 .exit_latency = 3,
                 .target_residency = 6,
                 .enter = &intel_idle },
         { /* MWAIT C2 */
                 .name = "C3-NHM",
                 .desc = "MWAIT 0x10",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 20,
                 .target_residency = 80,
                 .enter = &intel_idle },
         { /* MWAIT C3 */
                 .name = "C6-NHM",
                 .desc = "MWAIT 0x20",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 200,
                 .target_residency = 800,
                 .enter = &intel_idle },
@@ -143,28 +153,28 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
         { /* MWAIT C1 */
                 .name = "C1-SNB",
                 .desc = "MWAIT 0x00",
-                .flags = CPUIDLE_FLAG_TIME_VALID,
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
                 .exit_latency = 1,
                 .target_residency = 1,
                 .enter = &intel_idle },
         { /* MWAIT C2 */
                 .name = "C3-SNB",
                 .desc = "MWAIT 0x10",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 80,
                 .target_residency = 211,
                 .enter = &intel_idle },
         { /* MWAIT C3 */
                 .name = "C6-SNB",
                 .desc = "MWAIT 0x20",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 104,
                 .target_residency = 345,
                 .enter = &intel_idle },
         { /* MWAIT C4 */
                 .name = "C7-SNB",
                 .desc = "MWAIT 0x30",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 109,
                 .target_residency = 345,
                 .enter = &intel_idle },
@@ -175,28 +185,28 @@ static struct cpuidle_state ivb_cstates[MWAIT_MAX_NUM_CSTATES] = {
         { /* MWAIT C1 */
                 .name = "C1-IVB",
                 .desc = "MWAIT 0x00",
-                .flags = CPUIDLE_FLAG_TIME_VALID,
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
                 .exit_latency = 1,
                 .target_residency = 1,
                 .enter = &intel_idle },
         { /* MWAIT C2 */
                 .name = "C3-IVB",
                 .desc = "MWAIT 0x10",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 59,
                 .target_residency = 156,
                 .enter = &intel_idle },
         { /* MWAIT C3 */
                 .name = "C6-IVB",
                 .desc = "MWAIT 0x20",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 80,
                 .target_residency = 300,
                 .enter = &intel_idle },
         { /* MWAIT C4 */
                 .name = "C7-IVB",
                 .desc = "MWAIT 0x30",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 87,
                 .target_residency = 300,
                 .enter = &intel_idle },
@@ -207,14 +217,14 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
         { /* MWAIT C1 */
                 .name = "C1-ATM",
                 .desc = "MWAIT 0x00",
-                .flags = CPUIDLE_FLAG_TIME_VALID,
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
                 .exit_latency = 1,
                 .target_residency = 4,
                 .enter = &intel_idle },
         { /* MWAIT C2 */
                 .name = "C2-ATM",
                 .desc = "MWAIT 0x10",
-                .flags = CPUIDLE_FLAG_TIME_VALID,
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID,
                 .exit_latency = 20,
                 .target_residency = 80,
                 .enter = &intel_idle },
@@ -222,7 +232,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
         { /* MWAIT C4 */
                 .name = "C4-ATM",
                 .desc = "MWAIT 0x30",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 100,
                 .target_residency = 400,
                 .enter = &intel_idle },
@@ -230,41 +240,12 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
         { /* MWAIT C6 */
                 .name = "C6-ATM",
                 .desc = "MWAIT 0x52",
-                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 140,
                 .target_residency = 560,
                 .enter = &intel_idle },
 };
 
-static long get_driver_data(int cstate)
-{
-        int driver_data;
-        switch (cstate) {
-
-        case 1: /* MWAIT C1 */
-                driver_data = 0x00;
-                break;
-        case 2: /* MWAIT C2 */
-                driver_data = 0x10;
-                break;
-        case 3: /* MWAIT C3 */
-                driver_data = 0x20;
-                break;
-        case 4: /* MWAIT C4 */
-                driver_data = 0x30;
-                break;
-        case 5: /* MWAIT C5 */
-                driver_data = 0x40;
-                break;
-        case 6: /* MWAIT C6 */
-                driver_data = 0x52;
-                break;
-        default:
-                driver_data = 0x00;
-        }
-        return driver_data;
-}
-
 /**
  * intel_idle
  * @dev: cpuidle_device
@@ -278,8 +259,7 @@ static int intel_idle(struct cpuidle_device *dev,
 {
         unsigned long ecx = 1; /* break on interrupt flag */
         struct cpuidle_state *state = &drv->states[index];
-        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
-        unsigned long eax = (unsigned long)cpuidle_get_statedata(state_usage);
+        unsigned long eax = flg2MWAIT(state->flags);
         unsigned int cstate;
         int cpu = smp_processor_id();
 
@@ -558,9 +538,6 @@ static int intel_idle_cpu_init(int cpu)
                 if (cpuidle_state_table[cstate].enter == NULL)
                         continue;
 
-                dev->states_usage[dev->state_count].driver_data =
-                        (void *)get_driver_data(cstate);
-
                 dev->state_count += 1;
         }