Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull ACPI & power management update from Len Brown:
 "Re-write of the turbostat tool.
     lower overhead was necessary for measuring very large system when
     they are very idle.

  IVB support in intel_idle
     It's what I run on my IVB, others should be able to also:-)

  ACPICA core update
     We have found some bugs due to divergence between Linux and the
     upstream ACPICA base.  Most of these patches are to reduce that
     divergence to reduce the risk of future bugs.

  Some cpuidle updates, mostly for non-Intel
     More will be coming, as they depend on this part.

  Some thermal management changes needed by non-ACPI systems.

  Some _OST (OS Status Indication) updates for hot ACPI hot-plug."

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (51 commits)
  Thermal: Documentation update
  Thermal: Add Hysteresis attributes
  Thermal: Make Thermal trip points writeable
  ACPI/AC: prevent OOPS on some boxes due to missing check power_supply_register() return value check
  tools/power: turbostat: fix large c1% issue
  tools/power: turbostat v2 - re-write for efficiency
  ACPICA: Update to version 20120711
  ACPICA: AcpiSrc: Fix some translation issues for Linux conversion
  ACPICA: Update header files copyrights to 2012
  ACPICA: Add new ACPI table load/unload external interfaces
  ACPICA: Split file: tbxface.c -> tbxfload.c
  ACPICA: Add PCC address space to space ID decode function
  ACPICA: Fix some comment fields
  ACPICA: Table manager: deploy new firmware error/warning interfaces
  ACPICA: Add new interfaces for BIOS(firmware) errors and warnings
  ACPICA: Split exception code utilities to a new file, utexcep.c
  ACPI: acpi_pad: tune round_robin_time
  ACPICA: Update to version 20120620
  ACPICA: Add support for implicit notify on multiple devices
  ACPICA: Update comments; no functional change
  ...

1 files changed, 57 insertions, 28 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d6a533e68e0f..e28f6ea46f1a 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -92,6 +92,34 @@ int cpuidle_play_dead(void)
 }
 
 /**
+ * cpuidle_enter_state - enter the state and update stats
+ * @dev: cpuidle device for this cpu
+ * @drv: cpuidle driver for this cpu
+ * @next_state: index into drv->states of the state to enter
+ */
+int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
+                int next_state)
+{
+        int entered_state;
+
+        entered_state = cpuidle_enter_ops(dev, drv, next_state);
+
+        if (entered_state >= 0) {
+                /* Update cpuidle counters */
+                /* This can be moved to within driver enter routine
+                 * but that results in multiple copies of same code.
+                 */
+                dev->states_usage[entered_state].time +=
+                                (unsigned long long)dev->last_residency;
+                dev->states_usage[entered_state].usage++;
+        } else {
+                dev->last_residency = 0;
+        }
+
+        return entered_state;
+}
+
+/**
  * cpuidle_idle_call - the main idle loop
  *
  * NOTE: no locks or semaphores should be used here
@@ -113,15 +141,6 @@ int cpuidle_idle_call(void)
         if (!dev || !dev->enabled)
                 return -EBUSY;
 
-#if 0
-        /* shows regressions, re-enable for 2.6.29 */
-        /*
-         * run any timers that can be run now, at this point
-         * before calculating the idle duration etc.
-         */
-        hrtimer_peek_ahead_timers();
-#endif
-
         /* ask the governor for the next state */
         next_state = cpuidle_curr_governor->select(drv, dev);
         if (need_resched()) {
@@ -132,23 +151,15 @@ int cpuidle_idle_call(void)
         trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
         trace_cpu_idle_rcuidle(next_state, dev->cpu);
 
-        entered_state = cpuidle_enter_ops(dev, drv, next_state);
+        if (cpuidle_state_is_coupled(dev, drv, next_state))
+                entered_state = cpuidle_enter_state_coupled(dev, drv,
+                                                            next_state);
+        else
+                entered_state = cpuidle_enter_state(dev, drv, next_state);
 
         trace_power_end_rcuidle(dev->cpu);
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
-        if (entered_state >= 0) {
-                /* Update cpuidle counters */
-                /* This can be moved to within driver enter routine
-                 * but that results in multiple copies of same code.
-                 */
-                dev->states_usage[entered_state].time +=
-                                (unsigned long long)dev->last_residency;
-                dev->states_usage[entered_state].usage++;
-        } else {
-                dev->last_residency = 0;
-        }
-
         /* give the governor an opportunity to reflect on the outcome */
         if (cpuidle_curr_governor->reflect)
                 cpuidle_curr_governor->reflect(dev, entered_state);
@@ -299,6 +310,9 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
         int ret, i;
         struct cpuidle_driver *drv = cpuidle_get_driver();
 
+        if (!dev)
+                return -EINVAL;
+
         if (dev->enabled)
                 return 0;
         if (!drv || !cpuidle_curr_governor)
@@ -383,8 +397,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
         struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);
         struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
 
-        if (!dev)
-                return -EINVAL;
         if (!try_module_get(cpuidle_driver->owner))
                 return -EINVAL;
 
@@ -392,13 +404,25 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
 
         per_cpu(cpuidle_devices, dev->cpu) = dev;
         list_add(&dev->device_list, &cpuidle_detected_devices);
-        if ((ret = cpuidle_add_sysfs(cpu_dev))) {
-                module_put(cpuidle_driver->owner);
-                return ret;
-        }
+        ret = cpuidle_add_sysfs(cpu_dev);
+        if (ret)
+                goto err_sysfs;
+
+        ret = cpuidle_coupled_register_device(dev);
+        if (ret)
+                goto err_coupled;
 
         dev->registered = 1;
         return 0;
+
+err_coupled:
+        cpuidle_remove_sysfs(cpu_dev);
+        wait_for_completion(&dev->kobj_unregister);
+err_sysfs:
+        list_del(&dev->device_list);
+        per_cpu(cpuidle_devices, dev->cpu) = NULL;
+        module_put(cpuidle_driver->owner);
+        return ret;
 }
 
 /**
@@ -409,6 +433,9 @@ int cpuidle_register_device(struct cpuidle_device *dev)
 {
         int ret;
 
+        if (!dev)
+                return -EINVAL;
+
         mutex_lock(&cpuidle_lock);
 
         if ((ret = __cpuidle_register_device(dev))) {
@@ -448,6 +475,8 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
         wait_for_completion(&dev->kobj_unregister);
         per_cpu(cpuidle_devices, dev->cpu) = NULL;
 
+        cpuidle_coupled_unregister_device(dev);
+
         cpuidle_resume_and_unlock();
 
         module_put(cpuidle_driver->owner);