Merge tag 'pm+acpi-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management and ACPI updates from Rafael Wysocki:
 "This time the total number of ACPI commits is slightly greater than
  the number of cpufreq commits, but Viresh Kumar (who works on cpufreq)
  remains the most active patch submitter.

  To me, the most significant change is the addition of offline/online
  device operations to the driver core (with the Greg's blessing) and
  the related modifications of the ACPI core hotplug code.  Next are the
  freezer updates from Colin Cross that should make the freezing of
  tasks a bit less heavy weight.

  We also have a couple of regression fixes, a number of fixes for
  issues that have not been identified as regressions, two new drivers
  and a bunch of cleanups all over.

  Highlights:

   - Hotplug changes to support graceful hot-removal failures.

     It sometimes is necessary to fail device hot-removal operations
     gracefully if they cannot be carried out completely.  For example,
     if memory from a memory module being hot-removed has been allocated
     for the kernel's own use and cannot be moved elsewhere, it's
     desirable to fail the hot-removal operation in a graceful way
     rather than to crash the kernel, but currenty a success or a kernel
     crash are the only possible outcomes of an attempted memory
     hot-removal.  Needless to say, that is not a very attractive
     alternative and it had to be addressed.

     However, in order to make it work for memory, I first had to make
     it work for CPUs and for this purpose I needed to modify the ACPI
     processor driver.  It's been split into two parts, a resident one
     handling the low-level initialization/cleanup and a modular one
     playing the actual driver's role (but it binds to the CPU system
     device objects rather than to the ACPI device objects representing
     processors).  That's been sort of like a live brain surgery on a
     patient who's riding a bike.

     So this is a little scary, but since we found and fixed a couple of
     regressions it caused to happen during the early linux-next testing
     (a month ago), nobody has complained.

     As a bonus we remove some duplicated ACPI hotplug code, because the
     ACPI-based CPU hotplug is now going to use the common ACPI hotplug
     code.

   - Lighter weight freezing of tasks.

     These changes from Colin Cross and Mandeep Singh Baines are
     targeted at making the freezing of tasks a bit less heavy weight
     operation.  They reduce the number of tasks woken up every time
     during the freezing, by using the observation that the freezer
     simply doesn't need to wake up some of them and wait for them all
     to call refrigerator().  The time needed for the freezer to decide
     to report a failure is reduced too.

     Also reintroduced is the check causing a lockdep warining to
     trigger when try_to_freeze() is called with locks held (which is
     generally unsafe and shouldn't happen).

   - cpufreq updates

     First off, a commit from Srivatsa S Bhat fixes a resume regression
     introduced during the 3.10 cycle causing some cpufreq sysfs
     attributes to return wrong values to user space after resume.  The
     fix is kind of fresh, but also it's pretty obvious once Srivatsa
     has identified the root cause.

     Second, we have a new freqdomain_cpus sysfs attribute for the
     acpi-cpufreq driver to provide information previously available via
     related_cpus.  From Lan Tianyu.

     Finally, we fix a number of issues, mostly related to the
     CPUFREQ_POSTCHANGE notifier and cpufreq Kconfig options and clean
     up some code.  The majority of changes from Viresh Kumar with bits
     from Jacob Shin, Heiko Stübner, Xiaoguang Chen, Ezequiel Garcia,
     Arnd Bergmann, and Tang Yuantian.

   - ACPICA update

     A usual bunch of updates from the ACPICA upstream.

     During the 3.4 cycle we introduced support for ACPI 5 extended
     sleep registers, but they are only supposed to be used if the
     HW-reduced mode bit is set in the FADT flags and the code attempted
     to use them without checking that bit.  That caused suspend/resume
     regressions to happen on some systems.  Fix from Lv Zheng causes
     those registers to be used only if the HW-reduced mode bit is set.

     Apart from this some other ACPICA bugs are fixed and code cleanups
     are made by Bob Moore, Tomasz Nowicki, Lv Zheng, Chao Guan, and
     Zhang Rui.

   - cpuidle updates

     New driver for Xilinx Zynq processors is added by Michal Simek.

     Multidriver support simplification, addition of some missing
     kerneldoc comments and Kconfig-related fixes come from Daniel
     Lezcano.

   - ACPI power management updates

     Changes to make suspend/resume work correctly in Xen guests from
     Konrad Rzeszutek Wilk, sparse warning fix from Fengguang Wu and
     cleanups and fixes of the ACPI device power state selection
     routine.

   - ACPI documentation updates

     Some previously missing pieces of ACPI documentation are added by
     Lv Zheng and Aaron Lu (hopefully, that will help people to
     uderstand how the ACPI subsystem works) and one outdated doc is
     updated by Hanjun Guo.

   - Assorted ACPI updates

     We finally nailed down the IA-64 issue that was the reason for
     reverting commit 9f29ab11ddbf ("ACPI / scan: do not match drivers
     against objects having scan handlers"), so we can fix it and move
     the ACPI scan handler check added to the ACPI video driver back to
     the core.

     A mechanism for adding CMOS RTC address space handlers is
     introduced by Lan Tianyu to allow some EC-related breakage to be
     fixed on some systems.

     A spec-compliant implementation of acpi_os_get_timer() is added by
     Mika Westerberg.

     The evaluation of _STA is added to do_acpi_find_child() to avoid
     situations in which a pointer to a disabled device object is
     returned instead of an enabled one with the same _ADR value.  From
     Jeff Wu.

     Intel BayTrail PCH (Platform Controller Hub) support is added to
     the ACPI driver for Intel Low-Power Subsystems (LPSS) and that
     driver is modified to work around a couple of known BIOS issues.
     Changes from Mika Westerberg and Heikki Krogerus.

     The EC driver is fixed by Vasiliy Kulikov to use get_user() and
     put_user() instead of dereferencing user space pointers blindly.

     Code cleanups are made by Bjorn Helgaas, Nicholas Mazzuca and Toshi
     Kani.

   - Assorted power management updates

     The "runtime idle" helper routine is changed to take the return
     values of the callbacks executed by it into account and to call
     rpm_suspend() if they return 0, which allows us to reduce the
     overall code bloat a bit (by dropping some code that's not
     necessary any more after that modification).

     The runtime PM documentation is updated by Alan Stern (to reflect
     the "runtime idle" behavior change).

     New trace points for PM QoS are added by Sahara
     (<keun-o.park@windriver.com>).

     PM QoS documentation is updated by Lan Tianyu.

     Code cleanups are made and minor issues are addressed by Bernie
     Thompson, Bjorn Helgaas, Julius Werner, and Shuah Khan.

   - devfreq updates

     New driver for the Exynos5-bus device from Abhilash Kesavan.

     Minor cleanups, fixes and MAINTAINERS update from MyungJoo Ham,
     Abhilash Kesavan, Paul Bolle, Rajagopal Venkat, and Wei Yongjun.

   - OMAP power management updates

     Adaptive Voltage Scaling (AVS) SmartReflex voltage control driver
     updates from Andrii Tseglytskyi and Nishanth Menon."

* tag 'pm+acpi-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (162 commits)
  cpufreq: Fix cpufreq regression after suspend/resume
  ACPI / PM: Fix possible NULL pointer deref in acpi_pm_device_sleep_state()
  PM / Sleep: Warn about system time after resume with pm_trace
  cpufreq: don't leave stale policy pointer in cdbs->cur_policy
  acpi-cpufreq: Add new sysfs attribute freqdomain_cpus
  cpufreq: make sure frequency transitions are serialized
  ACPI: implement acpi_os_get_timer() according the spec
  ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan
  ACPI: Add CMOS RTC Operation Region handler support
  ACPI / processor: Drop unused variable from processor_perflib.c
  cpufreq: tegra: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c64xx: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: omap: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: imx6q: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: davinci: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: arm-big-little: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases
  ...

204 files changed, 7276 insertions, 2960 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 536562c626a2..81dbeb83bb45 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -34,6 +34,7 @@ acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
 acpi-y                          += bus.o glue.o
 acpi-y                          += scan.o
 acpi-y                          += resource.o
+acpi-y                          += acpi_processor.o
 acpi-y                          += processor_core.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
@@ -43,6 +44,7 @@ acpi-y				+= acpi_platform.o
 acpi-y                          += power.o
 acpi-y                          += event.o
 acpi-y                          += sysfs.o
+acpi-$(CONFIG_X86)              += acpi_cmos_rtc.o
 acpi-$(CONFIG_DEBUG_FS)         += debugfs.o
 acpi-$(CONFIG_ACPI_NUMA)        += numa.o
 acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
new file mode 100644
index 000000000000..84190ed89c04
--- /dev/null
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -0,0 +1,92 @@
+/*
+ * ACPI support for CMOS RTC Address Space access
+ *
+ * Copyright (C) 2013, Intel Corporation
+ * Authors: Lan Tianyu <tianyu.lan@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <asm-generic/rtc.h>
+
+#include "internal.h"
+
+#define PREFIX "ACPI: "
+
+ACPI_MODULE_NAME("cmos rtc");
+
+static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
+        { "PNP0B00" },
+        { "PNP0B01" },
+        { "PNP0B02" },
+        {}
+};
+
+static acpi_status
+acpi_cmos_rtc_space_handler(u32 function, acpi_physical_address address,
+                      u32 bits, u64 *value64,
+                      void *handler_context, void *region_context)
+{
+        int i;
+        u8 *value = (u8 *)&value64;
+
+        if (address > 0xff || !value64)
+                return AE_BAD_PARAMETER;
+
+        if (function != ACPI_WRITE && function != ACPI_READ)
+                return AE_BAD_PARAMETER;
+
+        spin_lock_irq(&rtc_lock);
+
+        for (i = 0; i < DIV_ROUND_UP(bits, 8); ++i, ++address, ++value)
+                if (function == ACPI_READ)
+                        *value = CMOS_READ(address);
+                else
+                        CMOS_WRITE(*value, address);
+
+        spin_unlock_irq(&rtc_lock);
+
+        return AE_OK;
+}
+
+static int acpi_install_cmos_rtc_space_handler(struct acpi_device *adev,
+                const struct acpi_device_id *id)
+{
+        acpi_status status;
+
+        status = acpi_install_address_space_handler(adev->handle,
+                        ACPI_ADR_SPACE_CMOS,
+                        &acpi_cmos_rtc_space_handler,
+                        NULL, NULL);
+        if (ACPI_FAILURE(status)) {
+                pr_err(PREFIX "Error installing CMOS-RTC region handler\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static void acpi_remove_cmos_rtc_space_handler(struct acpi_device *adev)
+{
+        if (ACPI_FAILURE(acpi_remove_address_space_handler(adev->handle,
+                        ACPI_ADR_SPACE_CMOS, &acpi_cmos_rtc_space_handler)))
+                pr_err(PREFIX "Error removing CMOS-RTC region handler\n");
+}
+
+static struct acpi_scan_handler cmos_rtc_handler = {
+        .ids = acpi_cmos_rtc_ids,
+        .attach = acpi_install_cmos_rtc_space_handler,
+        .detach = acpi_remove_cmos_rtc_space_handler,
+};
+
+void __init acpi_cmos_rtc_init(void)
+{
+        acpi_scan_add_handler(&cmos_rtc_handler);
+}
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index cab13f2fc28e..6a382188fa20 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -32,12 +32,26 @@ ACPI_MODULE_NAME("acpi_lpss");
 #define LPSS_GENERAL_LTR_MODE_SW        BIT(2)
 #define LPSS_SW_LTR                     0x10
 #define LPSS_AUTO_LTR                   0x14
+#define LPSS_TX_INT                     0x20
+#define LPSS_TX_INT_MASK                BIT(1)
+
+struct lpss_shared_clock {
+        const char *name;
+        unsigned long rate;
+        struct clk *clk;
+};
+
+struct lpss_private_data;
 
 struct lpss_device_desc {
         bool clk_required;
         const char *clkdev_name;
         bool ltr_required;
         unsigned int prv_offset;
+        size_t prv_size_override;
+        bool clk_gate;
+        struct lpss_shared_clock *shared_clock;
+        void (*setup)(struct lpss_private_data *pdata);
 };
 
 static struct lpss_device_desc lpss_dma_desc = {
@@ -52,17 +66,76 @@ struct lpss_private_data {
         const struct lpss_device_desc *dev_desc;
 };
 
+static void lpss_uart_setup(struct lpss_private_data *pdata)
+{
+        unsigned int tx_int_offset = pdata->dev_desc->prv_offset + LPSS_TX_INT;
+        u32 reg;
+
+        reg = readl(pdata->mmio_base + tx_int_offset);
+        writel(reg | LPSS_TX_INT_MASK, pdata->mmio_base + tx_int_offset);
+}
+
 static struct lpss_device_desc lpt_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x800,
         .ltr_required = true,
+        .clk_gate = true,
+};
+
+static struct lpss_device_desc lpt_uart_dev_desc = {
+        .clk_required = true,
+        .prv_offset = 0x800,
+        .ltr_required = true,
+        .clk_gate = true,
+        .setup = lpss_uart_setup,
 };
 
 static struct lpss_device_desc lpt_sdio_dev_desc = {
         .prv_offset = 0x1000,
+        .prv_size_override = 0x1018,
         .ltr_required = true,
 };
 
+static struct lpss_shared_clock uart_clock = {
+        .name = "uart_clk",
+        .rate = 44236800,
+};
+
+static struct lpss_device_desc byt_uart_dev_desc = {
+        .clk_required = true,
+        .prv_offset = 0x800,
+        .clk_gate = true,
+        .shared_clock = &uart_clock,
+        .setup = lpss_uart_setup,
+};
+
+static struct lpss_shared_clock spi_clock = {
+        .name = "spi_clk",
+        .rate = 50000000,
+};
+
+static struct lpss_device_desc byt_spi_dev_desc = {
+        .clk_required = true,
+        .prv_offset = 0x400,
+        .clk_gate = true,
+        .shared_clock = &spi_clock,
+};
+
+static struct lpss_device_desc byt_sdio_dev_desc = {
+        .clk_required = true,
+};
+
+static struct lpss_shared_clock i2c_clock = {
+        .name = "i2c_clk",
+        .rate = 100000000,
+};
+
+static struct lpss_device_desc byt_i2c_dev_desc = {
+        .clk_required = true,
+        .prv_offset = 0x800,
+        .shared_clock = &i2c_clock,
+};
+
 static const struct acpi_device_id acpi_lpss_device_ids[] = {
         /* Generic LPSS devices */
         { "INTL9C60", (unsigned long)&lpss_dma_desc },
@@ -72,11 +145,18 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {
         { "INT33C1", (unsigned long)&lpt_dev_desc },
         { "INT33C2", (unsigned long)&lpt_dev_desc },
         { "INT33C3", (unsigned long)&lpt_dev_desc },
-        { "INT33C4", (unsigned long)&lpt_dev_desc },
-        { "INT33C5", (unsigned long)&lpt_dev_desc },
+        { "INT33C4", (unsigned long)&lpt_uart_dev_desc },
+        { "INT33C5", (unsigned long)&lpt_uart_dev_desc },
         { "INT33C6", (unsigned long)&lpt_sdio_dev_desc },
         { "INT33C7", },
 
+        /* BayTrail LPSS devices */
+        { "80860F0A", (unsigned long)&byt_uart_dev_desc },
+        { "80860F0E", (unsigned long)&byt_spi_dev_desc },
+        { "80860F14", (unsigned long)&byt_sdio_dev_desc },
+        { "80860F41", (unsigned long)&byt_i2c_dev_desc },
+        { "INT33B2", },
+
         { }
 };
 
@@ -98,7 +178,10 @@ static int register_device_clock(struct acpi_device *adev,
                                  struct lpss_private_data *pdata)
 {
         const struct lpss_device_desc *dev_desc = pdata->dev_desc;
+        struct lpss_shared_clock *shared_clock = dev_desc->shared_clock;
+        struct clk *clk = ERR_PTR(-ENODEV);
         struct lpss_clk_data *clk_data;
+        const char *parent;
 
         if (!lpss_clk_dev)
                 lpt_register_clock_device();
@@ -117,14 +200,30 @@ static int register_device_clock(struct acpi_device *adev,
             || pdata->mmio_size < dev_desc->prv_offset + LPSS_CLK_SIZE)
                 return -ENODATA;
 
-        pdata->clk = clk_register_gate(NULL, dev_name(&adev->dev),
-                                       clk_data->name, 0,
-                                       pdata->mmio_base + dev_desc->prv_offset,
-                                       0, 0, NULL);
-        if (IS_ERR(pdata->clk))
-                return PTR_ERR(pdata->clk);
+        parent = clk_data->name;
+
+        if (shared_clock) {
+                clk = shared_clock->clk;
+                if (!clk) {
+                        clk = clk_register_fixed_rate(NULL, shared_clock->name,
+                                                      "lpss_clk", 0,
+                                                      shared_clock->rate);
+                        shared_clock->clk = clk;
+                }
+                parent = shared_clock->name;
+        }
+
+        if (dev_desc->clk_gate) {
+                clk = clk_register_gate(NULL, dev_name(&adev->dev), parent, 0,
+                                        pdata->mmio_base + dev_desc->prv_offset,
+                                        0, 0, NULL);
+                pdata->clk = clk;
+        }
 
-        clk_register_clkdev(pdata->clk, NULL, dev_name(&adev->dev));
+        if (IS_ERR(clk))
+                return PTR_ERR(clk);
+
+        clk_register_clkdev(clk, NULL, dev_name(&adev->dev));
         return 0;
 }
 
@@ -152,7 +251,10 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
 
         list_for_each_entry(rentry, &resource_list, node)
                 if (resource_type(&rentry->res) == IORESOURCE_MEM) {
-                        pdata->mmio_size = resource_size(&rentry->res);
+                        if (dev_desc->prv_size_override)
+                                pdata->mmio_size = dev_desc->prv_size_override;
+                        else
+                                pdata->mmio_size = resource_size(&rentry->res);
                         pdata->mmio_base = ioremap(rentry->res.start,
                                                    pdata->mmio_size);
                         pdata->dev_desc = dev_desc;
@@ -182,6 +284,9 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
                 goto err_out;
         }
 
+        if (dev_desc->setup)
+                dev_desc->setup(pdata);
+
         adev->driver_data = pdata;
         ret = acpi_create_platform_device(adev, id);
         if (ret > 0)
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 5e6301e94920..c711d1144044 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -28,6 +28,7 @@
  */
 
 #include <linux/acpi.h>
+#include <linux/memory.h>
 #include <linux/memory_hotplug.h>
 
 #include "internal.h"
@@ -166,13 +167,50 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
         return 0;
 }
 
+static unsigned long acpi_meminfo_start_pfn(struct acpi_memory_info *info)
+{
+        return PFN_DOWN(info->start_addr);
+}
+
+static unsigned long acpi_meminfo_end_pfn(struct acpi_memory_info *info)
+{
+        return PFN_UP(info->start_addr + info->length-1);
+}
+
+static int acpi_bind_memblk(struct memory_block *mem, void *arg)
+{
+        return acpi_bind_one(&mem->dev, (acpi_handle)arg);
+}
+
+static int acpi_bind_memory_blocks(struct acpi_memory_info *info,
+                                   acpi_handle handle)
+{
+        return walk_memory_range(acpi_meminfo_start_pfn(info),
+                                 acpi_meminfo_end_pfn(info), (void *)handle,
+                                 acpi_bind_memblk);
+}
+
+static int acpi_unbind_memblk(struct memory_block *mem, void *arg)
+{
+        acpi_unbind_one(&mem->dev);
+        return 0;
+}
+
+static void acpi_unbind_memory_blocks(struct acpi_memory_info *info,
+                                      acpi_handle handle)
+{
+        walk_memory_range(acpi_meminfo_start_pfn(info),
+                          acpi_meminfo_end_pfn(info), NULL, acpi_unbind_memblk);
+}
+
 static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 {
+        acpi_handle handle = mem_device->device->handle;
         int result, num_enabled = 0;
         struct acpi_memory_info *info;
         int node;
 
-        node = acpi_get_node(mem_device->device->handle);
+        node = acpi_get_node(handle);
         /*
          * Tell the VM there is more memory here...
          * Note: Assume that this function returns zero on success
@@ -203,6 +241,12 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
                 if (result && result != -EEXIST)
                         continue;
 
+                result = acpi_bind_memory_blocks(info, handle);
+                if (result) {
+                        acpi_unbind_memory_blocks(info, handle);
+                        return -ENODEV;
+                }
+
                 info->enabled = 1;
 
                 /*
@@ -227,12 +271,11 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
         return 0;
 }
 
-static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
+static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
 {
-        int result = 0, nid;
+        acpi_handle handle = mem_device->device->handle;
         struct acpi_memory_info *info, *n;
-
-        nid = acpi_get_node(mem_device->device->handle);
+        int nid = acpi_get_node(handle);
 
         list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
                 if (!info->enabled)
@@ -240,15 +283,12 @@ static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
 
                 if (nid < 0)
                         nid = memory_add_physaddr_to_nid(info->start_addr);
-                result = remove_memory(nid, info->start_addr, info->length);
-                if (result)
-                        return result;
 
+                acpi_unbind_memory_blocks(info, handle);
+                remove_memory(nid, info->start_addr, info->length);
                 list_del(&info->list);
                 kfree(info);
         }
-
-        return result;
 }
 
 static void acpi_memory_device_free(struct acpi_memory_device *mem_device)
@@ -300,7 +340,7 @@ static int acpi_memory_device_add(struct acpi_device *device,
         if (result) {
                 dev_err(&device->dev, "acpi_memory_enable_device() error\n");
                 acpi_memory_device_free(mem_device);
-                return -ENODEV;
+                return result;
         }
 
         dev_dbg(&device->dev, "Memory device configured by ACPI\n");
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
new file mode 100644
index 000000000000..e9b01e35ac37
--- /dev/null
+++ b/drivers/acpi/acpi_processor.c
@@ -0,0 +1,494 @@
+/*
+ * acpi_processor.c - ACPI processor enumeration support
+ *
+ * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
+ * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
+ * Copyright (C) 2004       Dominik Brodowski <linux@brodo.de>
+ * Copyright (C) 2004  Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
+ * Copyright (C) 2013, Intel Corporation
+ *                     Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
+#include <acpi/processor.h>
+
+#include <asm/cpu.h>
+
+#include "internal.h"
+
+#define _COMPONENT      ACPI_PROCESSOR_COMPONENT
+
+ACPI_MODULE_NAME("processor");
+
+DEFINE_PER_CPU(struct acpi_processor *, processors);
+EXPORT_PER_CPU_SYMBOL(processors);
+
+/* --------------------------------------------------------------------------
+                                Errata Handling
+   -------------------------------------------------------------------------- */
+
+struct acpi_processor_errata errata __read_mostly;
+EXPORT_SYMBOL_GPL(errata);
+
+static int acpi_processor_errata_piix4(struct pci_dev *dev)
+{
+        u8 value1 = 0;
+        u8 value2 = 0;
+
+
+        if (!dev)
+                return -EINVAL;
+
+        /*
+         * Note that 'dev' references the PIIX4 ACPI Controller.
+         */
+
+        switch (dev->revision) {
+        case 0:
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 A-step\n"));
+                break;
+        case 1:
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 B-step\n"));
+                break;
+        case 2:
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4E\n"));
+                break;
+        case 3:
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4M\n"));
+                break;
+        default:
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found unknown PIIX4\n"));
+                break;
+        }
+
+        switch (dev->revision) {
+
+        case 0:         /* PIIX4 A-step */
+        case 1:         /* PIIX4 B-step */
+                /*
+                 * See specification changes #13 ("Manual Throttle Duty Cycle")
+                 * and #14 ("Enabling and Disabling Manual Throttle"), plus
+                 * erratum #5 ("STPCLK# Deassertion Time") from the January
+                 * 2002 PIIX4 specification update.  Applies to only older
+                 * PIIX4 models.
+                 */
+                errata.piix4.throttle = 1;
+
+        case 2:         /* PIIX4E */
+        case 3:         /* PIIX4M */
+                /*
+                 * See erratum #18 ("C3 Power State/BMIDE and Type-F DMA
+                 * Livelock") from the January 2002 PIIX4 specification update.
+                 * Applies to all PIIX4 models.
+                 */
+
+                /*
+                 * BM-IDE
+                 * ------
+                 * Find the PIIX4 IDE Controller and get the Bus Master IDE
+                 * Status register address.  We'll use this later to read
+                 * each IDE controller's DMA status to make sure we catch all
+                 * DMA activity.
+                 */
+                dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
+                                     PCI_DEVICE_ID_INTEL_82371AB,
+                                     PCI_ANY_ID, PCI_ANY_ID, NULL);
+                if (dev) {
+                        errata.piix4.bmisx = pci_resource_start(dev, 4);
+                        pci_dev_put(dev);
+                }
+
+                /*
+                 * Type-F DMA
+                 * ----------
+                 * Find the PIIX4 ISA Controller and read the Motherboard
+                 * DMA controller's status to see if Type-F (Fast) DMA mode
+                 * is enabled (bit 7) on either channel.  Note that we'll
+                 * disable C3 support if this is enabled, as some legacy
+                 * devices won't operate well if fast DMA is disabled.
+                 */
+                dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
+                                     PCI_DEVICE_ID_INTEL_82371AB_0,
+                                     PCI_ANY_ID, PCI_ANY_ID, NULL);
+                if (dev) {
+                        pci_read_config_byte(dev, 0x76, &value1);
+                        pci_read_config_byte(dev, 0x77, &value2);
+                        if ((value1 & 0x80) || (value2 & 0x80))
+                                errata.piix4.fdma = 1;
+                        pci_dev_put(dev);
+                }
+
+                break;
+        }
+
+        if (errata.piix4.bmisx)
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "Bus master activity detection (BM-IDE) erratum enabled\n"));
+        if (errata.piix4.fdma)
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "Type-F DMA livelock erratum (C3 disabled)\n"));
+
+        return 0;
+}
+
+static int acpi_processor_errata(struct acpi_processor *pr)
+{
+        int result = 0;
+        struct pci_dev *dev = NULL;
+
+
+        if (!pr)
+                return -EINVAL;
+
+        /*
+         * PIIX4
+         */
+        dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
+                             PCI_DEVICE_ID_INTEL_82371AB_3, PCI_ANY_ID,
+                             PCI_ANY_ID, NULL);
+        if (dev) {
+                result = acpi_processor_errata_piix4(dev);
+                pci_dev_put(dev);
+        }
+
+        return result;
+}
+
+/* --------------------------------------------------------------------------
+                                Initialization
+   -------------------------------------------------------------------------- */
+
+#ifdef CONFIG_ACPI_HOTPLUG_CPU
+static int acpi_processor_hotadd_init(struct acpi_processor *pr)
+{
+        unsigned long long sta;
+        acpi_status status;
+        int ret;
+
+        status = acpi_evaluate_integer(pr->handle, "_STA", NULL, &sta);
+        if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_PRESENT))
+                return -ENODEV;
+
+        ret = acpi_map_lsapic(pr->handle, &pr->id);
+        if (ret)
+                return ret;
+
+        ret = arch_register_cpu(pr->id);
+        if (ret) {
+                acpi_unmap_lsapic(pr->id);
+                return ret;
+        }
+
+        /*
+         * CPU got hot-added, but cpu_data is not initialized yet.  Set a flag
+         * to delay cpu_idle/throttling initialization and do it when the CPU
+         * gets online for the first time.
+         */
+        pr_info("CPU%d has been hot-added\n", pr->id);
+        pr->flags.need_hotplug_init = 1;
+        return 0;
+}
+#else
+static inline int acpi_processor_hotadd_init(struct acpi_processor *pr)
+{
+        return -ENODEV;
+}
+#endif /* CONFIG_ACPI_HOTPLUG_CPU */
+
+static int acpi_processor_get_info(struct acpi_device *device)
+{
+        union acpi_object object = { 0 };
+        struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
+        struct acpi_processor *pr = acpi_driver_data(device);
+        int cpu_index, device_declaration = 0;
+        acpi_status status = AE_OK;
+        static int cpu0_initialized;
+
+        if (num_online_cpus() > 1)
+                errata.smp = TRUE;
+
+        acpi_processor_errata(pr);
+
+        /*
+         * Check to see if we have bus mastering arbitration control.  This
+         * is required for proper C3 usage (to maintain cache coherency).
+         */
+        if (acpi_gbl_FADT.pm2_control_block && acpi_gbl_FADT.pm2_control_length) {
+                pr->flags.bm_control = 1;
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "Bus mastering arbitration control present\n"));
+        } else
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                  "No bus mastering arbitration control\n"));
+
+        if (!strcmp(acpi_device_hid(device), ACPI_PROCESSOR_OBJECT_HID)) {
+                /* Declared with "Processor" statement; match ProcessorID */
+                status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
+                if (ACPI_FAILURE(status)) {
+                        dev_err(&device->dev,
+                                "Failed to evaluate processor object (0x%x)\n",
+                                status);
+                        return -ENODEV;
+                }
+
+                /*
+                 * TBD: Synch processor ID (via LAPIC/LSAPIC structures) on SMP.
+                 *      >>> 'acpi_get_processor_id(acpi_id, &id)' in
+                 *      arch/xxx/acpi.c
+                 */
+                pr->acpi_id = object.processor.proc_id;
+        } else {
+                /*
+                 * Declared with "Device" statement; match _UID.
+                 * Note that we don't handle string _UIDs yet.
+                 */
+                unsigned long long value;
+                status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
+                                                NULL, &value);
+                if (ACPI_FAILURE(status)) {
+                        dev_err(&device->dev,
+                                "Failed to evaluate processor _UID (0x%x)\n",
+                                status);
+                        return -ENODEV;
+                }
+                device_declaration = 1;
+                pr->acpi_id = value;
+        }
+        cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id);
+
+        /* Handle UP system running SMP kernel, with no LAPIC in MADT */
+        if (!cpu0_initialized && (cpu_index == -1) &&
+            (num_online_cpus() == 1)) {
+                cpu_index = 0;
+        }
+
+        cpu0_initialized = 1;
+
+        pr->id = cpu_index;
+
+        /*
+         *  Extra Processor objects may be enumerated on MP systems with
+         *  less than the max # of CPUs. They should be ignored _iff
+         *  they are physically not present.
+         */
+        if (pr->id == -1) {
+                int ret = acpi_processor_hotadd_init(pr);
+                if (ret)
+                        return ret;
+        }
+        /*
+         * On some boxes several processors use the same processor bus id.
+         * But they are located in different scope. For example:
+         * \_SB.SCK0.CPU0
+         * \_SB.SCK1.CPU0
+         * Rename the processor device bus id. And the new bus id will be
+         * generated as the following format:
+         * CPU+CPU ID.
+         */
+        sprintf(acpi_device_bid(device), "CPU%X", pr->id);
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d:%d]\n", pr->id,
+                          pr->acpi_id));
+
+        if (!object.processor.pblk_address)
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));
+        else if (object.processor.pblk_length != 6)
+                dev_err(&device->dev, "Invalid PBLK length [%d]\n",
+                            object.processor.pblk_length);
+        else {
+                pr->throttling.address = object.processor.pblk_address;
+                pr->throttling.duty_offset = acpi_gbl_FADT.duty_offset;
+                pr->throttling.duty_width = acpi_gbl_FADT.duty_width;
+
+                pr->pblk = object.processor.pblk_address;
+
+                /*
+                 * We don't care about error returns - we just try to mark
+                 * these reserved so that nobody else is confused into thinking
+                 * that this region might be unused..
+                 *
+                 * (In particular, allocating the IO range for Cardbus)
+                 */
+                request_region(pr->throttling.address, 6, "ACPI CPU throttle");
+        }
+
+        /*
+         * If ACPI describes a slot number for this CPU, we can use it to
+         * ensure we get the right value in the "physical id" field
+         * of /proc/cpuinfo
+         */
+        status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);
+        if (ACPI_SUCCESS(status))
+                arch_fix_phys_package_id(pr->id, object.integer.value);
+
+        return 0;
+}
+
+/*
+ * Do not put anything in here which needs the core to be online.
+ * For example MSR access or setting up things which check for cpuinfo_x86
+ * (cpu_data(cpu)) values, like CPU feature flags, family, model, etc.
+ * Such things have to be put in and set up by the processor driver's .probe().
+ */
+static DEFINE_PER_CPU(void *, processor_device_array);
+
+static int __cpuinit acpi_processor_add(struct acpi_device *device,
+                                        const struct acpi_device_id *id)
+{
+        struct acpi_processor *pr;
+        struct device *dev;
+        int result = 0;
+
+        pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);
+        if (!pr)
+                return -ENOMEM;
+
+        if (!zalloc_cpumask_var(&pr->throttling.shared_cpu_map, GFP_KERNEL)) {
+                result = -ENOMEM;
+                goto err_free_pr;
+        }
+
+        pr->handle = device->handle;
+        strcpy(acpi_device_name(device), ACPI_PROCESSOR_DEVICE_NAME);
+        strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);
+        device->driver_data = pr;
+
+        result = acpi_processor_get_info(device);
+        if (result) /* Processor is not physically present or unavailable */
+                return 0;
+
+#ifdef CONFIG_SMP
+        if (pr->id >= setup_max_cpus && pr->id != 0)
+                return 0;
+#endif
+
+        BUG_ON(pr->id >= nr_cpu_ids);
+
+        /*
+         * Buggy BIOS check.
+         * ACPI id of processors can be reported wrongly by the BIOS.
+         * Don't trust it blindly
+         */
+        if (per_cpu(processor_device_array, pr->id) != NULL &&
+            per_cpu(processor_device_array, pr->id) != device) {
+                dev_warn(&device->dev,
+                        "BIOS reported wrong ACPI id %d for the processor\n",
+                        pr->id);
+                /* Give up, but do not abort the namespace scan. */
+                goto err;
+        }
+        /*
+         * processor_device_array is not cleared on errors to allow buggy BIOS
+         * checks.
+         */
+        per_cpu(processor_device_array, pr->id) = device;
+        per_cpu(processors, pr->id) = pr;
+
+        dev = get_cpu_device(pr->id);
+        if (!dev) {
+                result = -ENODEV;
+                goto err;
+        }
+
+        result = acpi_bind_one(dev, pr->handle);
+        if (result)
+                goto err;
+
+        pr->dev = dev;
+        dev->offline = pr->flags.need_hotplug_init;
+
+        /* Trigger the processor driver's .probe() if present. */
+        if (device_attach(dev) >= 0)
+                return 1;
+
+        dev_err(dev, "Processor driver could not be attached\n");
+        acpi_unbind_one(dev);
+
+ err:
+        free_cpumask_var(pr->throttling.shared_cpu_map);
+        device->driver_data = NULL;
+        per_cpu(processors, pr->id) = NULL;
+ err_free_pr:
+        kfree(pr);
+        return result;
+}
+
+#ifdef CONFIG_ACPI_HOTPLUG_CPU
+/* --------------------------------------------------------------------------
+                                    Removal
+   -------------------------------------------------------------------------- */
+
+static void acpi_processor_remove(struct acpi_device *device)
+{
+        struct acpi_processor *pr;
+
+        if (!device || !acpi_driver_data(device))
+                return;
+
+        pr = acpi_driver_data(device);
+        if (pr->id >= nr_cpu_ids)
+                goto out;
+
+        /*
+         * The only reason why we ever get here is CPU hot-removal.  The CPU is
+         * already offline and the ACPI device removal locking prevents it from
+         * being put back online at this point.
+         *
+         * Unbind the driver from the processor device and detach it from the
+         * ACPI companion object.
+         */
+        device_release_driver(pr->dev);
+        acpi_unbind_one(pr->dev);
+
+        /* Clean up. */
+        per_cpu(processor_device_array, pr->id) = NULL;
+        per_cpu(processors, pr->id) = NULL;
+        try_offline_node(cpu_to_node(pr->id));
+
+        /* Remove the CPU. */
+        get_online_cpus();
+        arch_unregister_cpu(pr->id);
+        acpi_unmap_lsapic(pr->id);
+        put_online_cpus();
+
+ out:
+        free_cpumask_var(pr->throttling.shared_cpu_map);
+        kfree(pr);
+}
+#endif /* CONFIG_ACPI_HOTPLUG_CPU */
+
+/*
+ * The following ACPI IDs are known to be suitable for representing as
+ * processor devices.
+ */
+static const struct acpi_device_id processor_device_ids[] = {
+
+        { ACPI_PROCESSOR_OBJECT_HID, },
+        { ACPI_PROCESSOR_DEVICE_HID, },
+
+        { }
+};
+
+static struct acpi_scan_handler __refdata processor_handler = {
+        .ids = processor_device_ids,
+        .attach = acpi_processor_add,
+#ifdef CONFIG_ACPI_HOTPLUG_CPU
+        .detach = acpi_processor_remove,
+#endif
+        .hotplug = {
+                .enabled = true,
+        },
+};
+
+void __init acpi_processor_init(void)
+{
+        acpi_scan_add_handler_with_hotplug(&processor_handler, "processor");
+}
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index 7ddf29eca9f5..438304086ff1 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -83,6 +83,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 acpi-y +=               \
         nsaccess.o      \
         nsalloc.o       \
+        nsarguments.o   \
         nsconvert.o     \
         nsdump.o        \
         nseval.o        \
@@ -137,6 +138,7 @@ acpi-y +=		\
         tbfadt.o        \
         tbfind.o        \
         tbinstal.o      \
+        tbprint.o       \
         tbutils.o       \
         tbxface.o       \
         tbxfload.o      \
@@ -145,11 +147,13 @@ acpi-y +=		\
 acpi-y +=               \
         utaddress.o     \
         utalloc.o       \
+        utbuffer.o      \
         utcopy.o        \
         utexcep.o       \
         utdebug.o       \
         utdecode.o      \
         utdelete.o      \
+        uterror.o       \
         uteval.o        \
         utglobal.o      \
         utids.o         \
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 07160928ca25..b8d38117a20c 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -132,6 +132,12 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_truncate_io_addresses, FALSE);
  */
 u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_auto_repair, FALSE);
 
+/*
+ * Optionally do not load any SSDTs from the RSDT/XSDT during initialization.
+ * This can be useful for debugging ACPI problems on some machines.
+ */
+u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_ssdt_table_load, FALSE);
+
 /* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */
 
 struct acpi_table_fadt acpi_gbl_FADT;
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index d5bfbd331bfd..dfed26545ba2 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -362,23 +362,6 @@ union acpi_predefined_info {
 
 #pragma pack()
 
-/* Data block used during object validation */
-
-struct acpi_predefined_data {
-        char *pathname;
-        const union acpi_predefined_info *predefined;
-        union acpi_operand_object *parent_package;
-        struct acpi_namespace_node *node;
-        u32 flags;
-        u32 return_btype;
-        u8 node_flags;
-};
-
-/* Defines for Flags field above */
-
-#define ACPI_OBJECT_REPAIRED    1
-#define ACPI_OBJECT_WRAPPED     2
-
 /* Return object auto-repair info */
 
 typedef acpi_status(*acpi_object_converter) (union acpi_operand_object
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 53666bd9193d..530a2f8c1252 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -374,10 +374,11 @@
  * the plist contains a set of parens to allow variable-length lists.
  * These macros are used for both the debug and non-debug versions of the code.
  */
-#define ACPI_ERROR_NAMESPACE(s, e)      acpi_ut_namespace_error (AE_INFO, s, e);
-#define ACPI_ERROR_METHOD(s, n, p, e)   acpi_ut_method_error (AE_INFO, s, n, p, e);
-#define ACPI_WARN_PREDEFINED(plist)     acpi_ut_predefined_warning plist
-#define ACPI_INFO_PREDEFINED(plist)     acpi_ut_predefined_info plist
+#define ACPI_ERROR_NAMESPACE(s, e)          acpi_ut_namespace_error (AE_INFO, s, e);
+#define ACPI_ERROR_METHOD(s, n, p, e)       acpi_ut_method_error (AE_INFO, s, n, p, e);
+#define ACPI_WARN_PREDEFINED(plist)         acpi_ut_predefined_warning plist
+#define ACPI_INFO_PREDEFINED(plist)         acpi_ut_predefined_info plist
+#define ACPI_BIOS_ERROR_PREDEFINED(plist)   acpi_ut_predefined_bios_error plist
 
 #else
 
@@ -387,6 +388,7 @@
 #define ACPI_ERROR_METHOD(s, n, p, e)
 #define ACPI_WARN_PREDEFINED(plist)
 #define ACPI_INFO_PREDEFINED(plist)
+#define ACPI_BIOS_ERROR_PREDEFINED(plist)
 
 #endif                          /* ACPI_NO_ERROR_MESSAGES */
 
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index d2e491876bc0..b83dc32a5ae0 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -223,22 +223,33 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info);
 void acpi_ns_exec_module_code_list(void);
 
 /*
- * nspredef - Support for predefined/reserved names
+ * nsarguments - Argument count/type checking for predefined/reserved names
  */
-acpi_status
-acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
-                               u32 user_param_count,
-                               acpi_status return_status,
-                               union acpi_operand_object **return_object);
+void
+acpi_ns_check_argument_count(char *pathname,
+                             struct acpi_namespace_node *node,
+                             u32 user_param_count,
+                             const union acpi_predefined_info *info);
 
 void
-acpi_ns_check_parameter_count(char *pathname,
+acpi_ns_check_acpi_compliance(char *pathname,
                               struct acpi_namespace_node *node,
-                              u32 user_param_count,
-                              const union acpi_predefined_info *info);
+                              const union acpi_predefined_info *predefined);
+
+void acpi_ns_check_argument_types(struct acpi_evaluate_info *info);
+
+/*
+ * nspredef - Return value checking for predefined/reserved names
+ */
+acpi_status
+acpi_ns_check_return_value(struct acpi_namespace_node *node,
+                           struct acpi_evaluate_info *info,
+                           u32 user_param_count,
+                           acpi_status return_status,
+                           union acpi_operand_object **return_object);
 
 acpi_status
-acpi_ns_check_object_type(struct acpi_predefined_data *data,
+acpi_ns_check_object_type(struct acpi_evaluate_info *info,
                           union acpi_operand_object **return_object_ptr,
                           u32 expected_btypes, u32 package_index);
 
@@ -246,7 +257,7 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
  * nsprepkg - Validation of predefined name packages
  */
 acpi_status
-acpi_ns_check_package(struct acpi_predefined_data *data,
+acpi_ns_check_package(struct acpi_evaluate_info *info,
                       union acpi_operand_object **return_object_ptr);
 
 /*
@@ -308,24 +319,24 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node,
  * predefined methods/objects
  */
 acpi_status
-acpi_ns_simple_repair(struct acpi_predefined_data *data,
+acpi_ns_simple_repair(struct acpi_evaluate_info *info,
                       u32 expected_btypes,
                       u32 package_index,
                       union acpi_operand_object **return_object_ptr);
 
 acpi_status
-acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
+acpi_ns_wrap_with_package(struct acpi_evaluate_info *info,
                           union acpi_operand_object *original_object,
                           union acpi_operand_object **obj_desc_ptr);
 
 acpi_status
-acpi_ns_repair_null_element(struct acpi_predefined_data *data,
+acpi_ns_repair_null_element(struct acpi_evaluate_info *info,
                             u32 expected_btypes,
                             u32 package_index,
                             union acpi_operand_object **return_object_ptr);
 
 void
-acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
+acpi_ns_remove_null_elements(struct acpi_evaluate_info *info,
                              u8 package_type,
                              union acpi_operand_object *obj_desc);
 
@@ -334,7 +345,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
  * predefined methods/objects
  */
 acpi_status
-acpi_ns_complex_repairs(struct acpi_predefined_data *data,
+acpi_ns_complex_repairs(struct acpi_evaluate_info *info,
                         struct acpi_namespace_node *node,
                         acpi_status validate_status,
                         union acpi_operand_object **return_object_ptr);
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index b22b70944fd6..f600aded7261 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -128,8 +128,8 @@ enum acpi_return_package_types {
 #define ARG_COUNT_IS_MINIMUM            0x8000
 #define METHOD_MAX_ARG_TYPE             ACPI_TYPE_PACKAGE
 
-#define METHOD_GET_COUNT(arg_list)      (arg_list & METHOD_ARG_MASK)
-#define METHOD_GET_NEXT_ARG(arg_list)   (arg_list >> METHOD_ARG_BIT_WIDTH)
+#define METHOD_GET_ARG_COUNT(arg_list)  ((arg_list) & METHOD_ARG_MASK)
+#define METHOD_GET_NEXT_TYPE(arg_list)  (((arg_list) >>= METHOD_ARG_BIT_WIDTH) & METHOD_ARG_MASK)
 
 /* Macros used to build the predefined info table */
 
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 7896d85876ca..fc83c0a5ca70 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -178,25 +178,41 @@ union acpi_aml_operands {
 };
 
 /*
- * Structure used to pass object evaluation parameters.
+ * Structure used to pass object evaluation information and parameters.
  * Purpose is to reduce CPU stack use.
  */
 struct acpi_evaluate_info {
-        struct acpi_namespace_node *prefix_node;
-        char *pathname;
-        union acpi_operand_object *obj_desc;
-        union acpi_operand_object **parameters;
-        struct acpi_namespace_node *resolved_node;
-        union acpi_operand_object *return_object;
-        u8 param_count;
-        u8 pass_number;
-        u8 return_object_type;
-        u8 flags;
+        /* The first 3 elements are passed by the caller to acpi_ns_evaluate */
+
+        struct acpi_namespace_node *prefix_node;        /* Input: starting node */
+        char *relative_pathname;        /* Input: path relative to prefix_node */
+        union acpi_operand_object **parameters; /* Input: argument list */
+
+        struct acpi_namespace_node *node;       /* Resolved node (prefix_node:relative_pathname) */
+        union acpi_operand_object *obj_desc;    /* Object attached to the resolved node */
+        char *full_pathname;    /* Full pathname of the resolved node */
+
+        const union acpi_predefined_info *predefined;   /* Used if Node is a predefined name */
+        union acpi_operand_object *return_object;       /* Object returned from the evaluation */
+        union acpi_operand_object *parent_package;      /* Used if return object is a Package */
+
+        u32 return_flags;       /* Used for return value analysis */
+        u32 return_btype;       /* Bitmapped type of the returned object */
+        u16 param_count;        /* Count of the input argument list */
+        u8 pass_number;         /* Parser pass number */
+        u8 return_object_type;  /* Object type of the returned object */
+        u8 node_flags;          /* Same as Node->Flags */
+        u8 flags;               /* General flags */
 };
 
 /* Values for Flags above */
 
-#define ACPI_IGNORE_RETURN_VALUE        1
+#define ACPI_IGNORE_RETURN_VALUE    1
+
+/* Defines for return_flags field above */
+
+#define ACPI_OBJECT_REPAIRED        1
+#define ACPI_OBJECT_WRAPPED         2
 
 /* Info used by acpi_ns_initialize_devices */
 
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 202f4f12d3e2..3c76edea6803 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -87,6 +87,48 @@ extern const char *acpi_gbl_fc_decode[];
 extern const char *acpi_gbl_pt_decode[];
 #endif
 
+/*
+ * For the iASL compiler case, the output is redirected to stderr so that
+ * any of the various ACPI errors and warnings do not appear in the output
+ * files, for either the compiler or disassembler portions of the tool.
+ */
+#ifdef ACPI_ASL_COMPILER
+
+#include <stdio.h>
+extern FILE *acpi_gbl_output_file;
+
+#define ACPI_MSG_REDIRECT_BEGIN \
+        FILE                            *output_file = acpi_gbl_output_file; \
+        acpi_os_redirect_output (stderr);
+
+#define ACPI_MSG_REDIRECT_END \
+        acpi_os_redirect_output (output_file);
+
+#else
+/*
+ * non-iASL case - no redirection, nothing to do
+ */
+#define ACPI_MSG_REDIRECT_BEGIN
+#define ACPI_MSG_REDIRECT_END
+#endif
+
+/*
+ * Common error message prefixes
+ */
+#define ACPI_MSG_ERROR          "ACPI Error: "
+#define ACPI_MSG_EXCEPTION      "ACPI Exception: "
+#define ACPI_MSG_WARNING        "ACPI Warning: "
+#define ACPI_MSG_INFO           "ACPI: "
+
+#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Error (bug): "
+#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Warning (bug): "
+
+/*
+ * Common message suffix
+ */
+#define ACPI_MSG_SUFFIX \
+        acpi_os_printf (" (%8.8X/%s-%u)\n", ACPI_CA_VERSION, module_name, line_number)
+
 /* Types for Resource descriptor entries */
 
 #define ACPI_INVALID_RESOURCE           0
@@ -578,7 +620,7 @@ void acpi_ut_print_string(char *string, u8 max_length);
 
 void ut_convert_backslashes(char *pathname);
 
-u8 acpi_ut_valid_acpi_name(u32 name);
+u8 acpi_ut_valid_acpi_name(char *name);
 
 u8 acpi_ut_valid_acpi_char(char character, u32 position);
 
@@ -670,6 +712,12 @@ acpi_ut_predefined_info(const char *module_name,
                         u32 line_number,
                         char *pathname, u8 node_flags, const char *format, ...);
 
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_predefined_bios_error(const char *module_name,
+                              u32 line_number,
+                              char *pathname,
+                              u8 node_flags, const char *format, ...);
+
 void
 acpi_ut_namespace_error(const char *module_name,
                         u32 line_number,
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 7ea0f162f11c..eb56b66444b5 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -78,7 +78,6 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
 
         switch (op->common.aml_opcode) {
         case AML_WHILE_OP:
-
                 /*
                  * If this is an additional iteration of a while loop, continue.
                  * There is no need to allocate a new control state.
@@ -99,7 +98,6 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
                 /*lint -fallthrough */
 
         case AML_IF_OP:
-
                 /*
                  * IF/WHILE: Create a new control state to manage these
                  * constructs. We need to manage these as a stack, in order
@@ -142,6 +140,7 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
                 break;
 
         default:
+
                 break;
         }
 
@@ -344,6 +343,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
         case AML_NOOP_OP:
 
                 /* Just do nothing! */
+
                 break;
 
         case AML_BREAK_POINT_OP:
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index feadeed1012d..d4bfe7b7f90a 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -563,21 +563,25 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
          */
         switch (walk_state->opcode) {
         case AML_FIELD_OP:
+
                 arg = acpi_ps_get_arg(op, 2);
                 type = ACPI_TYPE_LOCAL_REGION_FIELD;
                 break;
 
         case AML_BANK_FIELD_OP:
+
                 arg = acpi_ps_get_arg(op, 4);
                 type = ACPI_TYPE_LOCAL_BANK_FIELD;
                 break;
 
         case AML_INDEX_FIELD_OP:
+
                 arg = acpi_ps_get_arg(op, 3);
                 type = ACPI_TYPE_LOCAL_INDEX_FIELD;
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index bc8e63f7784b..14424200d246 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -127,6 +127,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
                 break;
 
         default:
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 3da80460ce38..c4b0b3657237 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -285,6 +285,7 @@ acpi_ds_method_data_get_node(u8 type,
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "Type %u is invalid", type));
                 return_ACPI_STATUS(AE_TYPE);
         }
@@ -428,7 +429,6 @@ acpi_ds_method_data_get_value(u8 type,
                                 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
 
                         case ACPI_REFCLASS_LOCAL:
-
                                 /*
                                  * No error message for this case, will be trapped again later to
                                  * detect and ignore cases of Store(local_x,local_x)
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index e20e9f84eee8..63f0d220ca3d 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -648,7 +648,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
         switch (obj_desc->common.type) {
         case ACPI_TYPE_BUFFER:
-
                 /*
                  * Defer evaluation of Buffer term_arg operand
                  */
@@ -660,7 +659,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                 break;
 
         case ACPI_TYPE_PACKAGE:
-
                 /*
                  * Defer evaluation of Package term_arg operand
                  */
@@ -741,6 +739,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                         break;
 
                 default:
+
                         ACPI_ERROR((AE_INFO, "Unknown Integer type 0x%X",
                                     op_info->type));
                         status = AE_AML_OPERAND_TYPE;
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index ee6367b8eaf7..1fc1ff114f26 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -636,6 +636,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_AML_BAD_OPCODE);
         }
 
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 99778997c35a..c666fc014987 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -240,7 +240,6 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
 
                 case AML_IF_OP:
                 case AML_WHILE_OP:
-
                         /*
                          * If we are executing the predicate AND this is the predicate op,
                          * we will use the return value
@@ -254,7 +253,9 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                         break;
 
                 default:
+
                         /* Ignore other control opcodes */
+
                         break;
                 }
 
@@ -263,7 +264,6 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                 goto result_not_used;
 
         case AML_CLASS_CREATE:
-
                 /*
                  * These opcodes allow term_arg(s) as operands and therefore
                  * the operands can be method calls. The result is used.
@@ -292,7 +292,6 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                 goto result_not_used;
 
         default:
-
                 /*
                  * In all other cases. the parent will actually use the return
                  * object, so keep it.
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index e2199a947470..151d924817e1 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -327,6 +327,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                 break;
 
         default:
+
                 break;
         }
 
@@ -488,7 +489,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                         break;
 
                 case AML_TYPE_METHOD_CALL:
-
                         /*
                          * If the method is referenced from within a package
                          * declaration, it is not a invocation of the method, just
@@ -582,7 +582,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                         switch (op->common.parent->common.aml_opcode) {
                         case AML_NAME_OP:
-
                                 /*
                                  * Put the Node on the object stack (Contains the ACPI Name
                                  * of this object)
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 6e17c0e24e63..95e681a36f9c 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -74,6 +74,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number)
 
         switch (pass_number) {
         case 1:
+
                 walk_state->parse_flags = ACPI_PARSE_LOAD_PASS1 |
                     ACPI_PARSE_DELETE_TREE;
                 walk_state->descending_callback = acpi_ds_load1_begin_op;
@@ -81,6 +82,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number)
                 break;
 
         case 2:
+
                 walk_state->parse_flags = ACPI_PARSE_LOAD_PASS1 |
                     ACPI_PARSE_DELETE_TREE;
                 walk_state->descending_callback = acpi_ds_load2_begin_op;
@@ -88,6 +90,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number)
                 break;
 
         case 3:
+
 #ifndef ACPI_NO_METHOD_EXECUTION
                 walk_state->parse_flags |= ACPI_PARSE_EXECUTE |
                     ACPI_PARSE_DELETE_TREE;
@@ -97,6 +100,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number)
                 break;
 
         default:
+
                 return (AE_BAD_PARAMETER);
         }
 
@@ -161,7 +165,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
 
         switch (walk_state->opcode) {
         case AML_SCOPE_OP:
-
                 /*
                  * The target name of the Scope() operator must exist at this point so
                  * that we can actually open the scope to enter new names underneath it.
@@ -210,7 +213,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                 case ACPI_TYPE_INTEGER:
                 case ACPI_TYPE_STRING:
                 case ACPI_TYPE_BUFFER:
-
                         /*
                          * These types we will allow, but we will change the type.
                          * This enables some existing code of the form:
@@ -232,7 +234,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                         break;
 
                 case ACPI_TYPE_METHOD:
-
                         /*
                          * Allow scope change to root during execution of module-level
                          * code. Root is typed METHOD during this time.
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index 4407ff2377d5..b1f8f4725c23 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -509,6 +509,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                         break;
 
                 default:
+
                         /* All NAMED_FIELD opcodes must be handled above */
                         break;
                 }
@@ -548,6 +549,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                         break;
 
                 default:
+
                         /* Unknown opcode */
 
                         status = AE_OK;
@@ -674,6 +676,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
 #endif                          /* ACPI_NO_METHOD_EXECUTION */
 
                 default:
+
                         /* All NAMED_COMPLEX opcodes must be handled above */
                         break;
                 }
@@ -721,6 +724,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                 break;
 
         default:
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c
index a621481c6cf2..fdb0a76e40a3 100644
--- a/drivers/acpi/acpica/evglock.c
+++ b/drivers/acpi/acpica/evglock.c
@@ -128,6 +128,7 @@ acpi_status acpi_ev_remove_global_lock_handler(void)
         status = acpi_remove_fixed_event_handler(ACPI_EVENT_GLOBAL,
                                                  acpi_ev_global_lock_handler);
 
+        acpi_os_delete_lock(acpi_gbl_global_lock_pending_lock);
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index a493b528f8f9..c8a1f7d5931f 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -529,7 +529,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 
         switch (local_gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) {
         case ACPI_GPE_DISPATCH_NOTIFY:
-
                 /*
                  * Implicit notify.
                  * Dispatch a DEVICE_WAKE notify to the appropriate handler.
@@ -579,11 +578,11 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                                         (local_gpe_event_info->dispatch.
                                          method_node)));
                 }
-
                 break;
 
         default:
-                return_VOID;    /* Should never happen */
+
+                return_VOID;    /* Should never happen */
         }
 
         /* Defer enabling of GPE until all notify handlers are done */
@@ -755,7 +754,6 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
 
         case ACPI_GPE_DISPATCH_METHOD:
         case ACPI_GPE_DISPATCH_NOTIFY:
-
                 /*
                  * Execute the method associated with the GPE
                  * NOTE: Level-triggered GPEs are cleared after the method completes.
@@ -771,7 +769,6 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                 break;
 
         default:
-
                 /*
                  * No handler or method to run!
                  * 03/2010: This case should no longer be possible. We will not allow
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index a2d688bbac02..c1aa1eda26c3 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -382,6 +382,8 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 
         status = acpi_ev_install_gpe_block(gpe_block, interrupt_number);
         if (ACPI_FAILURE(status)) {
+                ACPI_FREE(gpe_block->register_info);
+                ACPI_FREE(gpe_block->event_info);
                 ACPI_FREE(gpe_block);
                 return_ACPI_STATUS(status);
         }
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 72b8f6b3f4ca..9037f17c9608 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -363,14 +363,17 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
          */
         switch (name[1]) {
         case 'L':
+
                 type = ACPI_GPE_LEVEL_TRIGGERED;
                 break;
 
         case 'E':
+
                 type = ACPI_GPE_EDGE_TRIGGERED;
                 break;
 
         default:
+
                 /* Unknown method type, just ignore it */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c
index d4f83112c2e2..068af96134b8 100644
--- a/drivers/acpi/acpica/evhandler.c
+++ b/drivers/acpi/acpica/evhandler.c
@@ -354,36 +354,43 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
 
                 switch (space_id) {
                 case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+
                         handler = acpi_ex_system_memory_space_handler;
                         setup = acpi_ev_system_memory_region_setup;
                         break;
 
                 case ACPI_ADR_SPACE_SYSTEM_IO:
+
                         handler = acpi_ex_system_io_space_handler;
                         setup = acpi_ev_io_space_region_setup;
                         break;
 
                 case ACPI_ADR_SPACE_PCI_CONFIG:
+
                         handler = acpi_ex_pci_config_space_handler;
                         setup = acpi_ev_pci_config_region_setup;
                         break;
 
                 case ACPI_ADR_SPACE_CMOS:
+
                         handler = acpi_ex_cmos_space_handler;
                         setup = acpi_ev_cmos_region_setup;
                         break;
 
                 case ACPI_ADR_SPACE_PCI_BAR_TARGET:
+
                         handler = acpi_ex_pci_bar_space_handler;
                         setup = acpi_ev_pci_bar_region_setup;
                         break;
 
                 case ACPI_ADR_SPACE_DATA_TABLE:
+
                         handler = acpi_ex_data_table_space_handler;
                         setup = NULL;
                         break;
 
                 default:
+
                         status = AE_BAD_PARAMETER;
                         goto unlock_and_exit;
                 }
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index c986b2336b81..1b111ef74903 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -78,6 +78,7 @@ u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node)
                 return (TRUE);
 
         default:
+
                 return (FALSE);
         }
 }
@@ -275,6 +276,8 @@ void acpi_ev_terminate(void)
                         ACPI_ERROR((AE_INFO,
                                     "Could not remove Global Lock handler"));
                 }
+
+                acpi_gbl_events_initialized = FALSE;
         }
 
         /* Deallocate all handler objects installed within GPE info structs */
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 6555e350fc1f..cea14d6fc76c 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -54,7 +54,8 @@ extern u8 acpi_gbl_default_address_spaces[];
 
 /* Local prototypes */
 
-static void acpi_ev_orphan_ec_reg_method(void);
+static void
+acpi_ev_orphan_ec_reg_method(struct acpi_namespace_node *ec_device_node);
 
 static acpi_status
 acpi_ev_reg_run(acpi_handle obj_handle,
@@ -532,7 +533,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
         }
 
         info->prefix_node = region_obj2->extra.method_REG;
-        info->pathname = NULL;
+        info->relative_pathname = NULL;
         info->parameters = args;
         info->flags = ACPI_IGNORE_RETURN_VALUE;
 
@@ -612,7 +613,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
         /* Special case for EC: handle "orphan" _REG methods with no region */
 
         if (space_id == ACPI_ADR_SPACE_EC) {
-                acpi_ev_orphan_ec_reg_method();
+                acpi_ev_orphan_ec_reg_method(node);
         }
 
         return_ACPI_STATUS(status);
@@ -681,7 +682,7 @@ acpi_ev_reg_run(acpi_handle obj_handle,
  *
  * FUNCTION:    acpi_ev_orphan_ec_reg_method
  *
- * PARAMETERS:  None
+ * PARAMETERS:  ec_device_node      - Namespace node for an EC device
  *
  * RETURN:      None
  *
@@ -693,37 +694,27 @@ acpi_ev_reg_run(acpi_handle obj_handle,
  *              detected by providing a _REG method object underneath the
  *              Embedded Controller device."
  *
- *              To quickly access the EC device, we use the EC_ID that appears
- *              within the ECDT. Otherwise, we would need to perform a time-
- *              consuming namespace walk, executing _HID methods to find the
- *              EC device.
+ *              To quickly access the EC device, we use the ec_device_node used
+ *              during EC handler installation. Otherwise, we would need to
+ *              perform a time consuming namespace walk, executing _HID
+ *              methods to find the EC device.
+ *
+ *  MUTEX:      Assumes the namespace is locked
  *
  ******************************************************************************/
 
-static void acpi_ev_orphan_ec_reg_method(void)
+static void
+acpi_ev_orphan_ec_reg_method(struct acpi_namespace_node *ec_device_node)
 {
-        struct acpi_table_ecdt *table;
+        acpi_handle reg_method;
+        struct acpi_namespace_node *next_node;
         acpi_status status;
         struct acpi_object_list args;
         union acpi_object objects[2];
-        struct acpi_namespace_node *ec_device_node;
-        struct acpi_namespace_node *reg_method;
-        struct acpi_namespace_node *next_node;
 
         ACPI_FUNCTION_TRACE(ev_orphan_ec_reg_method);
 
-        /* Get the ECDT (if present in system) */
-
-        status = acpi_get_table(ACPI_SIG_ECDT, 0,
-                                ACPI_CAST_INDIRECT_PTR(struct acpi_table_header,
-                                                       &table));
-        if (ACPI_FAILURE(status)) {
-                return_VOID;
-        }
-
-        /* We need a valid EC_ID string */
-
-        if (!(*table->id)) {
+        if (!ec_device_node) {
                 return_VOID;
         }
 
@@ -731,22 +722,11 @@ static void acpi_ev_orphan_ec_reg_method(void)
 
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
-        /* Get a handle to the EC device referenced in the ECDT */
-
-        status = acpi_get_handle(NULL,
-                                 ACPI_CAST_PTR(char, table->id),
-                                 ACPI_CAST_PTR(acpi_handle, &ec_device_node));
-        if (ACPI_FAILURE(status)) {
-                goto exit;
-        }
-
         /* Get a handle to a _REG method immediately under the EC device */
 
-        status = acpi_get_handle(ec_device_node,
-                                 METHOD_NAME__REG, ACPI_CAST_PTR(acpi_handle,
-                                                                 &reg_method));
+        status = acpi_get_handle(ec_device_node, METHOD_NAME__REG, &reg_method);
         if (ACPI_FAILURE(status)) {
-                goto exit;
+                goto exit;      /* There is no _REG method present */
         }
 
         /*
@@ -754,19 +734,20 @@ static void acpi_ev_orphan_ec_reg_method(void)
          * this scope with the Embedded Controller space ID. Otherwise, it
          * will already have been executed. Note, this allows for Regions
          * with other space IDs to be present; but the code below will then
-         * execute the _REG method with the EC space ID argument.
+         * execute the _REG method with the embedded_control space_ID argument.
          */
         next_node = acpi_ns_get_next_node(ec_device_node, NULL);
         while (next_node) {
                 if ((next_node->type == ACPI_TYPE_REGION) &&
                     (next_node->object) &&
                     (next_node->object->region.space_id == ACPI_ADR_SPACE_EC)) {
-                        goto exit;      /* Do not execute _REG */
+                        goto exit;      /* Do not execute the _REG */
                 }
+
                 next_node = acpi_ns_get_next_node(ec_device_node, next_node);
         }
 
-        /* Evaluate the _REG(EC,Connect) method */
+        /* Evaluate the _REG(embedded_control,Connect) method */
 
         args.count = 2;
         args.pointer = objects;
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 3bb616794b3b..8354c4f7f10c 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -596,7 +596,9 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
                                 break;
 
                         default:
+
                                 /* Ignore other objects */
+
                                 break;
                         }
 
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index aff4cc261211..7662f1a42ff6 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -366,16 +366,19 @@ acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
 
         switch (action) {
         case ACPI_GPE_ENABLE:
+
                 ACPI_SET_BIT(gpe_register_info->enable_for_wake,
                              (u8)register_bit);
                 break;
 
         case ACPI_GPE_DISABLE:
+
                 ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
                                (u8)register_bit);
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "%u, Invalid action", action));
                 status = AE_BAD_PARAMETER;
                 break;
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 96c9e5f355ae..80cecf838591 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -139,6 +139,7 @@ acpi_install_address_space_handler(acpi_handle device,
                 break;
 
         default:
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index d93b70be60ad..06d216c8d43a 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -480,6 +480,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
@@ -588,7 +589,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
             (ACPI_GET_DESCRIPTOR_TYPE(ddb_handle) != ACPI_DESC_TYPE_OPERAND) ||
             (ddb_handle->common.type != ACPI_TYPE_LOCAL_REFERENCE) ||
             (!(ddb_handle->common.flags & AOPOBJ_DATA_VALID))) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
         /* Get the table index from the ddb_handle */
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index d2b9613bbf01..69e4a8cc9b71 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -99,6 +99,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -117,7 +118,6 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
 
         switch (obj_desc->common.type) {
         case ACPI_TYPE_STRING:
-
                 /*
                  * Convert string to an integer - for most cases, the string must be
                  * hexadecimal as per the ACPI specification. The only exception (as
@@ -161,6 +161,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
         default:
 
                 /* No other types can get here */
+
                 break;
         }
 
@@ -213,7 +214,6 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_OK);
 
         case ACPI_TYPE_INTEGER:
-
                 /*
                  * Create a new Buffer object.
                  * Need enough space for one integer
@@ -233,7 +233,6 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                 break;
 
         case ACPI_TYPE_STRING:
-
                 /*
                  * Create a new Buffer object
                  * Size will be the string length
@@ -258,6 +257,7 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -304,15 +304,18 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
 
                 switch (data_width) {
                 case 1:
+
                         decimal_length = ACPI_MAX8_DECIMAL_DIGITS;
                         break;
 
                 case 4:
+
                         decimal_length = ACPI_MAX32_DECIMAL_DIGITS;
                         break;
 
                 case 8:
                 default:
+
                         decimal_length = ACPI_MAX64_DECIMAL_DIGITS;
                         break;
                 }
@@ -546,6 +549,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -599,6 +603,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                         break;
 
                 default:
+
                         /* No conversion allowed for these types */
 
                         if (destination_type != source_desc->common.type) {
@@ -649,6 +654,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                         break;
 
                 default:
+
                         ACPI_ERROR((AE_INFO,
                                     "Bad destination type during conversion: 0x%X",
                                     destination_type));
@@ -664,6 +670,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO,
                             "Unknown Target type ID 0x%X AmlOpcode 0x%X DestType %s",
                             GET_CURRENT_ARG_TYPE(walk_state->op_info->
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 26a13f67977e..269e81d86ef4 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -103,7 +103,6 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
         case ACPI_TYPE_BUFFER:
         case ACPI_TYPE_PACKAGE:
         case ACPI_TYPE_BUFFER_FIELD:
-
                 /*
                  * These types open a new scope, so we need the NS node in order to access
                  * any children.
@@ -113,7 +112,6 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
         case ACPI_TYPE_PROCESSOR:
         case ACPI_TYPE_THERMAL:
         case ACPI_TYPE_LOCAL_SCOPE:
-
                 /*
                  * The new alias has the type ALIAS and points to the original
                  * NS node, not the object itself.
@@ -124,7 +122,6 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
                 break;
 
         case ACPI_TYPE_METHOD:
-
                 /*
                  * Control method aliases need to be differentiated
                  */
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index 7eb853cd279f..81c72a4ecd82 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -193,6 +193,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                         return_VOID;
 
                 default:
+
                         break;
                 }
 
@@ -226,6 +227,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                                         break;
 
                                 default:
+
                                         acpi_ex_do_debug_object((source_desc->
                                                                  reference.
                                                                  node)->object,
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index e5a3c249f7fa..c740f24e3101 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -357,6 +357,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
 
                 switch (info->opcode) {
                 case ACPI_EXD_INIT:
+
                         break;
 
                 case ACPI_EXD_TYPE:
@@ -718,6 +719,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
                 break;
 
         default:
+
                 /* Unknown Type */
 
                 acpi_os_printf("Unknown Type %X\n", obj_desc->common.type);
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index 7d4bae71e8c6..c2a65aaf29af 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -331,21 +331,25 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 
         switch (source_desc->common.type) {
         case ACPI_TYPE_INTEGER:
+
                 buffer = &source_desc->integer.value;
                 length = sizeof(source_desc->integer.value);
                 break;
 
         case ACPI_TYPE_BUFFER:
+
                 buffer = source_desc->buffer.pointer;
                 length = source_desc->buffer.length;
                 break;
 
         case ACPI_TYPE_STRING:
+
                 buffer = source_desc->string.pointer;
                 length = source_desc->string.length;
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index c84ee956fa4c..7e0afe72487e 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -446,7 +446,6 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                 break;
 
         case ACPI_TYPE_LOCAL_BANK_FIELD:
-
                 /*
                  * Ensure that the bank_value is not beyond the capacity of
                  * the register
@@ -488,7 +487,6 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                 break;
 
         case ACPI_TYPE_LOCAL_INDEX_FIELD:
-
                 /*
                  * Ensure that the index_value is not beyond the capacity of
                  * the register
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 72a2a13b6d36..00bf29877574 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -105,7 +105,6 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
                 break;
 
         case ACPI_DESC_TYPE_NAMED:
-
                 /*
                  * A named reference that has already been resolved to a Node
                  */
@@ -261,20 +260,24 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
          */
         switch (operand0->common.type) {
         case ACPI_TYPE_INTEGER:
+
                 status =
                     acpi_ex_convert_to_integer(operand1, &local_operand1, 16);
                 break;
 
         case ACPI_TYPE_STRING:
+
                 status = acpi_ex_convert_to_string(operand1, &local_operand1,
                                                    ACPI_IMPLICIT_CONVERT_HEX);
                 break;
 
         case ACPI_TYPE_BUFFER:
+
                 status = acpi_ex_convert_to_buffer(operand1, &local_operand1);
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "Invalid object type: 0x%X",
                             operand0->common.type));
                 status = AE_AML_INTERNAL;
@@ -519,6 +522,7 @@ acpi_ex_do_logical_numeric_op(u16 opcode,
                 break;
 
         default:
+
                 status = AE_AML_INTERNAL;
                 break;
         }
@@ -580,20 +584,24 @@ acpi_ex_do_logical_op(u16 opcode,
          */
         switch (operand0->common.type) {
         case ACPI_TYPE_INTEGER:
+
                 status =
                     acpi_ex_convert_to_integer(operand1, &local_operand1, 16);
                 break;
 
         case ACPI_TYPE_STRING:
+
                 status = acpi_ex_convert_to_string(operand1, &local_operand1,
                                                    ACPI_IMPLICIT_CONVERT_HEX);
                 break;
 
         case ACPI_TYPE_BUFFER:
+
                 status = acpi_ex_convert_to_buffer(operand1, &local_operand1);
                 break;
 
         default:
+
                 status = AE_AML_INTERNAL;
                 break;
         }
@@ -636,6 +644,7 @@ acpi_ex_do_logical_op(u16 opcode,
                         break;
 
                 default:
+
                         status = AE_AML_INTERNAL;
                         break;
                 }
@@ -703,6 +712,7 @@ acpi_ex_do_logical_op(u16 opcode,
                         break;
 
                 default:
+
                         status = AE_AML_INTERNAL;
                         break;
                 }
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index b60c877f5906..814b4a3d656a 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -327,7 +327,6 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                         break;
 
                 case AML_FROM_BCD_OP:   /* from_bcd (BCDValue, Result) */
-
                         /*
                          * The 64-bit ACPI integer can hold 16 4-bit BCD characters
                          * (if table is 32-bit, integer can hold 8 BCD characters)
@@ -407,7 +406,6 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                         break;
 
                 case AML_COND_REF_OF_OP:        /* cond_ref_of (source_object, Result) */
-
                         /*
                          * This op is a little strange because the internal return value is
                          * different than the return value stored in the result descriptor
@@ -442,13 +440,14 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                         goto cleanup;
 
                 default:
+
                         /* No other opcodes get here */
+
                         break;
                 }
                 break;
 
         case AML_STORE_OP:      /* Store (Source, Target) */
-
                 /*
                  * A store operand is typically a number, string, buffer or lvalue
                  * Be careful about deleting the source object,
@@ -615,7 +614,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
         case AML_DECREMENT_OP:  /* Decrement (Operand)  */
         case AML_INCREMENT_OP:  /* Increment (Operand)  */
-
                 /*
                  * Create a new integer. Can't just get the base integer and
                  * increment it because it may be an Arg or Field.
@@ -682,7 +680,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                 break;
 
         case AML_TYPE_OP:       /* object_type (source_object) */
-
                 /*
                  * Note: The operand is not resolved at this point because we want to
                  * get the associated object, not its value. For example, we don't
@@ -709,7 +706,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                 break;
 
         case AML_SIZE_OF_OP:    /* size_of (source_object) */
-
                 /*
                  * Note: The operand is not resolved at this point because we want to
                  * get the associated object, not its value.
@@ -735,10 +731,12 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                  */
                 switch (type) {
                 case ACPI_TYPE_INTEGER:
+
                         value = acpi_gbl_integer_byte_width;
                         break;
 
                 case ACPI_TYPE_STRING:
+
                         value = temp_desc->string.length;
                         break;
 
@@ -759,6 +757,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                         break;
 
                 default:
+
                         ACPI_ERROR((AE_INFO,
                                     "Operand must be Buffer/Integer/String/Package - found type %s",
                                     acpi_ut_get_type_name(type)));
@@ -860,9 +859,11 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 break;
 
                         case ACPI_TYPE_STRING:
+
                                 break;
 
                         default:
+
                                 status = AE_AML_OPERAND_TYPE;
                                 goto cleanup;
                         }
@@ -923,7 +924,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                          */
                         switch (operand[0]->reference.class) {
                         case ACPI_REFCLASS_INDEX:
-
                                 /*
                                  * The target type for the Index operator must be
                                  * either a Buffer or a Package
@@ -956,7 +956,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                         break;
 
                                 case ACPI_TYPE_PACKAGE:
-
                                         /*
                                          * Return the referenced element of the package. We must
                                          * add another reference to the referenced object, however.
@@ -999,6 +998,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 break;
 
                         default:
+
                                 ACPI_ERROR((AE_INFO,
                                             "Unknown class in reference(%p) - 0x%2.2X",
                                             operand[0],
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index b0838a4ea53e..d5088f7030c7 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -304,7 +304,6 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 break;
 
         case AML_TO_STRING_OP:  /* to_string (Buffer, Length, Result) (ACPI 2.0) */
-
                 /*
                  * Input object is guaranteed to be a buffer at this point (it may have
                  * been converted.)  Copy the raw buffer data to a new object of
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 2d7491f3126e..37656f12f204 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -155,7 +155,6 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
         switch (walk_state->opcode) {
         case AML_MID_OP:        /* Mid (Source[0], Index[1], Length[2], Result[3]) */
-
                 /*
                  * Create the return object. The Source operand is guaranteed to be
                  * either a String or a Buffer, so just use its type.
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index b76b97002dff..879b6cd8319c 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -119,7 +119,6 @@ acpi_ex_do_match(u32 match_op,
                 break;
 
         case MATCH_MEQ:
-
                 /*
                  * True if equal: (P[i] == M)
                  * Change to:     (M == P[i])
@@ -133,7 +132,6 @@ acpi_ex_do_match(u32 match_op,
                 break;
 
         case MATCH_MLE:
-
                 /*
                  * True if less than or equal: (P[i] <= M) (P[i] not_greater than M)
                  * Change to:                  (M >= P[i]) (M not_less than P[i])
@@ -148,7 +146,6 @@ acpi_ex_do_match(u32 match_op,
                 break;
 
         case MATCH_MLT:
-
                 /*
                  * True if less than: (P[i] < M)
                  * Change to:         (M > P[i])
@@ -162,7 +159,6 @@ acpi_ex_do_match(u32 match_op,
                 break;
 
         case MATCH_MGE:
-
                 /*
                  * True if greater than or equal: (P[i] >= M) (P[i] not_less than M)
                  * Change to:                     (M <= P[i]) (M not_greater than P[i])
@@ -177,7 +173,6 @@ acpi_ex_do_match(u32 match_op,
                 break;
 
         case MATCH_MGT:
-
                 /*
                  * True if greater than: (P[i] > M)
                  * Change to:            (M < P[i])
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 6b728aef2dca..5a588611ab48 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -253,26 +253,31 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
 
         case AML_FIELD_ACCESS_BYTE:
         case AML_FIELD_ACCESS_BUFFER:   /* ACPI 2.0 (SMBus Buffer) */
+
                 byte_alignment = 1;
                 bit_length = 8;
                 break;
 
         case AML_FIELD_ACCESS_WORD:
+
                 byte_alignment = 2;
                 bit_length = 16;
                 break;
 
         case AML_FIELD_ACCESS_DWORD:
+
                 byte_alignment = 4;
                 bit_length = 32;
                 break;
 
         case AML_FIELD_ACCESS_QWORD:    /* ACPI 2.0 */
+
                 byte_alignment = 8;
                 bit_length = 64;
                 break;
 
         default:
+
                 /* Invalid field access type */
 
                 ACPI_ERROR((AE_INFO, "Unknown field access type 0x%X", access));
@@ -598,7 +603,9 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 break;
 
         default:
+
                 /* No other types should get here */
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 182abaf045e1..303429bb4d5d 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -88,22 +88,27 @@ acpi_ex_system_memory_space_handler(u32 function,
 
         switch (bit_width) {
         case 8:
+
                 length = 1;
                 break;
 
         case 16:
+
                 length = 2;
                 break;
 
         case 32:
+
                 length = 4;
                 break;
 
         case 64:
+
                 length = 8;
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "Invalid SystemMemory width %u",
                             bit_width));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
@@ -214,23 +219,29 @@ acpi_ex_system_memory_space_handler(u32 function,
                 *value = 0;
                 switch (bit_width) {
                 case 8:
-                        *value = (u64) ACPI_GET8(logical_addr_ptr);
+
+                        *value = (u64)ACPI_GET8(logical_addr_ptr);
                         break;
 
                 case 16:
-                        *value = (u64) ACPI_GET16(logical_addr_ptr);
+
+                        *value = (u64)ACPI_GET16(logical_addr_ptr);
                         break;
 
                 case 32:
-                        *value = (u64) ACPI_GET32(logical_addr_ptr);
+
+                        *value = (u64)ACPI_GET32(logical_addr_ptr);
                         break;
 
                 case 64:
-                        *value = (u64) ACPI_GET64(logical_addr_ptr);
+
+                        *value = (u64)ACPI_GET64(logical_addr_ptr);
                         break;
 
                 default:
+
                         /* bit_width was already validated */
+
                         break;
                 }
                 break;
@@ -239,28 +250,35 @@ acpi_ex_system_memory_space_handler(u32 function,
 
                 switch (bit_width) {
                 case 8:
+
                         ACPI_SET8(logical_addr_ptr, *value);
                         break;
 
                 case 16:
+
                         ACPI_SET16(logical_addr_ptr, *value);
                         break;
 
                 case 32:
+
                         ACPI_SET32(logical_addr_ptr, *value);
                         break;
 
                 case 64:
+
                         ACPI_SET64(logical_addr_ptr, *value);
                         break;
 
                 default:
+
                         /* bit_width was already validated */
+
                         break;
                 }
                 break;
 
         default:
+
                 status = AE_BAD_PARAMETER;
                 break;
         }
@@ -320,6 +338,7 @@ acpi_ex_system_io_space_handler(u32 function,
                 break;
 
         default:
+
                 status = AE_BAD_PARAMETER;
                 break;
         }
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 8565b6bd12bb..acd34f599313 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -248,6 +248,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                         break;
 
                 default:
+
                         /* No named references are allowed here */
 
                         ACPI_ERROR((AE_INFO,
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index e4f9dfbb2a13..ac04278ad28f 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -156,7 +156,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                 switch (ref_type) {
                 case ACPI_REFCLASS_LOCAL:
                 case ACPI_REFCLASS_ARG:
-
                         /*
                          * Get the local from the method's state info
                          * Note: this increments the local's object reference count
@@ -309,6 +308,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                 break;
 
         default:
+
                 break;
         }
 
@@ -348,10 +348,12 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
         switch (ACPI_GET_DESCRIPTOR_TYPE(obj_desc)) {
         case ACPI_DESC_TYPE_OPERAND:
+
                 type = obj_desc->common.type;
                 break;
 
         case ACPI_DESC_TYPE_NAMED:
+
                 type = ((struct acpi_namespace_node *)obj_desc)->type;
                 obj_desc =
                     acpi_ns_get_attached_object((struct acpi_namespace_node *)
@@ -538,7 +540,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
                 break;
 
         default:
+
                 /* No change to Type required */
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 9fb9f5e9a4da..00e5af7129c1 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -307,7 +307,6 @@ acpi_ex_resolve_operands(u16 opcode,
                 case ARGI_TARGETREF:    /* Allows implicit conversion rules before store */
                 case ARGI_FIXED_TARGET: /* No implicit conversion before store to target */
                 case ARGI_SIMPLE_TARGET:        /* Name, Local, or arg - no implicit conversion  */
-
                         /*
                          * Need an operand of type ACPI_TYPE_LOCAL_REFERENCE
                          * A Namespace Node is OK as-is
@@ -326,7 +325,6 @@ acpi_ex_resolve_operands(u16 opcode,
                         goto next_operand;
 
                 case ARGI_DATAREFOBJ:   /* Store operator only */
-
                         /*
                          * We don't want to resolve index_op reference objects during
                          * a store because this would be an implicit de_ref_of operation.
@@ -343,7 +341,9 @@ acpi_ex_resolve_operands(u16 opcode,
                         break;
 
                 default:
+
                         /* All cases covered above */
+
                         break;
                 }
 
@@ -433,7 +433,6 @@ acpi_ex_resolve_operands(u16 opcode,
                         goto next_operand;
 
                 case ARGI_BUFFER:
-
                         /*
                          * Need an operand of type ACPI_TYPE_BUFFER,
                          * But we can implicitly convert from a STRING or INTEGER
@@ -459,7 +458,6 @@ acpi_ex_resolve_operands(u16 opcode,
                         goto next_operand;
 
                 case ARGI_STRING:
-
                         /*
                          * Need an operand of type ACPI_TYPE_STRING,
                          * But we can implicitly convert from a BUFFER or INTEGER
@@ -562,6 +560,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
+
                                 ACPI_ERROR((AE_INFO,
                                             "Needed [Buffer/String/Package/Reference], found [%s] %p",
                                             acpi_ut_get_object_type_name
@@ -584,6 +583,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
+
                                 ACPI_ERROR((AE_INFO,
                                             "Needed [Buffer/String/Package], found [%s] %p",
                                             acpi_ut_get_object_type_name
@@ -605,6 +605,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
+
                                 ACPI_ERROR((AE_INFO,
                                             "Needed [Region/Buffer], found [%s] %p",
                                             acpi_ut_get_object_type_name
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 93c6049c2d75..2bdba6f7d762 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -114,6 +114,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
         switch (dest_desc->common.type) {
         case ACPI_TYPE_LOCAL_REFERENCE:
+
                 break;
 
         case ACPI_TYPE_INTEGER:
@@ -178,7 +179,6 @@ acpi_ex_store(union acpi_operand_object *source_desc,
                 break;
 
         case ACPI_REFCLASS_DEBUG:
-
                 /*
                  * Storing to the Debug object causes the value stored to be
                  * displayed and otherwise has no effect -- see ACPI Specification
@@ -291,7 +291,6 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                 break;
 
         case ACPI_TYPE_BUFFER_FIELD:
-
                 /*
                  * Store into a Buffer or String (not actually a real buffer_field)
                  * at a location defined by an Index.
@@ -447,7 +446,6 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
         case ACPI_TYPE_INTEGER:
         case ACPI_TYPE_STRING:
         case ACPI_TYPE_BUFFER:
-
                 /*
                  * These target types are all of type Integer/String/Buffer, and
                  * therefore support implicit conversion before the store.
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index 1cefe777068e..20d809d90c5b 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -85,11 +85,9 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                  * These cases all require only Integers or values that
                  * can be converted to Integers (Strings or Buffers)
                  */
-
         case ACPI_TYPE_INTEGER:
         case ACPI_TYPE_STRING:
         case ACPI_TYPE_BUFFER:
-
                 /*
                  * Stores into a Field/Region or into a Integer/Buffer/String
                  * are all essentially the same. This case handles the
@@ -133,7 +131,6 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
 
         case ACPI_TYPE_LOCAL_ALIAS:
         case ACPI_TYPE_LOCAL_METHOD_ALIAS:
-
                 /*
                  * All aliases should have been resolved earlier, during the
                  * operand resolution phase.
@@ -144,7 +141,6 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
 
         case ACPI_TYPE_PACKAGE:
         default:
-
                 /*
                  * All other types than Alias and the various Fields come here,
                  * including the untyped case - ACPI_TYPE_ANY.
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 579c3a53ac87..3d36df828f52 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -108,7 +108,6 @@ acpi_status acpi_hw_set_mode(u32 mode)
                 break;
 
         case ACPI_SYS_MODE_LEGACY:
-
                 /*
                  * BIOS should clear all fixed status bits and restore fixed event
                  * enable bits to default
@@ -120,6 +119,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
                 break;
 
         default:
+
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 20d02e93c990..96540506058f 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -127,14 +127,17 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
                 /*lint -fallthrough */
 
         case ACPI_GPE_ENABLE:
+
                 ACPI_SET_BIT(enable_mask, register_bit);
                 break;
 
         case ACPI_GPE_DISABLE:
+
                 ACPI_CLEAR_BIT(enable_mask, register_bit);
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "Invalid GPE Action, %u", action));
                 return (AE_BAD_PARAMETER);
         }
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 083d6551f0e2..8d2e866be15f 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -419,6 +419,7 @@ acpi_status acpi_hw_register_read(u32 register_id, u32 *return_value)
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "Unknown Register ID: 0x%X", register_id));
                 status = AE_BAD_PARAMETER;
                 break;
@@ -491,7 +492,6 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                 break;
 
         case ACPI_REGISTER_PM1_CONTROL: /* PM1 A/B: 16-bit access each */
-
                 /*
                  * Perform a read first to preserve certain bits (per ACPI spec)
                  * Note: This includes SCI_EN, we never want to change this bit
@@ -520,7 +520,6 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                 break;
 
         case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
-
                 /*
                  * For control registers, all reserved bits must be preserved,
                  * as per the ACPI spec.
@@ -555,6 +554,7 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
                 break;
 
         default:
+
                 ACPI_ERROR((AE_INFO, "Unknown Register ID: 0x%X", register_id));
                 status = AE_BAD_PARAMETER;
                 break;
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 04c2e16f2c0a..5ee7a814cd92 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -495,7 +495,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
          * Evaluate the \_Sx namespace object containing the register values
          * for this state
          */
-        info->pathname =
+        info->relative_pathname =
             ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]);
         status = acpi_ns_evaluate(info);
         if (ACPI_FAILURE(status)) {
@@ -506,7 +506,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
 
         if (!info->return_object) {
                 ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",
-                            info->pathname));
+                            info->relative_pathname));
                 status = AE_AML_NO_RETURN_VALUE;
                 goto cleanup;
         }
@@ -528,10 +528,12 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
         elements = info->return_object->package.elements;
         switch (info->return_object->package.count) {
         case 0:
+
                 status = AE_AML_PACKAGE_LIMIT;
                 break;
 
         case 1:
+
                 if (elements[0]->common.type != ACPI_TYPE_INTEGER) {
                         status = AE_AML_OPERAND_TYPE;
                         break;
@@ -545,6 +547,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
 
         case 2:
         default:
+
                 if ((elements[0]->common.type != ACPI_TYPE_INTEGER) ||
                     (elements[1]->common.type != ACPI_TYPE_INTEGER)) {
                         status = AE_AML_OPERAND_TYPE;
@@ -565,7 +568,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "While evaluating Sleep State [%s]",
-                                info->pathname));
+                                info->relative_pathname));
         }
 
         ACPI_FREE(info);
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 35eebdac0f9d..f2e669db8b65 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -240,12 +240,14 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id)
             &acpi_sleep_dispatch[function_id];
 
 #if (!ACPI_REDUCED_HARDWARE)
-
         /*
          * If the Hardware Reduced flag is set (from the FADT), we must
-         * use the extended sleep registers
+         * use the extended sleep registers (FADT). Note: As per the ACPI
+         * specification, these extended registers are to be used for HW-reduced
+         * platforms only. They are not general-purpose replacements for the
+         * legacy PM register sleep support.
          */
-        if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) {
+        if (acpi_gbl_reduced_hardware) {
                 status = sleep_functions->extended_function(sleep_state);
         } else {
                 /* Legacy sleep */
@@ -314,20 +316,24 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
 
         switch (sleep_state) {
         case ACPI_STATE_S0:
+
                 sst_value = ACPI_SST_WORKING;
                 break;
 
         case ACPI_STATE_S1:
         case ACPI_STATE_S2:
         case ACPI_STATE_S3:
+
                 sst_value = ACPI_SST_SLEEPING;
                 break;
 
         case ACPI_STATE_S4:
+
                 sst_value = ACPI_SST_SLEEP_CONTEXT;
                 break;
 
         default:
+
                 sst_value = ACPI_SST_INDICATOR_OFF;     /* Default is off */
                 break;
         }
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 8769cf83b044..c5316e5bd4ab 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -151,6 +151,7 @@ acpi_status acpi_ns_root_initialize(void)
                          */
                         switch (init_val->type) {
                         case ACPI_TYPE_METHOD:
+
                                 obj_desc->method.param_count =
                                     (u8) ACPI_TO_INTEGER(val);
                                 obj_desc->common.flags |= AOPOBJ_DATA_VALID;
diff --git a/drivers/acpi/acpica/nsarguments.c b/drivers/acpi/acpica/nsarguments.c
new file mode 100644
index 000000000000..74b24c82707e
--- /dev/null
+++ b/drivers/acpi/acpica/nsarguments.c
@@ -0,0 +1,294 @@
+/******************************************************************************
+ *
+ * Module Name: nsarguments - Validation of args for ACPI predefined methods
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2013, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acpredef.h"
+
+#define _COMPONENT          ACPI_NAMESPACE
+ACPI_MODULE_NAME("nsarguments")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_check_argument_types
+ *
+ * PARAMETERS:  info            - Method execution information block
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Check the incoming argument count and all argument types
+ *              against the argument type list for a predefined name.
+ *
+ ******************************************************************************/
+void acpi_ns_check_argument_types(struct acpi_evaluate_info *info)
+{
+        u16 arg_type_list;
+        u8 arg_count;
+        u8 arg_type;
+        u8 user_arg_type;
+        u32 i;
+
+        /* If not a predefined name, cannot typecheck args */
+
+        if (!info->predefined) {
+                return;
+        }
+
+        arg_type_list = info->predefined->info.argument_list;
+        arg_count = METHOD_GET_ARG_COUNT(arg_type_list);
+
+        /* Typecheck all arguments */
+
+        for (i = 0; ((i < arg_count) && (i < info->param_count)); i++) {
+                arg_type = METHOD_GET_NEXT_TYPE(arg_type_list);
+                user_arg_type = info->parameters[i]->common.type;
+
+                if (user_arg_type != arg_type) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Argument #%u type mismatch - "
+                                              "Found [%s], ACPI requires [%s]",
+                                              (i + 1),
+                                              acpi_ut_get_type_name
+                                              (user_arg_type),
+                                              acpi_ut_get_type_name(arg_type)));
+                }
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_check_acpi_compliance
+ *
+ * PARAMETERS:  pathname        - Full pathname to the node (for error msgs)
+ *              node            - Namespace node for the method/object
+ *              predefined      - Pointer to entry in predefined name table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Check that the declared parameter count (in ASL/AML) for a
+ *              predefined name is what is expected (matches what is defined in
+ *              the ACPI specification for this predefined name.)
+ *
+ ******************************************************************************/
+
+void
+acpi_ns_check_acpi_compliance(char *pathname,
+                              struct acpi_namespace_node *node,
+                              const union acpi_predefined_info *predefined)
+{
+        u32 aml_param_count;
+        u32 required_param_count;
+
+        if (!predefined) {
+                return;
+        }
+
+        /* Get the ACPI-required arg count from the predefined info table */
+
+        required_param_count =
+            METHOD_GET_ARG_COUNT(predefined->info.argument_list);
+
+        /*
+         * If this object is not a control method, we can check if the ACPI
+         * spec requires that it be a method.
+         */
+        if (node->type != ACPI_TYPE_METHOD) {
+                if (required_param_count > 0) {
+
+                        /* Object requires args, must be implemented as a method */
+
+                        ACPI_BIOS_ERROR_PREDEFINED((AE_INFO, pathname,
+                                                    ACPI_WARN_ALWAYS,
+                                                    "Object (%s) must be a control method with %u arguments",
+                                                    acpi_ut_get_type_name(node->
+                                                                          type),
+                                                    required_param_count));
+                } else if (!required_param_count
+                           && !predefined->info.expected_btypes) {
+
+                        /* Object requires no args and no return value, must be a method */
+
+                        ACPI_BIOS_ERROR_PREDEFINED((AE_INFO, pathname,
+                                                    ACPI_WARN_ALWAYS,
+                                                    "Object (%s) must be a control method "
+                                                    "with no arguments and no return value",
+                                                    acpi_ut_get_type_name(node->
+                                                                          type)));
+                }
+
+                return;
+        }
+
+        /*
+         * This is a control method.
+         * Check that the ASL/AML-defined parameter count for this method
+         * matches the ACPI-required parameter count
+         *
+         * Some methods are allowed to have a "minimum" number of args (_SCP)
+         * because their definition in ACPI has changed over time.
+         *
+         * Note: These are BIOS errors in the declaration of the object
+         */
+        aml_param_count = node->object->method.param_count;
+
+        if (aml_param_count < required_param_count) {
+                ACPI_BIOS_ERROR_PREDEFINED((AE_INFO, pathname, ACPI_WARN_ALWAYS,
+                                            "Insufficient arguments - "
+                                            "ASL declared %u, ACPI requires %u",
+                                            aml_param_count,
+                                            required_param_count));
+        } else if ((aml_param_count > required_param_count)
+                   && !(predefined->info.
+                        argument_list & ARG_COUNT_IS_MINIMUM)) {
+                ACPI_BIOS_ERROR_PREDEFINED((AE_INFO, pathname, ACPI_WARN_ALWAYS,
+                                            "Excess arguments - "
+                                            "ASL declared %u, ACPI requires %u",
+                                            aml_param_count,
+                                            required_param_count));
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_check_argument_count
+ *
+ * PARAMETERS:  pathname        - Full pathname to the node (for error msgs)
+ *              node            - Namespace node for the method/object
+ *              user_param_count - Number of args passed in by the caller
+ *              predefined      - Pointer to entry in predefined name table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Check that incoming argument count matches the declared
+ *              parameter count (in the ASL/AML) for an object.
+ *
+ ******************************************************************************/
+
+void
+acpi_ns_check_argument_count(char *pathname,
+                             struct acpi_namespace_node *node,
+                             u32 user_param_count,
+                             const union acpi_predefined_info *predefined)
+{
+        u32 aml_param_count;
+        u32 required_param_count;
+
+        if (!predefined) {
+                /*
+                 * Not a predefined name. Check the incoming user argument count
+                 * against the count that is specified in the method/object.
+                 */
+                if (node->type != ACPI_TYPE_METHOD) {
+                        if (user_param_count) {
+                                ACPI_INFO_PREDEFINED((AE_INFO, pathname,
+                                                      ACPI_WARN_ALWAYS,
+                                                      "%u arguments were passed to a non-method ACPI object (%s)",
+                                                      user_param_count,
+                                                      acpi_ut_get_type_name
+                                                      (node->type)));
+                        }
+
+                        return;
+                }
+
+                /*
+                 * This is a control method. Check the parameter count.
+                 * We can only check the incoming argument count against the
+                 * argument count declared for the method in the ASL/AML.
+                 *
+                 * Emit a message if too few or too many arguments have been passed
+                 * by the caller.
+                 *
+                 * Note: Too many arguments will not cause the method to
+                 * fail. However, the method will fail if there are too few
+                 * arguments and the method attempts to use one of the missing ones.
+                 */
+                aml_param_count = node->object->method.param_count;
+
+                if (user_param_count < aml_param_count) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Insufficient arguments - "
+                                              "Caller passed %u, method requires %u",
+                                              user_param_count,
+                                              aml_param_count));
+                } else if (user_param_count > aml_param_count) {
+                        ACPI_INFO_PREDEFINED((AE_INFO, pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Excess arguments - "
+                                              "Caller passed %u, method requires %u",
+                                              user_param_count,
+                                              aml_param_count));
+                }
+
+                return;
+        }
+
+        /*
+         * This is a predefined name. Validate the user-supplied parameter
+         * count against the ACPI specification. We don't validate against
+         * the method itself because what is important here is that the
+         * caller is in conformance with the spec. (The arg count for the
+         * method was checked against the ACPI spec earlier.)
+         *
+         * Some methods are allowed to have a "minimum" number of args (_SCP)
+         * because their definition in ACPI has changed over time.
+         */
+        required_param_count =
+            METHOD_GET_ARG_COUNT(predefined->info.argument_list);
+
+        if (user_param_count < required_param_count) {
+                ACPI_WARN_PREDEFINED((AE_INFO, pathname, ACPI_WARN_ALWAYS,
+                                      "Insufficient arguments - "
+                                      "Caller passed %u, ACPI requires %u",
+                                      user_param_count, required_param_count));
+        } else if ((user_param_count > required_param_count) &&
+                   !(predefined->info.argument_list & ARG_COUNT_IS_MINIMUM)) {
+                ACPI_INFO_PREDEFINED((AE_INFO, pathname, ACPI_WARN_ALWAYS,
+                                      "Excess arguments - "
+                                      "Caller passed %u, ACPI requires %u",
+                                      user_param_count, required_param_count));
+        }
+}
diff --git a/drivers/acpi/acpica/nsconvert.c b/drivers/acpi/acpica/nsconvert.c
index 8f79a9d2d50e..acd2964c2690 100644
--- a/drivers/acpi/acpica/nsconvert.c
+++ b/drivers/acpi/acpica/nsconvert.c
@@ -103,6 +103,7 @@ acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
                 break;
 
         default:
+
                 return (AE_AML_OPERAND_TYPE);
         }
 
@@ -191,6 +192,7 @@ acpi_ns_convert_to_string(union acpi_operand_object *original_object,
                 break;
 
         default:
+
                 return (AE_AML_OPERAND_TYPE);
         }
 
@@ -294,6 +296,7 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
                 break;
 
         default:
+
                 return (AE_AML_OPERAND_TYPE);
         }
 
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index ce6e97326205..7418c77fde8c 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -244,10 +244,12 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                         case ACPI_TYPE_BUFFER:
                         case ACPI_TYPE_STRING:
                         case ACPI_TYPE_METHOD:
+
                                 acpi_os_printf("<No attached object>");
                                 break;
 
                         default:
+
                                 break;
                         }
 
@@ -433,6 +435,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                         break;
 
                 default:
+
                         break;
                 }
                 break;
@@ -567,32 +570,39 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                         goto cleanup;
 
                 case ACPI_TYPE_BUFFER_FIELD:
+
                         obj_desc =
                             (union acpi_operand_object *)obj_desc->buffer_field.
                             buffer_obj;
                         break;
 
                 case ACPI_TYPE_PACKAGE:
+
                         obj_desc = (void *)obj_desc->package.elements;
                         break;
 
                 case ACPI_TYPE_METHOD:
+
                         obj_desc = (void *)obj_desc->method.aml_start;
                         break;
 
                 case ACPI_TYPE_LOCAL_REGION_FIELD:
+
                         obj_desc = (void *)obj_desc->field.region_obj;
                         break;
 
                 case ACPI_TYPE_LOCAL_BANK_FIELD:
+
                         obj_desc = (void *)obj_desc->bank_field.region_obj;
                         break;
 
                 case ACPI_TYPE_LOCAL_INDEX_FIELD:
+
                         obj_desc = (void *)obj_desc->index_field.index_obj;
                         break;
 
                 default:
+
                         goto cleanup;
                 }
 
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index b61db69d5675..18108bc2e51c 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -61,7 +61,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
  *
  * PARAMETERS:  info            - Evaluation info block, contains:
  *                  prefix_node     - Prefix or Method/Object Node to execute
- *                  pathname        - Name of method to execute, If NULL, the
+ *                  relative_path   - Name of method to execute, If NULL, the
  *                                    Node is the object to execute
  *                  parameters      - List of parameters to pass to the method,
  *                                    terminated by NULL. Params itself may be
@@ -82,10 +82,9 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
  *
  ******************************************************************************/
 
-acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
+acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
 {
         acpi_status status;
-        struct acpi_namespace_node *node;
 
         ACPI_FUNCTION_TRACE(ns_evaluate);
 
@@ -93,83 +92,138 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Initialize the return value to an invalid object */
-
-        info->return_object = NULL;
-        info->param_count = 0;
-
-        if (!info->resolved_node) {
+        if (!info->node) {
                 /*
-                 * Get the actual namespace node for the target object if we need to.
-                 * Handles these cases:
+                 * Get the actual namespace node for the target object if we
+                 * need to. Handles these cases:
                  *
-                 * 1) Null node, Pathname (absolute path)
-                 * 2) Node, Pathname (path relative to Node)
-                 * 3) Node, Null Pathname
+                 * 1) Null node, valid pathname from root (absolute path)
+                 * 2) Node and valid pathname (path relative to Node)
+                 * 3) Node, Null pathname
                  */
-                status = acpi_ns_get_node(info->prefix_node, info->pathname,
-                                          ACPI_NS_NO_UPSEARCH,
-                                          &info->resolved_node);
+                status =
+                    acpi_ns_get_node(info->prefix_node, info->relative_pathname,
+                                     ACPI_NS_NO_UPSEARCH, &info->node);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
         }
 
         /*
-         * For a method alias, we must grab the actual method node so that proper
-         * scoping context will be established before execution.
+         * For a method alias, we must grab the actual method node so that
+         * proper scoping context will be established before execution.
          */
-        if (acpi_ns_get_type(info->resolved_node) ==
-            ACPI_TYPE_LOCAL_METHOD_ALIAS) {
-                info->resolved_node =
+        if (acpi_ns_get_type(info->node) == ACPI_TYPE_LOCAL_METHOD_ALIAS) {
+                info->node =
                     ACPI_CAST_PTR(struct acpi_namespace_node,
-                                  info->resolved_node->object);
+                                  info->node->object);
+        }
+
+        /* Complete the info block initialization */
+
+        info->return_object = NULL;
+        info->node_flags = info->node->flags;
+        info->obj_desc = acpi_ns_get_attached_object(info->node);
+
+        ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "%s [%p] Value %p\n",
+                          info->relative_pathname, info->node,
+                          acpi_ns_get_attached_object(info->node)));
+
+        /* Get info if we have a predefined name (_HID, etc.) */
+
+        info->predefined =
+            acpi_ut_match_predefined_method(info->node->name.ascii);
+
+        /* Get the full pathname to the object, for use in warning messages */
+
+        info->full_pathname = acpi_ns_get_external_pathname(info->node);
+        if (!info->full_pathname) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "%s [%p] Value %p\n", info->pathname,
-                          info->resolved_node,
-                          acpi_ns_get_attached_object(info->resolved_node)));
+        /* Count the number of arguments being passed in */
+
+        info->param_count = 0;
+        if (info->parameters) {
+                while (info->parameters[info->param_count]) {
+                        info->param_count++;
+                }
+
+                /* Warn on impossible argument count */
+
+                if (info->param_count > ACPI_METHOD_NUM_ARGS) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Excess arguments (%u) - using only %u",
+                                              info->param_count,
+                                              ACPI_METHOD_NUM_ARGS));
+
+                        info->param_count = ACPI_METHOD_NUM_ARGS;
+                }
+        }
+
+        /*
+         * For predefined names: Check that the declared argument count
+         * matches the ACPI spec -- otherwise this is a BIOS error.
+         */
+        acpi_ns_check_acpi_compliance(info->full_pathname, info->node,
+                                      info->predefined);
+
+        /*
+         * For all names: Check that the incoming argument count for
+         * this method/object matches the actual ASL/AML definition.
+         */
+        acpi_ns_check_argument_count(info->full_pathname, info->node,
+                                     info->param_count, info->predefined);
 
-        node = info->resolved_node;
+        /* For predefined names: Typecheck all incoming arguments */
+
+        acpi_ns_check_argument_types(info);
 
         /*
-         * Two major cases here:
+         * Three major evaluation cases:
          *
-         * 1) The object is a control method -- execute it
-         * 2) The object is not a method -- just return it's current value
+         * 1) Object types that cannot be evaluated by definition
+         * 2) The object is a control method -- execute it
+         * 3) The object is not a method -- just return it's current value
          */
-        if (acpi_ns_get_type(info->resolved_node) == ACPI_TYPE_METHOD) {
+        switch (acpi_ns_get_type(info->node)) {
+        case ACPI_TYPE_DEVICE:
+        case ACPI_TYPE_EVENT:
+        case ACPI_TYPE_MUTEX:
+        case ACPI_TYPE_REGION:
+        case ACPI_TYPE_THERMAL:
+        case ACPI_TYPE_LOCAL_SCOPE:
+                /*
+                 * 1) Disallow evaluation of certain object types. For these,
+                 *    object evaluation is undefined and not supported.
+                 */
+                ACPI_ERROR((AE_INFO,
+                            "%s: Evaluation of object type [%s] is not supported",
+                            info->full_pathname,
+                            acpi_ut_get_type_name(info->node->type)));
+
+                status = AE_TYPE;
+                goto cleanup;
+
+        case ACPI_TYPE_METHOD:
                 /*
-                 * 1) Object is a control method - execute it
+                 * 2) Object is a control method - execute it
                  */
 
                 /* Verify that there is a method object associated with this node */
 
-                info->obj_desc =
-                    acpi_ns_get_attached_object(info->resolved_node);
                 if (!info->obj_desc) {
                         ACPI_ERROR((AE_INFO,
-                                    "Control method has no attached sub-object"));
-                        return_ACPI_STATUS(AE_NULL_OBJECT);
+                                    "%s: Method has no attached sub-object",
+                                    info->full_pathname));
+                        status = AE_NULL_OBJECT;
+                        goto cleanup;
                 }
 
-                /* Count the number of arguments being passed to the method */
-
-                if (info->parameters) {
-                        while (info->parameters[info->param_count]) {
-                                if (info->param_count > ACPI_METHOD_MAX_ARG) {
-                                        return_ACPI_STATUS(AE_LIMIT);
-                                }
-                                info->param_count++;
-                        }
-                }
-
-
-                ACPI_DUMP_PATHNAME(info->resolved_node, "ACPI: Execute Method",
-                                   ACPI_LV_INFO, _COMPONENT);
-
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Method at AML address %p Length %X\n",
+                                  "**** Execute method [%s] at AML address %p length %X\n",
+                                  info->full_pathname,
                                   info->obj_desc->method.aml_start + 1,
                                   info->obj_desc->method.aml_length - 1));
 
@@ -184,81 +238,61 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
                 acpi_ex_enter_interpreter();
                 status = acpi_ps_execute_method(info);
                 acpi_ex_exit_interpreter();
-        } else {
+                break;
+
+        default:
                 /*
-                 * 2) Object is not a method, return its current value
-                 *
-                 * Disallow certain object types. For these, "evaluation" is undefined.
+                 * 3) All other non-method objects -- get the current object value
                  */
-                switch (info->resolved_node->type) {
-                case ACPI_TYPE_DEVICE:
-                case ACPI_TYPE_EVENT:
-                case ACPI_TYPE_MUTEX:
-                case ACPI_TYPE_REGION:
-                case ACPI_TYPE_THERMAL:
-                case ACPI_TYPE_LOCAL_SCOPE:
-
-                        ACPI_ERROR((AE_INFO,
-                                    "[%4.4s] Evaluation of object type [%s] is not supported",
-                                    info->resolved_node->name.ascii,
-                                    acpi_ut_get_type_name(info->resolved_node->
-                                                          type)));
-
-                        return_ACPI_STATUS(AE_TYPE);
-
-                default:
-                        break;
-                }
 
                 /*
-                 * Objects require additional resolution steps (e.g., the Node may be
-                 * a field that must be read, etc.) -- we can't just grab the object
-                 * out of the node.
+                 * Some objects require additional resolution steps (e.g., the Node
+                 * may be a field that must be read, etc.) -- we can't just grab
+                 * the object out of the node.
                  *
                  * Use resolve_node_to_value() to get the associated value.
                  *
                  * NOTE: we can get away with passing in NULL for a walk state because
-                 * resolved_node is guaranteed to not be a reference to either a method
+                 * the Node is guaranteed to not be a reference to either a method
                  * local or a method argument (because this interface is never called
                  * from a running method.)
                  *
                  * Even though we do not directly invoke the interpreter for object
-                 * resolution, we must lock it because we could access an opregion.
-                 * The opregion access code assumes that the interpreter is locked.
+                 * resolution, we must lock it because we could access an op_region.
+                 * The op_region access code assumes that the interpreter is locked.
                  */
                 acpi_ex_enter_interpreter();
 
-                /* Function has a strange interface */
+                /* TBD: resolve_node_to_value has a strange interface, fix */
+
+                info->return_object =
+                    ACPI_CAST_PTR(union acpi_operand_object, info->node);
 
                 status =
-                    acpi_ex_resolve_node_to_value(&info->resolved_node, NULL);
+                    acpi_ex_resolve_node_to_value(ACPI_CAST_INDIRECT_PTR
+                                                  (struct acpi_namespace_node,
+                                                   &info->return_object), NULL);
                 acpi_ex_exit_interpreter();
 
-                /*
-                 * If acpi_ex_resolve_node_to_value() succeeded, the return value was placed
-                 * in resolved_node.
-                 */
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_RETURN_VALUE;
-                        info->return_object =
-                            ACPI_CAST_PTR(union acpi_operand_object,
-                                          info->resolved_node);
-
-                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "Returning object %p [%s]\n",
-                                          info->return_object,
-                                          acpi_ut_get_object_type_name(info->
-                                                                       return_object)));
+                if (ACPI_FAILURE(status)) {
+                        goto cleanup;
                 }
+
+                ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "Returned object %p [%s]\n",
+                                  info->return_object,
+                                  acpi_ut_get_object_type_name(info->
+                                                               return_object)));
+
+                status = AE_CTRL_RETURN_VALUE;  /* Always has a "return value" */
+                break;
         }
 
         /*
-         * Check input argument count against the ASL-defined count for a method.
-         * Also check predefined names: argument count and return value against
-         * the ACPI specification. Some incorrect return value types are repaired.
+         * For predefined names, check the return value against the ACPI
+         * specification. Some incorrect return value types are repaired.
          */
-        (void)acpi_ns_check_predefined_names(node, info->param_count,
-                status, &info->return_object);
+        (void)acpi_ns_check_return_value(info->node, info, info->param_count,
+                                         status, &info->return_object);
 
         /* Check if there is a return value that must be dealt with */
 
@@ -278,12 +312,15 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
 
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "*** Completed evaluation of object %s ***\n",
-                          info->pathname));
+                          info->relative_pathname));
 
+ cleanup:
         /*
          * Namespace was unlocked by the handling acpi_ns* function, so we
-         * just return
+         * just free the pathname and return
          */
+        ACPI_FREE(info->full_pathname);
+        info->full_pathname = NULL;
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 46f0f83417a1..dd2ceae3f717 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -176,7 +176,7 @@ acpi_status acpi_ns_initialize_devices(void)
          * part of the ACPI specification.
          */
         info.evaluate_info->prefix_node = acpi_gbl_root_node;
-        info.evaluate_info->pathname = METHOD_NAME__INI;
+        info.evaluate_info->relative_pathname = METHOD_NAME__INI;
         info.evaluate_info->parameters = NULL;
         info.evaluate_info->flags = ACPI_IGNORE_RETURN_VALUE;
 
@@ -266,28 +266,34 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
 
         switch (type) {
         case ACPI_TYPE_REGION:
+
                 info->op_region_count++;
                 break;
 
         case ACPI_TYPE_BUFFER_FIELD:
+
                 info->field_count++;
                 break;
 
         case ACPI_TYPE_LOCAL_BANK_FIELD:
+
                 info->field_count++;
                 break;
 
         case ACPI_TYPE_BUFFER:
+
                 info->buffer_count++;
                 break;
 
         case ACPI_TYPE_PACKAGE:
+
                 info->package_count++;
                 break;
 
         default:
 
                 /* No init required, just exit now */
+
                 return (AE_OK);
         }
 
@@ -337,7 +343,9 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                 break;
 
         default:
+
                 /* No other types can get here */
+
                 break;
         }
 
@@ -416,6 +424,7 @@ acpi_ns_find_ini_methods(acpi_handle obj_handle,
                 break;
 
         default:
+
                 break;
         }
 
@@ -560,7 +569,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 
         ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info));
         info->prefix_node = device_node;
-        info->pathname = METHOD_NAME__INI;
+        info->relative_pathname = METHOD_NAME__INI;
         info->parameters = NULL;
         info->flags = ACPI_IGNORE_RETURN_VALUE;
 
@@ -574,8 +583,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 
                 /* Ignore error and move on to next device */
 
-                char *scope_name =
-                    acpi_ns_get_external_pathname(info->resolved_node);
+                char *scope_name = acpi_ns_get_external_pathname(info->node);
 
                 ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",
                                 scope_name));
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 8a52916148cb..24b71a01bf93 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -61,28 +61,29 @@ ACPI_MODULE_NAME("nspredef")
  * There are several areas that are validated:
  *
  *  1) The number of input arguments as defined by the method/object in the
- *      ASL is validated against the ACPI specification.
+ *     ASL is validated against the ACPI specification.
  *  2) The type of the return object (if any) is validated against the ACPI
- *      specification.
+ *     specification.
  *  3) For returned package objects, the count of package elements is
- *      validated, as well as the type of each package element. Nested
- *      packages are supported.
+ *     validated, as well as the type of each package element. Nested
+ *     packages are supported.
  *
  * For any problems found, a warning message is issued.
  *
  ******************************************************************************/
 /* Local prototypes */
 static acpi_status
-acpi_ns_check_reference(struct acpi_predefined_data *data,
+acpi_ns_check_reference(struct acpi_evaluate_info *info,
                         union acpi_operand_object *return_object);
 
 static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object);
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_check_predefined_names
+ * FUNCTION:    acpi_ns_check_return_value
  *
  * PARAMETERS:  node            - Namespace node for the method/object
+ *              info            - Method execution information block
  *              user_param_count - Number of parameters actually passed
  *              return_status   - Status from the object evaluation
  *              return_object_ptr - Pointer to the object returned from the
@@ -90,44 +91,25 @@ static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object);
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Check an ACPI name for a match in the predefined name list.
+ * DESCRIPTION: Check the value returned from a predefined name.
  *
  ******************************************************************************/
 
 acpi_status
-acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
-                               u32 user_param_count,
-                               acpi_status return_status,
-                               union acpi_operand_object **return_object_ptr)
+acpi_ns_check_return_value(struct acpi_namespace_node *node,
+                           struct acpi_evaluate_info *info,
+                           u32 user_param_count,
+                           acpi_status return_status,
+                           union acpi_operand_object **return_object_ptr)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
         const union acpi_predefined_info *predefined;
-        char *pathname;
-        struct acpi_predefined_data *data;
-
-        /* Match the name for this method/object against the predefined list */
-
-        predefined = acpi_ut_match_predefined_method(node->name.ascii);
-
-        /* Get the full pathname to the object, for use in warning messages */
-
-        pathname = acpi_ns_get_external_pathname(node);
-        if (!pathname) {
-                return (AE_OK); /* Could not get pathname, ignore */
-        }
-
-        /*
-         * Check that the parameter count for this method matches the ASL
-         * definition. For predefined names, ensure that both the caller and
-         * the method itself are in accordance with the ACPI specification.
-         */
-        acpi_ns_check_parameter_count(pathname, node, user_param_count,
-                                      predefined);
 
         /* If not a predefined name, we cannot validate the return object */
 
+        predefined = info->predefined;
         if (!predefined) {
-                goto cleanup;
+                return (AE_OK);
         }
 
         /*
@@ -135,7 +117,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
          * validate the return object
          */
         if ((return_status != AE_OK) && (return_status != AE_CTRL_RETURN_VALUE)) {
-                goto cleanup;
+                return (AE_OK);
         }
 
         /*
@@ -154,25 +136,14 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
         if (acpi_gbl_disable_auto_repair ||
             (!predefined->info.expected_btypes) ||
             (predefined->info.expected_btypes == ACPI_RTYPE_ALL)) {
-                goto cleanup;
-        }
-
-        /* Create the parameter data block for object validation */
-
-        data = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_predefined_data));
-        if (!data) {
-                goto cleanup;
+                return (AE_OK);
         }
-        data->predefined = predefined;
-        data->node = node;
-        data->node_flags = node->flags;
-        data->pathname = pathname;
 
         /*
          * Check that the type of the main return object is what is expected
          * for this predefined name
          */
-        status = acpi_ns_check_object_type(data, return_object_ptr,
+        status = acpi_ns_check_object_type(info, return_object_ptr,
                                            predefined->info.expected_btypes,
                                            ACPI_NOT_PACKAGE_ELEMENT);
         if (ACPI_FAILURE(status)) {
@@ -184,10 +155,16 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
          * Note: Package may have been newly created by call above.
          */
         if ((*return_object_ptr)->common.type == ACPI_TYPE_PACKAGE) {
-                data->parent_package = *return_object_ptr;
-                status = acpi_ns_check_package(data, return_object_ptr);
+                info->parent_package = *return_object_ptr;
+                status = acpi_ns_check_package(info, return_object_ptr);
                 if (ACPI_FAILURE(status)) {
-                        goto exit;
+
+                        /* We might be able to fix some errors */
+
+                        if ((status != AE_AML_OPERAND_TYPE) &&
+                            (status != AE_AML_OPERAND_VALUE)) {
+                                goto exit;
+                        }
                 }
         }
 
@@ -199,7 +176,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
          * performed on a per-name basis, i.e., the code is specific to
          * particular predefined names.
          */
-        status = acpi_ns_complex_repairs(data, node, status, return_object_ptr);
+        status = acpi_ns_complex_repairs(info, node, status, return_object_ptr);
 
 exit:
         /*
@@ -207,112 +184,18 @@ exit:
          * or more objects, mark the parent node to suppress further warning
          * messages during the next evaluation of the same method/object.
          */
-        if (ACPI_FAILURE(status) || (data->flags & ACPI_OBJECT_REPAIRED)) {
+        if (ACPI_FAILURE(status) || (info->return_flags & ACPI_OBJECT_REPAIRED)) {
                 node->flags |= ANOBJ_EVALUATED;
         }
-        ACPI_FREE(data);
 
-cleanup:
-        ACPI_FREE(pathname);
         return (status);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ns_check_parameter_count
- *
- * PARAMETERS:  pathname        - Full pathname to the node (for error msgs)
- *              node            - Namespace node for the method/object
- *              user_param_count - Number of args passed in by the caller
- *              predefined      - Pointer to entry in predefined name table
- *
- * RETURN:      None
- *
- * DESCRIPTION: Check that the declared (in ASL/AML) parameter count for a
- *              predefined name is what is expected (i.e., what is defined in
- *              the ACPI specification for this predefined name.)
- *
- ******************************************************************************/
-
-void
-acpi_ns_check_parameter_count(char *pathname,
-                              struct acpi_namespace_node *node,
-                              u32 user_param_count,
-                              const union acpi_predefined_info *predefined)
-{
-        u32 param_count;
-        u32 required_params_current;
-        u32 required_params_old;
-
-        /* Methods have 0-7 parameters. All other types have zero. */
-
-        param_count = 0;
-        if (node->type == ACPI_TYPE_METHOD) {
-                param_count = node->object->method.param_count;
-        }
-
-        if (!predefined) {
-                /*
-                 * Check the parameter count for non-predefined methods/objects.
-                 *
-                 * Warning if too few or too many arguments have been passed by the
-                 * caller. An incorrect number of arguments may not cause the method
-                 * to fail. However, the method will fail if there are too few
-                 * arguments and the method attempts to use one of the missing ones.
-                 */
-                if (user_param_count < param_count) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, pathname,
-                                              ACPI_WARN_ALWAYS,
-                                              "Insufficient arguments - needs %u, found %u",
-                                              param_count, user_param_count));
-                } else if (user_param_count > param_count) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, pathname,
-                                              ACPI_WARN_ALWAYS,
-                                              "Excess arguments - needs %u, found %u",
-                                              param_count, user_param_count));
-                }
-                return;
-        }
-
-        /*
-         * Validate the user-supplied parameter count.
-         * Allow two different legal argument counts (_SCP, etc.)
-         */
-        required_params_current =
-            predefined->info.argument_list & METHOD_ARG_MASK;
-        required_params_old =
-            predefined->info.argument_list >> METHOD_ARG_BIT_WIDTH;
-
-        if (user_param_count != ACPI_UINT32_MAX) {
-                if ((user_param_count != required_params_current) &&
-                    (user_param_count != required_params_old)) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, pathname,
-                                              ACPI_WARN_ALWAYS,
-                                              "Parameter count mismatch - "
-                                              "caller passed %u, ACPI requires %u",
-                                              user_param_count,
-                                              required_params_current));
-                }
-        }
-
-        /*
-         * Check that the ASL-defined parameter count is what is expected for
-         * this predefined name (parameter count as defined by the ACPI
-         * specification)
-         */
-        if ((param_count != required_params_current) &&
-            (param_count != required_params_old)) {
-                ACPI_WARN_PREDEFINED((AE_INFO, pathname, node->flags,
-                                      "Parameter count mismatch - ASL declared %u, ACPI requires %u",
-                                      param_count, required_params_current));
-        }
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ns_check_object_type
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  info            - Method execution information block
  *              return_object_ptr - Pointer to the object returned from the
  *                                evaluation of a method or object
  *              expected_btypes - Bitmap of expected return type(s)
@@ -328,7 +211,7 @@ acpi_ns_check_parameter_count(char *pathname,
  ******************************************************************************/
 
 acpi_status
-acpi_ns_check_object_type(struct acpi_predefined_data *data,
+acpi_ns_check_object_type(struct acpi_evaluate_info *info,
                           union acpi_operand_object **return_object_ptr,
                           u32 expected_btypes, u32 package_index)
 {
@@ -340,7 +223,8 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
 
         if (return_object &&
             ACPI_GET_DESCRIPTOR_TYPE(return_object) == ACPI_DESC_TYPE_NAMED) {
-                ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                      info->node_flags,
                                       "Invalid return type - Found a Namespace node [%4.4s] type %s",
                                       return_object->node.name.ascii,
                                       acpi_ut_get_type_name(return_object->node.
@@ -356,8 +240,8 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
          * from all of the predefined names (including elements of returned
          * packages)
          */
-        data->return_btype = acpi_ns_get_bitmapped_type(return_object);
-        if (data->return_btype == ACPI_RTYPE_ANY) {
+        info->return_btype = acpi_ns_get_bitmapped_type(return_object);
+        if (info->return_btype == ACPI_RTYPE_ANY) {
 
                 /* Not one of the supported objects, must be incorrect */
                 goto type_error_exit;
@@ -365,16 +249,18 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
 
         /* For reference objects, check that the reference type is correct */
 
-        if ((data->return_btype & expected_btypes) == ACPI_RTYPE_REFERENCE) {
-                status = acpi_ns_check_reference(data, return_object);
+        if ((info->return_btype & expected_btypes) == ACPI_RTYPE_REFERENCE) {
+                status = acpi_ns_check_reference(info, return_object);
                 return (status);
         }
 
         /* Attempt simple repair of the returned object if necessary */
 
-        status = acpi_ns_simple_repair(data, expected_btypes,
+        status = acpi_ns_simple_repair(info, expected_btypes,
                                        package_index, return_object_ptr);
-        return (status);
+        if (ACPI_SUCCESS(status)) {
+                return (AE_OK); /* Successful repair */
+        }
 
       type_error_exit:
 
@@ -383,12 +269,14 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
         acpi_ut_get_expected_return_types(type_buffer, expected_btypes);
 
         if (package_index == ACPI_NOT_PACKAGE_ELEMENT) {
-                ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                      info->node_flags,
                                       "Return type mismatch - found %s, expected %s",
                                       acpi_ut_get_object_type_name
                                       (return_object), type_buffer));
         } else {
-                ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                      info->node_flags,
                                       "Return Package type mismatch at index %u - "
                                       "found %s, expected %s", package_index,
                                       acpi_ut_get_object_type_name
@@ -402,7 +290,7 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_reference
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  info            - Method execution information block
  *              return_object   - Object returned from the evaluation of a
  *                                method or object
  *
@@ -415,7 +303,7 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_reference(struct acpi_predefined_data *data,
+acpi_ns_check_reference(struct acpi_evaluate_info *info,
                         union acpi_operand_object *return_object)
 {
 
@@ -428,7 +316,7 @@ acpi_ns_check_reference(struct acpi_predefined_data *data,
                 return (AE_OK);
         }
 
-        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, info->node_flags,
                               "Return type mismatch - unexpected reference object type [%s] %2.2X",
                               acpi_ut_get_reference_name(return_object),
                               return_object->reference.class));
@@ -462,26 +350,32 @@ static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object)
 
         switch (return_object->common.type) {
         case ACPI_TYPE_INTEGER:
+
                 return_btype = ACPI_RTYPE_INTEGER;
                 break;
 
         case ACPI_TYPE_BUFFER:
+
                 return_btype = ACPI_RTYPE_BUFFER;
                 break;
 
         case ACPI_TYPE_STRING:
+
                 return_btype = ACPI_RTYPE_STRING;
                 break;
 
         case ACPI_TYPE_PACKAGE:
+
                 return_btype = ACPI_RTYPE_PACKAGE;
                 break;
 
         case ACPI_TYPE_LOCAL_REFERENCE:
+
                 return_btype = ACPI_RTYPE_REFERENCE;
                 break;
 
         default:
+
                 /* Not one of the supported objects, must be incorrect */
 
                 return_btype = ACPI_RTYPE_ANY;
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index 77cdd539de16..6d55cef7916c 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -51,12 +51,12 @@ ACPI_MODULE_NAME("nsprepkg")
 
 /* Local prototypes */
 static acpi_status
-acpi_ns_check_package_list(struct acpi_predefined_data *data,
+acpi_ns_check_package_list(struct acpi_evaluate_info *info,
                            const union acpi_predefined_info *package,
                            union acpi_operand_object **elements, u32 count);
 
 static acpi_status
-acpi_ns_check_package_elements(struct acpi_predefined_data *data,
+acpi_ns_check_package_elements(struct acpi_evaluate_info *info,
                                union acpi_operand_object **elements,
                                u8 type1,
                                u32 count1,
@@ -66,7 +66,7 @@ acpi_ns_check_package_elements(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_package
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -78,7 +78,7 @@ acpi_ns_check_package_elements(struct acpi_predefined_data *data,
  ******************************************************************************/
 
 acpi_status
-acpi_ns_check_package(struct acpi_predefined_data *data,
+acpi_ns_check_package(struct acpi_evaluate_info *info,
                       union acpi_operand_object **return_object_ptr)
 {
         union acpi_operand_object *return_object = *return_object_ptr;
@@ -93,18 +93,18 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
 
         /* The package info for this name is in the next table entry */
 
-        package = data->predefined + 1;
+        package = info->predefined + 1;
 
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "%s Validating return Package of Type %X, Count %X\n",
-                          data->pathname, package->ret_info.type,
+                          info->full_pathname, package->ret_info.type,
                           return_object->package.count));
 
         /*
          * For variable-length Packages, we can safely remove all embedded
          * and trailing NULL package elements
          */
-        acpi_ns_remove_null_elements(data, package->ret_info.type,
+        acpi_ns_remove_null_elements(info, package->ret_info.type,
                                      return_object);
 
         /* Extract package count and elements array */
@@ -121,7 +121,8 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                         return (AE_OK);
                 }
 
-                ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                      info->node_flags,
                                       "Return Package has no elements (empty)"));
 
                 return (AE_AML_OPERAND_VALUE);
@@ -135,7 +136,6 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
          */
         switch (package->ret_info.type) {
         case ACPI_PTYPE1_FIXED:
-
                 /*
                  * The package count is fixed and there are no sub-packages
                  *
@@ -150,13 +150,13 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                         ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                           "%s: Return Package is larger than needed - "
                                           "found %u, expected %u\n",
-                                          data->pathname, count,
+                                          info->full_pathname, count,
                                           expected_count));
                 }
 
                 /* Validate all elements of the returned package */
 
-                status = acpi_ns_check_package_elements(data, elements,
+                status = acpi_ns_check_package_elements(info, elements,
                                                         package->ret_info.
                                                         object_type1,
                                                         package->ret_info.
@@ -168,13 +168,12 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                 break;
 
         case ACPI_PTYPE1_VAR:
-
                 /*
                  * The package count is variable, there are no sub-packages, and all
                  * elements must be of the same type
                  */
                 for (i = 0; i < count; i++) {
-                        status = acpi_ns_check_object_type(data, elements,
+                        status = acpi_ns_check_object_type(info, elements,
                                                            package->ret_info.
                                                            object_type1, i);
                         if (ACPI_FAILURE(status)) {
@@ -185,7 +184,6 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                 break;
 
         case ACPI_PTYPE1_OPTION:
-
                 /*
                  * The package count is variable, there are no sub-packages. There are
                  * a fixed number of required elements, and a variable number of
@@ -206,7 +204,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                                 /* These are the required package elements (0, 1, or 2) */
 
                                 status =
-                                    acpi_ns_check_object_type(data, elements,
+                                    acpi_ns_check_object_type(info, elements,
                                                               package->
                                                               ret_info3.
                                                               object_type[i],
@@ -218,7 +216,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                                 /* These are the optional package elements */
 
                                 status =
-                                    acpi_ns_check_object_type(data, elements,
+                                    acpi_ns_check_object_type(info, elements,
                                                               package->
                                                               ret_info3.
                                                               tail_object_type,
@@ -235,7 +233,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
 
                 /* First element is the (Integer) revision */
 
-                status = acpi_ns_check_object_type(data, elements,
+                status = acpi_ns_check_object_type(info, elements,
                                                    ACPI_RTYPE_INTEGER, 0);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -247,14 +245,14 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                 /* Examine the sub-packages */
 
                 status =
-                    acpi_ns_check_package_list(data, package, elements, count);
+                    acpi_ns_check_package_list(info, package, elements, count);
                 break;
 
         case ACPI_PTYPE2_PKG_COUNT:
 
                 /* First element is the (Integer) count of sub-packages to follow */
 
-                status = acpi_ns_check_object_type(data, elements,
+                status = acpi_ns_check_object_type(info, elements,
                                                    ACPI_RTYPE_INTEGER, 0);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -275,7 +273,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                 /* Examine the sub-packages */
 
                 status =
-                    acpi_ns_check_package_list(data, package, elements, count);
+                    acpi_ns_check_package_list(info, package, elements, count);
                 break;
 
         case ACPI_PTYPE2:
@@ -283,7 +281,6 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
         case ACPI_PTYPE2_MIN:
         case ACPI_PTYPE2_COUNT:
         case ACPI_PTYPE2_FIX_VAR:
-
                 /*
                  * These types all return a single Package that consists of a
                  * variable number of sub-Packages.
@@ -300,7 +297,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                         /* Create the new outer package and populate it */
 
                         status =
-                            acpi_ns_wrap_with_package(data, return_object,
+                            acpi_ns_wrap_with_package(info, return_object,
                                                       return_object_ptr);
                         if (ACPI_FAILURE(status)) {
                                 return (status);
@@ -316,14 +313,15 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
                 /* Examine the sub-packages */
 
                 status =
-                    acpi_ns_check_package_list(data, package, elements, count);
+                    acpi_ns_check_package_list(info, package, elements, count);
                 break;
 
         default:
 
                 /* Should not get here if predefined info table is correct */
 
-                ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                      info->node_flags,
                                       "Invalid internal return type in table entry: %X",
                                       package->ret_info.type));
 
@@ -336,7 +334,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
 
         /* Error exit for the case with an incorrect package count */
 
-        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, info->node_flags,
                               "Return Package is too small - found %u elements, expected %u",
                               count, expected_count));
 
@@ -347,7 +345,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_package_list
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  info            - Method execution information block
  *              package         - Pointer to package-specific info for method
  *              elements        - Element list of parent package. All elements
  *                                of this list should be of type Package.
@@ -360,7 +358,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_package_list(struct acpi_predefined_data *data,
+acpi_ns_check_package_list(struct acpi_evaluate_info *info,
                            const union acpi_predefined_info *package,
                            union acpi_operand_object **elements, u32 count)
 {
@@ -381,11 +379,11 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
         for (i = 0; i < count; i++) {
                 sub_package = *elements;
                 sub_elements = sub_package->package.elements;
-                data->parent_package = sub_package;
+                info->parent_package = sub_package;
 
                 /* Each sub-object must be of type Package */
 
-                status = acpi_ns_check_object_type(data, &sub_package,
+                status = acpi_ns_check_object_type(info, &sub_package,
                                                    ACPI_RTYPE_PACKAGE, i);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -393,7 +391,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
 
                 /* Examine the different types of expected sub-packages */
 
-                data->parent_package = sub_package;
+                info->parent_package = sub_package;
                 switch (package->ret_info.type) {
                 case ACPI_PTYPE2:
                 case ACPI_PTYPE2_PKG_COUNT:
@@ -408,7 +406,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         }
 
                         status =
-                            acpi_ns_check_package_elements(data, sub_elements,
+                            acpi_ns_check_package_elements(info, sub_elements,
                                                            package->ret_info.
                                                            object_type1,
                                                            package->ret_info.
@@ -434,7 +432,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         }
 
                         status =
-                            acpi_ns_check_package_elements(data, sub_elements,
+                            acpi_ns_check_package_elements(info, sub_elements,
                                                            package->ret_info.
                                                            object_type1,
                                                            package->ret_info.
@@ -463,7 +461,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
 
                         for (j = 0; j < expected_count; j++) {
                                 status =
-                                    acpi_ns_check_object_type(data,
+                                    acpi_ns_check_object_type(info,
                                                               &sub_elements[j],
                                                               package->
                                                               ret_info2.
@@ -487,7 +485,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         /* Check the type of each sub-package element */
 
                         status =
-                            acpi_ns_check_package_elements(data, sub_elements,
+                            acpi_ns_check_package_elements(info, sub_elements,
                                                            package->ret_info.
                                                            object_type1,
                                                            sub_package->package.
@@ -498,12 +496,11 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         break;
 
                 case ACPI_PTYPE2_COUNT:
-
                         /*
                          * First element is the (Integer) count of elements, including
                          * the count field (the ACPI name is num_elements)
                          */
-                        status = acpi_ns_check_object_type(data, sub_elements,
+                        status = acpi_ns_check_object_type(info, sub_elements,
                                                            ACPI_RTYPE_INTEGER,
                                                            0);
                         if (ACPI_FAILURE(status)) {
@@ -537,7 +534,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                         /* Check the type of each sub-package element */
 
                         status =
-                            acpi_ns_check_package_elements(data,
+                            acpi_ns_check_package_elements(info,
                                                            (sub_elements + 1),
                                                            package->ret_info.
                                                            object_type1,
@@ -562,7 +559,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
 
         /* The sub-package count was smaller than required */
 
-        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, info->node_flags,
                               "Return Sub-Package[%u] is too small - found %u elements, expected %u",
                               i, sub_package->package.count, expected_count));
 
@@ -573,7 +570,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_check_package_elements
  *
- * PARAMETERS:  data            - Pointer to validation data structure
+ * PARAMETERS:  info            - Method execution information block
  *              elements        - Pointer to the package elements array
  *              type1           - Object type for first group
  *              count1          - Count for first group
@@ -589,7 +586,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_check_package_elements(struct acpi_predefined_data *data,
+acpi_ns_check_package_elements(struct acpi_evaluate_info *info,
                                union acpi_operand_object **elements,
                                u8 type1,
                                u32 count1,
@@ -605,7 +602,7 @@ acpi_ns_check_package_elements(struct acpi_predefined_data *data,
          * The second group can have a count of zero.
          */
         for (i = 0; i < count1; i++) {
-                status = acpi_ns_check_object_type(data, this_element,
+                status = acpi_ns_check_object_type(info, this_element,
                                                    type1, i + start_index);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -614,7 +611,7 @@ acpi_ns_check_package_elements(struct acpi_predefined_data *data,
         }
 
         for (i = 0; i < count2; i++) {
-                status = acpi_ns_check_object_type(data, this_element,
+                status = acpi_ns_check_object_type(info, this_element,
                                                    type2,
                                                    (i + count1 + start_index));
                 if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index 18f02e4ece01..f8e71ea60319 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -130,7 +130,7 @@ static const struct acpi_simple_repair_info acpi_object_repair_info[] = {
  *
  * FUNCTION:    acpi_ns_simple_repair
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              expected_btypes     - Object types expected
  *              package_index       - Index of object within parent package (if
  *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
@@ -146,7 +146,7 @@ static const struct acpi_simple_repair_info acpi_object_repair_info[] = {
  ******************************************************************************/
 
 acpi_status
-acpi_ns_simple_repair(struct acpi_predefined_data *data,
+acpi_ns_simple_repair(struct acpi_evaluate_info *info,
                       u32 expected_btypes,
                       u32 package_index,
                       union acpi_operand_object **return_object_ptr)
@@ -162,12 +162,12 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
          * Special repairs for certain names that are in the repair table.
          * Check if this name is in the list of repairable names.
          */
-        predefined = acpi_ns_match_simple_repair(data->node,
-                                                 data->return_btype,
+        predefined = acpi_ns_match_simple_repair(info->node,
+                                                 info->return_btype,
                                                  package_index);
         if (predefined) {
                 if (!return_object) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
                                               ACPI_WARN_ALWAYS,
                                               "Missing expected return value"));
                 }
@@ -191,7 +191,7 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
          * Do not perform simple object repair unless the return type is not
          * expected.
          */
-        if (data->return_btype & expected_btypes) {
+        if (info->return_btype & expected_btypes) {
                 return (AE_OK);
         }
 
@@ -211,7 +211,7 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
          */
         if (!return_object) {
                 if (expected_btypes && (!(expected_btypes & ACPI_RTYPE_NONE))) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
                                               ACPI_WARN_ALWAYS,
                                               "Missing expected return value"));
 
@@ -247,14 +247,14 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
                  * for correct contents (expected object type or types).
                  */
                 status =
-                    acpi_ns_wrap_with_package(data, return_object, &new_object);
+                    acpi_ns_wrap_with_package(info, return_object, &new_object);
                 if (ACPI_SUCCESS(status)) {
                         /*
                          * The original object just had its reference count
                          * incremented for being inserted into the new package.
                          */
                         *return_object_ptr = new_object;        /* New Package object */
-                        data->flags |= ACPI_OBJECT_REPAIRED;
+                        info->return_flags |= ACPI_OBJECT_REPAIRED;
                         return (AE_OK);
                 }
         }
@@ -277,7 +277,7 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
                  * package object as part of the repair, we don't need to
                  * change the reference count.
                  */
-                if (!(data->flags & ACPI_OBJECT_WRAPPED)) {
+                if (!(info->return_flags & ACPI_OBJECT_WRAPPED)) {
                         new_object->common.reference_count =
                             return_object->common.reference_count;
 
@@ -288,14 +288,14 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
 
                 ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                   "%s: Converted %s to expected %s at Package index %u\n",
-                                  data->pathname,
+                                  info->full_pathname,
                                   acpi_ut_get_object_type_name(return_object),
                                   acpi_ut_get_object_type_name(new_object),
                                   package_index));
         } else {
                 ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                   "%s: Converted %s to expected %s\n",
-                                  data->pathname,
+                                  info->full_pathname,
                                   acpi_ut_get_object_type_name(return_object),
                                   acpi_ut_get_object_type_name(new_object)));
         }
@@ -304,7 +304,7 @@ acpi_ns_simple_repair(struct acpi_predefined_data *data,
 
         acpi_ut_remove_reference(return_object);
         *return_object_ptr = new_object;
-        data->flags |= ACPI_OBJECT_REPAIRED;
+        info->return_flags |= ACPI_OBJECT_REPAIRED;
         return (AE_OK);
 }
 
@@ -359,7 +359,7 @@ static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
  *
  * FUNCTION:    acpi_ns_repair_null_element
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              expected_btypes     - Object types expected
  *              package_index       - Index of object within parent package (if
  *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
@@ -374,7 +374,7 @@ static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
  ******************************************************************************/
 
 acpi_status
-acpi_ns_repair_null_element(struct acpi_predefined_data *data,
+acpi_ns_repair_null_element(struct acpi_evaluate_info * info,
                             u32 expected_btypes,
                             u32 package_index,
                             union acpi_operand_object **return_object_ptr)
@@ -424,16 +424,16 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
         /* Set the reference count according to the parent Package object */
 
         new_object->common.reference_count =
-            data->parent_package->common.reference_count;
+            info->parent_package->common.reference_count;
 
         ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                           "%s: Converted NULL package element to expected %s at index %u\n",
-                          data->pathname,
+                          info->full_pathname,
                           acpi_ut_get_object_type_name(new_object),
                           package_index));
 
         *return_object_ptr = new_object;
-        data->flags |= ACPI_OBJECT_REPAIRED;
+        info->return_flags |= ACPI_OBJECT_REPAIRED;
         return (AE_OK);
 }
 
@@ -441,7 +441,7 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_remove_null_elements
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              package_type        - An acpi_return_package_types value
  *              obj_desc            - A Package object
  *
@@ -454,7 +454,7 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
  *****************************************************************************/
 
 void
-acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
+acpi_ns_remove_null_elements(struct acpi_evaluate_info *info,
                              u8 package_type,
                              union acpi_operand_object *obj_desc)
 {
@@ -480,6 +480,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
         case ACPI_PTYPE2_MIN:
         case ACPI_PTYPE2_REV_FIXED:
         case ACPI_PTYPE2_FIX_VAR:
+
                 break;
 
         default:
@@ -511,7 +512,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
         if (new_count < count) {
                 ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                   "%s: Found and removed %u NULL elements\n",
-                                  data->pathname, (count - new_count)));
+                                  info->full_pathname, (count - new_count)));
 
                 /* NULL terminate list and update the package count */
 
@@ -524,7 +525,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_wrap_with_package
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              original_object     - Pointer to the object to repair.
  *              obj_desc_ptr        - The new package object is returned here
  *
@@ -545,7 +546,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
  ******************************************************************************/
 
 acpi_status
-acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
+acpi_ns_wrap_with_package(struct acpi_evaluate_info *info,
                           union acpi_operand_object *original_object,
                           union acpi_operand_object **obj_desc_ptr)
 {
@@ -566,12 +567,12 @@ acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
 
         ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                           "%s: Wrapped %s with expected Package object\n",
-                          data->pathname,
+                          info->full_pathname,
                           acpi_ut_get_object_type_name(original_object)));
 
         /* Return the new object in the object pointer */
 
         *obj_desc_ptr = pkg_obj_desc;
-        data->flags |= ACPI_OBJECT_REPAIRED | ACPI_OBJECT_WRAPPED;
+        info->return_flags |= ACPI_OBJECT_REPAIRED | ACPI_OBJECT_WRAPPED;
         return (AE_OK);
 }
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 149e9b9c2c1b..c84603ee83ae 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -54,7 +54,7 @@ ACPI_MODULE_NAME("nsrepair2")
  * be repaired on a per-name basis.
  */
 typedef
-acpi_status(*acpi_repair_function) (struct acpi_predefined_data *data,
+acpi_status(*acpi_repair_function) (struct acpi_evaluate_info * info,
                                     union acpi_operand_object
                                     **return_object_ptr);
 
@@ -71,45 +71,57 @@ static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
                                                                    *node);
 
 static acpi_status
-acpi_ns_repair_ALR(struct acpi_predefined_data *data,
+acpi_ns_repair_ALR(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr);
 
 static acpi_status
-acpi_ns_repair_CID(struct acpi_predefined_data *data,
+acpi_ns_repair_CID(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr);
 
 static acpi_status
-acpi_ns_repair_FDE(struct acpi_predefined_data *data,
+acpi_ns_repair_CST(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr);
 
 static acpi_status
-acpi_ns_repair_HID(struct acpi_predefined_data *data,
+acpi_ns_repair_FDE(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr);
 
 static acpi_status
-acpi_ns_repair_PSS(struct acpi_predefined_data *data,
+acpi_ns_repair_HID(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr);
 
 static acpi_status
-acpi_ns_repair_TSS(struct acpi_predefined_data *data,
+acpi_ns_repair_PRT(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr);
 
 static acpi_status
-acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
+acpi_ns_repair_PSS(struct acpi_evaluate_info *info,
+                   union acpi_operand_object **return_object_ptr);
+
+static acpi_status
+acpi_ns_repair_TSS(struct acpi_evaluate_info *info,
+                   union acpi_operand_object **return_object_ptr);
+
+static acpi_status
+acpi_ns_check_sorted_list(struct acpi_evaluate_info *info,
                           union acpi_operand_object *return_object,
+                          u32 start_index,
                           u32 expected_count,
                           u32 sort_index,
                           u8 sort_direction, char *sort_key_name);
 
-static void
-acpi_ns_sort_list(union acpi_operand_object **elements,
-                  u32 count, u32 index, u8 sort_direction);
-
 /* Values for sort_direction above */
 
 #define ACPI_SORT_ASCENDING     0
 #define ACPI_SORT_DESCENDING    1
 
+static void
+acpi_ns_remove_element(union acpi_operand_object *obj_desc, u32 index);
+
+static void
+acpi_ns_sort_list(union acpi_operand_object **elements,
+                  u32 count, u32 index, u8 sort_direction);
+
 /*
  * This table contains the names of the predefined methods for which we can
  * perform more complex repairs.
@@ -118,9 +130,11 @@ acpi_ns_sort_list(union acpi_operand_object **elements,
  *
  * _ALR: Sort the list ascending by ambient_illuminance
  * _CID: Strings: uppercase all, remove any leading asterisk
+ * _CST: Sort the list ascending by C state type
  * _FDE: Convert Buffer of BYTEs to a Buffer of DWORDs
  * _GTM: Convert Buffer of BYTEs to a Buffer of DWORDs
  * _HID: Strings: uppercase all, remove any leading asterisk
+ * _PRT: Fix reversed source_name and source_index
  * _PSS: Sort the list descending by Power
  * _TSS: Sort the list descending by Power
  *
@@ -134,9 +148,11 @@ acpi_ns_sort_list(union acpi_operand_object **elements,
 static const struct acpi_repair_info acpi_ns_repairable_names[] = {
         {"_ALR", acpi_ns_repair_ALR},
         {"_CID", acpi_ns_repair_CID},
+        {"_CST", acpi_ns_repair_CST},
         {"_FDE", acpi_ns_repair_FDE},
         {"_GTM", acpi_ns_repair_FDE},   /* _GTM has same repair as _FDE */
         {"_HID", acpi_ns_repair_HID},
+        {"_PRT", acpi_ns_repair_PRT},
         {"_PSS", acpi_ns_repair_PSS},
         {"_TSS", acpi_ns_repair_TSS},
         {{0, 0, 0, 0}, NULL}    /* Table terminator */
@@ -150,7 +166,7 @@ static const struct acpi_repair_info acpi_ns_repairable_names[] = {
  *
  * FUNCTION:    acpi_ns_complex_repairs
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              node                - Namespace node for the method/object
  *              validate_status     - Original status of earlier validation
  *              return_object_ptr   - Pointer to the object returned from the
@@ -165,7 +181,7 @@ static const struct acpi_repair_info acpi_ns_repairable_names[] = {
  *****************************************************************************/
 
 acpi_status
-acpi_ns_complex_repairs(struct acpi_predefined_data *data,
+acpi_ns_complex_repairs(struct acpi_evaluate_info *info,
                         struct acpi_namespace_node *node,
                         acpi_status validate_status,
                         union acpi_operand_object **return_object_ptr)
@@ -180,7 +196,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
                 return (validate_status);
         }
 
-        status = predefined->repair_function(data, return_object_ptr);
+        status = predefined->repair_function(info, return_object_ptr);
         return (status);
 }
 
@@ -219,7 +235,7 @@ static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
  *
  * FUNCTION:    acpi_ns_repair_ALR
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -231,13 +247,13 @@ static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_repair_ALR(struct acpi_predefined_data *data,
+acpi_ns_repair_ALR(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr)
 {
         union acpi_operand_object *return_object = *return_object_ptr;
         acpi_status status;
 
-        status = acpi_ns_check_sorted_list(data, return_object, 2, 1,
+        status = acpi_ns_check_sorted_list(info, return_object, 0, 2, 1,
                                            ACPI_SORT_ASCENDING,
                                            "AmbientIlluminance");
 
@@ -248,7 +264,7 @@ acpi_ns_repair_ALR(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_FDE
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -262,7 +278,7 @@ acpi_ns_repair_ALR(struct acpi_predefined_data *data,
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_repair_FDE(struct acpi_predefined_data *data,
+acpi_ns_repair_FDE(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr)
 {
         union acpi_operand_object *return_object = *return_object_ptr;
@@ -285,8 +301,8 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
                 /* We can only repair if we have exactly 5 BYTEs */
 
                 if (return_object->buffer.length != ACPI_FDE_BYTE_BUFFER_SIZE) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
-                                              data->node_flags,
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              info->node_flags,
                                               "Incorrect return buffer length %u, expected %u",
                                               return_object->buffer.length,
                                               ACPI_FDE_DWORD_BUFFER_SIZE));
@@ -316,10 +332,11 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
 
                 ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                   "%s Expanded Byte Buffer to expected DWord Buffer\n",
-                                  data->pathname));
+                                  info->full_pathname));
                 break;
 
         default:
+
                 return (AE_AML_OPERAND_TYPE);
         }
 
@@ -328,7 +345,7 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
         acpi_ut_remove_reference(return_object);
         *return_object_ptr = buffer_object;
 
-        data->flags |= ACPI_OBJECT_REPAIRED;
+        info->return_flags |= ACPI_OBJECT_REPAIRED;
         return (AE_OK);
 }
 
@@ -336,7 +353,7 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
  *
  * FUNCTION:    acpi_ns_repair_CID
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -349,7 +366,7 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_repair_CID(struct acpi_predefined_data *data,
+acpi_ns_repair_CID(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr)
 {
         acpi_status status;
@@ -362,7 +379,7 @@ acpi_ns_repair_CID(struct acpi_predefined_data *data,
         /* Check for _CID as a simple string */
 
         if (return_object->common.type == ACPI_TYPE_STRING) {
-                status = acpi_ns_repair_HID(data, return_object_ptr);
+                status = acpi_ns_repair_HID(info, return_object_ptr);
                 return (status);
         }
 
@@ -379,7 +396,7 @@ acpi_ns_repair_CID(struct acpi_predefined_data *data,
                 original_element = *element_ptr;
                 original_ref_count = original_element->common.reference_count;
 
-                status = acpi_ns_repair_HID(data, element_ptr);
+                status = acpi_ns_repair_HID(info, element_ptr);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
@@ -404,9 +421,95 @@ acpi_ns_repair_CID(struct acpi_predefined_data *data,
 
 /******************************************************************************
  *
+ * FUNCTION:    acpi_ns_repair_CST
+ *
+ * PARAMETERS:  info                - Method execution information block
+ *              return_object_ptr   - Pointer to the object returned from the
+ *                                    evaluation of a method or object
+ *
+ * RETURN:      Status. AE_OK if object is OK or was repaired successfully
+ *
+ * DESCRIPTION: Repair for the _CST object:
+ *              1. Sort the list ascending by C state type
+ *              2. Ensure type cannot be zero
+ *              3. A sub-package count of zero means _CST is meaningless
+ *              4. Count must match the number of C state sub-packages
+ *
+ *****************************************************************************/
+
+static acpi_status
+acpi_ns_repair_CST(struct acpi_evaluate_info *info,
+                   union acpi_operand_object **return_object_ptr)
+{
+        union acpi_operand_object *return_object = *return_object_ptr;
+        union acpi_operand_object **outer_elements;
+        u32 outer_element_count;
+        union acpi_operand_object *obj_desc;
+        acpi_status status;
+        u8 removing;
+        u32 i;
+
+        ACPI_FUNCTION_NAME(ns_repair_CST);
+
+        /*
+         * Check if the C-state type values are proportional.
+         */
+        outer_element_count = return_object->package.count - 1;
+        i = 0;
+        while (i < outer_element_count) {
+                outer_elements = &return_object->package.elements[i + 1];
+                removing = FALSE;
+
+                if ((*outer_elements)->package.count == 0) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              info->node_flags,
+                                              "SubPackage[%u] - removing entry due to zero count",
+                                              i));
+                        removing = TRUE;
+                        goto remove_element;
+                }
+
+                obj_desc = (*outer_elements)->package.elements[1];      /* Index1 = Type */
+                if ((u32)obj_desc->integer.value == 0) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              info->node_flags,
+                                              "SubPackage[%u] - removing entry due to invalid Type(0)",
+                                              i));
+                        removing = TRUE;
+                }
+
+              remove_element:
+                if (removing) {
+                        acpi_ns_remove_element(return_object, i + 1);
+                        outer_element_count--;
+                } else {
+                        i++;
+                }
+        }
+
+        /* Update top-level package count, Type "Integer" checked elsewhere */
+
+        obj_desc = return_object->package.elements[0];
+        obj_desc->integer.value = outer_element_count;
+
+        /*
+         * Entries (subpackages) in the _CST Package must be sorted by the
+         * C-state type, in ascending order.
+         */
+        status = acpi_ns_check_sorted_list(info, return_object, 1, 4, 1,
+                                           ACPI_SORT_ASCENDING, "C-State Type");
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
  * FUNCTION:    acpi_ns_repair_HID
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -418,7 +521,7 @@ acpi_ns_repair_CID(struct acpi_predefined_data *data,
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_repair_HID(struct acpi_predefined_data *data,
+acpi_ns_repair_HID(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr)
 {
         union acpi_operand_object *return_object = *return_object_ptr;
@@ -435,12 +538,13 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
         }
 
         if (return_object->string.length == 0) {
-                ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
+                ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                      info->node_flags,
                                       "Invalid zero-length _HID or _CID string"));
 
                 /* Return AE_OK anyway, let driver handle it */
 
-                data->flags |= ACPI_OBJECT_REPAIRED;
+                info->return_flags |= ACPI_OBJECT_REPAIRED;
                 return (AE_OK);
         }
 
@@ -464,7 +568,7 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
 
                 ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                   "%s: Removed invalid leading asterisk\n",
-                                  data->pathname));
+                                  info->full_pathname));
         }
 
         /*
@@ -486,53 +590,69 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
 
 /******************************************************************************
  *
- * FUNCTION:    acpi_ns_repair_TSS
+ * FUNCTION:    acpi_ns_repair_PRT
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
  * RETURN:      Status. AE_OK if object is OK or was repaired successfully
  *
- * DESCRIPTION: Repair for the _TSS object. If necessary, sort the object list
- *              descending by the power dissipation values.
+ * DESCRIPTION: Repair for the _PRT object. If necessary, fix reversed
+ *              source_name and source_index field, a common BIOS bug.
  *
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_repair_TSS(struct acpi_predefined_data *data,
+acpi_ns_repair_PRT(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr)
 {
-        union acpi_operand_object *return_object = *return_object_ptr;
-        acpi_status status;
-        struct acpi_namespace_node *node;
+        union acpi_operand_object *package_object = *return_object_ptr;
+        union acpi_operand_object **top_object_list;
+        union acpi_operand_object **sub_object_list;
+        union acpi_operand_object *obj_desc;
+        u32 element_count;
+        u32 index;
 
-        /*
-         * We can only sort the _TSS return package if there is no _PSS in the
-         * same scope. This is because if _PSS is present, the ACPI specification
-         * dictates that the _TSS Power Dissipation field is to be ignored, and
-         * therefore some BIOSs leave garbage values in the _TSS Power field(s).
-         * In this case, it is best to just return the _TSS package as-is.
-         * (May, 2011)
-         */
-        status =
-            acpi_ns_get_node(data->node, "^_PSS", ACPI_NS_NO_UPSEARCH, &node);
-        if (ACPI_SUCCESS(status)) {
-                return (AE_OK);
-        }
+        /* Each element in the _PRT package is a subpackage */
 
-        status = acpi_ns_check_sorted_list(data, return_object, 5, 1,
-                                           ACPI_SORT_DESCENDING,
-                                           "PowerDissipation");
+        top_object_list = package_object->package.elements;
+        element_count = package_object->package.count;
 
-        return (status);
+        for (index = 0; index < element_count; index++) {
+                sub_object_list = (*top_object_list)->package.elements;
+
+                /*
+                 * If the BIOS has erroneously reversed the _PRT source_name (index 2)
+                 * and the source_index (index 3), fix it. _PRT is important enough to
+                 * workaround this BIOS error. This also provides compatibility with
+                 * other ACPI implementations.
+                 */
+                obj_desc = sub_object_list[3];
+                if (!obj_desc || (obj_desc->common.type != ACPI_TYPE_INTEGER)) {
+                        sub_object_list[3] = sub_object_list[2];
+                        sub_object_list[2] = obj_desc;
+                        info->return_flags |= ACPI_OBJECT_REPAIRED;
+
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              info->node_flags,
+                                              "PRT[%X]: Fixed reversed SourceName and SourceIndex",
+                                              index));
+                }
+
+                /* Point to the next union acpi_operand_object in the top level package */
+
+                top_object_list++;
+        }
+
+        return (AE_OK);
 }
 
 /******************************************************************************
  *
  * FUNCTION:    acpi_ns_repair_PSS
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object_ptr   - Pointer to the object returned from the
  *                                    evaluation of a method or object
  *
@@ -546,7 +666,7 @@ acpi_ns_repair_TSS(struct acpi_predefined_data *data,
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_repair_PSS(struct acpi_predefined_data *data,
+acpi_ns_repair_PSS(struct acpi_evaluate_info *info,
                    union acpi_operand_object **return_object_ptr)
 {
         union acpi_operand_object *return_object = *return_object_ptr;
@@ -564,7 +684,7 @@ acpi_ns_repair_PSS(struct acpi_predefined_data *data,
          * incorrectly sorted, sort it. We sort by cpu_frequency, since this
          * should be proportional to the power.
          */
-        status = acpi_ns_check_sorted_list(data, return_object, 6, 0,
+        status = acpi_ns_check_sorted_list(info, return_object, 0, 6, 0,
                                            ACPI_SORT_DESCENDING,
                                            "CpuFrequency");
         if (ACPI_FAILURE(status)) {
@@ -584,8 +704,8 @@ acpi_ns_repair_PSS(struct acpi_predefined_data *data,
                 obj_desc = elements[1]; /* Index1 = power_dissipation */
 
                 if ((u32) obj_desc->integer.value > previous_value) {
-                        ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
-                                              data->node_flags,
+                        ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+                                              info->node_flags,
                                               "SubPackage[%u,%u] - suspicious power dissipation values",
                                               i - 1, i));
                 }
@@ -599,10 +719,55 @@ acpi_ns_repair_PSS(struct acpi_predefined_data *data,
 
 /******************************************************************************
  *
+ * FUNCTION:    acpi_ns_repair_TSS
+ *
+ * PARAMETERS:  info                - Method execution information block
+ *              return_object_ptr   - Pointer to the object returned from the
+ *                                    evaluation of a method or object
+ *
+ * RETURN:      Status. AE_OK if object is OK or was repaired successfully
+ *
+ * DESCRIPTION: Repair for the _TSS object. If necessary, sort the object list
+ *              descending by the power dissipation values.
+ *
+ *****************************************************************************/
+
+static acpi_status
+acpi_ns_repair_TSS(struct acpi_evaluate_info *info,
+                   union acpi_operand_object **return_object_ptr)
+{
+        union acpi_operand_object *return_object = *return_object_ptr;
+        acpi_status status;
+        struct acpi_namespace_node *node;
+
+        /*
+         * We can only sort the _TSS return package if there is no _PSS in the
+         * same scope. This is because if _PSS is present, the ACPI specification
+         * dictates that the _TSS Power Dissipation field is to be ignored, and
+         * therefore some BIOSs leave garbage values in the _TSS Power field(s).
+         * In this case, it is best to just return the _TSS package as-is.
+         * (May, 2011)
+         */
+        status = acpi_ns_get_node(info->node, "^_PSS",
+                                  ACPI_NS_NO_UPSEARCH, &node);
+        if (ACPI_SUCCESS(status)) {
+                return (AE_OK);
+        }
+
+        status = acpi_ns_check_sorted_list(info, return_object, 0, 5, 1,
+                                           ACPI_SORT_DESCENDING,
+                                           "PowerDissipation");
+
+        return (status);
+}
+
+/******************************************************************************
+ *
  * FUNCTION:    acpi_ns_check_sorted_list
  *
- * PARAMETERS:  data                - Pointer to validation data structure
+ * PARAMETERS:  info                - Method execution information block
  *              return_object       - Pointer to the top-level returned object
+ *              start_index         - Index of the first sub-package
  *              expected_count      - Minimum length of each sub-package
  *              sort_index          - Sub-package entry to sort on
  *              sort_direction      - Ascending or descending
@@ -617,8 +782,9 @@ acpi_ns_repair_PSS(struct acpi_predefined_data *data,
  *****************************************************************************/
 
 static acpi_status
-acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
+acpi_ns_check_sorted_list(struct acpi_evaluate_info *info,
                           union acpi_operand_object *return_object,
+                          u32 start_index,
                           u32 expected_count,
                           u32 sort_index,
                           u8 sort_direction, char *sort_key_name)
@@ -643,12 +809,14 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
          * Any NULL elements should have been removed by earlier call
          * to acpi_ns_remove_null_elements.
          */
-        outer_elements = return_object->package.elements;
         outer_element_count = return_object->package.count;
-        if (!outer_element_count) {
+        if (!outer_element_count || start_index >= outer_element_count) {
                 return (AE_AML_PACKAGE_LIMIT);
         }
 
+        outer_elements = &return_object->package.elements[start_index];
+        outer_element_count -= start_index;
+
         previous_value = 0;
         if (sort_direction == ACPI_SORT_DESCENDING) {
                 previous_value = ACPI_UINT32_MAX;
@@ -685,15 +853,16 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
                      (obj_desc->integer.value < previous_value)) ||
                     ((sort_direction == ACPI_SORT_DESCENDING) &&
                      (obj_desc->integer.value > previous_value))) {
-                        acpi_ns_sort_list(return_object->package.elements,
+                        acpi_ns_sort_list(&return_object->package.
+                                          elements[start_index],
                                           outer_element_count, sort_index,
                                           sort_direction);
 
-                        data->flags |= ACPI_OBJECT_REPAIRED;
+                        info->return_flags |= ACPI_OBJECT_REPAIRED;
 
                         ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
                                           "%s: Repaired unsorted list - now sorted by %s\n",
-                                          data->pathname, sort_key_name));
+                                          info->full_pathname, sort_key_name));
                         return (AE_OK);
                 }
 
@@ -752,3 +921,52 @@ acpi_ns_sort_list(union acpi_operand_object **elements,
                 }
         }
 }
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_remove_element
+ *
+ * PARAMETERS:  obj_desc            - Package object element list
+ *              index               - Index of element to remove
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Remove the requested element of a package and delete it.
+ *
+ *****************************************************************************/
+
+static void
+acpi_ns_remove_element(union acpi_operand_object *obj_desc, u32 index)
+{
+        union acpi_operand_object **source;
+        union acpi_operand_object **dest;
+        u32 count;
+        u32 new_count;
+        u32 i;
+
+        ACPI_FUNCTION_NAME(ns_remove_element);
+
+        count = obj_desc->package.count;
+        new_count = count - 1;
+
+        source = obj_desc->package.elements;
+        dest = source;
+
+        /* Examine all elements of the package object, remove matched index */
+
+        for (i = 0; i < count; i++) {
+                if (i == index) {
+                        acpi_ut_remove_reference(*source);      /* Remove one ref for being in pkg */
+                        acpi_ut_remove_reference(*source);
+                } else {
+                        *dest = *source;
+                        dest++;
+                }
+                source++;
+        }
+
+        /* NULL terminate list and update the package count */
+
+        *dest = NULL;
+        obj_desc->package.count = new_count;
+}
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 2808586fad30..08c0b5beec88 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -419,10 +419,12 @@ acpi_ns_externalize_name(u32 internal_name_length,
 
         switch (internal_name[0]) {
         case AML_ROOT_PREFIX:
+
                 prefix_length = 1;
                 break;
 
         case AML_PARENT_PREFIX:
+
                 for (i = 0; i < internal_name_length; i++) {
                         if (ACPI_IS_PARENT_PREFIX(internal_name[i])) {
                                 prefix_length = i + 1;
@@ -438,6 +440,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
                 break;
 
         default:
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index fc69949151bb..f553cfdb71dd 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -187,8 +187,6 @@ acpi_evaluate_object(acpi_handle handle,
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        info->pathname = pathname;
-
         /* Convert and validate the device handle */
 
         info->prefix_node = acpi_ns_validate_handle(handle);
@@ -198,17 +196,64 @@ acpi_evaluate_object(acpi_handle handle,
         }
 
         /*
-         * If there are parameters to be passed to a control method, the external
-         * objects must all be converted to internal objects
+         * Get the actual namespace node for the target object.
+         * Handles these cases:
+         *
+         * 1) Null node, valid pathname from root (absolute path)
+         * 2) Node and valid pathname (path relative to Node)
+         * 3) Node, Null pathname
+         */
+        if ((pathname) && (ACPI_IS_ROOT_PREFIX(pathname[0]))) {
+
+                /* The path is fully qualified, just evaluate by name */
+
+                info->prefix_node = NULL;
+        } else if (!handle) {
+                /*
+                 * A handle is optional iff a fully qualified pathname is specified.
+                 * Since we've already handled fully qualified names above, this is
+                 * an error.
+                 */
+                if (!pathname) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                          "Both Handle and Pathname are NULL"));
+                } else {
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                          "Null Handle with relative pathname [%s]",
+                                          pathname));
+                }
+
+                status = AE_BAD_PARAMETER;
+                goto cleanup;
+        }
+
+        info->relative_pathname = pathname;
+
+        /*
+         * Convert all external objects passed as arguments to the
+         * internal version(s).
          */
         if (external_params && external_params->count) {
+                info->param_count = (u16)external_params->count;
+
+                /* Warn on impossible argument count */
+
+                if (info->param_count > ACPI_METHOD_NUM_ARGS) {
+                        ACPI_WARN_PREDEFINED((AE_INFO, pathname,
+                                              ACPI_WARN_ALWAYS,
+                                              "Excess arguments (%u) - using only %u",
+                                              info->param_count,
+                                              ACPI_METHOD_NUM_ARGS));
+
+                        info->param_count = ACPI_METHOD_NUM_ARGS;
+                }
+
                 /*
                  * Allocate a new parameter block for the internal objects
                  * Add 1 to count to allow for null terminated internal list
                  */
-                info->parameters = ACPI_ALLOCATE_ZEROED(((acpi_size)
-                                                         external_params->
-                                                         count +
+                info->parameters = ACPI_ALLOCATE_ZEROED(((acpi_size) info->
+                                                         param_count +
                                                          1) * sizeof(void *));
                 if (!info->parameters) {
                         status = AE_NO_MEMORY;
@@ -217,7 +262,7 @@ acpi_evaluate_object(acpi_handle handle,
 
                 /* Convert each external object in the list to an internal object */
 
-                for (i = 0; i < external_params->count; i++) {
+                for (i = 0; i < info->param_count; i++) {
                         status =
                             acpi_ut_copy_eobject_to_iobject(&external_params->
                                                             pointer[i],
@@ -227,43 +272,96 @@ acpi_evaluate_object(acpi_handle handle,
                                 goto cleanup;
                         }
                 }
-                info->parameters[external_params->count] = NULL;
+
+                info->parameters[info->param_count] = NULL;
         }
 
+#if 0
+
         /*
-         * Three major cases:
-         * 1) Fully qualified pathname
-         * 2) No handle, not fully qualified pathname (error)
-         * 3) Valid handle
+         * Begin incoming argument count analysis. Check for too few args
+         * and too many args.
          */
-        if ((pathname) && (ACPI_IS_ROOT_PREFIX(pathname[0]))) {
 
-                /* The path is fully qualified, just evaluate by name */
+        switch (acpi_ns_get_type(info->node)) {
+        case ACPI_TYPE_METHOD:
+
+                /* Check incoming argument count against the method definition */
+
+                if (info->obj_desc->method.param_count > info->param_count) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Insufficient arguments (%u) - %u are required",
+                                    info->param_count,
+                                    info->obj_desc->method.param_count));
+
+                        status = AE_MISSING_ARGUMENTS;
+                        goto cleanup;
+                }
+
+                else if (info->obj_desc->method.param_count < info->param_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Excess arguments (%u) - only %u are required",
+                                      info->param_count,
+                                      info->obj_desc->method.param_count));
+
+                        /* Just pass the required number of arguments */
+
+                        info->param_count = info->obj_desc->method.param_count;
+                }
 
-                info->prefix_node = NULL;
-                status = acpi_ns_evaluate(info);
-        } else if (!handle) {
                 /*
-                 * A handle is optional iff a fully qualified pathname is specified.
-                 * Since we've already handled fully qualified names above, this is
-                 * an error
+                 * Any incoming external objects to be passed as arguments to the
+                 * method must be converted to internal objects
                  */
-                if (!pathname) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "Both Handle and Pathname are NULL"));
-                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "Null Handle with relative pathname [%s]",
-                                          pathname));
+                if (info->param_count) {
+                        /*
+                         * Allocate a new parameter block for the internal objects
+                         * Add 1 to count to allow for null terminated internal list
+                         */
+                        info->parameters = ACPI_ALLOCATE_ZEROED(((acpi_size)
+                                                                 info->
+                                                                 param_count +
+                                                                 1) *
+                                                                sizeof(void *));
+                        if (!info->parameters) {
+                                status = AE_NO_MEMORY;
+                                goto cleanup;
+                        }
+
+                        /* Convert each external object in the list to an internal object */
+
+                        for (i = 0; i < info->param_count; i++) {
+                                status =
+                                    acpi_ut_copy_eobject_to_iobject
+                                    (&external_params->pointer[i],
+                                     &info->parameters[i]);
+                                if (ACPI_FAILURE(status)) {
+                                        goto cleanup;
+                                }
+                        }
+
+                        info->parameters[info->param_count] = NULL;
                 }
+                break;
 
-                status = AE_BAD_PARAMETER;
-        } else {
-                /* We have a namespace a node and a possible relative path */
+        default:
+
+                /* Warn if arguments passed to an object that is not a method */
 
-                status = acpi_ns_evaluate(info);
+                if (info->param_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "%u arguments were passed to a non-method ACPI object",
+                                      info->param_count));
+                }
+                break;
         }
 
+#endif
+
+        /* Now we can evaluate the object */
+
+        status = acpi_ns_evaluate(info);
+
         /*
          * If we are expecting a return value, and all went well above,
          * copy the return value to an external object.
@@ -413,6 +511,7 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)
                 break;
 
         default:
+
                 return;
         }
 
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 9f25a3d4e992..91a5a69db80c 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -629,24 +629,28 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
 
                                 switch (opcode) {
                                 case AML_BYTE_OP:       /* AML_BYTEDATA_ARG */
+
                                         buffer_length =
                                             ACPI_GET8(parser_state->aml);
                                         parser_state->aml += 1;
                                         break;
 
                                 case AML_WORD_OP:       /* AML_WORDDATA_ARG */
+
                                         buffer_length =
                                             ACPI_GET16(parser_state->aml);
                                         parser_state->aml += 2;
                                         break;
 
                                 case AML_DWORD_OP:      /* AML_DWORDATA_ARG */
+
                                         buffer_length =
                                             ACPI_GET32(parser_state->aml);
                                         parser_state->aml += 4;
                                         break;
 
                                 default:
+
                                         buffer_length = 0;
                                         break;
                                 }
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 63c455447481..065b44ae538f 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -164,7 +164,6 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                         case AML_IF_OP:
                         case AML_ELSE_OP:
                         case AML_WHILE_OP:
-
                                 /*
                                  * Currently supported module-level opcodes are:
                                  * IF/ELSE/WHILE. These appear to be the most common,
@@ -289,6 +288,7 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                 default:
 
                         /* No action for all other opcodes */
+
                         break;
                 }
 
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c
index 12c4028002b1..95dc608a66a8 100644
--- a/drivers/acpi/acpica/psobject.c
+++ b/drivers/acpi/acpica/psobject.c
@@ -402,6 +402,7 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
 
         switch (status) {
         case AE_OK:
+
                 break;
 
         case AE_CTRL_TRANSFER:
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index abc4c48b2edd..86198a9139b5 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -176,10 +176,10 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
 
                 switch (parent_info->class) {
                 case AML_CLASS_CONTROL:
+
                         break;
 
                 case AML_CLASS_CREATE:
-
                         /*
                          * These opcodes contain term_arg operands. The current
                          * op must be replaced by a placeholder return op
@@ -192,7 +192,6 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                         break;
 
                 case AML_CLASS_NAMED_OBJECT:
-
                         /*
                          * These opcodes contain term_arg operands. The current
                          * op must be replaced by a placeholder return op
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index c1934bf04f0a..877dc0de8df3 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -308,7 +308,9 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op)
                 break;
 
         default:
+
                 /* All others have no children */
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index f68254268965..11b99ab20bb3 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -125,7 +125,7 @@ static void acpi_ps_start_trace(struct acpi_evaluate_info *info)
         }
 
         if ((!acpi_gbl_trace_method_name) ||
-            (acpi_gbl_trace_method_name != info->resolved_node->name.integer)) {
+            (acpi_gbl_trace_method_name != info->node->name.integer)) {
                 goto exit;
         }
 
@@ -170,7 +170,7 @@ static void acpi_ps_stop_trace(struct acpi_evaluate_info *info)
         }
 
         if ((!acpi_gbl_trace_method_name) ||
-            (acpi_gbl_trace_method_name != info->resolved_node->name.integer)) {
+            (acpi_gbl_trace_method_name != info->node->name.integer)) {
                 goto exit;
         }
 
@@ -226,15 +226,14 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
 
         /* Validate the Info and method Node */
 
-        if (!info || !info->resolved_node) {
+        if (!info || !info->node) {
                 return_ACPI_STATUS(AE_NULL_ENTRY);
         }
 
         /* Init for new method, wait on concurrency semaphore */
 
         status =
-            acpi_ds_begin_method_execution(info->resolved_node, info->obj_desc,
-                                           NULL);
+            acpi_ds_begin_method_execution(info->node, info->obj_desc, NULL);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -253,8 +252,7 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
                           "**** Begin Method Parse/Execute [%4.4s] **** Node=%p Obj=%p\n",
-                          info->resolved_node->name.ascii, info->resolved_node,
-                          info->obj_desc));
+                          info->node->name.ascii, info->node, info->obj_desc));
 
         /* Create and init a Root Node */
 
@@ -275,7 +273,7 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
                 goto cleanup;
         }
 
-        status = acpi_ds_init_aml_walk(walk_state, op, info->resolved_node,
+        status = acpi_ds_init_aml_walk(walk_state, op, info->node,
                                        info->obj_desc->method.aml_start,
                                        info->obj_desc->method.aml_length, info,
                                        info->pass_number);
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 72077fa1eea5..b62a0f4f4f9b 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -352,6 +352,7 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                         break;
 
                 default:
+
                         break;
                 }
 
@@ -539,6 +540,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                         break;
 
                 default:
+
                         break;
                 }
 
@@ -650,8 +652,9 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
 
                 name_found = FALSE;
 
-                for (table_index = 0; table_index < 4 && !name_found;
-                     table_index++) {
+                for (table_index = 0;
+                     table_index < package_element->package.count
+                     && !name_found; table_index++) {
                         if (*sub_object_list && /* Null object allowed */
                             ((ACPI_TYPE_STRING ==
                               (*sub_object_list)->common.type) ||
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index f8b55b426c9d..65f3e1c5b598 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -273,17 +273,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                  */
                 user_prt->length = (sizeof(struct acpi_pci_routing_table) - 4);
 
-                /* Each element of the top-level package must also be a package */
-
-                if ((*top_object_list)->common.type != ACPI_TYPE_PACKAGE) {
-                        ACPI_ERROR((AE_INFO,
-                                    "(PRT[%u]) Need sub-package, found %s",
-                                    index,
-                                    acpi_ut_get_object_type_name
-                                    (*top_object_list)));
-                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
-                }
-
                 /* Each sub-package must be of length 4 */
 
                 if ((*top_object_list)->package.count != 4) {
@@ -327,22 +316,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 user_prt->pin = (u32) obj_desc->integer.value;
 
                 /*
-                 * If the BIOS has erroneously reversed the _PRT source_name (index 2)
-                 * and the source_index (index 3), fix it. _PRT is important enough to
-                 * workaround this BIOS error. This also provides compatibility with
-                 * other ACPI implementations.
-                 */
-                obj_desc = sub_object_list[3];
-                if (!obj_desc || (obj_desc->common.type != ACPI_TYPE_INTEGER)) {
-                        sub_object_list[3] = sub_object_list[2];
-                        sub_object_list[2] = obj_desc;
-
-                        ACPI_WARNING((AE_INFO,
-                                      "(PRT[%X].Source) SourceName and SourceIndex are reversed, fixed",
-                                      index));
-                }
-
-                /*
                  * 3) Third subobject: Dereference the PRT.source_name
                  * The name may be unresolved (slack mode), so allow a null object
                  */
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index b5fc0db2e87b..8a2d4986b0aa 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -120,17 +120,20 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         /* Strings */
 
                 case ACPI_RSD_LITERAL:
+
                         acpi_rs_out_string(name,
                                            ACPI_CAST_PTR(char, table->pointer));
                         break;
 
                 case ACPI_RSD_STRING:
+
                         acpi_rs_out_string(name, ACPI_CAST_PTR(char, target));
                         break;
 
                         /* Data items, 8/16/32/64 bit */
 
                 case ACPI_RSD_UINT8:
+
                         if (table->pointer) {
                                 acpi_rs_out_string(name, ACPI_CAST_PTR(char,
                                                                        table->
@@ -142,20 +145,24 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         break;
 
                 case ACPI_RSD_UINT16:
+
                         acpi_rs_out_integer16(name, ACPI_GET16(target));
                         break;
 
                 case ACPI_RSD_UINT32:
+
                         acpi_rs_out_integer32(name, ACPI_GET32(target));
                         break;
 
                 case ACPI_RSD_UINT64:
+
                         acpi_rs_out_integer64(name, ACPI_GET64(target));
                         break;
 
                         /* Flags: 1-bit and 2-bit flags supported */
 
                 case ACPI_RSD_1BITFLAG:
+
                         acpi_rs_out_string(name, ACPI_CAST_PTR(char,
                                                                table->
                                                                pointer[*target &
@@ -163,6 +170,7 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         break;
 
                 case ACPI_RSD_2BITFLAG:
+
                         acpi_rs_out_string(name, ACPI_CAST_PTR(char,
                                                                table->
                                                                pointer[*target &
@@ -170,6 +178,7 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         break;
 
                 case ACPI_RSD_3BITFLAG:
+
                         acpi_rs_out_string(name, ACPI_CAST_PTR(char,
                                                                table->
                                                                pointer[*target &
@@ -258,6 +267,7 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         break;
 
                 default:
+
                         acpi_os_printf("**** Invalid table opcode [%X] ****\n",
                                        table->opcode);
                         return;
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index d5bf05a96096..80d12994e0d0 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -194,7 +194,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                         break;
 
                 case ACPI_RSC_COUNT_GPIO_RES:
-
                         /*
                          * Vendor data is optional (length/offset may both be zero)
                          * Examine vendor data length field first
@@ -410,12 +409,14 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                          */
                         switch (info->resource_offset) {
                         case ACPI_RSC_COMPARE_AML_LENGTH:
+
                                 if (aml_resource_length != info->value) {
                                         goto exit;
                                 }
                                 break;
 
                         case ACPI_RSC_COMPARE_VALUE:
+
                                 if (ACPI_GET8(source) != info->value) {
                                         goto exit;
                                 }
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index a44953c6f75d..480b6b40c5ea 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -147,6 +147,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                 case ACPI_RSC_MOVE_GPIO_RES:
                 case ACPI_RSC_MOVE_SERIAL_VEN:
                 case ACPI_RSC_MOVE_SERIAL_RES:
+
                         ACPI_MEMCPY(destination, source, item_count);
                         return;
 
@@ -157,21 +158,25 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                          */
                 case ACPI_RSC_MOVE16:
                 case ACPI_RSC_MOVE_GPIO_PIN:
+
                         ACPI_MOVE_16_TO_16(&ACPI_CAST_PTR(u16, destination)[i],
                                            &ACPI_CAST_PTR(u16, source)[i]);
                         break;
 
                 case ACPI_RSC_MOVE32:
+
                         ACPI_MOVE_32_TO_32(&ACPI_CAST_PTR(u32, destination)[i],
                                            &ACPI_CAST_PTR(u32, source)[i]);
                         break;
 
                 case ACPI_RSC_MOVE64:
+
                         ACPI_MOVE_64_TO_64(&ACPI_CAST_PTR(u64, destination)[i],
                                            &ACPI_CAST_PTR(u64, source)[i]);
                         break;
 
                 default:
+
                         return;
                 }
         }
@@ -736,7 +741,7 @@ acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
         }
 
         info->prefix_node = node;
-        info->pathname = METHOD_NAME__SRS;
+        info->relative_pathname = METHOD_NAME__SRS;
         info->parameters = args;
         info->flags = ACPI_IGNORE_RETURN_VALUE;
 
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index c0e5d2d3ce67..94e3517554f9 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -402,6 +402,7 @@ acpi_resource_to_address64(struct acpi_resource *resource,
                 break;
 
         default:
+
                 return (AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index e57cd38004e3..42a13c0d7015 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -141,8 +141,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
                 ACPI_BIOS_ERROR((AE_INFO,
                                  "Table has invalid signature [%4.4s] (0x%8.8X), "
                                  "must be SSDT or OEMx",
-                                 acpi_ut_valid_acpi_name(*(u32 *)table_desc->
-                                                         pointer->
+                                 acpi_ut_valid_acpi_name(table_desc->pointer->
                                                          signature) ?
                                  table_desc->pointer->signature : "????",
                                  *(u32 *)table_desc->pointer->signature));
@@ -471,15 +470,19 @@ void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
         }
         switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {
         case ACPI_TABLE_ORIGIN_MAPPED:
+
                 acpi_os_unmap_memory(table_desc->pointer, table_desc->length);
                 break;
+
         case ACPI_TABLE_ORIGIN_ALLOCATED:
+
                 ACPI_FREE(table_desc->pointer);
                 break;
 
                 /* Not mapped or allocated, there is nothing we can do */
 
         default:
+
                 return;
         }
 
diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c
new file mode 100644
index 000000000000..dc963f823d2c
--- /dev/null
+++ b/drivers/acpi/acpica/tbprint.c
@@ -0,0 +1,237 @@
+/******************************************************************************
+ *
+ * Module Name: tbprint - Table output utilities
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2013, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "actables.h"
+
+#define _COMPONENT          ACPI_TABLES
+ACPI_MODULE_NAME("tbprint")
+
+/* Local prototypes */
+static void acpi_tb_fix_string(char *string, acpi_size length);
+
+static void
+acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
+                             struct acpi_table_header *header);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_fix_string
+ *
+ * PARAMETERS:  string              - String to be repaired
+ *              length              - Maximum length
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Replace every non-printable or non-ascii byte in the string
+ *              with a question mark '?'.
+ *
+ ******************************************************************************/
+
+static void acpi_tb_fix_string(char *string, acpi_size length)
+{
+
+        while (length && *string) {
+                if (!ACPI_IS_PRINT(*string)) {
+                        *string = '?';
+                }
+                string++;
+                length--;
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_cleanup_table_header
+ *
+ * PARAMETERS:  out_header          - Where the cleaned header is returned
+ *              header              - Input ACPI table header
+ *
+ * RETURN:      Returns the cleaned header in out_header
+ *
+ * DESCRIPTION: Copy the table header and ensure that all "string" fields in
+ *              the header consist of printable characters.
+ *
+ ******************************************************************************/
+
+static void
+acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
+                             struct acpi_table_header *header)
+{
+
+        ACPI_MEMCPY(out_header, header, sizeof(struct acpi_table_header));
+
+        acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE);
+        acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE);
+        acpi_tb_fix_string(out_header->oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
+        acpi_tb_fix_string(out_header->asl_compiler_id, ACPI_NAME_SIZE);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_print_table_header
+ *
+ * PARAMETERS:  address             - Table physical address
+ *              header              - Table header
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print an ACPI table header. Special cases for FACS and RSDP.
+ *
+ ******************************************************************************/
+
+void
+acpi_tb_print_table_header(acpi_physical_address address,
+                           struct acpi_table_header *header)
+{
+        struct acpi_table_header local_header;
+
+        /*
+         * The reason that the Address is cast to a void pointer is so that we
+         * can use %p which will work properly on both 32-bit and 64-bit hosts.
+         */
+        if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {
+
+                /* FACS only has signature and length fields */
+
+                ACPI_INFO((AE_INFO, "%4.4s %p %05X",
+                           header->signature, ACPI_CAST_PTR(void, address),
+                           header->length));
+        } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
+
+                /* RSDP has no common fields */
+
+                ACPI_MEMCPY(local_header.oem_id,
+                            ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                          header)->oem_id, ACPI_OEM_ID_SIZE);
+                acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
+
+                ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
+                           ACPI_CAST_PTR(void, address),
+                           (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
+                            revision >
+                            0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                               header)->length : 20,
+                           ACPI_CAST_PTR(struct acpi_table_rsdp,
+                                         header)->revision,
+                           local_header.oem_id));
+        } else {
+                /* Standard ACPI table with full common header */
+
+                acpi_tb_cleanup_table_header(&local_header, header);
+
+                ACPI_INFO((AE_INFO,
+                           "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
+                           local_header.signature, ACPI_CAST_PTR(void, address),
+                           local_header.length, local_header.revision,
+                           local_header.oem_id, local_header.oem_table_id,
+                           local_header.oem_revision,
+                           local_header.asl_compiler_id,
+                           local_header.asl_compiler_revision));
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_validate_checksum
+ *
+ * PARAMETERS:  table               - ACPI table to verify
+ *              length              - Length of entire table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Verifies that the table checksums to zero. Optionally returns
+ *              exception on bad checksum.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
+{
+        u8 checksum;
+
+        /* Compute the checksum on the table */
+
+        checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length);
+
+        /* Checksum ok? (should be zero) */
+
+        if (checksum) {
+                ACPI_BIOS_WARNING((AE_INFO,
+                                   "Incorrect checksum in table [%4.4s] - 0x%2.2X, "
+                                   "should be 0x%2.2X",
+                                   table->signature, table->checksum,
+                                   (u8)(table->checksum - checksum)));
+
+#if (ACPI_CHECKSUM_ABORT)
+                return (AE_BAD_CHECKSUM);
+#endif
+        }
+
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_checksum
+ *
+ * PARAMETERS:  buffer          - Pointer to memory region to be checked
+ *              length          - Length of this memory region
+ *
+ * RETURN:      Checksum (u8)
+ *
+ * DESCRIPTION: Calculates circular checksum of memory region.
+ *
+ ******************************************************************************/
+
+u8 acpi_tb_checksum(u8 *buffer, u32 length)
+{
+        u8 sum = 0;
+        u8 *end = buffer + length;
+
+        while (buffer < end) {
+                sum = (u8)(sum + *(buffer++));
+        }
+
+        return (sum);
+}
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index ce3d5db39a9c..bffdfc7b8322 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Module Name: tbutils   - table utilities
+ * Module Name: tbutils - ACPI Table utilities
  *
  *****************************************************************************/
 
@@ -49,12 +49,6 @@
 ACPI_MODULE_NAME("tbutils")
 
 /* Local prototypes */
-static void acpi_tb_fix_string(char *string, acpi_size length);
-
-static void
-acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
-                             struct acpi_table_header *header);
-
 static acpi_physical_address
 acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size);
 
@@ -176,189 +170,6 @@ u8 acpi_tb_tables_loaded(void)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_fix_string
- *
- * PARAMETERS:  string              - String to be repaired
- *              length              - Maximum length
- *
- * RETURN:      None
- *
- * DESCRIPTION: Replace every non-printable or non-ascii byte in the string
- *              with a question mark '?'.
- *
- ******************************************************************************/
-
-static void acpi_tb_fix_string(char *string, acpi_size length)
-{
-
-        while (length && *string) {
-                if (!ACPI_IS_PRINT(*string)) {
-                        *string = '?';
-                }
-                string++;
-                length--;
-        }
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_cleanup_table_header
- *
- * PARAMETERS:  out_header          - Where the cleaned header is returned
- *              header              - Input ACPI table header
- *
- * RETURN:      Returns the cleaned header in out_header
- *
- * DESCRIPTION: Copy the table header and ensure that all "string" fields in
- *              the header consist of printable characters.
- *
- ******************************************************************************/
-
-static void
-acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
-                             struct acpi_table_header *header)
-{
-
-        ACPI_MEMCPY(out_header, header, sizeof(struct acpi_table_header));
-
-        acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE);
-        acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE);
-        acpi_tb_fix_string(out_header->oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
-        acpi_tb_fix_string(out_header->asl_compiler_id, ACPI_NAME_SIZE);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_print_table_header
- *
- * PARAMETERS:  address             - Table physical address
- *              header              - Table header
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print an ACPI table header. Special cases for FACS and RSDP.
- *
- ******************************************************************************/
-
-void
-acpi_tb_print_table_header(acpi_physical_address address,
-                           struct acpi_table_header *header)
-{
-        struct acpi_table_header local_header;
-
-        /*
-         * The reason that the Address is cast to a void pointer is so that we
-         * can use %p which will work properly on both 32-bit and 64-bit hosts.
-         */
-        if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {
-
-                /* FACS only has signature and length fields */
-
-                ACPI_INFO((AE_INFO, "%4.4s %p %05X",
-                           header->signature, ACPI_CAST_PTR(void, address),
-                           header->length));
-        } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
-
-                /* RSDP has no common fields */
-
-                ACPI_MEMCPY(local_header.oem_id,
-                            ACPI_CAST_PTR(struct acpi_table_rsdp,
-                                          header)->oem_id, ACPI_OEM_ID_SIZE);
-                acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
-
-                ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
-                           ACPI_CAST_PTR (void, address),
-                           (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
-                            revision >
-                            0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
-                                               header)->length : 20,
-                           ACPI_CAST_PTR(struct acpi_table_rsdp,
-                                         header)->revision,
-                           local_header.oem_id));
-        } else {
-                /* Standard ACPI table with full common header */
-
-                acpi_tb_cleanup_table_header(&local_header, header);
-
-                ACPI_INFO((AE_INFO,
-                           "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
-                           local_header.signature, ACPI_CAST_PTR(void, address),
-                           local_header.length, local_header.revision,
-                           local_header.oem_id, local_header.oem_table_id,
-                           local_header.oem_revision,
-                           local_header.asl_compiler_id,
-                           local_header.asl_compiler_revision));
-
-        }
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_validate_checksum
- *
- * PARAMETERS:  table               - ACPI table to verify
- *              length              - Length of entire table
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Verifies that the table checksums to zero. Optionally returns
- *              exception on bad checksum.
- *
- ******************************************************************************/
-
-acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
-{
-        u8 checksum;
-
-        /* Compute the checksum on the table */
-
-        checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length);
-
-        /* Checksum ok? (should be zero) */
-
-        if (checksum) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "Incorrect checksum in table [%4.4s] - 0x%2.2X, "
-                                   "should be 0x%2.2X",
-                                   table->signature, table->checksum,
-                                   (u8)(table->checksum - checksum)));
-
-#if (ACPI_CHECKSUM_ABORT)
-
-                return (AE_BAD_CHECKSUM);
-#endif
-        }
-
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_checksum
- *
- * PARAMETERS:  buffer          - Pointer to memory region to be checked
- *              length          - Length of this memory region
- *
- * RETURN:      Checksum (u8)
- *
- * DESCRIPTION: Calculates circular checksum of memory region.
- *
- ******************************************************************************/
-
-u8 acpi_tb_checksum(u8 *buffer, u32 length)
-{
-        u8 sum = 0;
-        u8 *end = buffer + length;
-
-        while (buffer < end) {
-                sum = (u8) (sum + *(buffer++));
-        }
-
-        return (sum);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_tb_check_dsdt_header
  *
  * PARAMETERS:  None
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index 67e046ec8f0a..0ba9e328d5d7 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -53,8 +53,6 @@ ACPI_MODULE_NAME("tbxfload")
 /* Local prototypes */
 static acpi_status acpi_tb_load_namespace(void);
 
-static int no_auto_ssdt;
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_load_tables
@@ -180,8 +178,16 @@ static acpi_status acpi_tb_load_namespace(void)
                         continue;
                 }
 
-                if (no_auto_ssdt) {
-                        printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
+                /*
+                 * Optionally do not load any SSDTs from the RSDT/XSDT. This can
+                 * be useful for debugging ACPI problems on some machines.
+                 */
+                if (acpi_gbl_disable_ssdt_table_load) {
+                        ACPI_INFO((AE_INFO, "Ignoring %4.4s at %p",
+                                   acpi_gbl_root_table_list.tables[i].signature.
+                                   ascii, ACPI_CAST_PTR(void,
+                                                        acpi_gbl_root_table_list.
+                                                        tables[i].address)));
                         continue;
                 }
 
@@ -376,14 +382,3 @@ acpi_status acpi_unload_parent_table(acpi_handle object)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_unload_parent_table)
-
-static int __init acpi_no_auto_ssdt_setup(char *s) {
-
-        printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
-
-        no_auto_ssdt = 1;
-
-        return 1;
-}
-
-__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
diff --git a/drivers/acpi/acpica/utbuffer.c b/drivers/acpi/acpica/utbuffer.c
new file mode 100644
index 000000000000..11fde93be120
--- /dev/null
+++ b/drivers/acpi/acpica/utbuffer.c
@@ -0,0 +1,201 @@
+/******************************************************************************
+ *
+ * Module Name: utbuffer - Buffer dump routines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2013, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utbuffer")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_dump_buffer
+ *
+ * PARAMETERS:  buffer              - Buffer to dump
+ *              count               - Amount to dump, in bytes
+ *              display             - BYTE, WORD, DWORD, or QWORD display:
+ *                                      DB_BYTE_DISPLAY
+ *                                      DB_WORD_DISPLAY
+ *                                      DB_DWORD_DISPLAY
+ *                                      DB_QWORD_DISPLAY
+ *              base_offset         - Beginning buffer offset (display only)
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Generic dump buffer in both hex and ascii.
+ *
+ ******************************************************************************/
+void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
+{
+        u32 i = 0;
+        u32 j;
+        u32 temp32;
+        u8 buf_char;
+
+        if (!buffer) {
+                acpi_os_printf("Null Buffer Pointer in DumpBuffer!\n");
+                return;
+        }
+
+        if ((count < 4) || (count & 0x01)) {
+                display = DB_BYTE_DISPLAY;
+        }
+
+        /* Nasty little dump buffer routine! */
+
+        while (i < count) {
+
+                /* Print current offset */
+
+                acpi_os_printf("%6.4X: ", (base_offset + i));
+
+                /* Print 16 hex chars */
+
+                for (j = 0; j < 16;) {
+                        if (i + j >= count) {
+
+                                /* Dump fill spaces */
+
+                                acpi_os_printf("%*s", ((display * 2) + 1), " ");
+                                j += display;
+                                continue;
+                        }
+
+                        switch (display) {
+                        case DB_BYTE_DISPLAY:
+                        default:        /* Default is BYTE display */
+
+                                acpi_os_printf("%02X ",
+                                               buffer[(acpi_size) i + j]);
+                                break;
+
+                        case DB_WORD_DISPLAY:
+
+                                ACPI_MOVE_16_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j]);
+                                acpi_os_printf("%04X ", temp32);
+                                break;
+
+                        case DB_DWORD_DISPLAY:
+
+                                ACPI_MOVE_32_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j]);
+                                acpi_os_printf("%08X ", temp32);
+                                break;
+
+                        case DB_QWORD_DISPLAY:
+
+                                ACPI_MOVE_32_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j]);
+                                acpi_os_printf("%08X", temp32);
+
+                                ACPI_MOVE_32_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j +
+                                                           4]);
+                                acpi_os_printf("%08X ", temp32);
+                                break;
+                        }
+
+                        j += display;
+                }
+
+                /*
+                 * Print the ASCII equivalent characters but watch out for the bad
+                 * unprintable ones (printable chars are 0x20 through 0x7E)
+                 */
+                acpi_os_printf(" ");
+                for (j = 0; j < 16; j++) {
+                        if (i + j >= count) {
+                                acpi_os_printf("\n");
+                                return;
+                        }
+
+                        buf_char = buffer[(acpi_size) i + j];
+                        if (ACPI_IS_PRINT(buf_char)) {
+                                acpi_os_printf("%c", buf_char);
+                        } else {
+                                acpi_os_printf(".");
+                        }
+                }
+
+                /* Done with that line. */
+
+                acpi_os_printf("\n");
+                i += 16;
+        }
+
+        return;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_debug_dump_buffer
+ *
+ * PARAMETERS:  buffer              - Buffer to dump
+ *              count               - Amount to dump, in bytes
+ *              display             - BYTE, WORD, DWORD, or QWORD display:
+ *                                      DB_BYTE_DISPLAY
+ *                                      DB_WORD_DISPLAY
+ *                                      DB_DWORD_DISPLAY
+ *                                      DB_QWORD_DISPLAY
+ *              component_ID        - Caller's component ID
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Generic dump buffer in both hex and ascii.
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
+{
+
+        /* Only dump the buffer if tracing is enabled */
+
+        if (!((ACPI_LV_TABLES & acpi_dbg_level) &&
+              (component_id & acpi_dbg_layer))) {
+                return;
+        }
+
+        acpi_ut_dump_buffer(buffer, count, display, 0);
+}
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index e4c9291fc0a3..1731c27c36a6 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -178,7 +178,6 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
 
                 switch (internal_object->reference.class) {
                 case ACPI_REFCLASS_NAME:
-
                         /*
                          * For namepath, return the object handle ("reference")
                          * We are referring to the namespace node
@@ -264,7 +263,6 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
 
         switch (object_type) {
         case ACPI_COPY_TYPE_SIMPLE:
-
                 /*
                  * This is a simple or null object
                  */
@@ -278,7 +276,6 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
                 break;
 
         case ACPI_COPY_TYPE_PACKAGE:
-
                 /*
                  * Build the package object
                  */
@@ -304,6 +301,7 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
                 break;
 
         default:
+
                 return (AE_BAD_PARAMETER);
         }
 
@@ -481,6 +479,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                 return_ACPI_STATUS(AE_OK);
 
         default:
+
                 /* All other types are not supported */
 
                 ACPI_ERROR((AE_INFO,
@@ -544,7 +543,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                 break;
 
         default:
+
                 /* Other types can't get here */
+
                 break;
         }
 
@@ -800,7 +801,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                 break;
 
         default:
+
                 /* Nothing to do for other simple objects */
+
                 break;
         }
 
@@ -868,7 +871,6 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
                 break;
 
         case ACPI_COPY_TYPE_PACKAGE:
-
                 /*
                  * This object is a package - go down another nesting level
                  * Create and build the package object
@@ -891,6 +893,7 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
                 break;
 
         default:
+
                 return (AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index c57d9cc07ba9..5796e11a0671 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Module Name: utdebug - Debug print routines
+ * Module Name: utdebug - Debug print/trace routines
  *
  *****************************************************************************/
 
@@ -543,149 +543,3 @@ acpi_ut_ptr_exit(u32 line_number,
 }
 
 #endif
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_dump_buffer
- *
- * PARAMETERS:  buffer              - Buffer to dump
- *              count               - Amount to dump, in bytes
- *              display             - BYTE, WORD, DWORD, or QWORD display
- *              offset              - Beginning buffer offset (display only)
- *
- * RETURN:      None
- *
- * DESCRIPTION: Generic dump buffer in both hex and ascii.
- *
- ******************************************************************************/
-
-void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
-{
-        u32 i = 0;
-        u32 j;
-        u32 temp32;
-        u8 buf_char;
-
-        if (!buffer) {
-                acpi_os_printf("Null Buffer Pointer in DumpBuffer!\n");
-                return;
-        }
-
-        if ((count < 4) || (count & 0x01)) {
-                display = DB_BYTE_DISPLAY;
-        }
-
-        /* Nasty little dump buffer routine! */
-
-        while (i < count) {
-
-                /* Print current offset */
-
-                acpi_os_printf("%6.4X: ", (base_offset + i));
-
-                /* Print 16 hex chars */
-
-                for (j = 0; j < 16;) {
-                        if (i + j >= count) {
-
-                                /* Dump fill spaces */
-
-                                acpi_os_printf("%*s", ((display * 2) + 1), " ");
-                                j += display;
-                                continue;
-                        }
-
-                        switch (display) {
-                        case DB_BYTE_DISPLAY:
-                        default:        /* Default is BYTE display */
-
-                                acpi_os_printf("%02X ",
-                                               buffer[(acpi_size) i + j]);
-                                break;
-
-                        case DB_WORD_DISPLAY:
-
-                                ACPI_MOVE_16_TO_32(&temp32,
-                                                   &buffer[(acpi_size) i + j]);
-                                acpi_os_printf("%04X ", temp32);
-                                break;
-
-                        case DB_DWORD_DISPLAY:
-
-                                ACPI_MOVE_32_TO_32(&temp32,
-                                                   &buffer[(acpi_size) i + j]);
-                                acpi_os_printf("%08X ", temp32);
-                                break;
-
-                        case DB_QWORD_DISPLAY:
-
-                                ACPI_MOVE_32_TO_32(&temp32,
-                                                   &buffer[(acpi_size) i + j]);
-                                acpi_os_printf("%08X", temp32);
-
-                                ACPI_MOVE_32_TO_32(&temp32,
-                                                   &buffer[(acpi_size) i + j +
-                                                           4]);
-                                acpi_os_printf("%08X ", temp32);
-                                break;
-                        }
-
-                        j += display;
-                }
-
-                /*
-                 * Print the ASCII equivalent characters but watch out for the bad
-                 * unprintable ones (printable chars are 0x20 through 0x7E)
-                 */
-                acpi_os_printf(" ");
-                for (j = 0; j < 16; j++) {
-                        if (i + j >= count) {
-                                acpi_os_printf("\n");
-                                return;
-                        }
-
-                        buf_char = buffer[(acpi_size) i + j];
-                        if (ACPI_IS_PRINT(buf_char)) {
-                                acpi_os_printf("%c", buf_char);
-                        } else {
-                                acpi_os_printf(".");
-                        }
-                }
-
-                /* Done with that line. */
-
-                acpi_os_printf("\n");
-                i += 16;
-        }
-
-        return;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_debug_dump_buffer
- *
- * PARAMETERS:  buffer              - Buffer to dump
- *              count               - Amount to dump, in bytes
- *              display             - BYTE, WORD, DWORD, or QWORD display
- *              component_ID        - Caller's component ID
- *
- * RETURN:      None
- *
- * DESCRIPTION: Generic dump buffer in both hex and ascii.
- *
- ******************************************************************************/
-
-void
-acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
-{
-
-        /* Only dump the buffer if tracing is enabled */
-
-        if (!((ACPI_LV_TABLES & acpi_dbg_level) &&
-              (component_id & acpi_dbg_layer))) {
-                return;
-        }
-
-        acpi_ut_dump_buffer(buffer, count, display, 0);
-}
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 29b930250b6f..d6b33f29d327 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -303,6 +303,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                 break;
 
         default:
+
                 break;
         }
 
@@ -508,7 +509,6 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
                 case ACPI_TYPE_PROCESSOR:
                 case ACPI_TYPE_POWER:
                 case ACPI_TYPE_THERMAL:
-
                         /*
                          * Update the notify objects for these types (if present)
                          * Two lists, system and device notify handlers.
@@ -623,6 +623,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
 
                 case ACPI_TYPE_REGION:
                 default:
+
                         break;  /* No subobjects for all other types */
                 }
 
diff --git a/drivers/acpi/acpica/uterror.c b/drivers/acpi/acpica/uterror.c
new file mode 100644
index 000000000000..154fdcaa5830
--- /dev/null
+++ b/drivers/acpi/acpica/uterror.c
@@ -0,0 +1,289 @@
+/*******************************************************************************
+ *
+ * Module Name: uterror - Various internal error/warning output functions
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2013, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("uterror")
+
+/*
+ * This module contains internal error functions that may
+ * be configured out.
+ */
+#if !defined (ACPI_NO_ERROR_MESSAGES)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_predefined_warning
+ *
+ * PARAMETERS:  module_name     - Caller's module name (for error output)
+ *              line_number     - Caller's line number (for error output)
+ *              pathname        - Full pathname to the node
+ *              node_flags      - From Namespace node for the method/object
+ *              format          - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Warnings for the predefined validation module. Messages are
+ *              only emitted the first time a problem with a particular
+ *              method/object is detected. This prevents a flood of error
+ *              messages for methods that are repeatedly evaluated.
+ *
+ ******************************************************************************/
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_predefined_warning(const char *module_name,
+                           u32 line_number,
+                           char *pathname,
+                           u8 node_flags, const char *format, ...)
+{
+        va_list arg_list;
+
+        /*
+         * Warning messages for this method/object will be disabled after the
+         * first time a validation fails or an object is successfully repaired.
+         */
+        if (node_flags & ANOBJ_EVALUATED) {
+                return;
+        }
+
+        acpi_os_printf(ACPI_MSG_WARNING "%s: ", pathname);
+
+        va_start(arg_list, format);
+        acpi_os_vprintf(format, arg_list);
+        ACPI_MSG_SUFFIX;
+        va_end(arg_list);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_predefined_info
+ *
+ * PARAMETERS:  module_name     - Caller's module name (for error output)
+ *              line_number     - Caller's line number (for error output)
+ *              pathname        - Full pathname to the node
+ *              node_flags      - From Namespace node for the method/object
+ *              format          - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Info messages for the predefined validation module. Messages
+ *              are only emitted the first time a problem with a particular
+ *              method/object is detected. This prevents a flood of
+ *              messages for methods that are repeatedly evaluated.
+ *
+ ******************************************************************************/
+
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_predefined_info(const char *module_name,
+                        u32 line_number,
+                        char *pathname, u8 node_flags, const char *format, ...)
+{
+        va_list arg_list;
+
+        /*
+         * Warning messages for this method/object will be disabled after the
+         * first time a validation fails or an object is successfully repaired.
+         */
+        if (node_flags & ANOBJ_EVALUATED) {
+                return;
+        }
+
+        acpi_os_printf(ACPI_MSG_INFO "%s: ", pathname);
+
+        va_start(arg_list, format);
+        acpi_os_vprintf(format, arg_list);
+        ACPI_MSG_SUFFIX;
+        va_end(arg_list);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_predefined_bios_error
+ *
+ * PARAMETERS:  module_name     - Caller's module name (for error output)
+ *              line_number     - Caller's line number (for error output)
+ *              pathname        - Full pathname to the node
+ *              node_flags      - From Namespace node for the method/object
+ *              format          - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: BIOS error message for predefined names. Messages
+ *              are only emitted the first time a problem with a particular
+ *              method/object is detected. This prevents a flood of
+ *              messages for methods that are repeatedly evaluated.
+ *
+ ******************************************************************************/
+
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_predefined_bios_error(const char *module_name,
+                              u32 line_number,
+                              char *pathname,
+                              u8 node_flags, const char *format, ...)
+{
+        va_list arg_list;
+
+        /*
+         * Warning messages for this method/object will be disabled after the
+         * first time a validation fails or an object is successfully repaired.
+         */
+        if (node_flags & ANOBJ_EVALUATED) {
+                return;
+        }
+
+        acpi_os_printf(ACPI_MSG_BIOS_ERROR "%s: ", pathname);
+
+        va_start(arg_list, format);
+        acpi_os_vprintf(format, arg_list);
+        ACPI_MSG_SUFFIX;
+        va_end(arg_list);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_namespace_error
+ *
+ * PARAMETERS:  module_name         - Caller's module name (for error output)
+ *              line_number         - Caller's line number (for error output)
+ *              internal_name       - Name or path of the namespace node
+ *              lookup_status       - Exception code from NS lookup
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print error message with the full pathname for the NS node.
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_namespace_error(const char *module_name,
+                        u32 line_number,
+                        const char *internal_name, acpi_status lookup_status)
+{
+        acpi_status status;
+        u32 bad_name;
+        char *name = NULL;
+
+        ACPI_MSG_REDIRECT_BEGIN;
+        acpi_os_printf(ACPI_MSG_ERROR);
+
+        if (lookup_status == AE_BAD_CHARACTER) {
+
+                /* There is a non-ascii character in the name */
+
+                ACPI_MOVE_32_TO_32(&bad_name,
+                                   ACPI_CAST_PTR(u32, internal_name));
+                acpi_os_printf("[0x%.8X] (NON-ASCII)", bad_name);
+        } else {
+                /* Convert path to external format */
+
+                status = acpi_ns_externalize_name(ACPI_UINT32_MAX,
+                                                  internal_name, NULL, &name);
+
+                /* Print target name */
+
+                if (ACPI_SUCCESS(status)) {
+                        acpi_os_printf("[%s]", name);
+                } else {
+                        acpi_os_printf("[COULD NOT EXTERNALIZE NAME]");
+                }
+
+                if (name) {
+                        ACPI_FREE(name);
+                }
+        }
+
+        acpi_os_printf(" Namespace lookup failure, %s",
+                       acpi_format_exception(lookup_status));
+
+        ACPI_MSG_SUFFIX;
+        ACPI_MSG_REDIRECT_END;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_method_error
+ *
+ * PARAMETERS:  module_name         - Caller's module name (for error output)
+ *              line_number         - Caller's line number (for error output)
+ *              message             - Error message to use on failure
+ *              prefix_node         - Prefix relative to the path
+ *              path                - Path to the node (optional)
+ *              method_status       - Execution status
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print error message with the full pathname for the method.
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_method_error(const char *module_name,
+                     u32 line_number,
+                     const char *message,
+                     struct acpi_namespace_node *prefix_node,
+                     const char *path, acpi_status method_status)
+{
+        acpi_status status;
+        struct acpi_namespace_node *node = prefix_node;
+
+        ACPI_MSG_REDIRECT_BEGIN;
+        acpi_os_printf(ACPI_MSG_ERROR);
+
+        if (path) {
+                status =
+                    acpi_ns_get_node(prefix_node, path, ACPI_NS_NO_UPSEARCH,
+                                     &node);
+                if (ACPI_FAILURE(status)) {
+                        acpi_os_printf("[Could not get node by pathname]");
+                }
+        }
+
+        acpi_ns_print_node_pathname(node, message);
+        acpi_os_printf(", %s", acpi_format_exception(method_status));
+
+        ACPI_MSG_SUFFIX;
+        ACPI_MSG_REDIRECT_END;
+}
+
+#endif                          /* ACPI_NO_ERROR_MESSAGES */
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index c3f3a7e7bdc7..ee83adb97b1e 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -68,7 +68,7 @@ ACPI_MODULE_NAME("uteval")
  ******************************************************************************/
 
 acpi_status
-acpi_ut_evaluate_object(struct acpi_namespace_node * prefix_node,
+acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
                         char *path,
                         u32 expected_return_btypes,
                         union acpi_operand_object **return_desc)
@@ -87,7 +87,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node * prefix_node,
         }
 
         info->prefix_node = prefix_node;
-        info->pathname = path;
+        info->relative_pathname = path;
 
         /* Evaluate the object/method */
 
@@ -123,22 +123,27 @@ acpi_ut_evaluate_object(struct acpi_namespace_node * prefix_node,
 
         switch ((info->return_object)->common.type) {
         case ACPI_TYPE_INTEGER:
+
                 return_btype = ACPI_BTYPE_INTEGER;
                 break;
 
         case ACPI_TYPE_BUFFER:
+
                 return_btype = ACPI_BTYPE_BUFFER;
                 break;
 
         case ACPI_TYPE_STRING:
+
                 return_btype = ACPI_BTYPE_STRING;
                 break;
 
         case ACPI_TYPE_PACKAGE:
+
                 return_btype = ACPI_BTYPE_PACKAGE;
                 break;
 
         default:
+
                 return_btype = 0;
                 break;
         }
diff --git a/drivers/acpi/acpica/utexcep.c b/drivers/acpi/acpica/utexcep.c
index b543a144941a..ff6d9e8aa842 100644
--- a/drivers/acpi/acpica/utexcep.c
+++ b/drivers/acpi/acpica/utexcep.c
@@ -146,6 +146,7 @@ const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status status)
                 break;
 
         default:
+
                 break;
         }
 
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 43a170a74a61..fa69071db418 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -341,14 +341,17 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
 
                 switch (cid_objects[i]->common.type) {
                 case ACPI_TYPE_INTEGER:
+
                         string_area_size += ACPI_EISAID_STRING_SIZE;
                         break;
 
                 case ACPI_TYPE_STRING:
+
                         string_area_size += cid_objects[i]->string.length + 1;
                         break;
 
                 default:
+
                         status = AE_TYPE;
                         goto cleanup;
                 }
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 785fdd07ae56..02f9101b65e4 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -382,10 +382,12 @@ acpi_ut_display_init_pathname(u8 type,
 
         switch (type) {
         case ACPI_TYPE_METHOD:
+
                 acpi_os_printf("Executing  ");
                 break;
 
         default:
+
                 acpi_os_printf("Initializing ");
                 break;
         }
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 1099f5c069f8..aa61f66ee861 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -129,6 +129,7 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(const char
                 break;
 
         default:
+
                 /* All others have no secondary object */
                 break;
         }
@@ -353,6 +354,7 @@ u8 acpi_ut_valid_internal_object(void *object)
                 return (TRUE);
 
         default:
+
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                   "%p is not not an ACPI operand obj [%s]\n",
                                   object, acpi_ut_get_descriptor_name(object)));
@@ -509,7 +511,6 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
                 switch (internal_object->reference.class) {
                 case ACPI_REFCLASS_NAME:
-
                         /*
                          * Get the actual length of the full pathname to this object.
                          * The reference will be converted to the pathname to the object
@@ -525,7 +526,6 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                         break;
 
                 default:
-
                         /*
                          * No other reference opcodes are supported.
                          * Notably, Locals and Args are not supported, but this may be
@@ -585,7 +585,6 @@ acpi_ut_get_element_length(u8 object_type,
 
         switch (object_type) {
         case ACPI_COPY_TYPE_SIMPLE:
-
                 /*
                  * Simple object - just get the size (Null object/entry is handled
                  * here also) and sum it into the running package length
diff --git a/drivers/acpi/acpica/utpredef.c b/drivers/acpi/acpica/utpredef.c
index 29459479148f..2b1ce4cd3207 100644
--- a/drivers/acpi/acpica/utpredef.c
+++ b/drivers/acpi/acpica/utpredef.c
@@ -147,6 +147,11 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
         u32 i;
         u32 j;
 
+        if (!expected_btypes) {
+                ACPI_STRCPY(buffer, "NONE");
+                return;
+        }
+
         j = 1;
         buffer[0] = 0;
         this_rtype = ACPI_RTYPE_INTEGER;
@@ -328,9 +333,7 @@ static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types)
 
         /* First field in the types list is the count of args to follow */
 
-        arg_count = (argument_types & METHOD_ARG_MASK);
-        argument_types >>= METHOD_ARG_BIT_WIDTH;
-
+        arg_count = METHOD_GET_ARG_COUNT(argument_types);
         if (arg_count > METHOD_PREDEF_ARGS_MAX) {
                 printf("**** Invalid argument count (%u) "
                        "in predefined info structure\n", arg_count);
@@ -340,7 +343,8 @@ static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types)
         /* Get each argument from the list, convert to ascii, store to buffer */
 
         for (i = 0; i < arg_count; i++) {
-                this_argument_type = (argument_types & METHOD_ARG_MASK);
+                this_argument_type = METHOD_GET_NEXT_TYPE(argument_types);
+
                 if (!this_argument_type
                     || (this_argument_type > METHOD_MAX_ARG_TYPE)) {
                         printf("**** Invalid argument type (%u) "
@@ -351,10 +355,6 @@ static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types)
 
                 strcat(buffer,
                        ut_external_type_names[this_argument_type] + sub_index);
-
-                /* Shift to next argument type field */
-
-                argument_types >>= METHOD_ARG_BIT_WIDTH;
                 sub_index = 0;
         }
 
diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c
index b3e36a81aa4d..c53759b76a3f 100644
--- a/drivers/acpi/acpica/utstring.c
+++ b/drivers/acpi/acpica/utstring.c
@@ -186,10 +186,13 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
         switch (base) {
         case ACPI_ANY_BASE:
         case 16:
+
                 break;
 
         default:
+
                 /* Invalid Base */
+
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -355,36 +358,44 @@ void acpi_ut_print_string(char *string, u8 max_length)
 
                 switch (string[i]) {
                 case 0x07:
+
                         acpi_os_printf("\\a");  /* BELL */
                         break;
 
                 case 0x08:
+
                         acpi_os_printf("\\b");  /* BACKSPACE */
                         break;
 
                 case 0x0C:
+
                         acpi_os_printf("\\f");  /* FORMFEED */
                         break;
 
                 case 0x0A:
+
                         acpi_os_printf("\\n");  /* LINEFEED */
                         break;
 
                 case 0x0D:
+
                         acpi_os_printf("\\r");  /* CARRIAGE RETURN */
                         break;
 
                 case 0x09:
+
                         acpi_os_printf("\\t");  /* HORIZONTAL TAB */
                         break;
 
                 case 0x0B:
+
                         acpi_os_printf("\\v");  /* VERTICAL TAB */
                         break;
 
                 case '\'':      /* Single Quote */
                 case '\"':      /* Double Quote */
                 case '\\':      /* Backslash */
+
                         acpi_os_printf("\\%c", (int)string[i]);
                         break;
 
@@ -451,7 +462,8 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position)
  *
  * FUNCTION:    acpi_ut_valid_acpi_name
  *
- * PARAMETERS:  name            - The name to be examined
+ * PARAMETERS:  name            - The name to be examined. Does not have to
+ *                                be NULL terminated string.
  *
  * RETURN:      TRUE if the name is valid, FALSE otherwise
  *
@@ -462,15 +474,14 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position)
  *
  ******************************************************************************/
 
-u8 acpi_ut_valid_acpi_name(u32 name)
+u8 acpi_ut_valid_acpi_name(char *name)
 {
         u32 i;
 
         ACPI_FUNCTION_ENTRY();
 
         for (i = 0; i < ACPI_NAME_SIZE; i++) {
-                if (!acpi_ut_valid_acpi_char
-                    ((ACPI_CAST_PTR(char, &name))[i], i)) {
+                if (!acpi_ut_valid_acpi_char(name[i], i)) {
                         return (FALSE);
                 }
         }
diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c
index 62774c7b76a8..160f13f4aab5 100644
--- a/drivers/acpi/acpica/uttrack.c
+++ b/drivers/acpi/acpica/uttrack.c
@@ -603,6 +603,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                         switch (ACPI_GET_DESCRIPTOR_TYPE
                                                 (descriptor)) {
                                         case ACPI_DESC_TYPE_OPERAND:
+
                                                 if (element->size ==
                                                     sizeof(union
                                                            acpi_operand_object))
@@ -613,6 +614,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                                 break;
 
                                         case ACPI_DESC_TYPE_PARSER:
+
                                                 if (element->size ==
                                                     sizeof(union
                                                            acpi_parse_object)) {
@@ -622,6 +624,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                                 break;
 
                                         case ACPI_DESC_TYPE_NAMED:
+
                                                 if (element->size ==
                                                     sizeof(struct
                                                            acpi_namespace_node))
@@ -632,6 +635,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                                 break;
 
                                         default:
+
                                                 break;
                                         }
 
@@ -639,6 +643,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
 
                                         switch (descriptor_type) {
                                         case ACPI_DESC_TYPE_OPERAND:
+
                                                 acpi_os_printf
                                                     ("%12.12s RefCount 0x%04X\n",
                                                      acpi_ut_get_type_name
@@ -649,6 +654,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                                 break;
 
                                         case ACPI_DESC_TYPE_PARSER:
+
                                                 acpi_os_printf
                                                     ("AmlOpcode 0x%04hX\n",
                                                      descriptor->op.asl.
@@ -656,6 +662,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                                 break;
 
                                         case ACPI_DESC_TYPE_NAMED:
+
                                                 acpi_os_printf("%4.4s\n",
                                                                acpi_ut_get_node_name
                                                                (&descriptor->
@@ -663,6 +670,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                                 break;
 
                                         default:
+
                                                 acpi_os_printf("\n");
                                                 break;
                                         }
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 976b6c734fce..e966a2e47b76 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -44,7 +44,6 @@
 #include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utxferror")
@@ -52,43 +51,7 @@ ACPI_MODULE_NAME("utxferror")
 /*
  * This module is used for the in-kernel ACPICA as well as the ACPICA
  * tools/applications.
- *
- * For the iASL compiler case, the output is redirected to stderr so that
- * any of the various ACPI errors and warnings do not appear in the output
- * files, for either the compiler or disassembler portions of the tool.
  */
-#ifdef ACPI_ASL_COMPILER
-#include <stdio.h>
-extern FILE *acpi_gbl_output_file;
-
-#define ACPI_MSG_REDIRECT_BEGIN \
-        FILE                            *output_file = acpi_gbl_output_file; \
-        acpi_os_redirect_output (stderr);
-
-#define ACPI_MSG_REDIRECT_END \
-        acpi_os_redirect_output (output_file);
-
-#else
-/*
- * non-iASL case - no redirection, nothing to do
- */
-#define ACPI_MSG_REDIRECT_BEGIN
-#define ACPI_MSG_REDIRECT_END
-#endif
-/*
- * Common message prefixes
- */
-#define ACPI_MSG_ERROR          "ACPI Error: "
-#define ACPI_MSG_EXCEPTION      "ACPI Exception: "
-#define ACPI_MSG_WARNING        "ACPI Warning: "
-#define ACPI_MSG_INFO           "ACPI: "
-#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Bug: Error: "
-#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Bug: Warning: "
-/*
- * Common message suffix
- */
-#define ACPI_MSG_SUFFIX \
-        acpi_os_printf (" (%8.8X/%s-%u)\n", ACPI_CA_VERSION, module_name, line_number)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_error
@@ -285,200 +248,3 @@ acpi_bios_warning(const char *module_name,
 }
 
 ACPI_EXPORT_SYMBOL(acpi_bios_warning)
-
-/*
- * The remainder of this module contains internal error functions that may
- * be configured out.
- */
-#if !defined (ACPI_NO_ERROR_MESSAGES) && !defined (ACPI_BIN_APP)
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_predefined_warning
- *
- * PARAMETERS:  module_name     - Caller's module name (for error output)
- *              line_number     - Caller's line number (for error output)
- *              pathname        - Full pathname to the node
- *              node_flags      - From Namespace node for the method/object
- *              format          - Printf format string + additional args
- *
- * RETURN:      None
- *
- * DESCRIPTION: Warnings for the predefined validation module. Messages are
- *              only emitted the first time a problem with a particular
- *              method/object is detected. This prevents a flood of error
- *              messages for methods that are repeatedly evaluated.
- *
- ******************************************************************************/
-void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_predefined_warning(const char *module_name,
-                           u32 line_number,
-                           char *pathname,
-                           u8 node_flags, const char *format, ...)
-{
-        va_list arg_list;
-
-        /*
-         * Warning messages for this method/object will be disabled after the
-         * first time a validation fails or an object is successfully repaired.
-         */
-        if (node_flags & ANOBJ_EVALUATED) {
-                return;
-        }
-
-        acpi_os_printf(ACPI_MSG_WARNING "For %s: ", pathname);
-
-        va_start(arg_list, format);
-        acpi_os_vprintf(format, arg_list);
-        ACPI_MSG_SUFFIX;
-        va_end(arg_list);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_predefined_info
- *
- * PARAMETERS:  module_name     - Caller's module name (for error output)
- *              line_number     - Caller's line number (for error output)
- *              pathname        - Full pathname to the node
- *              node_flags      - From Namespace node for the method/object
- *              format          - Printf format string + additional args
- *
- * RETURN:      None
- *
- * DESCRIPTION: Info messages for the predefined validation module. Messages
- *              are only emitted the first time a problem with a particular
- *              method/object is detected. This prevents a flood of
- *              messages for methods that are repeatedly evaluated.
- *
- ******************************************************************************/
-
-void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_predefined_info(const char *module_name,
-                        u32 line_number,
-                        char *pathname, u8 node_flags, const char *format, ...)
-{
-        va_list arg_list;
-
-        /*
-         * Warning messages for this method/object will be disabled after the
-         * first time a validation fails or an object is successfully repaired.
-         */
-        if (node_flags & ANOBJ_EVALUATED) {
-                return;
-        }
-
-        acpi_os_printf(ACPI_MSG_INFO "For %s: ", pathname);
-
-        va_start(arg_list, format);
-        acpi_os_vprintf(format, arg_list);
-        ACPI_MSG_SUFFIX;
-        va_end(arg_list);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_namespace_error
- *
- * PARAMETERS:  module_name         - Caller's module name (for error output)
- *              line_number         - Caller's line number (for error output)
- *              internal_name       - Name or path of the namespace node
- *              lookup_status       - Exception code from NS lookup
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print error message with the full pathname for the NS node.
- *
- ******************************************************************************/
-
-void
-acpi_ut_namespace_error(const char *module_name,
-                        u32 line_number,
-                        const char *internal_name, acpi_status lookup_status)
-{
-        acpi_status status;
-        u32 bad_name;
-        char *name = NULL;
-
-        ACPI_MSG_REDIRECT_BEGIN;
-        acpi_os_printf(ACPI_MSG_ERROR);
-
-        if (lookup_status == AE_BAD_CHARACTER) {
-
-                /* There is a non-ascii character in the name */
-
-                ACPI_MOVE_32_TO_32(&bad_name,
-                                   ACPI_CAST_PTR(u32, internal_name));
-                acpi_os_printf("[0x%.8X] (NON-ASCII)", bad_name);
-        } else {
-                /* Convert path to external format */
-
-                status = acpi_ns_externalize_name(ACPI_UINT32_MAX,
-                                                  internal_name, NULL, &name);
-
-                /* Print target name */
-
-                if (ACPI_SUCCESS(status)) {
-                        acpi_os_printf("[%s]", name);
-                } else {
-                        acpi_os_printf("[COULD NOT EXTERNALIZE NAME]");
-                }
-
-                if (name) {
-                        ACPI_FREE(name);
-                }
-        }
-
-        acpi_os_printf(" Namespace lookup failure, %s",
-                       acpi_format_exception(lookup_status));
-
-        ACPI_MSG_SUFFIX;
-        ACPI_MSG_REDIRECT_END;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_method_error
- *
- * PARAMETERS:  module_name         - Caller's module name (for error output)
- *              line_number         - Caller's line number (for error output)
- *              message             - Error message to use on failure
- *              prefix_node         - Prefix relative to the path
- *              path                - Path to the node (optional)
- *              method_status       - Execution status
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print error message with the full pathname for the method.
- *
- ******************************************************************************/
-
-void
-acpi_ut_method_error(const char *module_name,
-                     u32 line_number,
-                     const char *message,
-                     struct acpi_namespace_node *prefix_node,
-                     const char *path, acpi_status method_status)
-{
-        acpi_status status;
-        struct acpi_namespace_node *node = prefix_node;
-
-        ACPI_MSG_REDIRECT_BEGIN;
-        acpi_os_printf(ACPI_MSG_ERROR);
-
-        if (path) {
-                status =
-                    acpi_ns_get_node(prefix_node, path, ACPI_NS_NO_UPSEARCH,
-                                     &node);
-                if (ACPI_FAILURE(status)) {
-                        acpi_os_printf("[Could not get node by pathname]");
-                }
-        }
-
-        acpi_ns_print_node_pathname(node, message);
-        acpi_os_printf(", %s", acpi_format_exception(method_status));
-
-        ACPI_MSG_SUFFIX;
-        ACPI_MSG_REDIRECT_END;
-}
-
-#endif                          /* ACPI_NO_ERROR_MESSAGES */
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index e7100459ac4a..082b4dd252a8 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -425,7 +425,7 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
 {
         int result = -EFAULT;
         acpi_status status = 0;
-        char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags)?
+        char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags) ?
                         "_BIX" : "_BIF";
 
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -661,11 +661,11 @@ static void find_battery(const struct dmi_header *dm, void *private)
 static void acpi_battery_quirks(struct acpi_battery *battery)
 {
         if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
-                return ;
+                return;
 
-        if (battery->full_charge_capacity == 100 &&
-            battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN &&
-            battery->capacity_now >=0 && battery->capacity_now <= 100) {
+        if (battery->full_charge_capacity == 100 &&
+                battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN &&
+                battery->capacity_now >= 0 && battery->capacity_now <= 100) {
                 set_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags);
                 battery->full_charge_capacity = battery->design_capacity;
                 battery->capacity_now = (battery->capacity_now *
@@ -673,7 +673,7 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
         }
 
         if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
-                return ;
+                return;
 
         if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
                 const char *s;
@@ -761,7 +761,7 @@ static int acpi_battery_print_info(struct seq_file *seq, int result)
                 goto end;
 
         seq_printf(seq, "present:                 %s\n",
-                   acpi_battery_present(battery)?"yes":"no");
+                   acpi_battery_present(battery) ? "yes" : "no");
         if (!acpi_battery_present(battery))
                 goto end;
         if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
@@ -817,12 +817,12 @@ static int acpi_battery_print_state(struct seq_file *seq, int result)
                 goto end;
 
         seq_printf(seq, "present:                 %s\n",
-                   acpi_battery_present(battery)?"yes":"no");
+                   acpi_battery_present(battery) ? "yes" : "no");
         if (!acpi_battery_present(battery))
                 goto end;
 
         seq_printf(seq, "capacity state:          %s\n",
-                        (battery->state & 0x04)?"critical":"ok");
+                        (battery->state & 0x04) ? "critical" : "ok");
         if ((battery->state & 0x01) && (battery->state & 0x02))
                 seq_printf(seq,
                            "charging state:          charging/discharging\n");
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 292de3cab9cc..a5bb33bab448 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -91,8 +91,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
 
 int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
 {
-        acpi_status status = AE_OK;
-
+        acpi_status status;
 
         if (!device)
                 return -EINVAL;
@@ -162,7 +161,7 @@ EXPORT_SYMBOL(acpi_bus_private_data_handler);
 
 int acpi_bus_get_private_data(acpi_handle handle, void **data)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
 
         if (!*data)
                 return -EINVAL;
@@ -361,7 +360,7 @@ extern int event_is_open;
 int acpi_bus_generate_proc_event4(const char *device_class, const char *bus_id, u8 type, int data)
 {
         struct acpi_bus_event *event;
-        unsigned long flags = 0;
+        unsigned long flags;
 
         /* drop event on the floor if no one's listening */
         if (!event_is_open)
@@ -400,7 +399,7 @@ EXPORT_SYMBOL(acpi_bus_generate_proc_event);
 
 int acpi_bus_receive_event(struct acpi_bus_event *event)
 {
-        unsigned long flags = 0;
+        unsigned long flags;
         struct acpi_bus_event *entry = NULL;
 
         DECLARE_WAITQUEUE(wait, current);
@@ -593,7 +592,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
 
 static int __init acpi_bus_init_irq(void)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
         union acpi_object arg = { ACPI_TYPE_INTEGER };
         struct acpi_object_list arg_list = { 1, &arg };
         char *message = NULL;
@@ -640,7 +639,7 @@ u8 acpi_gbl_permanent_mmap;
 
 void __init acpi_early_init(void)
 {
-        acpi_status status = AE_OK;
+        acpi_status status;
 
         if (acpi_disabled)
                 return;
@@ -714,8 +713,8 @@ void __init acpi_early_init(void)
 
 static int __init acpi_bus_init(void)
 {
-        int result = 0;
-        acpi_status status = AE_OK;
+        int result;
+        acpi_status status;
         extern acpi_status acpi_os_initialize1(void);
 
         acpi_os_initialize1();
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 31c217a42839..e9e8bb24785b 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -419,62 +419,73 @@ bool acpi_bus_can_wakeup(acpi_handle handle)
 EXPORT_SYMBOL(acpi_bus_can_wakeup);
 
 /**
- * acpi_device_power_state - Get preferred power state of ACPI device.
+ * acpi_dev_pm_get_state - Get preferred power state of ACPI device.
  * @dev: Device whose preferred target power state to return.
  * @adev: ACPI device node corresponding to @dev.
  * @target_state: System state to match the resultant device state.
- * @d_max_in: Deepest low-power state to take into consideration.
- * @d_min_p: Location to store the upper limit of the allowed states range.
- * Return value: Preferred power state of the device on success, -ENODEV
- * (if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
+ * @d_min_p: Location to store the highest power state available to the device.
+ * @d_max_p: Location to store the lowest power state available to the device.
  *
- * Find the lowest power (highest number) ACPI device power state that the
- * device can be in while the system is in the state represented by
- * @target_state.  If @d_min_p is set, the highest power (lowest number) device
- * power state that @dev can be in for the given system sleep state is stored
- * at the location pointed to by it.
+ * Find the lowest power (highest number) and highest power (lowest number) ACPI
+ * device power states that the device can be in while the system is in the
+ * state represented by @target_state.  Store the integer numbers representing
+ * those stats in the memory locations pointed to by @d_max_p and @d_min_p,
+ * respectively.
  *
  * Callers must ensure that @dev and @adev are valid pointers and that @adev
  * actually corresponds to @dev before using this function.
+ *
+ * Returns 0 on success or -ENODATA when one of the ACPI methods fails or
+ * returns a value that doesn't make sense.  The memory locations pointed to by
+ * @d_max_p and @d_min_p are only modified on success.
  */
-int acpi_device_power_state(struct device *dev, struct acpi_device *adev,
-                            u32 target_state, int d_max_in, int *d_min_p)
+static int acpi_dev_pm_get_state(struct device *dev, struct acpi_device *adev,
+                                 u32 target_state, int *d_min_p, int *d_max_p)
 {
-        char acpi_method[] = "_SxD";
-        unsigned long long d_min, d_max;
+        char method[] = { '_', 'S', '0' + target_state, 'D', '\0' };
+        acpi_handle handle = adev->handle;
+        unsigned long long ret;
+        int d_min, d_max;
         bool wakeup = false;
+        acpi_status status;
 
-        if (d_max_in < ACPI_STATE_D0 || d_max_in > ACPI_STATE_D3)
-                return -EINVAL;
-
-        if (d_max_in > ACPI_STATE_D3_HOT) {
-                enum pm_qos_flags_status stat;
-
-                stat = dev_pm_qos_flags(dev, PM_QOS_FLAG_NO_POWER_OFF);
-                if (stat == PM_QOS_FLAGS_ALL)
-                        d_max_in = ACPI_STATE_D3_HOT;
-        }
-
-        acpi_method[2] = '0' + target_state;
         /*
-         * If the sleep state is S0, the lowest limit from ACPI is D3,
-         * but if the device has _S0W, we will use the value from _S0W
-         * as the lowest limit from ACPI.  Finally, we will constrain
-         * the lowest limit with the specified one.
+         * If the system state is S0, the lowest power state the device can be
+         * in is D3cold, unless the device has _S0W and is supposed to signal
+         * wakeup, in which case the return value of _S0W has to be used as the
+         * lowest power state available to the device.
          */
         d_min = ACPI_STATE_D0;
-        d_max = ACPI_STATE_D3;
+        d_max = ACPI_STATE_D3_COLD;
 
         /*
          * If present, _SxD methods return the minimum D-state (highest power
          * state) we can use for the corresponding S-states.  Otherwise, the
          * minimum D-state is D0 (ACPI 3.x).
-         *
-         * NOTE: We rely on acpi_evaluate_integer() not clobbering the integer
-         * provided -- that's our fault recovery, we ignore retval.
          */
         if (target_state > ACPI_STATE_S0) {
-                acpi_evaluate_integer(adev->handle, acpi_method, NULL, &d_min);
+                /*
+                 * We rely on acpi_evaluate_integer() not clobbering the integer
+                 * provided if AE_NOT_FOUND is returned.
+                 */
+                ret = d_min;
+                status = acpi_evaluate_integer(handle, method, NULL, &ret);
+                if ((ACPI_FAILURE(status) && status != AE_NOT_FOUND)
+                    || ret > ACPI_STATE_D3_COLD)
+                        return -ENODATA;
+
+                /*
+                 * We need to handle legacy systems where D3hot and D3cold are
+                 * the same and 3 is returned in both cases, so fall back to
+                 * D3cold if D3hot is not a valid state.
+                 */
+                if (!adev->power.states[ret].flags.valid) {
+                        if (ret == ACPI_STATE_D3_HOT)
+                                ret = ACPI_STATE_D3_COLD;
+                        else
+                                return -ENODATA;
+                }
+                d_min = ret;
                 wakeup = device_may_wakeup(dev) && adev->wakeup.flags.valid
                         && adev->wakeup.sleep_state >= target_state;
         } else if (dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) !=
@@ -490,38 +501,30 @@ int acpi_device_power_state(struct device *dev, struct acpi_device *adev,
          * can wake the system.  _S0W may be valid, too.
          */
         if (wakeup) {
-                acpi_status status;
-
-                acpi_method[3] = 'W';
-                status = acpi_evaluate_integer(adev->handle, acpi_method, NULL,
-                                                &d_max);
-                if (ACPI_FAILURE(status)) {
-                        if (target_state != ACPI_STATE_S0 ||
-                            status != AE_NOT_FOUND)
+                method[3] = 'W';
+                status = acpi_evaluate_integer(handle, method, NULL, &ret);
+                if (status == AE_NOT_FOUND) {
+                        if (target_state > ACPI_STATE_S0)
                                 d_max = d_min;
-                } else if (d_max < d_min) {
-                        /* Warn the user of the broken DSDT */
-                        printk(KERN_WARNING "ACPI: Wrong value from %s\n",
-                                acpi_method);
-                        /* Sanitize it */
-                        d_min = d_max;
+                } else if (ACPI_SUCCESS(status) && ret <= ACPI_STATE_D3_COLD) {
+                        /* Fall back to D3cold if ret is not a valid state. */
+                        if (!adev->power.states[ret].flags.valid)
+                                ret = ACPI_STATE_D3_COLD;
+
+                        d_max = ret > d_min ? ret : d_min;
+                } else {
+                        return -ENODATA;
                 }
         }
 
-        if (d_max_in < d_min)
-                return -EINVAL;
         if (d_min_p)
                 *d_min_p = d_min;
-        /* constrain d_max with specified lowest limit (max number) */
-        if (d_max > d_max_in) {
-                for (d_max = d_max_in; d_max > d_min; d_max--) {
-                        if (adev->power.states[d_max].flags.valid)
-                                break;
-                }
-        }
-        return d_max;
+
+        if (d_max_p)
+                *d_max_p = d_max;
+
+        return 0;
 }
-EXPORT_SYMBOL_GPL(acpi_device_power_state);
 
 /**
  * acpi_pm_device_sleep_state - Get preferred power state of ACPI device.
@@ -529,7 +532,8 @@ EXPORT_SYMBOL_GPL(acpi_device_power_state);
  * @d_min_p: Location to store the upper limit of the allowed states range.
  * @d_max_in: Deepest low-power state to take into consideration.
  * Return value: Preferred power state of the device on success, -ENODEV
- * (if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
+ * if there's no 'struct acpi_device' for @dev, -EINVAL if @d_max_in is
+ * incorrect, or -ENODATA on ACPI method failure.
  *
  * The caller must ensure that @dev is valid before using this function.
  */
@@ -537,14 +541,43 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in)
 {
         acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
         struct acpi_device *adev;
+        int ret, d_min, d_max;
+
+        if (d_max_in < ACPI_STATE_D0 || d_max_in > ACPI_STATE_D3_COLD)
+                return -EINVAL;
+
+        if (d_max_in > ACPI_STATE_D3_HOT) {
+                enum pm_qos_flags_status stat;
+
+                stat = dev_pm_qos_flags(dev, PM_QOS_FLAG_NO_POWER_OFF);
+                if (stat == PM_QOS_FLAGS_ALL)
+                        d_max_in = ACPI_STATE_D3_HOT;
+        }
 
         if (!handle || acpi_bus_get_device(handle, &adev)) {
                 dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
                 return -ENODEV;
         }
 
-        return acpi_device_power_state(dev, adev, acpi_target_system_state(),
-                                       d_max_in, d_min_p);
+        ret = acpi_dev_pm_get_state(dev, adev, acpi_target_system_state(),
+                                    &d_min, &d_max);
+        if (ret)
+                return ret;
+
+        if (d_max_in < d_min)
+                return -EINVAL;
+
+        if (d_max > d_max_in) {
+                for (d_max = d_max_in; d_max > d_min; d_max--) {
+                        if (adev->power.states[d_max].flags.valid)
+                                break;
+                }
+        }
+
+        if (d_min_p)
+                *d_min_p = d_min;
+
+        return d_max;
 }
 EXPORT_SYMBOL(acpi_pm_device_sleep_state);
 
@@ -695,17 +728,13 @@ struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
 static int acpi_dev_pm_low_power(struct device *dev, struct acpi_device *adev,
                                  u32 system_state)
 {
-        int power_state;
+        int ret, state;
 
         if (!acpi_device_power_manageable(adev))
                 return 0;
 
-        power_state = acpi_device_power_state(dev, adev, system_state,
-                                              ACPI_STATE_D3, NULL);
-        if (power_state < ACPI_STATE_D0 || power_state > ACPI_STATE_D3)
-                return -EIO;
-
-        return acpi_device_set_power(adev, power_state);
+        ret = acpi_dev_pm_get_state(dev, adev, system_state, NULL, &state);
+        return ret ? ret : acpi_device_set_power(adev, state);
 }
 
 /**
@@ -908,7 +937,6 @@ static struct dev_pm_domain acpi_general_pm_domain = {
 #ifdef CONFIG_PM_RUNTIME
                 .runtime_suspend = acpi_subsys_runtime_suspend,
                 .runtime_resume = acpi_subsys_runtime_resume,
-                .runtime_idle = pm_generic_runtime_idle,
 #endif
 #ifdef CONFIG_PM_SLEEP
                 .prepare = acpi_subsys_prepare,
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index edc00818c803..80403c1a89f8 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -983,6 +983,10 @@ static struct dmi_system_id __initdata ec_dmi_table[] = {
         ec_enlarge_storm_threshold, "CLEVO hardware", {
         DMI_MATCH(DMI_SYS_VENDOR, "CLEVO Co."),
         DMI_MATCH(DMI_PRODUCT_NAME, "M720T/M730T"),}, NULL},
+        {
+        ec_skip_dsdt_scan, "HP Folio 13", {
+        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL},
         {},
 };
 
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index 7586544fddb4..4e7b798900f2 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -12,6 +12,7 @@
 #include <linux/acpi.h>
 #include <linux/debugfs.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 #include "internal.h"
 
 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
@@ -34,7 +35,6 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
          * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
          */
         unsigned int size = EC_SPACE_SIZE;
-        u8 *data = (u8 *) buf;
         loff_t init_off = *off;
         int err = 0;
 
@@ -47,9 +47,15 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
                 size = count;
 
         while (size) {
-                err = ec_read(*off, &data[*off - init_off]);
+                u8 byte_read;
+                err = ec_read(*off, &byte_read);
                 if (err)
                         return err;
+                if (put_user(byte_read, buf + *off - init_off)) {
+                        if (*off - init_off)
+                                return *off - init_off; /* partial read */
+                        return -EFAULT;
+                }
                 *off += 1;
                 size--;
         }
@@ -65,7 +71,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
 
         unsigned int size = count;
         loff_t init_off = *off;
-        u8 *data = (u8 *) buf;
         int err = 0;
 
         if (*off >= EC_SPACE_SIZE)
@@ -76,7 +81,12 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
         }
 
         while (size) {
-                u8 byte_write = data[*off - init_off];
+                u8 byte_write;
+                if (get_user(byte_write, buf + *off - init_off)) {
+                        if (*off - init_off)
+                                return *off - init_off; /* partial write */
+                        return -EFAULT;
+                }
                 err = ec_write(*off, byte_write);
                 if (err)
                         return err;
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 40a84cc6740c..f68095756fb7 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -81,13 +81,15 @@ static struct acpi_bus_type *acpi_get_bus_type(struct device *dev)
 static acpi_status do_acpi_find_child(acpi_handle handle, u32 lvl_not_used,
                                       void *addr_p, void **ret_p)
 {
-        unsigned long long addr;
+        unsigned long long addr, sta;
         acpi_status status;
 
         status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &addr);
         if (ACPI_SUCCESS(status) && addr == *((u64 *)addr_p)) {
                 *ret_p = handle;
-                return AE_CTRL_TERMINATE;
+                status = acpi_bus_get_status_handle(handle, &sta);
+                if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_ENABLED))
+                        return AE_CTRL_TERMINATE;
         }
         return AE_OK;
 }
@@ -105,7 +107,7 @@ acpi_handle acpi_get_child(acpi_handle parent, u64 address)
 }
 EXPORT_SYMBOL(acpi_get_child);
 
-static int acpi_bind_one(struct device *dev, acpi_handle handle)
+int acpi_bind_one(struct device *dev, acpi_handle handle)
 {
         struct acpi_device *acpi_dev;
         acpi_status status;
@@ -188,8 +190,9 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
         kfree(physical_node);
         goto err;
 }
+EXPORT_SYMBOL_GPL(acpi_bind_one);
 
-static int acpi_unbind_one(struct device *dev)
+int acpi_unbind_one(struct device *dev)
 {
         struct acpi_device_physical_node *entry;
         struct acpi_device *acpi_dev;
@@ -238,6 +241,7 @@ err:
         dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
         return -EINVAL;
 }
+EXPORT_SYMBOL_GPL(acpi_unbind_one);
 
 static int acpi_platform_notify(struct device *dev)
 {
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index c610a76d92c4..3a50a34fe176 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -33,6 +33,7 @@ static inline void acpi_pci_slot_init(void) { }
 void acpi_pci_root_init(void);
 void acpi_pci_link_init(void);
 void acpi_pci_root_hp_init(void);
+void acpi_processor_init(void);
 void acpi_platform_init(void);
 int acpi_sysfs_init(void);
 #ifdef CONFIG_ACPI_CONTAINER
@@ -50,6 +51,13 @@ void acpi_memory_hotplug_init(void);
 #else
 static inline void acpi_memory_hotplug_init(void) {}
 #endif
+#ifdef CONFIG_X86
+void acpi_cmos_rtc_init(void);
+#else
+static inline void acpi_cmos_rtc_init(void) {}
+#endif
+
+extern bool acpi_force_hot_remove;
 
 void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
                                     const char *name);
@@ -81,6 +89,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
                              int type, unsigned long long sta);
 void acpi_device_add_finalize(struct acpi_device *device);
 void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);
+int acpi_bind_one(struct device *dev, acpi_handle handle);
+int acpi_unbind_one(struct device *dev);
 
 /* --------------------------------------------------------------------------
                                   Power Resource
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index e72186340fec..6ab2c3505520 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -835,19 +835,9 @@ void acpi_os_stall(u32 us)
  */
 u64 acpi_os_get_timer(void)
 {
-        static u64 t;
-
-#ifdef  CONFIG_HPET
-        /* TBD: use HPET if available */
-#endif
-
-#ifdef  CONFIG_X86_PM_TIMER
-        /* TBD: default to PM timer if HPET was not available */
-#endif
-        if (!t)
-                printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n");
-
-        return ++t;
+        u64 time_ns = ktime_to_ns(ktime_get());
+        do_div(time_ns, 100);
+        return time_ns;
 }
 
 acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width)
@@ -1715,6 +1705,17 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
 }
 #endif
 
+static int __init acpi_no_auto_ssdt_setup(char *s)
+{
+        printk(KERN_NOTICE PREFIX "SSDT auto-load disabled\n");
+
+        acpi_gbl_disable_ssdt_table_load = TRUE;
+
+        return 1;
+}
+
+__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
+
 acpi_status __init acpi_os_initialize(void)
 {
         acpi_os_map_generic_address(&acpi_gbl_FADT.xpm1a_event_block);
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index c266cdc11784..823be116619e 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -1,11 +1,13 @@
 /*
- * acpi_processor.c - ACPI Processor Driver ($Revision: 71 $)
+ * processor_driver.c - ACPI Processor Driver
  *
  *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2004       Dominik Brodowski <linux@brodo.de>
  *  Copyright (C) 2004  Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  *                      - Added processor hotplug support
+ *  Copyright (C) 2013, Intel Corporation
+ *                      Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -24,55 +26,26 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *  TBD:
- *      1. Make # power states dynamic.
- *      2. Support duty_cycle values that span bit 4.
- *      3. Optimize by having scheduler determine business instead of
- *         having us try to calculate it here.
- *      4. Need C1 timing -- must modify kernel (IRQ handler) to get this.
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/pm.h>
 #include <linux/cpufreq.h>
 #include <linux/cpu.h>
-#include <linux/dmi.h>
-#include <linux/moduleparam.h>
 #include <linux/cpuidle.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
-#include <linux/memory_hotplug.h>
-
-#include <asm/io.h>
-#include <asm/cpu.h>
-#include <asm/delay.h>
-#include <asm/uaccess.h>
-#include <asm/processor.h>
-#include <asm/smp.h>
-#include <asm/acpi.h>
-
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+
 #include <acpi/processor.h>
 
+#include "internal.h"
+
 #define PREFIX "ACPI: "
 
-#define ACPI_PROCESSOR_CLASS            "processor"
-#define ACPI_PROCESSOR_DEVICE_NAME      "Processor"
-#define ACPI_PROCESSOR_FILE_INFO        "info"
-#define ACPI_PROCESSOR_FILE_THROTTLING  "throttling"
-#define ACPI_PROCESSOR_FILE_LIMIT       "limit"
 #define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
 #define ACPI_PROCESSOR_NOTIFY_POWER     0x81
 #define ACPI_PROCESSOR_NOTIFY_THROTTLING        0x82
-#define ACPI_PROCESSOR_DEVICE_HID       "ACPI0007"
-
-#define ACPI_PROCESSOR_LIMIT_USER       0
-#define ACPI_PROCESSOR_LIMIT_THERMAL    1
 
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_driver");
@@ -81,12 +54,8 @@ MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION("ACPI Processor Driver");
 MODULE_LICENSE("GPL");
 
-static int acpi_processor_add(struct acpi_device *device);
-static int acpi_processor_remove(struct acpi_device *device);
-static void acpi_processor_notify(struct acpi_device *device, u32 event);
-static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr);
-static int acpi_processor_handle_eject(struct acpi_processor *pr);
-static int acpi_processor_start(struct acpi_processor *pr);
+static int acpi_processor_start(struct device *dev);
+static int acpi_processor_stop(struct device *dev);
 
 static const struct acpi_device_id processor_device_ids[] = {
         {ACPI_PROCESSOR_OBJECT_HID, 0},
@@ -95,295 +64,24 @@ static const struct acpi_device_id processor_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, processor_device_ids);
 
-static struct acpi_driver acpi_processor_driver = {
+static struct device_driver acpi_processor_driver = {
         .name = "processor",
-        .class = ACPI_PROCESSOR_CLASS,
-        .ids = processor_device_ids,
-        .ops = {
-                .add = acpi_processor_add,
-                .remove = acpi_processor_remove,
-                .notify = acpi_processor_notify,
-                },
+        .bus = &cpu_subsys,
+        .acpi_match_table = processor_device_ids,
+        .probe = acpi_processor_start,
+        .remove = acpi_processor_stop,
 };
 
-#define INSTALL_NOTIFY_HANDLER          1
-#define UNINSTALL_NOTIFY_HANDLER        2
-
-DEFINE_PER_CPU(struct acpi_processor *, processors);
-EXPORT_PER_CPU_SYMBOL(processors);
-
-struct acpi_processor_errata errata __read_mostly;
-
-/* --------------------------------------------------------------------------
-                                Errata Handling
-   -------------------------------------------------------------------------- */
-
-static int acpi_processor_errata_piix4(struct pci_dev *dev)
-{
-        u8 value1 = 0;
-        u8 value2 = 0;
-
-
-        if (!dev)
-                return -EINVAL;
-
-        /*
-         * Note that 'dev' references the PIIX4 ACPI Controller.
-         */
-
-        switch (dev->revision) {
-        case 0:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 A-step\n"));
-                break;
-        case 1:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4 B-step\n"));
-                break;
-        case 2:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4E\n"));
-                break;
-        case 3:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found PIIX4M\n"));
-                break;
-        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found unknown PIIX4\n"));
-                break;
-        }
-
-        switch (dev->revision) {
-
-        case 0:         /* PIIX4 A-step */
-        case 1:         /* PIIX4 B-step */
-                /*
-                 * See specification changes #13 ("Manual Throttle Duty Cycle")
-                 * and #14 ("Enabling and Disabling Manual Throttle"), plus
-                 * erratum #5 ("STPCLK# Deassertion Time") from the January
-                 * 2002 PIIX4 specification update.  Applies to only older
-                 * PIIX4 models.
-                 */
-                errata.piix4.throttle = 1;
-
-        case 2:         /* PIIX4E */
-        case 3:         /* PIIX4M */
-                /*
-                 * See erratum #18 ("C3 Power State/BMIDE and Type-F DMA
-                 * Livelock") from the January 2002 PIIX4 specification update.
-                 * Applies to all PIIX4 models.
-                 */
-
-                /*
-                 * BM-IDE
-                 * ------
-                 * Find the PIIX4 IDE Controller and get the Bus Master IDE
-                 * Status register address.  We'll use this later to read
-                 * each IDE controller's DMA status to make sure we catch all
-                 * DMA activity.
-                 */
-                dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                                     PCI_DEVICE_ID_INTEL_82371AB,
-                                     PCI_ANY_ID, PCI_ANY_ID, NULL);
-                if (dev) {
-                        errata.piix4.bmisx = pci_resource_start(dev, 4);
-                        pci_dev_put(dev);
-                }
-
-                /*
-                 * Type-F DMA
-                 * ----------
-                 * Find the PIIX4 ISA Controller and read the Motherboard
-                 * DMA controller's status to see if Type-F (Fast) DMA mode
-                 * is enabled (bit 7) on either channel.  Note that we'll
-                 * disable C3 support if this is enabled, as some legacy
-                 * devices won't operate well if fast DMA is disabled.
-                 */
-                dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                                     PCI_DEVICE_ID_INTEL_82371AB_0,
-                                     PCI_ANY_ID, PCI_ANY_ID, NULL);
-                if (dev) {
-                        pci_read_config_byte(dev, 0x76, &value1);
-                        pci_read_config_byte(dev, 0x77, &value2);
-                        if ((value1 & 0x80) || (value2 & 0x80))
-                                errata.piix4.fdma = 1;
-                        pci_dev_put(dev);
-                }
-
-                break;
-        }
-
-        if (errata.piix4.bmisx)
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Bus master activity detection (BM-IDE) erratum enabled\n"));
-        if (errata.piix4.fdma)
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Type-F DMA livelock erratum (C3 disabled)\n"));
-
-        return 0;
-}
-
-static int acpi_processor_errata(struct acpi_processor *pr)
+static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
 {
-        int result = 0;
-        struct pci_dev *dev = NULL;
-
-
-        if (!pr)
-                return -EINVAL;
-
-        /*
-         * PIIX4
-         */
-        dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                             PCI_DEVICE_ID_INTEL_82371AB_3, PCI_ANY_ID,
-                             PCI_ANY_ID, NULL);
-        if (dev) {
-                result = acpi_processor_errata_piix4(dev);
-                pci_dev_put(dev);
-        }
-
-        return result;
-}
-
-/* --------------------------------------------------------------------------
-                                 Driver Interface
-   -------------------------------------------------------------------------- */
-
-static int acpi_processor_get_info(struct acpi_device *device)
-{
-        acpi_status status = 0;
-        union acpi_object object = { 0 };
-        struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
+        struct acpi_device *device = data;
         struct acpi_processor *pr;
-        int cpu_index, device_declaration = 0;
-        static int cpu0_initialized;
-
-        pr = acpi_driver_data(device);
-        if (!pr)
-                return -EINVAL;
-
-        if (num_online_cpus() > 1)
-                errata.smp = TRUE;
-
-        acpi_processor_errata(pr);
-
-        /*
-         * Check to see if we have bus mastering arbitration control.  This
-         * is required for proper C3 usage (to maintain cache coherency).
-         */
-        if (acpi_gbl_FADT.pm2_control_block && acpi_gbl_FADT.pm2_control_length) {
-                pr->flags.bm_control = 1;
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Bus mastering arbitration control present\n"));
-        } else
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "No bus mastering arbitration control\n"));
-
-        if (!strcmp(acpi_device_hid(device), ACPI_PROCESSOR_OBJECT_HID)) {
-                /* Declared with "Processor" statement; match ProcessorID */
-                status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
-                if (ACPI_FAILURE(status)) {
-                        dev_err(&device->dev,
-                                "Failed to evaluate processor object (0x%x)\n",
-                                status);
-                        return -ENODEV;
-                }
-
-                /*
-                 * TBD: Synch processor ID (via LAPIC/LSAPIC structures) on SMP.
-                 *      >>> 'acpi_get_processor_id(acpi_id, &id)' in
-                 *      arch/xxx/acpi.c
-                 */
-                pr->acpi_id = object.processor.proc_id;
-        } else {
-                /*
-                 * Declared with "Device" statement; match _UID.
-                 * Note that we don't handle string _UIDs yet.
-                 */
-                unsigned long long value;
-                status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
-                                                NULL, &value);
-                if (ACPI_FAILURE(status)) {
-                        dev_err(&device->dev,
-                                "Failed to evaluate processor _UID (0x%x)\n",
-                                status);
-                        return -ENODEV;
-                }
-                device_declaration = 1;
-                pr->acpi_id = value;
-        }
-        cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id);
-
-        /* Handle UP system running SMP kernel, with no LAPIC in MADT */
-        if (!cpu0_initialized && (cpu_index == -1) &&
-            (num_online_cpus() == 1)) {
-                cpu_index = 0;
-        }
-
-        cpu0_initialized = 1;
-
-        pr->id = cpu_index;
-
-        /*
-         *  Extra Processor objects may be enumerated on MP systems with
-         *  less than the max # of CPUs. They should be ignored _iff
-         *  they are physically not present.
-         */
-        if (pr->id == -1) {
-                if (ACPI_FAILURE(acpi_processor_hotadd_init(pr)))
-                        return -ENODEV;
-        }
-        /*
-         * On some boxes several processors use the same processor bus id.
-         * But they are located in different scope. For example:
-         * \_SB.SCK0.CPU0
-         * \_SB.SCK1.CPU0
-         * Rename the processor device bus id. And the new bus id will be
-         * generated as the following format:
-         * CPU+CPU ID.
-         */
-        sprintf(acpi_device_bid(device), "CPU%X", pr->id);
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d:%d]\n", pr->id,
-                          pr->acpi_id));
-
-        if (!object.processor.pblk_address)
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));
-        else if (object.processor.pblk_length != 6)
-                dev_err(&device->dev, "Invalid PBLK length [%d]\n",
-                            object.processor.pblk_length);
-        else {
-                pr->throttling.address = object.processor.pblk_address;
-                pr->throttling.duty_offset = acpi_gbl_FADT.duty_offset;
-                pr->throttling.duty_width = acpi_gbl_FADT.duty_width;
-
-                pr->pblk = object.processor.pblk_address;
-
-                /*
-                 * We don't care about error returns - we just try to mark
-                 * these reserved so that nobody else is confused into thinking
-                 * that this region might be unused..
-                 *
-                 * (In particular, allocating the IO range for Cardbus)
-                 */
-                request_region(pr->throttling.address, 6, "ACPI CPU throttle");
-        }
-
-        /*
-         * If ACPI describes a slot number for this CPU, we can use it
-         * ensure we get the right value in the "physical id" field
-         * of /proc/cpuinfo
-         */
-        status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);
-        if (ACPI_SUCCESS(status))
-                arch_fix_phys_package_id(pr->id, object.integer.value);
-
-        return 0;
-}
-
-static DEFINE_PER_CPU(void *, processor_device_array);
-
-static void acpi_processor_notify(struct acpi_device *device, u32 event)
-{
-        struct acpi_processor *pr = acpi_driver_data(device);
         int saved;
 
+        if (device->handle != handle)
+                return;
+
+        pr = acpi_driver_data(device);
         if (!pr)
                 return;
 
@@ -420,55 +118,62 @@ static void acpi_processor_notify(struct acpi_device *device, u32 event)
         return;
 }
 
-static int acpi_cpu_soft_notify(struct notifier_block *nfb,
-                unsigned long action, void *hcpu)
+static __cpuinit int __acpi_processor_start(struct acpi_device *device);
+
+static int __cpuinit acpi_cpu_soft_notify(struct notifier_block *nfb,
+                                          unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
         struct acpi_processor *pr = per_cpu(processors, cpu);
+        struct acpi_device *device;
+
+        if (!pr || acpi_bus_get_device(pr->handle, &device))
+                return NOTIFY_DONE;
 
-        if (action == CPU_ONLINE && pr) {
-                /* CPU got physically hotplugged and onlined the first time:
-                 * Initialize missing things
+        if (action == CPU_ONLINE) {
+                /*
+                 * CPU got physically hotplugged and onlined for the first time:
+                 * Initialize missing things.
                  */
                 if (pr->flags.need_hotplug_init) {
+                        int ret;
+
                         pr_info("Will online and init hotplugged CPU: %d\n",
                                 pr->id);
-                        WARN(acpi_processor_start(pr), "Failed to start CPU:"
-                                " %d\n", pr->id);
                         pr->flags.need_hotplug_init = 0;
-                /* Normal CPU soft online event */
+                        ret = __acpi_processor_start(device);
+                        WARN(ret, "Failed to start CPU: %d\n", pr->id);
                 } else {
+                        /* Normal CPU soft online event. */
                         acpi_processor_ppc_has_changed(pr, 0);
                         acpi_processor_hotplug(pr);
                         acpi_processor_reevaluate_tstate(pr, action);
                         acpi_processor_tstate_has_changed(pr);
                 }
-        }
-        if (action == CPU_DEAD && pr) {
-                /* invalidate the flag.throttling after one CPU is offline */
+        } else if (action == CPU_DEAD) {
+                /* Invalidate flag.throttling after the CPU is offline. */
                 acpi_processor_reevaluate_tstate(pr, action);
         }
         return NOTIFY_OK;
 }
 
-static struct notifier_block acpi_cpu_notifier =
+static struct notifier_block __refdata acpi_cpu_notifier =
 {
             .notifier_call = acpi_cpu_soft_notify,
 };
 
-/*
- * acpi_processor_start() is called by the cpu_hotplug_notifier func:
- * acpi_cpu_soft_notify(). Getting it __cpuinit{data} is difficult, the
- * root cause seem to be that acpi_processor_uninstall_hotplug_notify()
- * is in the module_exit (__exit) func. Allowing acpi_processor_start()
- * to not be in __cpuinit section, but being called from __cpuinit funcs
- * via __ref looks like the right thing to do here.
- */
-static __ref int acpi_processor_start(struct acpi_processor *pr)
+static __cpuinit int __acpi_processor_start(struct acpi_device *device)
 {
-        struct acpi_device *device = per_cpu(processor_device_array, pr->id);
+        struct acpi_processor *pr = acpi_driver_data(device);
+        acpi_status status;
         int result = 0;
 
+        if (!pr)
+                return -ENODEV;
+
+        if (pr->flags.need_hotplug_init)
+                return 0;
+
 #ifdef CONFIG_CPU_FREQ
         acpi_processor_ppc_has_changed(pr, 0);
         acpi_processor_load_module(pr);
@@ -506,462 +211,95 @@ static __ref int acpi_processor_start(struct acpi_processor *pr)
                 goto err_remove_sysfs_thermal;
         }
 
-        return 0;
+        status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
+                                             acpi_processor_notify, device);
+        if (ACPI_SUCCESS(status))
+                return 0;
 
-err_remove_sysfs_thermal:
+        sysfs_remove_link(&pr->cdev->device.kobj, "device");
+ err_remove_sysfs_thermal:
         sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-err_thermal_unregister:
+ err_thermal_unregister:
         thermal_cooling_device_unregister(pr->cdev);
-err_power_exit:
+ err_power_exit:
         acpi_processor_power_exit(pr);
-
         return result;
 }
 
-/*
- * Do not put anything in here which needs the core to be online.
- * For example MSR access or setting up things which check for cpuinfo_x86
- * (cpu_data(cpu)) values, like CPU feature flags, family, model, etc.
- * Such things have to be put in and set up above in acpi_processor_start()
- */
-static int __cpuinit acpi_processor_add(struct acpi_device *device)
+static int __cpuinit acpi_processor_start(struct device *dev)
 {
-        struct acpi_processor *pr = NULL;
-        int result = 0;
-        struct device *dev;
-
-        pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);
-        if (!pr)
-                return -ENOMEM;
-
-        if (!zalloc_cpumask_var(&pr->throttling.shared_cpu_map, GFP_KERNEL)) {
-                result = -ENOMEM;
-                goto err_free_pr;
-        }
-
-        pr->handle = device->handle;
-        strcpy(acpi_device_name(device), ACPI_PROCESSOR_DEVICE_NAME);
-        strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);
-        device->driver_data = pr;
-
-        result = acpi_processor_get_info(device);
-        if (result) {
-                /* Processor is physically not present */
-                return 0;
-        }
+        struct acpi_device *device;
 
-#ifdef CONFIG_SMP
-        if (pr->id >= setup_max_cpus && pr->id != 0)
-                return 0;
-#endif
-
-        BUG_ON(pr->id >= nr_cpu_ids);
-
-        /*
-         * Buggy BIOS check
-         * ACPI id of processors can be reported wrongly by the BIOS.
-         * Don't trust it blindly
-         */
-        if (per_cpu(processor_device_array, pr->id) != NULL &&
-            per_cpu(processor_device_array, pr->id) != device) {
-                dev_warn(&device->dev,
-                        "BIOS reported wrong ACPI id %d for the processor\n",
-                        pr->id);
-                result = -ENODEV;
-                goto err_free_cpumask;
-        }
-        per_cpu(processor_device_array, pr->id) = device;
+        if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))
+                return -ENODEV;
 
-        per_cpu(processors, pr->id) = pr;
-
-        dev = get_cpu_device(pr->id);
-        if (sysfs_create_link(&device->dev.kobj, &dev->kobj, "sysdev")) {
-                result = -EFAULT;
-                goto err_clear_processor;
-        }
-
-        /*
-         * Do not start hotplugged CPUs now, but when they
-         * are onlined the first time
-         */
-        if (pr->flags.need_hotplug_init)
-                return 0;
-
-        result = acpi_processor_start(pr);
-        if (result)
-                goto err_remove_sysfs;
-
-        return 0;
-
-err_remove_sysfs:
-        sysfs_remove_link(&device->dev.kobj, "sysdev");
-err_clear_processor:
-        /*
-         * processor_device_array is not cleared to allow checks for buggy BIOS
-         */ 
-        per_cpu(processors, pr->id) = NULL;
-err_free_cpumask:
-        free_cpumask_var(pr->throttling.shared_cpu_map);
-err_free_pr:
-        kfree(pr);
-        return result;
+        return __acpi_processor_start(device);
 }
 
-static int acpi_processor_remove(struct acpi_device *device)
+static int acpi_processor_stop(struct device *dev)
 {
-        struct acpi_processor *pr = NULL;
+        struct acpi_device *device;
+        struct acpi_processor *pr;
 
+        if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))
+                return 0;
 
-        if (!device || !acpi_driver_data(device))
-                return -EINVAL;
+        acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
+                                   acpi_processor_notify);
 
         pr = acpi_driver_data(device);
-
-        if (pr->id >= nr_cpu_ids)
-                goto free;
-
-        if (device->removal_type == ACPI_BUS_REMOVAL_EJECT) {
-                if (acpi_processor_handle_eject(pr))
-                        return -EINVAL;
-        }
+        if (!pr)
+                return 0;
 
         acpi_processor_power_exit(pr);
 
-        sysfs_remove_link(&device->dev.kobj, "sysdev");
-
         if (pr->cdev) {
                 sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
                 sysfs_remove_link(&pr->cdev->device.kobj, "device");
                 thermal_cooling_device_unregister(pr->cdev);
                 pr->cdev = NULL;
         }
-
-        per_cpu(processors, pr->id) = NULL;
-        per_cpu(processor_device_array, pr->id) = NULL;
-        try_offline_node(cpu_to_node(pr->id));
-
-free:
-        free_cpumask_var(pr->throttling.shared_cpu_map);
-        kfree(pr);
-
         return 0;
 }
 
-#ifdef CONFIG_ACPI_HOTPLUG_CPU
-/****************************************************************************
- *      Acpi processor hotplug support                                      *
- ****************************************************************************/
-
-static int is_processor_present(acpi_handle handle)
-{
-        acpi_status status;
-        unsigned long long sta = 0;
-
-
-        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-
-        if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))
-                return 1;
-
-        /*
-         * _STA is mandatory for a processor that supports hot plug
-         */
-        if (status == AE_NOT_FOUND)
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                "Processor does not support hot plug\n"));
-        else
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Processor Device is not present"));
-        return 0;
-}
-
-static void acpi_processor_hotplug_notify(acpi_handle handle,
-                                          u32 event, void *data)
-{
-        struct acpi_device *device = NULL;
-        struct acpi_eject_event *ej_event = NULL;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
-        acpi_status status;
-        int result;
-
-        acpi_scan_lock_acquire();
-
-        switch (event) {
-        case ACPI_NOTIFY_BUS_CHECK:
-        case ACPI_NOTIFY_DEVICE_CHECK:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                "Processor driver received %s event\n",
-                       (event == ACPI_NOTIFY_BUS_CHECK) ?
-                       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"));
-
-                if (!is_processor_present(handle))
-                        break;
-
-                if (!acpi_bus_get_device(handle, &device))
-                        break;
-
-                result = acpi_bus_scan(handle);
-                if (result) {
-                        acpi_handle_err(handle, "Unable to add the device\n");
-                        break;
-                }
-                result = acpi_bus_get_device(handle, &device);
-                if (result) {
-                        acpi_handle_err(handle, "Missing device object\n");
-                        break;
-                }
-                ost_code = ACPI_OST_SC_SUCCESS;
-                break;
-
-        case ACPI_NOTIFY_EJECT_REQUEST:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "received ACPI_NOTIFY_EJECT_REQUEST\n"));
-
-                if (acpi_bus_get_device(handle, &device)) {
-                        acpi_handle_err(handle,
-                                "Device don't exist, dropping EJECT\n");
-                        break;
-                }
-                if (!acpi_driver_data(device)) {
-                        acpi_handle_err(handle,
-                                "Driver data is NULL, dropping EJECT\n");
-                        break;
-                }
-
-                ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
-                if (!ej_event) {
-                        acpi_handle_err(handle, "No memory, dropping EJECT\n");
-                        break;
-                }
-
-                get_device(&device->dev);
-                ej_event->device = device;
-                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
-                /* The eject is carried out asynchronously. */
-                status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
-                                                 ej_event);
-                if (ACPI_FAILURE(status)) {
-                        put_device(&device->dev);
-                        kfree(ej_event);
-                        break;
-                }
-                goto out;
-
-        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Unsupported event [0x%x]\n", event));
-
-                /* non-hotplug event; possibly handled by other handler */
-                goto out;
-        }
-
-        /* Inform firmware that the hotplug operation has completed */
-        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
-
- out:
-        acpi_scan_lock_release();
-}
-
-static acpi_status is_processor_device(acpi_handle handle)
-{
-        struct acpi_device_info *info;
-        char *hid;
-        acpi_status status;
-
-        status = acpi_get_object_info(handle, &info);
-        if (ACPI_FAILURE(status))
-                return status;
-
-        if (info->type == ACPI_TYPE_PROCESSOR) {
-                kfree(info);
-                return AE_OK;   /* found a processor object */
-        }
-
-        if (!(info->valid & ACPI_VALID_HID)) {
-                kfree(info);
-                return AE_ERROR;
-        }
-
-        hid = info->hardware_id.string;
-        if ((hid == NULL) || strcmp(hid, ACPI_PROCESSOR_DEVICE_HID)) {
-                kfree(info);
-                return AE_ERROR;
-        }
-
-        kfree(info);
-        return AE_OK;   /* found a processor device object */
-}
-
-static acpi_status
-processor_walk_namespace_cb(acpi_handle handle,
-                            u32 lvl, void *context, void **rv)
-{
-        acpi_status status;
-        int *action = context;
-
-        status = is_processor_device(handle);
-        if (ACPI_FAILURE(status))
-                return AE_OK;   /* not a processor; continue to walk */
-
-        switch (*action) {
-        case INSTALL_NOTIFY_HANDLER:
-                acpi_install_notify_handler(handle,
-                                            ACPI_SYSTEM_NOTIFY,
-                                            acpi_processor_hotplug_notify,
-                                            NULL);
-                break;
-        case UNINSTALL_NOTIFY_HANDLER:
-                acpi_remove_notify_handler(handle,
-                                           ACPI_SYSTEM_NOTIFY,
-                                           acpi_processor_hotplug_notify);
-                break;
-        default:
-                break;
-        }
-
-        /* found a processor; skip walking underneath */
-        return AE_CTRL_DEPTH;
-}
-
-static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
-{
-        acpi_handle handle = pr->handle;
-
-        if (!is_processor_present(handle)) {
-                return AE_ERROR;
-        }
-
-        if (acpi_map_lsapic(handle, &pr->id))
-                return AE_ERROR;
-
-        if (arch_register_cpu(pr->id)) {
-                acpi_unmap_lsapic(pr->id);
-                return AE_ERROR;
-        }
-
-        /* CPU got hot-plugged, but cpu_data is not initialized yet
-         * Set flag to delay cpu_idle/throttling initialization
-         * in:
-         * acpi_processor_add()
-         *   acpi_processor_get_info()
-         * and do it when the CPU gets online the first time
-         * TBD: Cleanup above functions and try to do this more elegant.
-         */
-        pr_info("CPU %d got hotplugged\n", pr->id);
-        pr->flags.need_hotplug_init = 1;
-
-        return AE_OK;
-}
-
-static int acpi_processor_handle_eject(struct acpi_processor *pr)
-{
-        if (cpu_online(pr->id))
-                cpu_down(pr->id);
-
-        get_online_cpus();
-        /*
-         * The cpu might become online again at this point. So we check whether
-         * the cpu has been onlined or not. If the cpu became online, it means
-         * that someone wants to use the cpu. So acpi_processor_handle_eject()
-         * returns -EAGAIN.
-         */
-        if (unlikely(cpu_online(pr->id))) {
-                put_online_cpus();
-                pr_warn("Failed to remove CPU %d, because other task "
-                        "brought the CPU back online\n", pr->id);
-                return -EAGAIN;
-        }
-        arch_unregister_cpu(pr->id);
-        acpi_unmap_lsapic(pr->id);
-        put_online_cpus();
-        return (0);
-}
-#else
-static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
-{
-        return AE_ERROR;
-}
-static int acpi_processor_handle_eject(struct acpi_processor *pr)
-{
-        return (-EINVAL);
-}
-#endif
-
-static
-void acpi_processor_install_hotplug_notify(void)
-{
-#ifdef CONFIG_ACPI_HOTPLUG_CPU
-        int action = INSTALL_NOTIFY_HANDLER;
-        acpi_walk_namespace(ACPI_TYPE_ANY,
-                            ACPI_ROOT_OBJECT,
-                            ACPI_UINT32_MAX,
-                            processor_walk_namespace_cb, NULL, &action, NULL);
-#endif
-        register_hotcpu_notifier(&acpi_cpu_notifier);
-}
-
-static
-void acpi_processor_uninstall_hotplug_notify(void)
-{
-#ifdef CONFIG_ACPI_HOTPLUG_CPU
-        int action = UNINSTALL_NOTIFY_HANDLER;
-        acpi_walk_namespace(ACPI_TYPE_ANY,
-                            ACPI_ROOT_OBJECT,
-                            ACPI_UINT32_MAX,
-                            processor_walk_namespace_cb, NULL, &action, NULL);
-#endif
-        unregister_hotcpu_notifier(&acpi_cpu_notifier);
-}
-
 /*
  * We keep the driver loaded even when ACPI is not running.
  * This is needed for the powernow-k8 driver, that works even without
  * ACPI, but needs symbols from this driver
  */
 
-static int __init acpi_processor_init(void)
+static int __init acpi_processor_driver_init(void)
 {
         int result = 0;
 
         if (acpi_disabled)
                 return 0;
 
-        result = acpi_bus_register_driver(&acpi_processor_driver);
+        result = driver_register(&acpi_processor_driver);
         if (result < 0)
                 return result;
 
         acpi_processor_syscore_init();
-
-        acpi_processor_install_hotplug_notify();
-
+        register_hotcpu_notifier(&acpi_cpu_notifier);
         acpi_thermal_cpufreq_init();
-
         acpi_processor_ppc_init();
-
         acpi_processor_throttling_init();
-
         return 0;
 }
 
-static void __exit acpi_processor_exit(void)
+static void __exit acpi_processor_driver_exit(void)
 {
         if (acpi_disabled)
                 return;
 
         acpi_processor_ppc_exit();
-
         acpi_thermal_cpufreq_exit();
-
-        acpi_processor_uninstall_hotplug_notify();
-
+        unregister_hotcpu_notifier(&acpi_cpu_notifier);
         acpi_processor_syscore_exit();
-
-        acpi_bus_unregister_driver(&acpi_processor_driver);
-
-        return;
+        driver_unregister(&acpi_processor_driver);
 }
 
-module_init(acpi_processor_init);
-module_exit(acpi_processor_exit);
+module_init(acpi_processor_driver_init);
+module_exit(acpi_processor_driver_exit);
 
 MODULE_ALIAS("processor");
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index eb133c77aadb..0461ccc92c54 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -214,13 +214,13 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr,
 #ifdef CONFIG_PM_SLEEP
 static u32 saved_bm_rld;
 
-int acpi_processor_suspend(void)
+static int acpi_processor_suspend(void)
 {
         acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &saved_bm_rld);
         return 0;
 }
 
-void acpi_processor_resume(void)
+static void acpi_processor_resume(void)
 {
         u32 resumed_bm_rld;
 
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index e854582f29a6..1e9732d809bf 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -639,7 +639,7 @@ end:
 int acpi_processor_preregister_performance(
                 struct acpi_processor_performance __percpu *performance)
 {
-        int count, count_target;
+        int count_target;
         int retval = 0;
         unsigned int i, j;
         cpumask_var_t covered_cpus;
@@ -711,7 +711,6 @@ int acpi_processor_preregister_performance(
 
                 /* Validate the Domain info */
                 count_target = pdomain->num_processors;
-                count = 1;
                 if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
                         pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL;
                 else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
@@ -745,7 +744,6 @@ int acpi_processor_preregister_performance(
 
                         cpumask_set_cpu(j, covered_cpus);
                         cpumask_set_cpu(j, pr->performance->shared_cpu_map);
-                        count++;
                 }
 
                 for_each_possible_cpu(j) {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 27da63061e11..dfe76f17cfc4 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -27,6 +27,12 @@ extern struct acpi_device *acpi_root;
 
 #define ACPI_IS_ROOT_DEVICE(device)    (!(device)->parent)
 
+/*
+ * If set, devices will be hot-removed even if they cannot be put offline
+ * gracefully (from the kernel's standpoint).
+ */
+bool acpi_force_hot_remove;
+
 static const char *dummy_hid = "device";
 
 static LIST_HEAD(acpi_device_list);
@@ -120,12 +126,78 @@ acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
 
+static acpi_status acpi_bus_offline_companions(acpi_handle handle, u32 lvl,
+                                               void *data, void **ret_p)
+{
+        struct acpi_device *device = NULL;
+        struct acpi_device_physical_node *pn;
+        bool second_pass = (bool)data;
+        acpi_status status = AE_OK;
+
+        if (acpi_bus_get_device(handle, &device))
+                return AE_OK;
+
+        mutex_lock(&device->physical_node_lock);
+
+        list_for_each_entry(pn, &device->physical_node_list, node) {
+                int ret;
+
+                if (second_pass) {
+                        /* Skip devices offlined by the first pass. */
+                        if (pn->put_online)
+                                continue;
+                } else {
+                        pn->put_online = false;
+                }
+                ret = device_offline(pn->dev);
+                if (acpi_force_hot_remove)
+                        continue;
+
+                if (ret >= 0) {
+                        pn->put_online = !ret;
+                } else {
+                        *ret_p = pn->dev;
+                        if (second_pass) {
+                                status = AE_ERROR;
+                                break;
+                        }
+                }
+        }
+
+        mutex_unlock(&device->physical_node_lock);
+
+        return status;
+}
+
+static acpi_status acpi_bus_online_companions(acpi_handle handle, u32 lvl,
+                                              void *data, void **ret_p)
+{
+        struct acpi_device *device = NULL;
+        struct acpi_device_physical_node *pn;
+
+        if (acpi_bus_get_device(handle, &device))
+                return AE_OK;
+
+        mutex_lock(&device->physical_node_lock);
+
+        list_for_each_entry(pn, &device->physical_node_list, node)
+                if (pn->put_online) {
+                        device_online(pn->dev);
+                        pn->put_online = false;
+                }
+
+        mutex_unlock(&device->physical_node_lock);
+
+        return AE_OK;
+}
+
 static int acpi_scan_hot_remove(struct acpi_device *device)
 {
         acpi_handle handle = device->handle;
         acpi_handle not_used;
         struct acpi_object_list arg_list;
         union acpi_object arg;
+        struct device *errdev;
         acpi_status status;
         unsigned long long sta;
 
@@ -136,10 +208,53 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
                 return -EINVAL;
         }
 
+        lock_device_hotplug();
+
+        /*
+         * Carry out two passes here and ignore errors in the first pass,
+         * because if the devices in question are memory blocks and
+         * CONFIG_MEMCG is set, one of the blocks may hold data structures
+         * that the other blocks depend on, but it is not known in advance which
+         * block holds them.
+         *
+         * If the first pass is successful, the second one isn't needed, though.
+         */
+        errdev = NULL;
+        acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
+                            NULL, acpi_bus_offline_companions,
+                            (void *)false, (void **)&errdev);
+        acpi_bus_offline_companions(handle, 0, (void *)false, (void **)&errdev);
+        if (errdev) {
+                errdev = NULL;
+                acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
+                                    NULL, acpi_bus_offline_companions,
+                                    (void *)true , (void **)&errdev);
+                if (!errdev || acpi_force_hot_remove)
+                        acpi_bus_offline_companions(handle, 0, (void *)true,
+                                                    (void **)&errdev);
+
+                if (errdev && !acpi_force_hot_remove) {
+                        dev_warn(errdev, "Offline failed.\n");
+                        acpi_bus_online_companions(handle, 0, NULL, NULL);
+                        acpi_walk_namespace(ACPI_TYPE_ANY, handle,
+                                            ACPI_UINT32_MAX,
+                                            acpi_bus_online_companions, NULL,
+                                            NULL, NULL);
+
+                        unlock_device_hotplug();
+
+                        put_device(&device->dev);
+                        return -EBUSY;
+                }
+        }
+
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                 "Hot-removing device %s...\n", dev_name(&device->dev)));
 
         acpi_bus_trim(device);
+
+        unlock_device_hotplug();
+
         /* Device node has been unregistered. */
         put_device(&device->dev);
         device = NULL;
@@ -236,6 +351,7 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
         int error;
 
         mutex_lock(&acpi_scan_lock);
+        lock_device_hotplug();
 
         acpi_bus_get_device(handle, &device);
         if (device) {
@@ -259,6 +375,7 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
                 kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
 
  out:
+        unlock_device_hotplug();
         acpi_evaluate_hotplug_ost(handle, ost_source, ost_code, NULL);
         mutex_unlock(&acpi_scan_lock);
 }
@@ -816,32 +933,43 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device)
                                            acpi_device_notify);
 }
 
-static int acpi_bus_driver_init(struct acpi_device *, struct acpi_driver *);
-static int acpi_device_probe(struct device * dev)
+static int acpi_device_probe(struct device *dev)
 {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
         struct acpi_driver *acpi_drv = to_acpi_driver(dev->driver);
         int ret;
 
-        ret = acpi_bus_driver_init(acpi_dev, acpi_drv);
-        if (!ret) {
-                if (acpi_drv->ops.notify) {
-                        ret = acpi_device_install_notify_handler(acpi_dev);
-                        if (ret) {
-                                if (acpi_drv->ops.remove)
-                                        acpi_drv->ops.remove(acpi_dev);
-                                acpi_dev->driver = NULL;
-                                acpi_dev->driver_data = NULL;
-                                return ret;
-                        }
-                }
+        if (acpi_dev->handler)
+                return -EINVAL;
 
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "Found driver [%s] for device [%s]\n",
-                        acpi_drv->name, acpi_dev->pnp.bus_id));
-                get_device(dev);
+        if (!acpi_drv->ops.add)
+                return -ENOSYS;
+
+        ret = acpi_drv->ops.add(acpi_dev);
+        if (ret)
+                return ret;
+
+        acpi_dev->driver = acpi_drv;
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                          "Driver [%s] successfully bound to device [%s]\n",
+                          acpi_drv->name, acpi_dev->pnp.bus_id));
+
+        if (acpi_drv->ops.notify) {
+                ret = acpi_device_install_notify_handler(acpi_dev);
+                if (ret) {
+                        if (acpi_drv->ops.remove)
+                                acpi_drv->ops.remove(acpi_dev);
+
+                        acpi_dev->driver = NULL;
+                        acpi_dev->driver_data = NULL;
+                        return ret;
+                }
         }
-        return ret;
+
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found driver [%s] for device [%s]\n",
+                          acpi_drv->name, acpi_dev->pnp.bus_id));
+        get_device(dev);
+        return 0;
 }
 
 static int acpi_device_remove(struct device * dev)
@@ -952,7 +1080,6 @@ int acpi_device_add(struct acpi_device *device,
                 printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n",
                        dev_name(&device->dev));
 
-        device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
         return 0;
 
  err:
@@ -998,41 +1125,6 @@ static void acpi_device_unregister(struct acpi_device *device)
                                  Driver Management
    -------------------------------------------------------------------------- */
 /**
- * acpi_bus_driver_init - add a device to a driver
- * @device: the device to add and initialize
- * @driver: driver for the device
- *
- * Used to initialize a device via its device driver.  Called whenever a
- * driver is bound to a device.  Invokes the driver's add() ops.
- */
-static int
-acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)
-{
-        int result = 0;
-
-        if (!device || !driver)
-                return -EINVAL;
-
-        if (!driver->ops.add)
-                return -ENOSYS;
-
-        result = driver->ops.add(device);
-        if (result)
-                return result;
-
-        device->driver = driver;
-
-        /*
-         * TBD - Configuration Management: Assign resources to device based
-         * upon possible configuration and currently allocated resources.
-         */
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Driver successfully bound to device\n"));
-        return 0;
-}
-
-/**
  * acpi_bus_register_driver - register a driver with the ACPI bus
  * @driver: driver being registered
  *
@@ -1939,7 +2031,6 @@ static acpi_status acpi_bus_device_detach(acpi_handle handle, u32 lvl_not_used,
         if (!acpi_bus_get_device(handle, &device)) {
                 struct acpi_scan_handler *dev_handler = device->handler;
 
-                device->removal_type = ACPI_BUS_REMOVAL_EJECT;
                 if (dev_handler) {
                         if (dev_handler->detach)
                                 dev_handler->detach(device);
@@ -2038,8 +2129,10 @@ int __init acpi_scan_init(void)
 
         acpi_pci_root_init();
         acpi_pci_link_init();
+        acpi_processor_init();
         acpi_platform_init();
         acpi_lpss_init();
+        acpi_cmos_rtc_init();
         acpi_container_init();
         acpi_memory_hotplug_init();
         acpi_dock_init();
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 9c1a435d10e6..187ab61889e6 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -494,6 +494,8 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
                 break;
 
         case ACPI_STATE_S3:
+                if (!acpi_suspend_lowlevel)
+                        return -ENOSYS;
                 error = acpi_suspend_lowlevel();
                 if (error)
                         return error;
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index fcae5fa2e1b3..5c5d1624fa2c 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -780,6 +780,33 @@ void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
         pr_err(PREFIX "Unable to add hotplug profile '%s'\n", name);
 }
 
+static ssize_t force_remove_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", !!acpi_force_hot_remove);
+}
+
+static ssize_t force_remove_store(struct kobject *kobj,
+                                  struct kobj_attribute *attr,
+                                  const char *buf, size_t size)
+{
+        bool val;
+        int ret;
+
+        ret = strtobool(buf, &val);
+        if (ret < 0)
+                return ret;
+
+        lock_device_hotplug();
+        acpi_force_hot_remove = val;
+        unlock_device_hotplug();
+        return size;
+}
+
+static const struct kobj_attribute force_remove_attr =
+        __ATTR(force_remove, S_IRUGO | S_IWUSR, force_remove_show,
+               force_remove_store);
+
 int __init acpi_sysfs_init(void)
 {
         int result;
@@ -789,6 +816,10 @@ int __init acpi_sysfs_init(void)
                 return result;
 
         hotplug_kobj = kobject_create_and_add("hotplug", acpi_kobj);
+        result = sysfs_create_file(hotplug_kobj, &force_remove_attr.attr);
+        if (result)
+                return result;
+
         result = sysfs_create_file(acpi_kobj, &pm_profile_attr.attr);
         return result;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 440eadf2d32c..5d7075d25700 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1722,9 +1722,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
         int error;
         acpi_status status;
 
-        if (device->handler)
-                return -EINVAL;
-
         status = acpi_walk_namespace(ACPI_TYPE_DEVICE,
                                 device->parent->handle, 1,
                                 acpi_video_bus_match, NULL,
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index cdbad3a454a0..c6707278a6bb 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -284,7 +284,7 @@ static const struct dev_pm_ops amba_pm = {
         SET_RUNTIME_PM_OPS(
                 amba_pm_runtime_suspend,
                 amba_pm_runtime_resume,
-                pm_generic_runtime_idle
+                NULL
         )
 };
 
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index adf002a3c584..6e458a40a93b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5436,7 +5436,7 @@ static int ata_port_runtime_idle(struct device *dev)
                                 return -EBUSY;
         }
 
-        return pm_runtime_suspend(dev);
+        return 0;
 }
 
 static int ata_port_runtime_suspend(struct device *dev)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6fdc53d46fa0..dc3ea237f086 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -403,6 +403,36 @@ static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,
 static struct device_attribute uevent_attr =
         __ATTR(uevent, S_IRUGO | S_IWUSR, show_uevent, store_uevent);
 
+static ssize_t show_online(struct device *dev, struct device_attribute *attr,
+                           char *buf)
+{
+        bool val;
+
+        lock_device_hotplug();
+        val = !dev->offline;
+        unlock_device_hotplug();
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t store_online(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        bool val;
+        int ret;
+
+        ret = strtobool(buf, &val);
+        if (ret < 0)
+                return ret;
+
+        lock_device_hotplug();
+        ret = val ? device_online(dev) : device_offline(dev);
+        unlock_device_hotplug();
+        return ret < 0 ? ret : count;
+}
+
+static struct device_attribute online_attr =
+        __ATTR(online, S_IRUGO | S_IWUSR, show_online, store_online);
+
 static int device_add_attributes(struct device *dev,
                                  struct device_attribute *attrs)
 {
@@ -516,6 +546,12 @@ static int device_add_attrs(struct device *dev)
         if (error)
                 goto err_remove_type_groups;
 
+        if (device_supports_offline(dev) && !dev->offline_disabled) {
+                error = device_create_file(dev, &online_attr);
+                if (error)
+                        goto err_remove_type_groups;
+        }
+
         return 0;
 
  err_remove_type_groups:
@@ -536,6 +572,7 @@ static void device_remove_attrs(struct device *dev)
         struct class *class = dev->class;
         const struct device_type *type = dev->type;
 
+        device_remove_file(dev, &online_attr);
         device_remove_groups(dev, dev->groups);
 
         if (type)
@@ -1435,6 +1472,99 @@ EXPORT_SYMBOL_GPL(put_device);
 EXPORT_SYMBOL_GPL(device_create_file);
 EXPORT_SYMBOL_GPL(device_remove_file);
 
+static DEFINE_MUTEX(device_hotplug_lock);
+
+void lock_device_hotplug(void)
+{
+        mutex_lock(&device_hotplug_lock);
+}
+
+void unlock_device_hotplug(void)
+{
+        mutex_unlock(&device_hotplug_lock);
+}
+
+static int device_check_offline(struct device *dev, void *not_used)
+{
+        int ret;
+
+        ret = device_for_each_child(dev, NULL, device_check_offline);
+        if (ret)
+                return ret;
+
+        return device_supports_offline(dev) && !dev->offline ? -EBUSY : 0;
+}
+
+/**
+ * device_offline - Prepare the device for hot-removal.
+ * @dev: Device to be put offline.
+ *
+ * Execute the device bus type's .offline() callback, if present, to prepare
+ * the device for a subsequent hot-removal.  If that succeeds, the device must
+ * not be used until either it is removed or its bus type's .online() callback
+ * is executed.
+ *
+ * Call under device_hotplug_lock.
+ */
+int device_offline(struct device *dev)
+{
+        int ret;
+
+        if (dev->offline_disabled)
+                return -EPERM;
+
+        ret = device_for_each_child(dev, NULL, device_check_offline);
+        if (ret)
+                return ret;
+
+        device_lock(dev);
+        if (device_supports_offline(dev)) {
+                if (dev->offline) {
+                        ret = 1;
+                } else {
+                        ret = dev->bus->offline(dev);
+                        if (!ret) {
+                                kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
+                                dev->offline = true;
+                        }
+                }
+        }
+        device_unlock(dev);
+
+        return ret;
+}
+
+/**
+ * device_online - Put the device back online after successful device_offline().
+ * @dev: Device to be put back online.
+ *
+ * If device_offline() has been successfully executed for @dev, but the device
+ * has not been removed subsequently, execute its bus type's .online() callback
+ * to indicate that the device can be used again.
+ *
+ * Call under device_hotplug_lock.
+ */
+int device_online(struct device *dev)
+{
+        int ret = 0;
+
+        device_lock(dev);
+        if (device_supports_offline(dev)) {
+                if (dev->offline) {
+                        ret = dev->bus->online(dev);
+                        if (!ret) {
+                                kobject_uevent(&dev->kobj, KOBJ_ONLINE);
+                                dev->offline = false;
+                        }
+                } else {
+                        ret = 1;
+                }
+        }
+        device_unlock(dev);
+
+        return ret;
+}
+
 struct root_device {
         struct device dev;
         struct module *owner;
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index c377673320ed..a16d20e389f0 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -13,17 +13,21 @@
 #include <linux/gfp.h>
 #include <linux/slab.h>
 #include <linux/percpu.h>
+#include <linux/acpi.h>
 
 #include "base.h"
 
-struct bus_type cpu_subsys = {
-        .name = "cpu",
-        .dev_name = "cpu",
-};
-EXPORT_SYMBOL_GPL(cpu_subsys);
-
 static DEFINE_PER_CPU(struct device *, cpu_sys_devices);
 
+static int cpu_subsys_match(struct device *dev, struct device_driver *drv)
+{
+        /* ACPI style match is the only one that may succeed. */
+        if (acpi_driver_match_device(dev, drv))
+                return 1;
+
+        return 0;
+}
+
 #ifdef CONFIG_HOTPLUG_CPU
 static void change_cpu_under_node(struct cpu *cpu,
                         unsigned int from_nid, unsigned int to_nid)
@@ -34,65 +38,38 @@ static void change_cpu_under_node(struct cpu *cpu,
         cpu->node_id = to_nid;
 }
 
-static ssize_t show_online(struct device *dev,
-                           struct device_attribute *attr,
-                           char *buf)
+static int __ref cpu_subsys_online(struct device *dev)
 {
         struct cpu *cpu = container_of(dev, struct cpu, dev);
+        int cpuid = dev->id;
+        int from_nid, to_nid;
+        int ret;
+
+        cpu_hotplug_driver_lock();
 
-        return sprintf(buf, "%u\n", !!cpu_online(cpu->dev.id));
+        from_nid = cpu_to_node(cpuid);
+        ret = cpu_up(cpuid);
+        /*
+         * When hot adding memory to memoryless node and enabling a cpu
+         * on the node, node number of the cpu may internally change.
+         */
+        to_nid = cpu_to_node(cpuid);
+        if (from_nid != to_nid)
+                change_cpu_under_node(cpu, from_nid, to_nid);
+
+        cpu_hotplug_driver_unlock();
+        return ret;
 }
 
-static ssize_t __ref store_online(struct device *dev,
-                                  struct device_attribute *attr,
-                                  const char *buf, size_t count)
+static int cpu_subsys_offline(struct device *dev)
 {
-        struct cpu *cpu = container_of(dev, struct cpu, dev);
-        int cpuid = cpu->dev.id;
-        int from_nid, to_nid;
-        ssize_t ret;
+        int ret;
 
         cpu_hotplug_driver_lock();
-        switch (buf[0]) {
-        case '0':
-                ret = cpu_down(cpuid);
-                if (!ret)
-                        kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
-                break;
-        case '1':
-                from_nid = cpu_to_node(cpuid);
-                ret = cpu_up(cpuid);
-
-                /*
-                 * When hot adding memory to memoryless node and enabling a cpu
-                 * on the node, node number of the cpu may internally change.
-                 */
-                to_nid = cpu_to_node(cpuid);
-                if (from_nid != to_nid)
-                        change_cpu_under_node(cpu, from_nid, to_nid);
-
-                if (!ret)
-                        kobject_uevent(&dev->kobj, KOBJ_ONLINE);
-                break;
-        default:
-                ret = -EINVAL;
-        }
+        ret = cpu_down(dev->id);
         cpu_hotplug_driver_unlock();
-
-        if (ret >= 0)
-                ret = count;
         return ret;
 }
-static DEVICE_ATTR(online, 0644, show_online, store_online);
-
-static struct attribute *hotplug_cpu_attrs[] = {
-        &dev_attr_online.attr,
-        NULL
-};
-
-static struct attribute_group hotplug_cpu_attr_group = {
-        .attrs = hotplug_cpu_attrs,
-};
 
 void unregister_cpu(struct cpu *cpu)
 {
@@ -127,6 +104,17 @@ static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store);
 #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
 #endif /* CONFIG_HOTPLUG_CPU */
 
+struct bus_type cpu_subsys = {
+        .name = "cpu",
+        .dev_name = "cpu",
+        .match = cpu_subsys_match,
+#ifdef CONFIG_HOTPLUG_CPU
+        .online = cpu_subsys_online,
+        .offline = cpu_subsys_offline,
+#endif
+};
+EXPORT_SYMBOL_GPL(cpu_subsys);
+
 #ifdef CONFIG_KEXEC
 #include <linux/kexec.h>
 
@@ -185,9 +173,6 @@ static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
 #ifdef CONFIG_KEXEC
         &crash_note_cpu_attr_group,
 #endif
-#ifdef CONFIG_HOTPLUG_CPU
-        &hotplug_cpu_attr_group,
-#endif
         NULL
 };
 
@@ -302,6 +287,8 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
         cpu->dev.id = num;
         cpu->dev.bus = &cpu_subsys;
         cpu->dev.release = cpu_device_release;
+        cpu->dev.offline_disabled = !cpu->hotpluggable;
+        cpu->dev.offline = !cpu_online(num);
 #ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
         cpu->dev.bus->uevent = arch_cpu_uevent;
 #endif
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index e315051cfeeb..2b7813ec6d02 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -37,9 +37,14 @@ static inline int base_memory_block_id(int section_nr)
         return section_nr / sections_per_block;
 }
 
+static int memory_subsys_online(struct device *dev);
+static int memory_subsys_offline(struct device *dev);
+
 static struct bus_type memory_subsys = {
         .name = MEMORY_CLASS_NAME,
         .dev_name = MEMORY_CLASS_NAME,
+        .online = memory_subsys_online,
+        .offline = memory_subsys_offline,
 };
 
 static BLOCKING_NOTIFIER_HEAD(memory_chain);
@@ -262,33 +267,64 @@ static int __memory_block_change_state(struct memory_block *mem,
 {
         int ret = 0;
 
-        if (mem->state != from_state_req) {
-                ret = -EINVAL;
-                goto out;
-        }
+        if (mem->state != from_state_req)
+                return -EINVAL;
 
         if (to_state == MEM_OFFLINE)
                 mem->state = MEM_GOING_OFFLINE;
 
         ret = memory_block_action(mem->start_section_nr, to_state, online_type);
+        mem->state = ret ? from_state_req : to_state;
+        return ret;
+}
 
-        if (ret) {
-                mem->state = from_state_req;
-                goto out;
-        }
+static int memory_subsys_online(struct device *dev)
+{
+        struct memory_block *mem = container_of(dev, struct memory_block, dev);
+        int ret;
 
-        mem->state = to_state;
-        switch (mem->state) {
-        case MEM_OFFLINE:
-                kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE);
-                break;
-        case MEM_ONLINE:
-                kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE);
-                break;
-        default:
-                break;
+        mutex_lock(&mem->state_mutex);
+
+        ret = mem->state == MEM_ONLINE ? 0 :
+                __memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE,
+                                            ONLINE_KEEP);
+
+        mutex_unlock(&mem->state_mutex);
+        return ret;
+}
+
+static int memory_subsys_offline(struct device *dev)
+{
+        struct memory_block *mem = container_of(dev, struct memory_block, dev);
+        int ret;
+
+        mutex_lock(&mem->state_mutex);
+
+        ret = mem->state == MEM_OFFLINE ? 0 :
+                __memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1);
+
+        mutex_unlock(&mem->state_mutex);
+        return ret;
+}
+
+static int __memory_block_change_state_uevent(struct memory_block *mem,
+                unsigned long to_state, unsigned long from_state_req,
+                int online_type)
+{
+        int ret = __memory_block_change_state(mem, to_state, from_state_req,
+                                              online_type);
+        if (!ret) {
+                switch (mem->state) {
+                case MEM_OFFLINE:
+                        kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE);
+                        break;
+                case MEM_ONLINE:
+                        kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE);
+                        break;
+                default:
+                        break;
+                }
         }
-out:
         return ret;
 }
 
@@ -299,8 +335,8 @@ static int memory_block_change_state(struct memory_block *mem,
         int ret;
 
         mutex_lock(&mem->state_mutex);
-        ret = __memory_block_change_state(mem, to_state, from_state_req,
-                                          online_type);
+        ret = __memory_block_change_state_uevent(mem, to_state, from_state_req,
+                                                 online_type);
         mutex_unlock(&mem->state_mutex);
 
         return ret;
@@ -310,22 +346,34 @@ store_mem_state(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct memory_block *mem;
+        bool offline;
         int ret = -EINVAL;
 
         mem = container_of(dev, struct memory_block, dev);
 
-        if (!strncmp(buf, "online_kernel", min_t(int, count, 13)))
+        lock_device_hotplug();
+
+        if (!strncmp(buf, "online_kernel", min_t(int, count, 13))) {
+                offline = false;
                 ret = memory_block_change_state(mem, MEM_ONLINE,
                                                 MEM_OFFLINE, ONLINE_KERNEL);
-        else if (!strncmp(buf, "online_movable", min_t(int, count, 14)))
+        } else if (!strncmp(buf, "online_movable", min_t(int, count, 14))) {
+                offline = false;
                 ret = memory_block_change_state(mem, MEM_ONLINE,
                                                 MEM_OFFLINE, ONLINE_MOVABLE);
-        else if (!strncmp(buf, "online", min_t(int, count, 6)))
+        } else if (!strncmp(buf, "online", min_t(int, count, 6))) {
+                offline = false;
                 ret = memory_block_change_state(mem, MEM_ONLINE,
                                                 MEM_OFFLINE, ONLINE_KEEP);
-        else if(!strncmp(buf, "offline", min_t(int, count, 7)))
+        } else if(!strncmp(buf, "offline", min_t(int, count, 7))) {
+                offline = true;
                 ret = memory_block_change_state(mem, MEM_OFFLINE,
                                                 MEM_ONLINE, -1);
+        }
+        if (!ret)
+                dev->offline = offline;
+
+        unlock_device_hotplug();
 
         if (ret)
                 return ret;
@@ -523,6 +571,7 @@ int register_memory(struct memory_block *memory)
         memory->dev.id = memory->start_section_nr / sections_per_block;
         memory->dev.release = memory_block_release;
         memory->dev.groups = memory_memblk_attr_groups;
+        memory->dev.offline = memory->state == MEM_OFFLINE;
 
         error = device_register(&memory->dev);
         return error;
@@ -646,21 +695,6 @@ int unregister_memory_section(struct mem_section *section)
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
-/*
- * offline one memory block. If the memory block has been offlined, do nothing.
- */
-int offline_memory_block(struct memory_block *mem)
-{
-        int ret = 0;
-
-        mutex_lock(&mem->state_mutex);
-        if (mem->state != MEM_OFFLINE)
-                ret = __memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1);
-        mutex_unlock(&mem->state_mutex);
-
-        return ret;
-}
-
 /* return true if the memory block is offlined, otherwise, return false */
 bool is_memblock_offlined(struct memory_block *mem)
 {
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ed75cf6ef9c9..6eaa7ab9e4bc 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -890,7 +890,6 @@ int platform_pm_restore(struct device *dev)
 static const struct dev_pm_ops platform_dev_pm_ops = {
         .runtime_suspend = pm_generic_runtime_suspend,
         .runtime_resume = pm_generic_runtime_resume,
-        .runtime_idle = pm_generic_runtime_idle,
         USE_PLATFORM_PM_SLEEP_OPS
 };
 
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 7072404c8b6d..bfb8955c406c 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2143,7 +2143,6 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
         genpd->max_off_time_changed = true;
         genpd->domain.ops.runtime_suspend = pm_genpd_runtime_suspend;
         genpd->domain.ops.runtime_resume = pm_genpd_runtime_resume;
-        genpd->domain.ops.runtime_idle = pm_generic_runtime_idle;
         genpd->domain.ops.prepare = pm_genpd_prepare;
         genpd->domain.ops.suspend = pm_genpd_suspend;
         genpd->domain.ops.suspend_late = pm_genpd_suspend_late;
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index bfd898b8988e..5ee030a864f9 100644
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -12,29 +12,6 @@
 
 #ifdef CONFIG_PM_RUNTIME
 /**
- * pm_generic_runtime_idle - Generic runtime idle callback for subsystems.
- * @dev: Device to handle.
- *
- * If PM operations are defined for the @dev's driver and they include
- * ->runtime_idle(), execute it and return its error code, if nonzero.
- * Otherwise, execute pm_runtime_suspend() for the device and return 0.
- */
-int pm_generic_runtime_idle(struct device *dev)
-{
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-        if (pm && pm->runtime_idle) {
-                int ret = pm->runtime_idle(dev);
-                if (ret)
-                        return ret;
-        }
-
-        pm_runtime_suspend(dev);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(pm_generic_runtime_idle);
-
-/**
  * pm_generic_runtime_suspend - Generic runtime suspend callback for subsystems.
  * @dev: Device to suspend.
  *
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index f0077cb8e249..c8ec186303db 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -648,14 +648,14 @@ int opp_init_cpufreq_table(struct device *dev,
 
         list_for_each_entry(opp, &dev_opp->opp_list, node) {
                 if (opp->available) {
-                        freq_table[i].index = i;
+                        freq_table[i].driver_data = i;
                         freq_table[i].frequency = opp->rate / 1000;
                         i++;
                 }
         }
         mutex_unlock(&dev_opp_list_lock);
 
-        freq_table[i].index = i;
+        freq_table[i].driver_data = i;
         freq_table[i].frequency = CPUFREQ_TABLE_END;
 
         *table = &freq_table[0];
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 71671c42ef45..5c1361a9e5dd 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -42,6 +42,7 @@
 #include <linux/export.h>
 #include <linux/pm_runtime.h>
 #include <linux/err.h>
+#include <trace/events/power.h>
 
 #include "power.h"
 
@@ -305,6 +306,7 @@ int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req,
         else if (!dev->power.qos)
                 ret = dev_pm_qos_constraints_allocate(dev);
 
+        trace_dev_pm_qos_add_request(dev_name(dev), type, value);
         if (!ret) {
                 req->dev = dev;
                 req->type = type;
@@ -349,6 +351,8 @@ static int __dev_pm_qos_update_request(struct dev_pm_qos_request *req,
                 return -EINVAL;
         }
 
+        trace_dev_pm_qos_update_request(dev_name(req->dev), req->type,
+                                        new_value);
         if (curr_value != new_value)
                 ret = apply_constraint(req, PM_QOS_UPDATE_REQ, new_value);
 
@@ -398,6 +402,8 @@ static int __dev_pm_qos_remove_request(struct dev_pm_qos_request *req)
         if (IS_ERR_OR_NULL(req->dev->power.qos))
                 return -ENODEV;
 
+        trace_dev_pm_qos_remove_request(dev_name(req->dev), req->type,
+                                        PM_QOS_DEFAULT_VALUE);
         ret = apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
         memset(req, 0, sizeof(*req));
         return ret;
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index ef13ad08afb2..268a35097578 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -293,11 +293,8 @@ static int rpm_idle(struct device *dev, int rpmflags)
         /* Pending requests need to be canceled. */
         dev->power.request = RPM_REQ_NONE;
 
-        if (dev->power.no_callbacks) {
-                /* Assume ->runtime_idle() callback would have suspended. */
-                retval = rpm_suspend(dev, rpmflags);
+        if (dev->power.no_callbacks)
                 goto out;
-        }
 
         /* Carry out an asynchronous or a synchronous idle notification. */
         if (rpmflags & RPM_ASYNC) {
@@ -306,7 +303,8 @@ static int rpm_idle(struct device *dev, int rpmflags)
                         dev->power.request_pending = true;
                         queue_work(pm_wq, &dev->power.work);
                 }
-                goto out;
+                trace_rpm_return_int(dev, _THIS_IP_, 0);
+                return 0;
         }
 
         dev->power.idle_notification = true;
@@ -326,14 +324,14 @@ static int rpm_idle(struct device *dev, int rpmflags)
                 callback = dev->driver->pm->runtime_idle;
 
         if (callback)
-                __rpm_callback(callback, dev);
+                retval = __rpm_callback(callback, dev);
 
         dev->power.idle_notification = false;
         wake_up_all(&dev->power.wait_queue);
 
  out:
         trace_rpm_return_int(dev, _THIS_IP_, retval);
-        return retval;
+        return retval ? retval : rpm_suspend(dev, rpmflags);
 }
 
 /**
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 79715e7fa43e..2d56f4113ae7 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -659,7 +659,7 @@ void pm_wakeup_event(struct device *dev, unsigned int msec)
 }
 EXPORT_SYMBOL_GPL(pm_wakeup_event);
 
-static void print_active_wakeup_sources(void)
+void pm_print_active_wakeup_sources(void)
 {
         struct wakeup_source *ws;
         int active = 0;
@@ -683,6 +683,7 @@ static void print_active_wakeup_sources(void)
                         last_activity_ws->name);
         rcu_read_unlock();
 }
+EXPORT_SYMBOL_GPL(pm_print_active_wakeup_sources);
 
 /**
  * pm_wakeup_pending - Check if power transition in progress should be aborted.
@@ -707,8 +708,10 @@ bool pm_wakeup_pending(void)
         }
         spin_unlock_irqrestore(&events_lock, flags);
 
-        if (ret)
-                print_active_wakeup_sources();
+        if (ret) {
+                pr_info("PM: Wakeup pending, aborting suspend\n");
+                pm_print_active_wakeup_sources();
+        }
 
         return ret;
 }
diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c
index 4f45eee9e33b..812f83f8b0c6 100644
--- a/drivers/clk/x86/clk-lpt.c
+++ b/drivers/clk/x86/clk-lpt.c
@@ -1,5 +1,5 @@
 /*
- * Intel Lynxpoint LPSS clocks.
+ * Intel Low Power Subsystem clocks.
  *
  * Copyright (C) 2013, Intel Corporation
  * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
@@ -18,8 +18,6 @@
 #include <linux/platform_data/clk-lpss.h>
 #include <linux/platform_device.h>
 
-#define PRV_CLOCK_PARAMS 0x800
-
 static int lpt_clk_probe(struct platform_device *pdev)
 {
         struct lpss_clk_data *drvdata;
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index a92440896868..de4d5d93c3fd 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -5,6 +5,7 @@
 config ARM_BIG_LITTLE_CPUFREQ
         tristate "Generic ARM big LITTLE CPUfreq driver"
         depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK
+        select CPU_FREQ_TABLE
         help
           This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.
 
@@ -18,6 +19,7 @@ config ARM_DT_BL_CPUFREQ
 config ARM_EXYNOS_CPUFREQ
         bool "SAMSUNG EXYNOS SoCs"
         depends on ARCH_EXYNOS
+        select CPU_FREQ_TABLE
         default y
         help
           This adds the CPUFreq driver common part for Samsung
@@ -46,6 +48,7 @@ config ARM_EXYNOS5250_CPUFREQ
 config ARM_EXYNOS5440_CPUFREQ
         def_bool SOC_EXYNOS5440
         depends on HAVE_CLK && PM_OPP && OF
+        select CPU_FREQ_TABLE
         help
           This adds the CPUFreq driver for Samsung EXYNOS5440
           SoC. The nature of exynos5440 clock controller is
@@ -55,7 +58,6 @@ config ARM_EXYNOS5440_CPUFREQ
 config ARM_HIGHBANK_CPUFREQ
         tristate "Calxeda Highbank-based"
         depends on ARCH_HIGHBANK
-        select CPU_FREQ_TABLE
         select GENERIC_CPUFREQ_CPU0
         select PM_OPP
         select REGULATOR
@@ -71,6 +73,7 @@ config ARM_IMX6Q_CPUFREQ
         tristate "Freescale i.MX6Q cpufreq support"
         depends on SOC_IMX6Q
         depends on REGULATOR_ANATOP
+        select CPU_FREQ_TABLE
         help
           This adds cpufreq driver support for Freescale i.MX6Q SOC.
 
@@ -86,6 +89,7 @@ config ARM_INTEGRATOR
 
 config ARM_KIRKWOOD_CPUFREQ
         def_bool ARCH_KIRKWOOD && OF
+        select CPU_FREQ_TABLE
         help
           This adds the CPUFreq driver for Marvell Kirkwood
           SoCs.
@@ -149,6 +153,7 @@ config ARM_S3C2412_CPUFREQ
 config ARM_S3C2416_CPUFREQ
         bool "S3C2416 CPU Frequency scaling support"
         depends on CPU_S3C2416
+        select CPU_FREQ_TABLE
         help
           This adds the CPUFreq driver for the Samsung S3C2416 and
           S3C2450 SoC. The S3C2416 supports changing the rate of the
@@ -179,6 +184,7 @@ config ARM_S3C2440_CPUFREQ
 config ARM_S3C64XX_CPUFREQ
         bool "Samsung S3C64XX"
         depends on CPU_S3C6410
+        select CPU_FREQ_TABLE
         default y
         help
           This adds the CPUFreq driver for Samsung S3C6410 SoC.
@@ -205,6 +211,15 @@ config ARM_SA1110_CPUFREQ
 config ARM_SPEAR_CPUFREQ
         bool "SPEAr CPUFreq support"
         depends on PLAT_SPEAR
+        select CPU_FREQ_TABLE
         default y
         help
           This adds the CPUFreq driver support for SPEAr SOCs.
+
+config ARM_TEGRA_CPUFREQ
+        bool "TEGRA CPUFreq support"
+        depends on ARCH_TEGRA
+        select CPU_FREQ_TABLE
+        default y
+        help
+          This adds the CPUFreq driver support for TEGRA SOCs.
diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc
index 9c926ca0d718..25ca9db62e09 100644
--- a/drivers/cpufreq/Kconfig.powerpc
+++ b/drivers/cpufreq/Kconfig.powerpc
@@ -1,6 +1,7 @@
 config CPU_FREQ_CBE
         tristate "CBE frequency scaling"
         depends on CBE_RAS && PPC_CELL
+        select CPU_FREQ_TABLE
         default m
         help
           This adds the cpufreq driver for Cell BE processors.
@@ -23,3 +24,39 @@ config CPU_FREQ_MAPLE
         help
           This adds support for frequency switching on Maple 970FX
           Evaluation Board and compatible boards (IBM JS2x blades).
+
+config PPC_CORENET_CPUFREQ
+        tristate "CPU frequency scaling driver for Freescale E500MC SoCs"
+        depends on PPC_E500MC && OF && COMMON_CLK
+        select CPU_FREQ_TABLE
+        select CLK_PPC_CORENET
+        help
+          This adds the CPUFreq driver support for Freescale e500mc,
+          e5500 and e6500 series SoCs which are capable of changing
+          the CPU's frequency dynamically.
+
+config CPU_FREQ_PMAC
+        bool "Support for Apple PowerBooks"
+        depends on ADB_PMU && PPC32
+        select CPU_FREQ_TABLE
+        help
+          This adds support for frequency switching on Apple PowerBooks,
+          this currently includes some models of iBook & Titanium
+          PowerBook.
+
+config CPU_FREQ_PMAC64
+        bool "Support for some Apple G5s"
+        depends on PPC_PMAC && PPC64
+        select CPU_FREQ_TABLE
+        help
+          This adds support for frequency switching on Apple iMac G5,
+          and some of the more recent desktop G5 machines as well.
+
+config PPC_PASEMI_CPUFREQ
+        bool "Support for PA Semi PWRficient"
+        depends on PPC_PASEMI
+        select CPU_FREQ_TABLE
+        default y
+        help
+          This adds the support for frequency switching on PA Semi
+          PWRficient processors.
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index 6bd63d63d356..e2b6eabef221 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -132,6 +132,7 @@ config X86_POWERNOW_K8
 config X86_AMD_FREQ_SENSITIVITY
         tristate "AMD frequency sensitivity feedback powersave bias"
         depends on CPU_FREQ_GOV_ONDEMAND && X86_ACPI_CPUFREQ && CPU_SUP_AMD
+        select CPU_FREQ_TABLE
         help
           This adds AMD-specific powersave bias function to the ondemand
           governor, which allows it to make more power-conscious frequency
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 6ad0b913ca17..d345b5a7aa71 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -76,7 +76,7 @@ obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o
 obj-$(CONFIG_ARM_SA1100_CPUFREQ)        += sa1100-cpufreq.o
 obj-$(CONFIG_ARM_SA1110_CPUFREQ)        += sa1110-cpufreq.o
 obj-$(CONFIG_ARM_SPEAR_CPUFREQ)         += spear-cpufreq.o
-obj-$(CONFIG_ARCH_TEGRA)                += tegra-cpufreq.o
+obj-$(CONFIG_ARM_TEGRA_CPUFREQ)         += tegra-cpufreq.o
 
 ##################################################################################
 # PowerPC platform drivers
@@ -84,11 +84,15 @@ obj-$(CONFIG_CPU_FREQ_CBE)		+= ppc-cbe-cpufreq.o
 ppc-cbe-cpufreq-y                       += ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o
 obj-$(CONFIG_CPU_FREQ_CBE_PMI)          += ppc_cbe_cpufreq_pmi.o
 obj-$(CONFIG_CPU_FREQ_MAPLE)            += maple-cpufreq.o
+obj-$(CONFIG_PPC_CORENET_CPUFREQ)   += ppc-corenet-cpufreq.o
+obj-$(CONFIG_CPU_FREQ_PMAC)             += pmac32-cpufreq.o
+obj-$(CONFIG_CPU_FREQ_PMAC64)           += pmac64-cpufreq.o
+obj-$(CONFIG_PPC_PASEMI_CPUFREQ)        += pasemi-cpufreq.o
 
 ##################################################################################
 # Other platform drivers
 obj-$(CONFIG_AVR32_AT32AP_CPUFREQ)      += at32ap-cpufreq.o
-obj-$(CONFIG_BLACKFIN)                  += blackfin-cpufreq.o
+obj-$(CONFIG_BFIN_CPU_FREQ)             += blackfin-cpufreq.o
 obj-$(CONFIG_CRIS_MACH_ARTPEC3)         += cris-artpec3-cpufreq.o
 obj-$(CONFIG_ETRAXFS)                   += cris-etraxfs-cpufreq.o
 obj-$(CONFIG_IA64_ACPI_CPUFREQ)         += ia64-acpi-cpufreq.o
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index edc089e9d0c4..39264020b88a 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -70,6 +70,7 @@ struct acpi_cpufreq_data {
         struct cpufreq_frequency_table *freq_table;
         unsigned int resume;
         unsigned int cpu_feature;
+        cpumask_var_t freqdomain_cpus;
 };
 
 static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
@@ -176,6 +177,15 @@ static struct global_attr global_boost = __ATTR(boost, 0644,
                                                 show_global_boost,
                                                 store_global_boost);
 
+static ssize_t show_freqdomain_cpus(struct cpufreq_policy *policy, char *buf)
+{
+        struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
+
+        return cpufreq_show_cpus(data->freqdomain_cpus, buf);
+}
+
+cpufreq_freq_attr_ro(freqdomain_cpus);
+
 #ifdef CONFIG_X86_ACPI_CPUFREQ_CPB
 static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
                          size_t count)
@@ -232,7 +242,7 @@ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
         perf = data->acpi_data;
 
         for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                if (msr == perf->states[data->freq_table[i].index].status)
+                if (msr == perf->states[data->freq_table[i].driver_data].status)
                         return data->freq_table[i].frequency;
         }
         return data->freq_table[0].frequency;
@@ -442,7 +452,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                 goto out;
         }
 
-        next_perf_state = data->freq_table[next_state].index;
+        next_perf_state = data->freq_table[next_state].driver_data;
         if (perf->state == next_perf_state) {
                 if (unlikely(data->resume)) {
                         pr_debug("Called after resume, resetting to P%d\n",
@@ -494,12 +504,14 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                         pr_debug("acpi_cpufreq_target failed (%d)\n",
                                 policy->cpu);
                         result = -EAGAIN;
-                        goto out;
+                        freqs.new = freqs.old;
                 }
         }
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
-        perf->state = next_perf_state;
+
+        if (!result)
+                perf->state = next_perf_state;
 
 out:
         return result;
@@ -702,6 +714,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
         if (!data)
                 return -ENOMEM;
 
+        if (!zalloc_cpumask_var(&data->freqdomain_cpus, GFP_KERNEL)) {
+                result = -ENOMEM;
+                goto err_free;
+        }
+
         data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
         per_cpu(acfreq_data, cpu) = data;
 
@@ -710,7 +727,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
         result = acpi_processor_register_performance(data->acpi_data, cpu);
         if (result)
-                goto err_free;
+                goto err_free_mask;
 
         perf = data->acpi_data;
         policy->shared_type = perf->shared_type;
@@ -723,6 +740,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
             policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {
                 cpumask_copy(policy->cpus, perf->shared_cpu_map);
         }
+        cpumask_copy(data->freqdomain_cpus, perf->shared_cpu_map);
 
 #ifdef CONFIG_SMP
         dmi_check_system(sw_any_bug_dmi_table);
@@ -734,6 +752,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
         if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) {
                 cpumask_clear(policy->cpus);
                 cpumask_set_cpu(cpu, policy->cpus);
+                cpumask_copy(data->freqdomain_cpus, cpu_sibling_mask(cpu));
                 policy->shared_type = CPUFREQ_SHARED_TYPE_HW;
                 pr_info_once(PFX "overriding BIOS provided _PSD data\n");
         }
@@ -811,7 +830,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                     data->freq_table[valid_states-1].frequency / 1000)
                         continue;
 
-                data->freq_table[valid_states].index = i;
+                data->freq_table[valid_states].driver_data = i;
                 data->freq_table[valid_states].frequency =
                     perf->states[i].core_frequency * 1000;
                 valid_states++;
@@ -868,6 +887,8 @@ err_freqfree:
         kfree(data->freq_table);
 err_unreg:
         acpi_processor_unregister_performance(perf, cpu);
+err_free_mask:
+        free_cpumask_var(data->freqdomain_cpus);
 err_free:
         kfree(data);
         per_cpu(acfreq_data, cpu) = NULL;
@@ -886,6 +907,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
                 per_cpu(acfreq_data, policy->cpu) = NULL;
                 acpi_processor_unregister_performance(data->acpi_data,
                                                       policy->cpu);
+                free_cpumask_var(data->freqdomain_cpus);
                 kfree(data->freq_table);
                 kfree(data);
         }
@@ -906,6 +928,7 @@ static int acpi_cpufreq_resume(struct cpufreq_policy *policy)
 
 static struct freq_attr *acpi_cpufreq_attr[] = {
         &cpufreq_freq_attr_scaling_available_freqs,
+        &freqdomain_cpus,
         NULL,   /* this is a placeholder for cpb, do not remove */
         NULL,
 };
@@ -947,7 +970,7 @@ static void __init acpi_cpufreq_boost_init(void)
         /* We create the boost file in any case, though for systems without
          * hardware support it will be read-only and hardwired to return 0.
          */
-        if (sysfs_create_file(cpufreq_global_kobject, &(global_boost.attr)))
+        if (cpufreq_sysfs_create_file(&(global_boost.attr)))
                 pr_warn(PFX "could not register global boost sysfs file\n");
         else
                 pr_debug("registered global boost sysfs file\n");
@@ -955,7 +978,7 @@ static void __init acpi_cpufreq_boost_init(void)
 
 static void __exit acpi_cpufreq_boost_exit(void)
 {
-        sysfs_remove_file(cpufreq_global_kobject, &(global_boost.attr));
+        cpufreq_sysfs_remove_file(&(global_boost.attr));
 
         if (msrs) {
                 unregister_cpu_notifier(&boost_nb);
@@ -1034,4 +1057,11 @@ static const struct x86_cpu_id acpi_cpufreq_ids[] = {
 };
 MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
 
+static const struct acpi_device_id processor_device_ids[] = {
+        {ACPI_PROCESSOR_OBJECT_HID, },
+        {ACPI_PROCESSOR_DEVICE_HID, },
+        {},
+};
+MODULE_DEVICE_TABLE(acpi, processor_device_ids);
+
 MODULE_ALIAS("acpi");
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index 5d7f53fcd6f5..3549f0784af1 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -84,11 +84,9 @@ static int bL_cpufreq_set_target(struct cpufreq_policy *policy,
         ret = clk_set_rate(clk[cur_cluster], freqs.new * 1000);
         if (ret) {
                 pr_err("clk_set_rate failed: %d\n", ret);
-                return ret;
+                freqs.new = freqs.old;
         }
 
-        policy->cur = freqs.new;
-
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
diff --git a/drivers/cpufreq/blackfin-cpufreq.c b/drivers/cpufreq/blackfin-cpufreq.c
index 995511e80bef..9cdbbd278a80 100644
--- a/drivers/cpufreq/blackfin-cpufreq.c
+++ b/drivers/cpufreq/blackfin-cpufreq.c
@@ -20,23 +20,23 @@
 
 
 /* this is the table of CCLK frequencies, in Hz */
-/* .index is the entry in the auxiliary dpm_state_table[] */
+/* .driver_data is the entry in the auxiliary dpm_state_table[] */
 static struct cpufreq_frequency_table bfin_freq_table[] = {
         {
                 .frequency = CPUFREQ_TABLE_END,
-                .index = 0,
+                .driver_data = 0,
         },
         {
                 .frequency = CPUFREQ_TABLE_END,
-                .index = 1,
+                .driver_data = 1,
         },
         {
                 .frequency = CPUFREQ_TABLE_END,
-                .index = 2,
+                .driver_data = 2,
         },
         {
                 .frequency = CPUFREQ_TABLE_END,
-                .index = 0,
+                .driver_data = 0,
         },
 };
 
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2d53f47d1747..6a015ada5285 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2001 Russell King
  *            (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
+ *            (C) 2013 Viresh Kumar <viresh.kumar@linaro.org>
  *
  *  Oct 2005 - Ashok Raj <ashok.raj@intel.com>
  *      Added handling for CPU hotplug
@@ -12,12 +13,13 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <asm/cputime.h>
 #include <linux/kernel.h>
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/notifier.h>
@@ -25,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/tick.h>
 #include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/cpu.h>
@@ -41,11 +44,13 @@
  */
 static struct cpufreq_driver *cpufreq_driver;
 static DEFINE_PER_CPU(struct cpufreq_policy *, cpufreq_cpu_data);
+static DEFINE_RWLOCK(cpufreq_driver_lock);
+static DEFINE_MUTEX(cpufreq_governor_lock);
+
 #ifdef CONFIG_HOTPLUG_CPU
 /* This one keeps track of the previously set governor of a removed CPU */
 static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor);
 #endif
-static DEFINE_RWLOCK(cpufreq_driver_lock);
 
 /*
  * cpu_policy_rwsem is a per CPU reader-writer semaphore designed to cure
@@ -132,6 +137,51 @@ bool have_governor_per_policy(void)
 {
         return cpufreq_driver->have_governor_per_policy;
 }
+EXPORT_SYMBOL_GPL(have_governor_per_policy);
+
+struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy)
+{
+        if (have_governor_per_policy())
+                return &policy->kobj;
+        else
+                return cpufreq_global_kobject;
+}
+EXPORT_SYMBOL_GPL(get_governor_parent_kobj);
+
+static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
+{
+        u64 idle_time;
+        u64 cur_wall_time;
+        u64 busy_time;
+
+        cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());
+
+        busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
+        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];
+        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];
+        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];
+        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];
+        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
+
+        idle_time = cur_wall_time - busy_time;
+        if (wall)
+                *wall = cputime_to_usecs(cur_wall_time);
+
+        return cputime_to_usecs(idle_time);
+}
+
+u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)
+{
+        u64 idle_time = get_cpu_idle_time_us(cpu, io_busy ? wall : NULL);
+
+        if (idle_time == -1ULL)
+                return get_cpu_idle_time_jiffy(cpu, wall);
+        else if (!io_busy)
+                idle_time += get_cpu_iowait_time_us(cpu, wall);
+
+        return idle_time;
+}
+EXPORT_SYMBOL_GPL(get_cpu_idle_time);
 
 static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
 {
@@ -150,7 +200,6 @@ static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
         if (!try_module_get(cpufreq_driver->owner))
                 goto err_out_unlock;
 
-
         /* get the CPU */
         data = per_cpu(cpufreq_cpu_data, cpu);
 
@@ -220,7 +269,7 @@ static void cpufreq_cpu_put_sysfs(struct cpufreq_policy *data)
  */
 #ifndef CONFIG_SMP
 static unsigned long l_p_j_ref;
-static unsigned int  l_p_j_ref_freq;
+static unsigned int l_p_j_ref_freq;
 
 static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
 {
@@ -233,7 +282,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
                 pr_debug("saving %lu as reference value for loops_per_jiffy; "
                         "freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);
         }
-        if ((val == CPUFREQ_POSTCHANGE  && ci->old != ci->new) ||
+        if ((val == CPUFREQ_POSTCHANGE && ci->old != ci->new) ||
             (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {
                 loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq,
                                                                 ci->new);
@@ -248,8 +297,7 @@ static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
 }
 #endif
 
-
-void __cpufreq_notify_transition(struct cpufreq_policy *policy,
+static void __cpufreq_notify_transition(struct cpufreq_policy *policy,
                 struct cpufreq_freqs *freqs, unsigned int state)
 {
         BUG_ON(irqs_disabled());
@@ -264,6 +312,12 @@ void __cpufreq_notify_transition(struct cpufreq_policy *policy,
         switch (state) {
 
         case CPUFREQ_PRECHANGE:
+                if (WARN(policy->transition_ongoing,
+                                "In middle of another frequency transition\n"))
+                        return;
+
+                policy->transition_ongoing = true;
+
                 /* detect if the driver reported a value as "old frequency"
                  * which is not equal to what the cpufreq core thinks is
                  * "old frequency".
@@ -283,6 +337,12 @@ void __cpufreq_notify_transition(struct cpufreq_policy *policy,
                 break;
 
         case CPUFREQ_POSTCHANGE:
+                if (WARN(!policy->transition_ongoing,
+                                "No frequency transition in progress\n"))
+                        return;
+
+                policy->transition_ongoing = false;
+
                 adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
                 pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new,
                         (unsigned long)freqs->cpu);
@@ -294,6 +354,7 @@ void __cpufreq_notify_transition(struct cpufreq_policy *policy,
                 break;
         }
 }
+
 /**
  * cpufreq_notify_transition - call notifier chain and adjust_jiffies
  * on frequency transition.
@@ -311,7 +372,6 @@ void cpufreq_notify_transition(struct cpufreq_policy *policy,
 EXPORT_SYMBOL_GPL(cpufreq_notify_transition);
 
 
-
 /*********************************************************************
  *                          SYSFS INTERFACE                          *
  *********************************************************************/
@@ -376,7 +436,6 @@ out:
         return err;
 }
 
-
 /**
  * cpufreq_per_cpu_attr_read() / show_##file_name() -
  * print out cpufreq information
@@ -441,7 +500,6 @@ static ssize_t show_cpuinfo_cur_freq(struct cpufreq_policy *policy,
         return sprintf(buf, "%u\n", cur_freq);
 }
 
-
 /**
  * show_scaling_governor - show the current policy for the specified CPU
  */
@@ -457,7 +515,6 @@ static ssize_t show_scaling_governor(struct cpufreq_policy *policy, char *buf)
         return -EINVAL;
 }
 
-
 /**
  * store_scaling_governor - store policy for the specified CPU
  */
@@ -480,8 +537,10 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
                                                 &new_policy.governor))
                 return -EINVAL;
 
-        /* Do not use cpufreq_set_policy here or the user_policy.max
-           will be wrongly overridden */
+        /*
+         * Do not use cpufreq_set_policy here or the user_policy.max
+         * will be wrongly overridden
+         */
         ret = __cpufreq_set_policy(policy, &new_policy);
 
         policy->user_policy.policy = policy->policy;
@@ -526,7 +585,7 @@ out:
         return i;
 }
 
-static ssize_t show_cpus(const struct cpumask *mask, char *buf)
+ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf)
 {
         ssize_t i = 0;
         unsigned int cpu;
@@ -541,6 +600,7 @@ static ssize_t show_cpus(const struct cpumask *mask, char *buf)
         i += sprintf(&buf[i], "\n");
         return i;
 }
+EXPORT_SYMBOL_GPL(cpufreq_show_cpus);
 
 /**
  * show_related_cpus - show the CPUs affected by each transition even if
@@ -548,7 +608,7 @@ static ssize_t show_cpus(const struct cpumask *mask, char *buf)
  */
 static ssize_t show_related_cpus(struct cpufreq_policy *policy, char *buf)
 {
-        return show_cpus(policy->related_cpus, buf);
+        return cpufreq_show_cpus(policy->related_cpus, buf);
 }
 
 /**
@@ -556,7 +616,7 @@ static ssize_t show_related_cpus(struct cpufreq_policy *policy, char *buf)
  */
 static ssize_t show_affected_cpus(struct cpufreq_policy *policy, char *buf)
 {
-        return show_cpus(policy->cpus, buf);
+        return cpufreq_show_cpus(policy->cpus, buf);
 }
 
 static ssize_t store_scaling_setspeed(struct cpufreq_policy *policy,
@@ -630,9 +690,6 @@ static struct attribute *default_attrs[] = {
         NULL
 };
 
-struct kobject *cpufreq_global_kobject;
-EXPORT_SYMBOL(cpufreq_global_kobject);
-
 #define to_policy(k) container_of(k, struct cpufreq_policy, kobj)
 #define to_attr(a) container_of(a, struct freq_attr, attr)
 
@@ -703,6 +760,49 @@ static struct kobj_type ktype_cpufreq = {
         .release        = cpufreq_sysfs_release,
 };
 
+struct kobject *cpufreq_global_kobject;
+EXPORT_SYMBOL(cpufreq_global_kobject);
+
+static int cpufreq_global_kobject_usage;
+
+int cpufreq_get_global_kobject(void)
+{
+        if (!cpufreq_global_kobject_usage++)
+                return kobject_add(cpufreq_global_kobject,
+                                &cpu_subsys.dev_root->kobj, "%s", "cpufreq");
+
+        return 0;
+}
+EXPORT_SYMBOL(cpufreq_get_global_kobject);
+
+void cpufreq_put_global_kobject(void)
+{
+        if (!--cpufreq_global_kobject_usage)
+                kobject_del(cpufreq_global_kobject);
+}
+EXPORT_SYMBOL(cpufreq_put_global_kobject);
+
+int cpufreq_sysfs_create_file(const struct attribute *attr)
+{
+        int ret = cpufreq_get_global_kobject();
+
+        if (!ret) {
+                ret = sysfs_create_file(cpufreq_global_kobject, attr);
+                if (ret)
+                        cpufreq_put_global_kobject();
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL(cpufreq_sysfs_create_file);
+
+void cpufreq_sysfs_remove_file(const struct attribute *attr)
+{
+        sysfs_remove_file(cpufreq_global_kobject, attr);
+        cpufreq_put_global_kobject();
+}
+EXPORT_SYMBOL(cpufreq_sysfs_remove_file);
+
 /* symlink affected CPUs */
 static int cpufreq_add_dev_symlink(unsigned int cpu,
                                    struct cpufreq_policy *policy)
@@ -1005,7 +1105,8 @@ static void update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu)
  * Caller should already have policy_rwsem in write mode for this CPU.
  * This routine frees the rwsem before returning.
  */
-static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
+static int __cpufreq_remove_dev(struct device *dev,
+                struct subsys_interface *sif)
 {
         unsigned int cpu = dev->id, ret, cpus;
         unsigned long flags;
@@ -1112,7 +1213,6 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif
         return 0;
 }
 
-
 static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
 {
         unsigned int cpu = dev->id;
@@ -1125,7 +1225,6 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
         return retval;
 }
 
-
 static void handle_update(struct work_struct *work)
 {
         struct cpufreq_policy *policy =
@@ -1136,7 +1235,8 @@ static void handle_update(struct work_struct *work)
 }
 
 /**
- *      cpufreq_out_of_sync - If actual and saved CPU frequency differs, we're in deep trouble.
+ *      cpufreq_out_of_sync - If actual and saved CPU frequency differs, we're
+ *      in deep trouble.
  *      @cpu: cpu number
  *      @old_freq: CPU frequency the kernel thinks the CPU runs at
  *      @new_freq: CPU frequency the CPU actually runs at
@@ -1151,7 +1251,6 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq,
         struct cpufreq_freqs freqs;
         unsigned long flags;
 
-
         pr_debug("Warning: CPU frequency out of sync: cpufreq and timing "
                "core thinks of %u, is %u kHz.\n", old_freq, new_freq);
 
@@ -1166,7 +1265,6 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq,
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 }
 
-
 /**
  * cpufreq_quick_get - get the CPU frequency (in kHz) from policy->cur
  * @cpu: CPU number
@@ -1212,7 +1310,6 @@ unsigned int cpufreq_quick_get_max(unsigned int cpu)
 }
 EXPORT_SYMBOL(cpufreq_quick_get_max);
 
-
 static unsigned int __cpufreq_get(unsigned int cpu)
 {
         struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
@@ -1271,7 +1368,6 @@ static struct subsys_interface cpufreq_interface = {
         .remove_dev     = cpufreq_remove_dev,
 };
 
-
 /**
  * cpufreq_bp_suspend - Prepare the boot CPU for system suspend.
  *
@@ -1408,11 +1504,10 @@ int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list)
 }
 EXPORT_SYMBOL(cpufreq_register_notifier);
 
-
 /**
  *      cpufreq_unregister_notifier - unregister a driver with cpufreq
  *      @nb: notifier block to be unregistered
- *      @list: CPUFREQ_TRANSITION_NOTIFIER or CPUFREQ_POLICY_NOTIFIER
+ *      @list: CPUFREQ_TRANSITION_NOTIFIER or CPUFREQ_POLICY_NOTIFIER
  *
  *      Remove a driver from the CPU frequency notifier list.
  *
@@ -1448,7 +1543,6 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier);
  *                              GOVERNORS                            *
  *********************************************************************/
 
-
 int __cpufreq_driver_target(struct cpufreq_policy *policy,
                             unsigned int target_freq,
                             unsigned int relation)
@@ -1458,6 +1552,8 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
 
         if (cpufreq_disabled())
                 return -ENODEV;
+        if (policy->transition_ongoing)
+                return -EBUSY;
 
         /* Make sure that target_freq is within supported range */
         if (target_freq > policy->max)
@@ -1484,10 +1580,6 @@ int cpufreq_driver_target(struct cpufreq_policy *policy,
 {
         int ret = -EINVAL;
 
-        policy = cpufreq_cpu_get(policy->cpu);
-        if (!policy)
-                goto no_policy;
-
         if (unlikely(lock_policy_rwsem_write(policy->cpu)))
                 goto fail;
 
@@ -1496,30 +1588,19 @@ int cpufreq_driver_target(struct cpufreq_policy *policy,
         unlock_policy_rwsem_write(policy->cpu);
 
 fail:
-        cpufreq_cpu_put(policy);
-no_policy:
         return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_driver_target);
 
 int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu)
 {
-        int ret = 0;
-
         if (cpufreq_disabled())
-                return ret;
+                return 0;
 
         if (!cpufreq_driver->getavg)
                 return 0;
 
-        policy = cpufreq_cpu_get(policy->cpu);
-        if (!policy)
-                return -EINVAL;
-
-        ret = cpufreq_driver->getavg(policy, cpu);
-
-        cpufreq_cpu_put(policy);
-        return ret;
+        return cpufreq_driver->getavg(policy, cpu);
 }
 EXPORT_SYMBOL_GPL(__cpufreq_driver_getavg);
 
@@ -1562,6 +1643,21 @@ static int __cpufreq_governor(struct cpufreq_policy *policy,
 
         pr_debug("__cpufreq_governor for CPU %u, event %u\n",
                                                 policy->cpu, event);
+
+        mutex_lock(&cpufreq_governor_lock);
+        if ((!policy->governor_enabled && (event == CPUFREQ_GOV_STOP)) ||
+            (policy->governor_enabled && (event == CPUFREQ_GOV_START))) {
+                mutex_unlock(&cpufreq_governor_lock);
+                return -EBUSY;
+        }
+
+        if (event == CPUFREQ_GOV_STOP)
+                policy->governor_enabled = false;
+        else if (event == CPUFREQ_GOV_START)
+                policy->governor_enabled = true;
+
+        mutex_unlock(&cpufreq_governor_lock);
+
         ret = policy->governor->governor(policy, event);
 
         if (!ret) {
@@ -1569,6 +1665,14 @@ static int __cpufreq_governor(struct cpufreq_policy *policy,
                         policy->governor->initialized++;
                 else if (event == CPUFREQ_GOV_POLICY_EXIT)
                         policy->governor->initialized--;
+        } else {
+                /* Restore original values */
+                mutex_lock(&cpufreq_governor_lock);
+                if (event == CPUFREQ_GOV_STOP)
+                        policy->governor_enabled = true;
+                else if (event == CPUFREQ_GOV_START)
+                        policy->governor_enabled = false;
+                mutex_unlock(&cpufreq_governor_lock);
         }
 
         /* we keep one module reference alive for
@@ -1581,7 +1685,6 @@ static int __cpufreq_governor(struct cpufreq_policy *policy,
         return ret;
 }
 
-
 int cpufreq_register_governor(struct cpufreq_governor *governor)
 {
         int err;
@@ -1606,7 +1709,6 @@ int cpufreq_register_governor(struct cpufreq_governor *governor)
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_governor);
 
-
 void cpufreq_unregister_governor(struct cpufreq_governor *governor)
 {
 #ifdef CONFIG_HOTPLUG_CPU
@@ -1636,7 +1738,6 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
 EXPORT_SYMBOL_GPL(cpufreq_unregister_governor);
 
 
-
 /*********************************************************************
  *                          POLICY INTERFACE                         *
  *********************************************************************/
@@ -1665,7 +1766,6 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu)
 }
 EXPORT_SYMBOL(cpufreq_get_policy);
 
-
 /*
  * data   : current policy.
  * policy : policy to be set.
@@ -1699,8 +1799,10 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data,
         blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
                         CPUFREQ_INCOMPATIBLE, policy);
 
-        /* verify the cpu speed can be set within this limit,
-           which might be different to the first one */
+        /*
+         * verify the cpu speed can be set within this limit, which might be
+         * different to the first one
+         */
         ret = cpufreq_driver->verify(policy);
         if (ret)
                 goto error_out;
@@ -1802,8 +1904,10 @@ int cpufreq_update_policy(unsigned int cpu)
         policy.policy = data->user_policy.policy;
         policy.governor = data->user_policy.governor;
 
-        /* BIOS might change freq behind our back
-          -> ask driver for current freq and notify governors about a change */
+        /*
+         * BIOS might change freq behind our back
+         * -> ask driver for current freq and notify governors about a change
+         */
         if (cpufreq_driver->get) {
                 policy.cur = cpufreq_driver->get(cpu);
                 if (!data->cur) {
@@ -1852,7 +1956,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
 }
 
 static struct notifier_block __refdata cpufreq_cpu_notifier = {
-    .notifier_call = cpufreq_cpu_callback,
+        .notifier_call = cpufreq_cpu_callback,
 };
 
 /*********************************************************************
@@ -1864,7 +1968,7 @@ static struct notifier_block __refdata cpufreq_cpu_notifier = {
  * @driver_data: A struct cpufreq_driver containing the values#
  * submitted by the CPU Frequency driver.
  *
- *   Registers a CPU Frequency driver to this core code. This code
+ * Registers a CPU Frequency driver to this core code. This code
  * returns zero on success, -EBUSY when another driver got here first
  * (and isn't unregistered in the meantime).
  *
@@ -1931,11 +2035,10 @@ err_null_driver:
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_driver);
 
-
 /**
  * cpufreq_unregister_driver - unregister the current CPUFreq driver
  *
- *    Unregister the current CPUFreq driver. Only call this if you have
+ * Unregister the current CPUFreq driver. Only call this if you have
  * the right to do so, i.e. if you have succeeded in initialising before!
  * Returns zero if successful, and -EINVAL if the cpufreq_driver is
  * currently not initialised.
@@ -1972,7 +2075,7 @@ static int __init cpufreq_core_init(void)
                 init_rwsem(&per_cpu(cpu_policy_rwsem, cpu));
         }
 
-        cpufreq_global_kobject = kobject_create_and_add("cpufreq", &cpu_subsys.dev_root->kobj);
+        cpufreq_global_kobject = kobject_create();
         BUG_ON(!cpufreq_global_kobject);
         register_syscore_ops(&cpufreq_syscore_ops);
 
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index dc9b72e25c1a..464587697561 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -23,21 +23,12 @@
 #include <linux/kernel_stat.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include <linux/tick.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
 #include <linux/cpu.h>
 
 #include "cpufreq_governor.h"
 
-static struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy)
-{
-        if (have_governor_per_policy())
-                return &policy->kobj;
-        else
-                return cpufreq_global_kobject;
-}
-
 static struct attribute_group *get_sysfs_attr(struct dbs_data *dbs_data)
 {
         if (have_governor_per_policy())
@@ -46,41 +37,6 @@ static struct attribute_group *get_sysfs_attr(struct dbs_data *dbs_data)
                 return dbs_data->cdata->attr_group_gov_sys;
 }
 
-static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
-{
-        u64 idle_time;
-        u64 cur_wall_time;
-        u64 busy_time;
-
-        cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());
-
-        busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
-        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];
-        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];
-        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];
-        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];
-        busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
-
-        idle_time = cur_wall_time - busy_time;
-        if (wall)
-                *wall = cputime_to_usecs(cur_wall_time);
-
-        return cputime_to_usecs(idle_time);
-}
-
-u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)
-{
-        u64 idle_time = get_cpu_idle_time_us(cpu, io_busy ? wall : NULL);
-
-        if (idle_time == -1ULL)
-                return get_cpu_idle_time_jiffy(cpu, wall);
-        else if (!io_busy)
-                idle_time += get_cpu_iowait_time_us(cpu, wall);
-
-        return idle_time;
-}
-EXPORT_SYMBOL_GPL(get_cpu_idle_time);
-
 void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
 {
         struct cpu_dbs_common_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);
@@ -278,6 +234,9 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         return rc;
                 }
 
+                if (!have_governor_per_policy())
+                        WARN_ON(cpufreq_get_global_kobject());
+
                 rc = sysfs_create_group(get_governor_parent_kobj(policy),
                                 get_sysfs_attr(dbs_data));
                 if (rc) {
@@ -316,6 +275,9 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         sysfs_remove_group(get_governor_parent_kobj(policy),
                                         get_sysfs_attr(dbs_data));
 
+                        if (!have_governor_per_policy())
+                                cpufreq_put_global_kobject();
+
                         if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
                                 (policy->governor->initialized == 1)) {
                                 struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
@@ -404,6 +366,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
                 mutex_lock(&dbs_data->mutex);
                 mutex_destroy(&cpu_cdbs->timer_mutex);
+                cpu_cdbs->cur_policy = NULL;
 
                 mutex_unlock(&dbs_data->mutex);
 
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index e16a96130cb3..6663ec3b3056 100644
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -81,7 +81,7 @@ static ssize_t show_##file_name##_gov_sys				\
         return sprintf(buf, "%u\n", tuners->file_name);                 \
 }                                                                       \
                                                                         \
-static ssize_t show_##file_name##_gov_pol                                       \
+static ssize_t show_##file_name##_gov_pol                               \
 (struct cpufreq_policy *policy, char *buf)                              \
 {                                                                       \
         struct dbs_data *dbs_data = policy->governor_data;              \
@@ -91,7 +91,7 @@ static ssize_t show_##file_name##_gov_pol					\
 
 #define store_one(_gov, file_name)                                      \
 static ssize_t store_##file_name##_gov_sys                              \
-(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count)   \
+(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count) \
 {                                                                       \
         struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;         \
         return store_##file_name(dbs_data, buf, count);                 \
@@ -256,7 +256,6 @@ static ssize_t show_sampling_rate_min_gov_pol				\
         return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);       \
 }
 
-u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
 void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
 bool need_load_eval(struct cpu_dbs_common_info *cdbs,
                 unsigned int sampling_rate);
diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c
index ceee06849b91..9fef7d6e4e6a 100644
--- a/drivers/cpufreq/cpufreq_performance.c
+++ b/drivers/cpufreq/cpufreq_performance.c
@@ -17,7 +17,6 @@
 #include <linux/cpufreq.h>
 #include <linux/init.h>
 
-
 static int cpufreq_governor_performance(struct cpufreq_policy *policy,
                                         unsigned int event)
 {
@@ -44,19 +43,16 @@ struct cpufreq_governor cpufreq_gov_performance = {
         .owner          = THIS_MODULE,
 };
 
-
 static int __init cpufreq_gov_performance_init(void)
 {
         return cpufreq_register_governor(&cpufreq_gov_performance);
 }
 
-
 static void __exit cpufreq_gov_performance_exit(void)
 {
         cpufreq_unregister_governor(&cpufreq_gov_performance);
 }
 
-
 MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");
 MODULE_DESCRIPTION("CPUfreq policy governor 'performance'");
 MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c
index 2d948a171155..32109a14f5dc 100644
--- a/drivers/cpufreq/cpufreq_powersave.c
+++ b/drivers/cpufreq/cpufreq_powersave.c
@@ -1,7 +1,7 @@
 /*
- *  linux/drivers/cpufreq/cpufreq_powersave.c
+ * linux/drivers/cpufreq/cpufreq_powersave.c
  *
- *  Copyright (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
+ * Copyright (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -48,13 +48,11 @@ static int __init cpufreq_gov_powersave_init(void)
         return cpufreq_register_governor(&cpufreq_gov_powersave);
 }
 
-
 static void __exit cpufreq_gov_powersave_exit(void)
 {
         cpufreq_unregister_governor(&cpufreq_gov_powersave);
 }
 
-
 MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");
 MODULE_DESCRIPTION("CPUfreq policy governor 'powersave'");
 MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index fb65decffa28..cd9e81713a71 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -27,7 +27,7 @@ static spinlock_t cpufreq_stats_lock;
 struct cpufreq_stats {
         unsigned int cpu;
         unsigned int total_trans;
-        unsigned long long  last_time;
+        unsigned long long last_time;
         unsigned int max_state;
         unsigned int state_num;
         unsigned int last_index;
@@ -116,7 +116,7 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
                 len += snprintf(buf + len, PAGE_SIZE - len, "%9u: ",
                                 stat->freq_table[i]);
 
-                for (j = 0; j < stat->state_num; j++)   {
+                for (j = 0; j < stat->state_num; j++) {
                         if (len >= PAGE_SIZE)
                                 break;
                         len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
@@ -349,6 +349,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
                 cpufreq_update_policy(cpu);
                 break;
         case CPU_DOWN_PREPARE:
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index bbeb9c0720a6..03078090b5f7 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -13,55 +13,13 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
 #include <linux/cpufreq.h>
-#include <linux/cpu.h>
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/sysfs.h>
+#include <linux/init.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 
-/**
- * A few values needed by the userspace governor
- */
-static DEFINE_PER_CPU(unsigned int, cpu_max_freq);
-static DEFINE_PER_CPU(unsigned int, cpu_min_freq);
-static DEFINE_PER_CPU(unsigned int, cpu_cur_freq); /* current CPU freq */
-static DEFINE_PER_CPU(unsigned int, cpu_set_freq); /* CPU freq desired by
-                                                        userspace */
 static DEFINE_PER_CPU(unsigned int, cpu_is_managed);
-
 static DEFINE_MUTEX(userspace_mutex);
-static int cpus_using_userspace_governor;
-
-/* keep track of frequency transitions */
-static int
-userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
-        void *data)
-{
-        struct cpufreq_freqs *freq = data;
-
-        if (!per_cpu(cpu_is_managed, freq->cpu))
-                return 0;
-
-        if (val == CPUFREQ_POSTCHANGE) {
-                pr_debug("saving cpu_cur_freq of cpu %u to be %u kHz\n",
-                                freq->cpu, freq->new);
-                per_cpu(cpu_cur_freq, freq->cpu) = freq->new;
-        }
-
-        return 0;
-}
-
-static struct notifier_block userspace_cpufreq_notifier_block = {
-        .notifier_call  = userspace_cpufreq_notifier
-};
-
 
 /**
  * cpufreq_set - set the CPU frequency
@@ -80,13 +38,6 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq)
         if (!per_cpu(cpu_is_managed, policy->cpu))
                 goto err;
 
-        per_cpu(cpu_set_freq, policy->cpu) = freq;
-
-        if (freq < per_cpu(cpu_min_freq, policy->cpu))
-                freq = per_cpu(cpu_min_freq, policy->cpu);
-        if (freq > per_cpu(cpu_max_freq, policy->cpu))
-                freq = per_cpu(cpu_max_freq, policy->cpu);
-
         /*
          * We're safe from concurrent calls to ->target() here
          * as we hold the userspace_mutex lock. If we were calling
@@ -104,10 +55,9 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq)
         return ret;
 }
 
-
 static ssize_t show_speed(struct cpufreq_policy *policy, char *buf)
 {
-        return sprintf(buf, "%u\n", per_cpu(cpu_cur_freq, policy->cpu));
+        return sprintf(buf, "%u\n", policy->cur);
 }
 
 static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
@@ -119,73 +69,37 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
         switch (event) {
         case CPUFREQ_GOV_START:
                 BUG_ON(!policy->cur);
-                mutex_lock(&userspace_mutex);
-
-                if (cpus_using_userspace_governor == 0) {
-                        cpufreq_register_notifier(
-                                        &userspace_cpufreq_notifier_block,
-                                        CPUFREQ_TRANSITION_NOTIFIER);
-                }
-                cpus_using_userspace_governor++;
+                pr_debug("started managing cpu %u\n", cpu);
 
+                mutex_lock(&userspace_mutex);
                 per_cpu(cpu_is_managed, cpu) = 1;
-                per_cpu(cpu_min_freq, cpu) = policy->min;
-                per_cpu(cpu_max_freq, cpu) = policy->max;
-                per_cpu(cpu_cur_freq, cpu) = policy->cur;
-                per_cpu(cpu_set_freq, cpu) = policy->cur;
-                pr_debug("managing cpu %u started "
-                        "(%u - %u kHz, currently %u kHz)\n",
-                                cpu,
-                                per_cpu(cpu_min_freq, cpu),
-                                per_cpu(cpu_max_freq, cpu),
-                                per_cpu(cpu_cur_freq, cpu));
-
                 mutex_unlock(&userspace_mutex);
                 break;
         case CPUFREQ_GOV_STOP:
-                mutex_lock(&userspace_mutex);
-                cpus_using_userspace_governor--;
-                if (cpus_using_userspace_governor == 0) {
-                        cpufreq_unregister_notifier(
-                                        &userspace_cpufreq_notifier_block,
-                                        CPUFREQ_TRANSITION_NOTIFIER);
-                }
+                pr_debug("managing cpu %u stopped\n", cpu);
 
+                mutex_lock(&userspace_mutex);
                 per_cpu(cpu_is_managed, cpu) = 0;
-                per_cpu(cpu_min_freq, cpu) = 0;
-                per_cpu(cpu_max_freq, cpu) = 0;
-                per_cpu(cpu_set_freq, cpu) = 0;
-                pr_debug("managing cpu %u stopped\n", cpu);
                 mutex_unlock(&userspace_mutex);
                 break;
         case CPUFREQ_GOV_LIMITS:
                 mutex_lock(&userspace_mutex);
-                pr_debug("limit event for cpu %u: %u - %u kHz, "
-                        "currently %u kHz, last set to %u kHz\n",
+                pr_debug("limit event for cpu %u: %u - %u kHz, currently %u kHz\n",
                         cpu, policy->min, policy->max,
-                        per_cpu(cpu_cur_freq, cpu),
-                        per_cpu(cpu_set_freq, cpu));
-                if (policy->max < per_cpu(cpu_set_freq, cpu)) {
+                        policy->cur);
+
+                if (policy->max < policy->cur)
                         __cpufreq_driver_target(policy, policy->max,
                                                 CPUFREQ_RELATION_H);
-                } else if (policy->min > per_cpu(cpu_set_freq, cpu)) {
+                else if (policy->min > policy->cur)
                         __cpufreq_driver_target(policy, policy->min,
                                                 CPUFREQ_RELATION_L);
-                } else {
-                        __cpufreq_driver_target(policy,
-                                                per_cpu(cpu_set_freq, cpu),
-                                                CPUFREQ_RELATION_L);
-                }
-                per_cpu(cpu_min_freq, cpu) = policy->min;
-                per_cpu(cpu_max_freq, cpu) = policy->max;
-                per_cpu(cpu_cur_freq, cpu) = policy->cur;
                 mutex_unlock(&userspace_mutex);
                 break;
         }
         return rc;
 }
 
-
 #ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
 static
 #endif
@@ -202,13 +116,11 @@ static int __init cpufreq_gov_userspace_init(void)
         return cpufreq_register_governor(&cpufreq_gov_userspace);
 }
 
-
 static void __exit cpufreq_gov_userspace_exit(void)
 {
         cpufreq_unregister_governor(&cpufreq_gov_userspace);
 }
 
-
 MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>, "
                 "Russell King <rmk@arm.linux.org.uk>");
 MODULE_DESCRIPTION("CPUfreq policy governor 'userspace'");
diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index c33c76c360fa..551dd655c6f2 100644
--- a/drivers/cpufreq/davinci-cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -114,6 +114,9 @@ static int davinci_target(struct cpufreq_policy *policy,
                 pdata->set_voltage(idx);
 
 out:
+        if (ret)
+                freqs.new = freqs.old;
+
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 6ec6539ae041..1fdb02b9f1ec 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -57,13 +57,13 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
         if (ret) {
                 pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n",
                        freqs.new * 1000, ret);
-                return ret;
+                freqs.new = freqs.old;
         }
 
         /* post change notification */
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
-        return 0;
+        return ret;
 }
 
 static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index 37380fb92621..a60efaeb4cf8 100644
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -161,6 +161,9 @@ postchange:
                 current_multiplier);
         }
 #endif
+        if (err)
+                freqs.new = freqs.old;
+
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         return err;
 }
@@ -188,7 +191,7 @@ static int eps_target(struct cpufreq_policy *policy,
         }
 
         /* Make frequency transition */
-        dest_state = centaur->freq_table[newstate].index & 0xffff;
+        dest_state = centaur->freq_table[newstate].driver_data & 0xffff;
         ret = eps_set_state(centaur, policy, dest_state);
         if (ret)
                 printk(KERN_ERR "eps: Timeout!\n");
@@ -380,9 +383,9 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
         f_table = &centaur->freq_table[0];
         if (brand != EPS_BRAND_C7M) {
                 f_table[0].frequency = fsb * min_multiplier;
-                f_table[0].index = (min_multiplier << 8) | min_voltage;
+                f_table[0].driver_data = (min_multiplier << 8) | min_voltage;
                 f_table[1].frequency = fsb * max_multiplier;
-                f_table[1].index = (max_multiplier << 8) | max_voltage;
+                f_table[1].driver_data = (max_multiplier << 8) | max_voltage;
                 f_table[2].frequency = CPUFREQ_TABLE_END;
         } else {
                 k = 0;
@@ -391,7 +394,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
                 for (i = min_multiplier; i <= max_multiplier; i++) {
                         voltage = (k * step) / 256 + min_voltage;
                         f_table[k].frequency = fsb * i;
-                        f_table[k].index = (i << 8) | voltage;
+                        f_table[k].driver_data = (i << 8) | voltage;
                         k++;
                 }
                 f_table[k].frequency = CPUFREQ_TABLE_END;
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 475b4f607f0d..0d32f02ef4d6 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -113,7 +113,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 if (ret) {
                         pr_err("%s: failed to set cpu voltage to %d\n",
                                 __func__, arm_volt);
-                        goto out;
+                        freqs.new = freqs.old;
+                        goto post_notify;
                 }
         }
 
@@ -123,14 +124,19 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 if (ret) {
                         pr_err("%s: failed to set cpu voltage to %d\n",
                                 __func__, safe_arm_volt);
-                        goto out;
+                        freqs.new = freqs.old;
+                        goto post_notify;
                 }
         }
 
         exynos_info->set_freq(old_index, index);
 
+post_notify:
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
+        if (ret)
+                goto out;
+
         /* When the new frequency is lower than current frequency */
         if ((freqs.new < freqs.old) ||
            ((freqs.new > freqs.old) && safe_arm_volt)) {
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index d7a79662e24c..f0d87412cc91 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -34,8 +34,8 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
 
                         continue;
                 }
-                pr_debug("table entry %u: %u kHz, %u index\n",
-                                        i, freq, table[i].index);
+                pr_debug("table entry %u: %u kHz, %u driver_data\n",
+                                        i, freq, table[i].driver_data);
                 if (freq < min_freq)
                         min_freq = freq;
                 if (freq > max_freq)
@@ -97,11 +97,11 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                                    unsigned int *index)
 {
         struct cpufreq_frequency_table optimal = {
-                .index = ~0,
+                .driver_data = ~0,
                 .frequency = 0,
         };
         struct cpufreq_frequency_table suboptimal = {
-                .index = ~0,
+                .driver_data = ~0,
                 .frequency = 0,
         };
         unsigned int i;
@@ -129,12 +129,12 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                         if (freq <= target_freq) {
                                 if (freq >= optimal.frequency) {
                                         optimal.frequency = freq;
-                                        optimal.index = i;
+                                        optimal.driver_data = i;
                                 }
                         } else {
                                 if (freq <= suboptimal.frequency) {
                                         suboptimal.frequency = freq;
-                                        suboptimal.index = i;
+                                        suboptimal.driver_data = i;
                                 }
                         }
                         break;
@@ -142,26 +142,26 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                         if (freq >= target_freq) {
                                 if (freq <= optimal.frequency) {
                                         optimal.frequency = freq;
-                                        optimal.index = i;
+                                        optimal.driver_data = i;
                                 }
                         } else {
                                 if (freq >= suboptimal.frequency) {
                                         suboptimal.frequency = freq;
-                                        suboptimal.index = i;
+                                        suboptimal.driver_data = i;
                                 }
                         }
                         break;
                 }
         }
-        if (optimal.index > i) {
-                if (suboptimal.index > i)
+        if (optimal.driver_data > i) {
+                if (suboptimal.driver_data > i)
                         return -EINVAL;
-                *index = suboptimal.index;
+                *index = suboptimal.driver_data;
         } else
-                *index = optimal.index;
+                *index = optimal.driver_data;
 
         pr_debug("target is %u (%u kHz, %u)\n", *index, table[*index].frequency,
-                table[*index].index);
+                table[*index].driver_data);
 
         return 0;
 }
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c
index c0075dbaa633..573c14ea802d 100644
--- a/drivers/cpufreq/ia64-acpi-cpufreq.c
+++ b/drivers/cpufreq/ia64-acpi-cpufreq.c
@@ -326,7 +326,7 @@ acpi_cpufreq_cpu_init (
         /* table init */
         for (i = 0; i <= data->acpi_data.state_count; i++)
         {
-                data->freq_table[i].index = i;
+                data->freq_table[i].driver_data = i;
                 if (i < data->acpi_data.state_count) {
                         data->freq_table[i].frequency =
                               data->acpi_data.states[i].core_frequency * 1000;
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index b78bc35973ba..e37cdaedbb5b 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -68,8 +68,6 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
         if (freqs.old == freqs.new)
                 return 0;
 
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
-
         rcu_read_lock();
         opp = opp_find_freq_ceil(cpu_dev, &freq_hz);
         if (IS_ERR(opp)) {
@@ -86,13 +84,16 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
                 freqs.old / 1000, volt_old / 1000,
                 freqs.new / 1000, volt / 1000);
 
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
         /* scaling up?  scale voltage before frequency */
         if (freqs.new > freqs.old) {
                 ret = regulator_set_voltage_tol(arm_reg, volt, 0);
                 if (ret) {
                         dev_err(cpu_dev,
                                 "failed to scale vddarm up: %d\n", ret);
-                        return ret;
+                        freqs.new = freqs.old;
+                        goto post_notify;
                 }
 
                 /*
@@ -145,15 +146,18 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
         if (ret) {
                 dev_err(cpu_dev, "failed to set clock rate: %d\n", ret);
                 regulator_set_voltage_tol(arm_reg, volt_old, 0);
-                return ret;
+                freqs.new = freqs.old;
+                goto post_notify;
         }
 
         /* scaling down?  scale voltage after frequency */
         if (freqs.new < freqs.old) {
                 ret = regulator_set_voltage_tol(arm_reg, volt, 0);
-                if (ret)
+                if (ret) {
                         dev_warn(cpu_dev,
                                  "failed to scale vddarm down: %d\n", ret);
+                        ret = 0;
+                }
 
                 if (freqs.old == FREQ_1P2_GHZ / 1000) {
                         regulator_set_voltage_tol(pu_reg,
@@ -163,9 +167,10 @@ static int imx6q_set_target(struct cpufreq_policy *policy,
                 }
         }
 
+post_notify:
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
-        return 0;
+        return ret;
 }
 
 static int imx6q_cpufreq_init(struct cpufreq_policy *policy)
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index b2644af985ec..c233ea617366 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -59,7 +59,7 @@ static void kirkwood_cpufreq_set_cpu_state(struct cpufreq_policy *policy,
                 unsigned int index)
 {
         struct cpufreq_freqs freqs;
-        unsigned int state = kirkwood_freq_table[index].index;
+        unsigned int state = kirkwood_freq_table[index].driver_data;
         unsigned long reg;
 
         freqs.old = kirkwood_cpufreq_get_cpu_frequency(0);
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index b448638e34de..b6a0a7a406b0 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -254,7 +254,7 @@ static void longhaul_setstate(struct cpufreq_policy *policy,
         u32 bm_timeout = 1000;
         unsigned int dir = 0;
 
-        mults_index = longhaul_table[table_index].index;
+        mults_index = longhaul_table[table_index].driver_data;
         /* Safety precautions */
         mult = mults[mults_index & 0x1f];
         if (mult == -1)
@@ -487,7 +487,7 @@ static int __cpuinit longhaul_get_ranges(void)
                 if (ratio > maxmult || ratio < minmult)
                         continue;
                 longhaul_table[k].frequency = calc_speed(ratio);
-                longhaul_table[k].index = j;
+                longhaul_table[k].driver_data   = j;
                 k++;
         }
         if (k <= 1) {
@@ -508,8 +508,8 @@ static int __cpuinit longhaul_get_ranges(void)
                 if (min_i != j) {
                         swap(longhaul_table[j].frequency,
                              longhaul_table[min_i].frequency);
-                        swap(longhaul_table[j].index,
-                             longhaul_table[min_i].index);
+                        swap(longhaul_table[j].driver_data,
+                             longhaul_table[min_i].driver_data);
                 }
         }
 
@@ -517,7 +517,7 @@ static int __cpuinit longhaul_get_ranges(void)
 
         /* Find index we are running on */
         for (j = 0; j < k; j++) {
-                if (mults[longhaul_table[j].index & 0x1f] == mult) {
+                if (mults[longhaul_table[j].driver_data & 0x1f] == mult) {
                         longhaul_index = j;
                         break;
                 }
@@ -613,7 +613,7 @@ static void __cpuinit longhaul_setup_voltagescaling(void)
                         pos = (speed - min_vid_speed) / kHz_step + minvid.pos;
                 else
                         pos = minvid.pos;
-                longhaul_table[j].index |= mV_vrm_table[pos] << 8;
+                longhaul_table[j].driver_data |= mV_vrm_table[pos] << 8;
                 vid = vrm_mV_table[mV_vrm_table[pos]];
                 printk(KERN_INFO PFX "f: %d kHz, index: %d, vid: %d mV\n",
                                 speed, j, vid.mV);
@@ -656,12 +656,12 @@ static int longhaul_target(struct cpufreq_policy *policy,
                  * this in hardware, C3 is old and we need to do this
                  * in software. */
                 i = longhaul_index;
-                current_vid = (longhaul_table[longhaul_index].index >> 8);
+                current_vid = (longhaul_table[longhaul_index].driver_data >> 8);
                 current_vid &= 0x1f;
                 if (table_index > longhaul_index)
                         dir = 1;
                 while (i != table_index) {
-                        vid = (longhaul_table[i].index >> 8) & 0x1f;
+                        vid = (longhaul_table[i].driver_data >> 8) & 0x1f;
                         if (vid != current_vid) {
                                 longhaul_setstate(policy, i);
                                 current_vid = vid;
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index d53912768946..bb838b985077 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -72,7 +72,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
 
         freq =
             ((cpu_clock_freq / 1000) *
-             loongson2_clockmod_table[newstate].index) / 8;
+             loongson2_clockmod_table[newstate].driver_data) / 8;
         if (freq < policy->min || freq > policy->max)
                 return -EINVAL;
 
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 0279d18a57f9..29468a522ee9 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -93,9 +93,6 @@ static int omap_target(struct cpufreq_policy *policy,
         if (freqs.old == freqs.new && policy->cur == freqs.new)
                 return ret;
 
-        /* notifiers */
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
-
         freq = freqs.new * 1000;
         ret = clk_round_rate(mpu_clk, freq);
         if (IS_ERR_VALUE(ret)) {
@@ -125,6 +122,9 @@ static int omap_target(struct cpufreq_policy *policy,
                 freqs.old / 1000, volt_old ? volt_old / 1000 : -1,
                 freqs.new / 1000, volt ? volt / 1000 : -1);
 
+        /* notifiers */
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
         /* scaling up?  scale voltage before frequency */
         if (mpu_reg && (freqs.new > freqs.old)) {
                 r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol);
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
index 421ef37d0bb3..9ee78170ff86 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -118,7 +118,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,
                 return -EINVAL;
 
         freqs.old = cpufreq_p4_get(policy->cpu);
-        freqs.new = stock_freq * p4clockmod_table[newstate].index / 8;
+        freqs.new = stock_freq * p4clockmod_table[newstate].driver_data / 8;
 
         if (freqs.new == freqs.old)
                 return 0;
@@ -131,7 +131,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy,
          * Developer's Manual, Volume 3
          */
         for_each_cpu(i, policy->cpus)
-                cpufreq_p4_setdc(i, p4clockmod_table[newstate].index);
+                cpufreq_p4_setdc(i, p4clockmod_table[newstate].driver_data);
 
         /* notifiers */
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
new file mode 100644
index 000000000000..b704da404067
--- /dev/null
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -0,0 +1,331 @@
+/*
+ * Copyright (C) 2007 PA Semi, Inc
+ *
+ * Authors: Egor Martovetsky <egor@pasemi.com>
+ *          Olof Johansson <olof@lixom.net>
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * Based on arch/powerpc/platforms/cell/cbe_cpufreq.c:
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/timer.h>
+#include <linux/module.h>
+
+#include <asm/hw_irq.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/smp.h>
+
+#define SDCASR_REG              0x0100
+#define SDCASR_REG_STRIDE       0x1000
+#define SDCPWR_CFGA0_REG        0x0100
+#define SDCPWR_PWST0_REG        0x0000
+#define SDCPWR_GIZTIME_REG      0x0440
+
+/* SDCPWR_GIZTIME_REG fields */
+#define SDCPWR_GIZTIME_GR       0x80000000
+#define SDCPWR_GIZTIME_LONGLOCK 0x000000ff
+
+/* Offset of ASR registers from SDC base */
+#define SDCASR_OFFSET           0x120000
+
+static void __iomem *sdcpwr_mapbase;
+static void __iomem *sdcasr_mapbase;
+
+static DEFINE_MUTEX(pas_switch_mutex);
+
+/* Current astate, is used when waking up from power savings on
+ * one core, in case the other core has switched states during
+ * the idle time.
+ */
+static int current_astate;
+
+/* We support 5(A0-A4) power states excluding turbo(A5-A6) modes */
+static struct cpufreq_frequency_table pas_freqs[] = {
+        {0,     0},
+        {1,     0},
+        {2,     0},
+        {3,     0},
+        {4,     0},
+        {0,     CPUFREQ_TABLE_END},
+};
+
+static struct freq_attr *pas_cpu_freqs_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
+/*
+ * hardware specific functions
+ */
+
+static int get_astate_freq(int astate)
+{
+        u32 ret;
+        ret = in_le32(sdcpwr_mapbase + SDCPWR_CFGA0_REG + (astate * 0x10));
+
+        return ret & 0x3f;
+}
+
+static int get_cur_astate(int cpu)
+{
+        u32 ret;
+
+        ret = in_le32(sdcpwr_mapbase + SDCPWR_PWST0_REG);
+        ret = (ret >> (cpu * 4)) & 0x7;
+
+        return ret;
+}
+
+static int get_gizmo_latency(void)
+{
+        u32 giztime, ret;
+
+        giztime = in_le32(sdcpwr_mapbase + SDCPWR_GIZTIME_REG);
+
+        /* just provide the upper bound */
+        if (giztime & SDCPWR_GIZTIME_GR)
+                ret = (giztime & SDCPWR_GIZTIME_LONGLOCK) * 128000;
+        else
+                ret = (giztime & SDCPWR_GIZTIME_LONGLOCK) * 1000;
+
+        return ret;
+}
+
+static void set_astate(int cpu, unsigned int astate)
+{
+        unsigned long flags;
+
+        /* Return if called before init has run */
+        if (unlikely(!sdcasr_mapbase))
+                return;
+
+        local_irq_save(flags);
+
+        out_le32(sdcasr_mapbase + SDCASR_REG + SDCASR_REG_STRIDE*cpu, astate);
+
+        local_irq_restore(flags);
+}
+
+int check_astate(void)
+{
+        return get_cur_astate(hard_smp_processor_id());
+}
+
+void restore_astate(int cpu)
+{
+        set_astate(cpu, current_astate);
+}
+
+/*
+ * cpufreq functions
+ */
+
+static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
+{
+        const u32 *max_freqp;
+        u32 max_freq;
+        int i, cur_astate;
+        struct resource res;
+        struct device_node *cpu, *dn;
+        int err = -ENODEV;
+
+        cpu = of_get_cpu_node(policy->cpu, NULL);
+
+        if (!cpu)
+                goto out;
+
+        dn = of_find_compatible_node(NULL, NULL, "1682m-sdc");
+        if (!dn)
+                dn = of_find_compatible_node(NULL, NULL,
+                                             "pasemi,pwrficient-sdc");
+        if (!dn)
+                goto out;
+        err = of_address_to_resource(dn, 0, &res);
+        of_node_put(dn);
+        if (err)
+                goto out;
+        sdcasr_mapbase = ioremap(res.start + SDCASR_OFFSET, 0x2000);
+        if (!sdcasr_mapbase) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        dn = of_find_compatible_node(NULL, NULL, "1682m-gizmo");
+        if (!dn)
+                dn = of_find_compatible_node(NULL, NULL,
+                                             "pasemi,pwrficient-gizmo");
+        if (!dn) {
+                err = -ENODEV;
+                goto out_unmap_sdcasr;
+        }
+        err = of_address_to_resource(dn, 0, &res);
+        of_node_put(dn);
+        if (err)
+                goto out_unmap_sdcasr;
+        sdcpwr_mapbase = ioremap(res.start, 0x1000);
+        if (!sdcpwr_mapbase) {
+                err = -EINVAL;
+                goto out_unmap_sdcasr;
+        }
+
+        pr_debug("init cpufreq on CPU %d\n", policy->cpu);
+
+        max_freqp = of_get_property(cpu, "clock-frequency", NULL);
+        if (!max_freqp) {
+                err = -EINVAL;
+                goto out_unmap_sdcpwr;
+        }
+
+        /* we need the freq in kHz */
+        max_freq = *max_freqp / 1000;
+
+        pr_debug("max clock-frequency is at %u kHz\n", max_freq);
+        pr_debug("initializing frequency table\n");
+
+        /* initialize frequency table */
+        for (i=0; pas_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
+                pas_freqs[i].frequency =
+                        get_astate_freq(pas_freqs[i].driver_data) * 100000;
+                pr_debug("%d: %d\n", i, pas_freqs[i].frequency);
+        }
+
+        policy->cpuinfo.transition_latency = get_gizmo_latency();
+
+        cur_astate = get_cur_astate(policy->cpu);
+        pr_debug("current astate is at %d\n",cur_astate);
+
+        policy->cur = pas_freqs[cur_astate].frequency;
+        cpumask_copy(policy->cpus, cpu_online_mask);
+
+        ppc_proc_freq = policy->cur * 1000ul;
+
+        cpufreq_frequency_table_get_attr(pas_freqs, policy->cpu);
+
+        /* this ensures that policy->cpuinfo_min and policy->cpuinfo_max
+         * are set correctly
+         */
+        return cpufreq_frequency_table_cpuinfo(policy, pas_freqs);
+
+out_unmap_sdcpwr:
+        iounmap(sdcpwr_mapbase);
+
+out_unmap_sdcasr:
+        iounmap(sdcasr_mapbase);
+out:
+        return err;
+}
+
+static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy)
+{
+        /*
+         * We don't support CPU hotplug. Don't unmap after the system
+         * has already made it to a running state.
+         */
+        if (system_state != SYSTEM_BOOTING)
+                return 0;
+
+        if (sdcasr_mapbase)
+                iounmap(sdcasr_mapbase);
+        if (sdcpwr_mapbase)
+                iounmap(sdcpwr_mapbase);
+
+        cpufreq_frequency_table_put_attr(policy->cpu);
+        return 0;
+}
+
+static int pas_cpufreq_verify(struct cpufreq_policy *policy)
+{
+        return cpufreq_frequency_table_verify(policy, pas_freqs);
+}
+
+static int pas_cpufreq_target(struct cpufreq_policy *policy,
+                              unsigned int target_freq,
+                              unsigned int relation)
+{
+        struct cpufreq_freqs freqs;
+        int pas_astate_new;
+        int i;
+
+        cpufreq_frequency_table_target(policy,
+                                       pas_freqs,
+                                       target_freq,
+                                       relation,
+                                       &pas_astate_new);
+
+        freqs.old = policy->cur;
+        freqs.new = pas_freqs[pas_astate_new].frequency;
+
+        mutex_lock(&pas_switch_mutex);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
+        pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n",
+                 policy->cpu,
+                 pas_freqs[pas_astate_new].frequency,
+                 pas_freqs[pas_astate_new].driver_data);
+
+        current_astate = pas_astate_new;
+
+        for_each_online_cpu(i)
+                set_astate(i, pas_astate_new);
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+        mutex_unlock(&pas_switch_mutex);
+
+        ppc_proc_freq = freqs.new * 1000ul;
+        return 0;
+}
+
+static struct cpufreq_driver pas_cpufreq_driver = {
+        .name           = "pas-cpufreq",
+        .owner          = THIS_MODULE,
+        .flags          = CPUFREQ_CONST_LOOPS,
+        .init           = pas_cpufreq_cpu_init,
+        .exit           = pas_cpufreq_cpu_exit,
+        .verify         = pas_cpufreq_verify,
+        .target         = pas_cpufreq_target,
+        .attr           = pas_cpu_freqs_attr,
+};
+
+/*
+ * module init and destoy
+ */
+
+static int __init pas_cpufreq_init(void)
+{
+        if (!of_machine_is_compatible("PA6T-1682M") &&
+            !of_machine_is_compatible("pasemi,pwrficient"))
+                return -ENODEV;
+
+        return cpufreq_register_driver(&pas_cpufreq_driver);
+}
+
+static void __exit pas_cpufreq_exit(void)
+{
+        cpufreq_unregister_driver(&pas_cpufreq_driver);
+}
+
+module_init(pas_cpufreq_init);
+module_exit(pas_cpufreq_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>, Olof Johansson <olof@lixom.net>");
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 0de00081a81e..1581fcc4cf4a 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -243,6 +243,8 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
         return 0;
 
 cmd_incomplete:
+        freqs.new = freqs.old;
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         iowrite16(0, &pcch_hdr->status);
         spin_unlock(&pcc_lock);
         return -EINVAL;
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
new file mode 100644
index 000000000000..3104fad82480
--- /dev/null
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -0,0 +1,721 @@
+/*
+ *  Copyright (C) 2002 - 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *  Copyright (C) 2004        John Steele Scott <toojays@toojays.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * TODO: Need a big cleanup here. Basically, we need to have different
+ * cpufreq_driver structures for the different type of HW instead of the
+ * current mess. We also need to better deal with the detection of the
+ * type of machine.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/adb.h>
+#include <linux/pmu.h>
+#include <linux/cpufreq.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/hardirq.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/irq.h>
+#include <asm/pmac_feature.h>
+#include <asm/mmu_context.h>
+#include <asm/sections.h>
+#include <asm/cputable.h>
+#include <asm/time.h>
+#include <asm/mpic.h>
+#include <asm/keylargo.h>
+#include <asm/switch_to.h>
+
+/* WARNING !!! This will cause calibrate_delay() to be called,
+ * but this is an __init function ! So you MUST go edit
+ * init/main.c to make it non-init before enabling DEBUG_FREQ
+ */
+#undef DEBUG_FREQ
+
+extern void low_choose_7447a_dfs(int dfs);
+extern void low_choose_750fx_pll(int pll);
+extern void low_sleep_handler(void);
+
+/*
+ * Currently, PowerMac cpufreq supports only high & low frequencies
+ * that are set by the firmware
+ */
+static unsigned int low_freq;
+static unsigned int hi_freq;
+static unsigned int cur_freq;
+static unsigned int sleep_freq;
+static unsigned long transition_latency;
+
+/*
+ * Different models uses different mechanisms to switch the frequency
+ */
+static int (*set_speed_proc)(int low_speed);
+static unsigned int (*get_speed_proc)(void);
+
+/*
+ * Some definitions used by the various speedprocs
+ */
+static u32 voltage_gpio;
+static u32 frequency_gpio;
+static u32 slew_done_gpio;
+static int no_schedule;
+static int has_cpu_l2lve;
+static int is_pmu_based;
+
+/* There are only two frequency states for each processor. Values
+ * are in kHz for the time being.
+ */
+#define CPUFREQ_HIGH                  0
+#define CPUFREQ_LOW                   1
+
+static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
+        {CPUFREQ_HIGH,          0},
+        {CPUFREQ_LOW,           0},
+        {0,                     CPUFREQ_TABLE_END},
+};
+
+static struct freq_attr* pmac_cpu_freqs_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
+static inline void local_delay(unsigned long ms)
+{
+        if (no_schedule)
+                mdelay(ms);
+        else
+                msleep(ms);
+}
+
+#ifdef DEBUG_FREQ
+static inline void debug_calc_bogomips(void)
+{
+        /* This will cause a recalc of bogomips and display the
+         * result. We backup/restore the value to avoid affecting the
+         * core cpufreq framework's own calculation.
+         */
+        unsigned long save_lpj = loops_per_jiffy;
+        calibrate_delay();
+        loops_per_jiffy = save_lpj;
+}
+#endif /* DEBUG_FREQ */
+
+/* Switch CPU speed under 750FX CPU control
+ */
+static int cpu_750fx_cpu_speed(int low_speed)
+{
+        u32 hid2;
+
+        if (low_speed == 0) {
+                /* ramping up, set voltage first */
+                pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, voltage_gpio, 0x05);
+                /* Make sure we sleep for at least 1ms */
+                local_delay(10);
+
+                /* tweak L2 for high voltage */
+                if (has_cpu_l2lve) {
+                        hid2 = mfspr(SPRN_HID2);
+                        hid2 &= ~0x2000;
+                        mtspr(SPRN_HID2, hid2);
+                }
+        }
+#ifdef CONFIG_6xx
+        low_choose_750fx_pll(low_speed);
+#endif
+        if (low_speed == 1) {
+                /* tweak L2 for low voltage */
+                if (has_cpu_l2lve) {
+                        hid2 = mfspr(SPRN_HID2);
+                        hid2 |= 0x2000;
+                        mtspr(SPRN_HID2, hid2);
+                }
+
+                /* ramping down, set voltage last */
+                pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, voltage_gpio, 0x04);
+                local_delay(10);
+        }
+
+        return 0;
+}
+
+static unsigned int cpu_750fx_get_cpu_speed(void)
+{
+        if (mfspr(SPRN_HID1) & HID1_PS)
+                return low_freq;
+        else
+                return hi_freq;
+}
+
+/* Switch CPU speed using DFS */
+static int dfs_set_cpu_speed(int low_speed)
+{
+        if (low_speed == 0) {
+                /* ramping up, set voltage first */
+                pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, voltage_gpio, 0x05);
+                /* Make sure we sleep for at least 1ms */
+                local_delay(1);
+        }
+
+        /* set frequency */
+#ifdef CONFIG_6xx
+        low_choose_7447a_dfs(low_speed);
+#endif
+        udelay(100);
+
+        if (low_speed == 1) {
+                /* ramping down, set voltage last */
+                pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, voltage_gpio, 0x04);
+                local_delay(1);
+        }
+
+        return 0;
+}
+
+static unsigned int dfs_get_cpu_speed(void)
+{
+        if (mfspr(SPRN_HID1) & HID1_DFS)
+                return low_freq;
+        else
+                return hi_freq;
+}
+
+
+/* Switch CPU speed using slewing GPIOs
+ */
+static int gpios_set_cpu_speed(int low_speed)
+{
+        int gpio, timeout = 0;
+
+        /* If ramping up, set voltage first */
+        if (low_speed == 0) {
+                pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, voltage_gpio, 0x05);
+                /* Delay is way too big but it's ok, we schedule */
+                local_delay(10);
+        }
+
+        /* Set frequency */
+        gpio =  pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, frequency_gpio, 0);
+        if (low_speed == ((gpio & 0x01) == 0))
+                goto skip;
+
+        pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, frequency_gpio,
+                          low_speed ? 0x04 : 0x05);
+        udelay(200);
+        do {
+                if (++timeout > 100)
+                        break;
+                local_delay(1);
+                gpio = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, slew_done_gpio, 0);
+        } while((gpio & 0x02) == 0);
+ skip:
+        /* If ramping down, set voltage last */
+        if (low_speed == 1) {
+                pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, voltage_gpio, 0x04);
+                /* Delay is way too big but it's ok, we schedule */
+                local_delay(10);
+        }
+
+#ifdef DEBUG_FREQ
+        debug_calc_bogomips();
+#endif
+
+        return 0;
+}
+
+/* Switch CPU speed under PMU control
+ */
+static int pmu_set_cpu_speed(int low_speed)
+{
+        struct adb_request req;
+        unsigned long save_l2cr;
+        unsigned long save_l3cr;
+        unsigned int pic_prio;
+        unsigned long flags;
+
+        preempt_disable();
+
+#ifdef DEBUG_FREQ
+        printk(KERN_DEBUG "HID1, before: %x\n", mfspr(SPRN_HID1));
+#endif
+        pmu_suspend();
+
+        /* Disable all interrupt sources on openpic */
+        pic_prio = mpic_cpu_get_priority();
+        mpic_cpu_set_priority(0xf);
+
+        /* Make sure the decrementer won't interrupt us */
+        asm volatile("mtdec %0" : : "r" (0x7fffffff));
+        /* Make sure any pending DEC interrupt occurring while we did
+         * the above didn't re-enable the DEC */
+        mb();
+        asm volatile("mtdec %0" : : "r" (0x7fffffff));
+
+        /* We can now disable MSR_EE */
+        local_irq_save(flags);
+
+        /* Giveup the FPU & vec */
+        enable_kernel_fp();
+
+#ifdef CONFIG_ALTIVEC
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                enable_kernel_altivec();
+#endif /* CONFIG_ALTIVEC */
+
+        /* Save & disable L2 and L3 caches */
+        save_l3cr = _get_L3CR();        /* (returns -1 if not available) */
+        save_l2cr = _get_L2CR();        /* (returns -1 if not available) */
+
+        /* Send the new speed command. My assumption is that this command
+         * will cause PLL_CFG[0..3] to be changed next time CPU goes to sleep
+         */
+        pmu_request(&req, NULL, 6, PMU_CPU_SPEED, 'W', 'O', 'O', 'F', low_speed);
+        while (!req.complete)
+                pmu_poll();
+
+        /* Prepare the northbridge for the speed transition */
+        pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,1,1);
+
+        /* Call low level code to backup CPU state and recover from
+         * hardware reset
+         */
+        low_sleep_handler();
+
+        /* Restore the northbridge */
+        pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,1,0);
+
+        /* Restore L2 cache */
+        if (save_l2cr != 0xffffffff && (save_l2cr & L2CR_L2E) != 0)
+                _set_L2CR(save_l2cr);
+        /* Restore L3 cache */
+        if (save_l3cr != 0xffffffff && (save_l3cr & L3CR_L3E) != 0)
+                _set_L3CR(save_l3cr);
+
+        /* Restore userland MMU context */
+        switch_mmu_context(NULL, current->active_mm);
+
+#ifdef DEBUG_FREQ
+        printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));
+#endif
+
+        /* Restore low level PMU operations */
+        pmu_unlock();
+
+        /*
+         * Restore decrementer; we'll take a decrementer interrupt
+         * as soon as interrupts are re-enabled and the generic
+         * clockevents code will reprogram it with the right value.
+         */
+        set_dec(1);
+
+        /* Restore interrupts */
+        mpic_cpu_set_priority(pic_prio);
+
+        /* Let interrupts flow again ... */
+        local_irq_restore(flags);
+
+#ifdef DEBUG_FREQ
+        debug_calc_bogomips();
+#endif
+
+        pmu_resume();
+
+        preempt_enable();
+
+        return 0;
+}
+
+static int do_set_cpu_speed(struct cpufreq_policy *policy, int speed_mode,
+                int notify)
+{
+        struct cpufreq_freqs freqs;
+        unsigned long l3cr;
+        static unsigned long prev_l3cr;
+
+        freqs.old = cur_freq;
+        freqs.new = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
+
+        if (freqs.old == freqs.new)
+                return 0;
+
+        if (notify)
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+        if (speed_mode == CPUFREQ_LOW &&
+            cpu_has_feature(CPU_FTR_L3CR)) {
+                l3cr = _get_L3CR();
+                if (l3cr & L3CR_L3E) {
+                        prev_l3cr = l3cr;
+                        _set_L3CR(0);
+                }
+        }
+        set_speed_proc(speed_mode == CPUFREQ_LOW);
+        if (speed_mode == CPUFREQ_HIGH &&
+            cpu_has_feature(CPU_FTR_L3CR)) {
+                l3cr = _get_L3CR();
+                if ((prev_l3cr & L3CR_L3E) && l3cr != prev_l3cr)
+                        _set_L3CR(prev_l3cr);
+        }
+        if (notify)
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+        cur_freq = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
+
+        return 0;
+}
+
+static unsigned int pmac_cpufreq_get_speed(unsigned int cpu)
+{
+        return cur_freq;
+}
+
+static int pmac_cpufreq_verify(struct cpufreq_policy *policy)
+{
+        return cpufreq_frequency_table_verify(policy, pmac_cpu_freqs);
+}
+
+static int pmac_cpufreq_target( struct cpufreq_policy *policy,
+                                        unsigned int target_freq,
+                                        unsigned int relation)
+{
+        unsigned int    newstate = 0;
+        int             rc;
+
+        if (cpufreq_frequency_table_target(policy, pmac_cpu_freqs,
+                        target_freq, relation, &newstate))
+                return -EINVAL;
+
+        rc = do_set_cpu_speed(policy, newstate, 1);
+
+        ppc_proc_freq = cur_freq * 1000ul;
+        return rc;
+}
+
+static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
+{
+        if (policy->cpu != 0)
+                return -ENODEV;
+
+        policy->cpuinfo.transition_latency      = transition_latency;
+        policy->cur = cur_freq;
+
+        cpufreq_frequency_table_get_attr(pmac_cpu_freqs, policy->cpu);
+        return cpufreq_frequency_table_cpuinfo(policy, pmac_cpu_freqs);
+}
+
+static u32 read_gpio(struct device_node *np)
+{
+        const u32 *reg = of_get_property(np, "reg", NULL);
+        u32 offset;
+
+        if (reg == NULL)
+                return 0;
+        /* That works for all keylargos but shall be fixed properly
+         * some day... The problem is that it seems we can't rely
+         * on the "reg" property of the GPIO nodes, they are either
+         * relative to the base of KeyLargo or to the base of the
+         * GPIO space, and the device-tree doesn't help.
+         */
+        offset = *reg;
+        if (offset < KEYLARGO_GPIO_LEVELS0)
+                offset += KEYLARGO_GPIO_LEVELS0;
+        return offset;
+}
+
+static int pmac_cpufreq_suspend(struct cpufreq_policy *policy)
+{
+        /* Ok, this could be made a bit smarter, but let's be robust for now. We
+         * always force a speed change to high speed before sleep, to make sure
+         * we have appropriate voltage and/or bus speed for the wakeup process,
+         * and to make sure our loops_per_jiffies are "good enough", that is will
+         * not cause too short delays if we sleep in low speed and wake in high
+         * speed..
+         */
+        no_schedule = 1;
+        sleep_freq = cur_freq;
+        if (cur_freq == low_freq && !is_pmu_based)
+                do_set_cpu_speed(policy, CPUFREQ_HIGH, 0);
+        return 0;
+}
+
+static int pmac_cpufreq_resume(struct cpufreq_policy *policy)
+{
+        /* If we resume, first check if we have a get() function */
+        if (get_speed_proc)
+                cur_freq = get_speed_proc();
+        else
+                cur_freq = 0;
+
+        /* We don't, hrm... we don't really know our speed here, best
+         * is that we force a switch to whatever it was, which is
+         * probably high speed due to our suspend() routine
+         */
+        do_set_cpu_speed(policy, sleep_freq == low_freq ?
+                         CPUFREQ_LOW : CPUFREQ_HIGH, 0);
+
+        ppc_proc_freq = cur_freq * 1000ul;
+
+        no_schedule = 0;
+        return 0;
+}
+
+static struct cpufreq_driver pmac_cpufreq_driver = {
+        .verify         = pmac_cpufreq_verify,
+        .target         = pmac_cpufreq_target,
+        .get            = pmac_cpufreq_get_speed,
+        .init           = pmac_cpufreq_cpu_init,
+        .suspend        = pmac_cpufreq_suspend,
+        .resume         = pmac_cpufreq_resume,
+        .flags          = CPUFREQ_PM_NO_WARN,
+        .attr           = pmac_cpu_freqs_attr,
+        .name           = "powermac",
+        .owner          = THIS_MODULE,
+};
+
+
+static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
+{
+        struct device_node *volt_gpio_np = of_find_node_by_name(NULL,
+                                                                "voltage-gpio");
+        struct device_node *freq_gpio_np = of_find_node_by_name(NULL,
+                                                                "frequency-gpio");
+        struct device_node *slew_done_gpio_np = of_find_node_by_name(NULL,
+                                                                     "slewing-done");
+        const u32 *value;
+
+        /*
+         * Check to see if it's GPIO driven or PMU only
+         *
+         * The way we extract the GPIO address is slightly hackish, but it
+         * works well enough for now. We need to abstract the whole GPIO
+         * stuff sooner or later anyway
+         */
+
+        if (volt_gpio_np)
+                voltage_gpio = read_gpio(volt_gpio_np);
+        if (freq_gpio_np)
+                frequency_gpio = read_gpio(freq_gpio_np);
+        if (slew_done_gpio_np)
+                slew_done_gpio = read_gpio(slew_done_gpio_np);
+
+        /* If we use the frequency GPIOs, calculate the min/max speeds based
+         * on the bus frequencies
+         */
+        if (frequency_gpio && slew_done_gpio) {
+                int lenp, rc;
+                const u32 *freqs, *ratio;
+
+                freqs = of_get_property(cpunode, "bus-frequencies", &lenp);
+                lenp /= sizeof(u32);
+                if (freqs == NULL || lenp != 2) {
+                        printk(KERN_ERR "cpufreq: bus-frequencies incorrect or missing\n");
+                        return 1;
+                }
+                ratio = of_get_property(cpunode, "processor-to-bus-ratio*2",
+                                                NULL);
+                if (ratio == NULL) {
+                        printk(KERN_ERR "cpufreq: processor-to-bus-ratio*2 missing\n");
+                        return 1;
+                }
+
+                /* Get the min/max bus frequencies */
+                low_freq = min(freqs[0], freqs[1]);
+                hi_freq = max(freqs[0], freqs[1]);
+
+                /* Grrrr.. It _seems_ that the device-tree is lying on the low bus
+                 * frequency, it claims it to be around 84Mhz on some models while
+                 * it appears to be approx. 101Mhz on all. Let's hack around here...
+                 * fortunately, we don't need to be too precise
+                 */
+                if (low_freq < 98000000)
+                        low_freq = 101000000;
+
+                /* Convert those to CPU core clocks */
+                low_freq = (low_freq * (*ratio)) / 2000;
+                hi_freq = (hi_freq * (*ratio)) / 2000;
+
+                /* Now we get the frequencies, we read the GPIO to see what is out current
+                 * speed
+                 */
+                rc = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, frequency_gpio, 0);
+                cur_freq = (rc & 0x01) ? hi_freq : low_freq;
+
+                set_speed_proc = gpios_set_cpu_speed;
+                return 1;
+        }
+
+        /* If we use the PMU, look for the min & max frequencies in the
+         * device-tree
+         */
+        value = of_get_property(cpunode, "min-clock-frequency", NULL);
+        if (!value)
+                return 1;
+        low_freq = (*value) / 1000;
+        /* The PowerBook G4 12" (PowerBook6,1) has an error in the device-tree
+         * here */
+        if (low_freq < 100000)
+                low_freq *= 10;
+
+        value = of_get_property(cpunode, "max-clock-frequency", NULL);
+        if (!value)
+                return 1;
+        hi_freq = (*value) / 1000;
+        set_speed_proc = pmu_set_cpu_speed;
+        is_pmu_based = 1;
+
+        return 0;
+}
+
+static int pmac_cpufreq_init_7447A(struct device_node *cpunode)
+{
+        struct device_node *volt_gpio_np;
+
+        if (of_get_property(cpunode, "dynamic-power-step", NULL) == NULL)
+                return 1;
+
+        volt_gpio_np = of_find_node_by_name(NULL, "cpu-vcore-select");
+        if (volt_gpio_np)
+                voltage_gpio = read_gpio(volt_gpio_np);
+        if (!voltage_gpio){
+                printk(KERN_ERR "cpufreq: missing cpu-vcore-select gpio\n");
+                return 1;
+        }
+
+        /* OF only reports the high frequency */
+        hi_freq = cur_freq;
+        low_freq = cur_freq/2;
+
+        /* Read actual frequency from CPU */
+        cur_freq = dfs_get_cpu_speed();
+        set_speed_proc = dfs_set_cpu_speed;
+        get_speed_proc = dfs_get_cpu_speed;
+
+        return 0;
+}
+
+static int pmac_cpufreq_init_750FX(struct device_node *cpunode)
+{
+        struct device_node *volt_gpio_np;
+        u32 pvr;
+        const u32 *value;
+
+        if (of_get_property(cpunode, "dynamic-power-step", NULL) == NULL)
+                return 1;
+
+        hi_freq = cur_freq;
+        value = of_get_property(cpunode, "reduced-clock-frequency", NULL);
+        if (!value)
+                return 1;
+        low_freq = (*value) / 1000;
+
+        volt_gpio_np = of_find_node_by_name(NULL, "cpu-vcore-select");
+        if (volt_gpio_np)
+                voltage_gpio = read_gpio(volt_gpio_np);
+
+        pvr = mfspr(SPRN_PVR);
+        has_cpu_l2lve = !((pvr & 0xf00) == 0x100);
+
+        set_speed_proc = cpu_750fx_cpu_speed;
+        get_speed_proc = cpu_750fx_get_cpu_speed;
+        cur_freq = cpu_750fx_get_cpu_speed();
+
+        return 0;
+}
+
+/* Currently, we support the following machines:
+ *
+ *  - Titanium PowerBook 1Ghz (PMU based, 667Mhz & 1Ghz)
+ *  - Titanium PowerBook 800 (PMU based, 667Mhz & 800Mhz)
+ *  - Titanium PowerBook 400 (PMU based, 300Mhz & 400Mhz)
+ *  - Titanium PowerBook 500 (PMU based, 300Mhz & 500Mhz)
+ *  - iBook2 500/600 (PMU based, 400Mhz & 500/600Mhz)
+ *  - iBook2 700 (CPU based, 400Mhz & 700Mhz, support low voltage)
+ *  - Recent MacRISC3 laptops
+ *  - All new machines with 7447A CPUs
+ */
+static int __init pmac_cpufreq_setup(void)
+{
+        struct device_node      *cpunode;
+        const u32               *value;
+
+        if (strstr(cmd_line, "nocpufreq"))
+                return 0;
+
+        /* Assume only one CPU */
+        cpunode = of_find_node_by_type(NULL, "cpu");
+        if (!cpunode)
+                goto out;
+
+        /* Get current cpu clock freq */
+        value = of_get_property(cpunode, "clock-frequency", NULL);
+        if (!value)
+                goto out;
+        cur_freq = (*value) / 1000;
+        transition_latency = CPUFREQ_ETERNAL;
+
+        /*  Check for 7447A based MacRISC3 */
+        if (of_machine_is_compatible("MacRISC3") &&
+            of_get_property(cpunode, "dynamic-power-step", NULL) &&
+            PVR_VER(mfspr(SPRN_PVR)) == 0x8003) {
+                pmac_cpufreq_init_7447A(cpunode);
+                transition_latency = 8000000;
+        /* Check for other MacRISC3 machines */
+        } else if (of_machine_is_compatible("PowerBook3,4") ||
+                   of_machine_is_compatible("PowerBook3,5") ||
+                   of_machine_is_compatible("MacRISC3")) {
+                pmac_cpufreq_init_MacRISC3(cpunode);
+        /* Else check for iBook2 500/600 */
+        } else if (of_machine_is_compatible("PowerBook4,1")) {
+                hi_freq = cur_freq;
+                low_freq = 400000;
+                set_speed_proc = pmu_set_cpu_speed;
+                is_pmu_based = 1;
+        }
+        /* Else check for TiPb 550 */
+        else if (of_machine_is_compatible("PowerBook3,3") && cur_freq == 550000) {
+                hi_freq = cur_freq;
+                low_freq = 500000;
+                set_speed_proc = pmu_set_cpu_speed;
+                is_pmu_based = 1;
+        }
+        /* Else check for TiPb 400 & 500 */
+        else if (of_machine_is_compatible("PowerBook3,2")) {
+                /* We only know about the 400 MHz and the 500Mhz model
+                 * they both have 300 MHz as low frequency
+                 */
+                if (cur_freq < 350000 || cur_freq > 550000)
+                        goto out;
+                hi_freq = cur_freq;
+                low_freq = 300000;
+                set_speed_proc = pmu_set_cpu_speed;
+                is_pmu_based = 1;
+        }
+        /* Else check for 750FX */
+        else if (PVR_VER(mfspr(SPRN_PVR)) == 0x7000)
+                pmac_cpufreq_init_750FX(cpunode);
+out:
+        of_node_put(cpunode);
+        if (set_speed_proc == NULL)
+                return -ENODEV;
+
+        pmac_cpu_freqs[CPUFREQ_LOW].frequency = low_freq;
+        pmac_cpu_freqs[CPUFREQ_HIGH].frequency = hi_freq;
+        ppc_proc_freq = cur_freq * 1000ul;
+
+        printk(KERN_INFO "Registering PowerMac CPU frequency driver\n");
+        printk(KERN_INFO "Low: %d Mhz, High: %d Mhz, Boot: %d Mhz\n",
+               low_freq/1000, hi_freq/1000, cur_freq/1000);
+
+        return cpufreq_register_driver(&pmac_cpufreq_driver);
+}
+
+module_init(pmac_cpufreq_setup);
+
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
new file mode 100644
index 000000000000..7ba423431cfe
--- /dev/null
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -0,0 +1,746 @@
+/*
+ *  Copyright (C) 2002 - 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *  and                       Markus Demleitner <msdemlei@cl.uni-heidelberg.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This driver adds basic cpufreq support for SMU & 970FX based G5 Macs,
+ * that is iMac G5 and latest single CPU desktop.
+ */
+
+#undef DEBUG
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/cpufreq.h>
+#include <linux/init.h>
+#include <linux/completion.h>
+#include <linux/mutex.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/irq.h>
+#include <asm/sections.h>
+#include <asm/cputable.h>
+#include <asm/time.h>
+#include <asm/smu.h>
+#include <asm/pmac_pfunc.h>
+
+#define DBG(fmt...) pr_debug(fmt)
+
+/* see 970FX user manual */
+
+#define SCOM_PCR 0x0aa001                       /* PCR scom addr */
+
+#define PCR_HILO_SELECT         0x80000000U     /* 1 = PCR, 0 = PCRH */
+#define PCR_SPEED_FULL          0x00000000U     /* 1:1 speed value */
+#define PCR_SPEED_HALF          0x00020000U     /* 1:2 speed value */
+#define PCR_SPEED_QUARTER       0x00040000U     /* 1:4 speed value */
+#define PCR_SPEED_MASK          0x000e0000U     /* speed mask */
+#define PCR_SPEED_SHIFT         17
+#define PCR_FREQ_REQ_VALID      0x00010000U     /* freq request valid */
+#define PCR_VOLT_REQ_VALID      0x00008000U     /* volt request valid */
+#define PCR_TARGET_TIME_MASK    0x00006000U     /* target time */
+#define PCR_STATLAT_MASK        0x00001f00U     /* STATLAT value */
+#define PCR_SNOOPLAT_MASK       0x000000f0U     /* SNOOPLAT value */
+#define PCR_SNOOPACC_MASK       0x0000000fU     /* SNOOPACC value */
+
+#define SCOM_PSR 0x408001                       /* PSR scom addr */
+/* warning: PSR is a 64 bits register */
+#define PSR_CMD_RECEIVED        0x2000000000000000U   /* command received */
+#define PSR_CMD_COMPLETED       0x1000000000000000U   /* command completed */
+#define PSR_CUR_SPEED_MASK      0x0300000000000000U   /* current speed */
+#define PSR_CUR_SPEED_SHIFT     (56)
+
+/*
+ * The G5 only supports two frequencies (Quarter speed is not supported)
+ */
+#define CPUFREQ_HIGH                  0
+#define CPUFREQ_LOW                   1
+
+static struct cpufreq_frequency_table g5_cpu_freqs[] = {
+        {CPUFREQ_HIGH,          0},
+        {CPUFREQ_LOW,           0},
+        {0,                     CPUFREQ_TABLE_END},
+};
+
+static struct freq_attr* g5_cpu_freqs_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
+/* Power mode data is an array of the 32 bits PCR values to use for
+ * the various frequencies, retrieved from the device-tree
+ */
+static int g5_pmode_cur;
+
+static void (*g5_switch_volt)(int speed_mode);
+static int (*g5_switch_freq)(int speed_mode);
+static int (*g5_query_freq)(void);
+
+static DEFINE_MUTEX(g5_switch_mutex);
+
+static unsigned long transition_latency;
+
+#ifdef CONFIG_PMAC_SMU
+
+static const u32 *g5_pmode_data;
+static int g5_pmode_max;
+
+static struct smu_sdbp_fvt *g5_fvt_table;       /* table of op. points */
+static int g5_fvt_count;                        /* number of op. points */
+static int g5_fvt_cur;                          /* current op. point */
+
+/*
+ * SMU based voltage switching for Neo2 platforms
+ */
+
+static void g5_smu_switch_volt(int speed_mode)
+{
+        struct smu_simple_cmd   cmd;
+
+        DECLARE_COMPLETION_ONSTACK(comp);
+        smu_queue_simple(&cmd, SMU_CMD_POWER_COMMAND, 8, smu_done_complete,
+                         &comp, 'V', 'S', 'L', 'E', 'W',
+                         0xff, g5_fvt_cur+1, speed_mode);
+        wait_for_completion(&comp);
+}
+
+/*
+ * Platform function based voltage/vdnap switching for Neo2
+ */
+
+static struct pmf_function *pfunc_set_vdnap0;
+static struct pmf_function *pfunc_vdnap0_complete;
+
+static void g5_vdnap_switch_volt(int speed_mode)
+{
+        struct pmf_args args;
+        u32 slew, done = 0;
+        unsigned long timeout;
+
+        slew = (speed_mode == CPUFREQ_LOW) ? 1 : 0;
+        args.count = 1;
+        args.u[0].p = &slew;
+
+        pmf_call_one(pfunc_set_vdnap0, &args);
+
+        /* It's an irq GPIO so we should be able to just block here,
+         * I'll do that later after I've properly tested the IRQ code for
+         * platform functions
+         */
+        timeout = jiffies + HZ/10;
+        while(!time_after(jiffies, timeout)) {
+                args.count = 1;
+                args.u[0].p = &done;
+                pmf_call_one(pfunc_vdnap0_complete, &args);
+                if (done)
+                        break;
+                msleep(1);
+        }
+        if (done == 0)
+                printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n");
+}
+
+
+/*
+ * SCOM based frequency switching for 970FX rev3
+ */
+static int g5_scom_switch_freq(int speed_mode)
+{
+        unsigned long flags;
+        int to;
+
+        /* If frequency is going up, first ramp up the voltage */
+        if (speed_mode < g5_pmode_cur)
+                g5_switch_volt(speed_mode);
+
+        local_irq_save(flags);
+
+        /* Clear PCR high */
+        scom970_write(SCOM_PCR, 0);
+        /* Clear PCR low */
+        scom970_write(SCOM_PCR, PCR_HILO_SELECT | 0);
+        /* Set PCR low */
+        scom970_write(SCOM_PCR, PCR_HILO_SELECT |
+                      g5_pmode_data[speed_mode]);
+
+        /* Wait for completion */
+        for (to = 0; to < 10; to++) {
+                unsigned long psr = scom970_read(SCOM_PSR);
+
+                if ((psr & PSR_CMD_RECEIVED) == 0 &&
+                    (((psr >> PSR_CUR_SPEED_SHIFT) ^
+                      (g5_pmode_data[speed_mode] >> PCR_SPEED_SHIFT)) & 0x3)
+                    == 0)
+                        break;
+                if (psr & PSR_CMD_COMPLETED)
+                        break;
+                udelay(100);
+        }
+
+        local_irq_restore(flags);
+
+        /* If frequency is going down, last ramp the voltage */
+        if (speed_mode > g5_pmode_cur)
+                g5_switch_volt(speed_mode);
+
+        g5_pmode_cur = speed_mode;
+        ppc_proc_freq = g5_cpu_freqs[speed_mode].frequency * 1000ul;
+
+        return 0;
+}
+
+static int g5_scom_query_freq(void)
+{
+        unsigned long psr = scom970_read(SCOM_PSR);
+        int i;
+
+        for (i = 0; i <= g5_pmode_max; i++)
+                if ((((psr >> PSR_CUR_SPEED_SHIFT) ^
+                      (g5_pmode_data[i] >> PCR_SPEED_SHIFT)) & 0x3) == 0)
+                        break;
+        return i;
+}
+
+/*
+ * Fake voltage switching for platforms with missing support
+ */
+
+static void g5_dummy_switch_volt(int speed_mode)
+{
+}
+
+#endif /* CONFIG_PMAC_SMU */
+
+/*
+ * Platform function based voltage switching for PowerMac7,2 & 7,3
+ */
+
+static struct pmf_function *pfunc_cpu0_volt_high;
+static struct pmf_function *pfunc_cpu0_volt_low;
+static struct pmf_function *pfunc_cpu1_volt_high;
+static struct pmf_function *pfunc_cpu1_volt_low;
+
+static void g5_pfunc_switch_volt(int speed_mode)
+{
+        if (speed_mode == CPUFREQ_HIGH) {
+                if (pfunc_cpu0_volt_high)
+                        pmf_call_one(pfunc_cpu0_volt_high, NULL);
+                if (pfunc_cpu1_volt_high)
+                        pmf_call_one(pfunc_cpu1_volt_high, NULL);
+        } else {
+                if (pfunc_cpu0_volt_low)
+                        pmf_call_one(pfunc_cpu0_volt_low, NULL);
+                if (pfunc_cpu1_volt_low)
+                        pmf_call_one(pfunc_cpu1_volt_low, NULL);
+        }
+        msleep(10); /* should be faster , to fix */
+}
+
+/*
+ * Platform function based frequency switching for PowerMac7,2 & 7,3
+ */
+
+static struct pmf_function *pfunc_cpu_setfreq_high;
+static struct pmf_function *pfunc_cpu_setfreq_low;
+static struct pmf_function *pfunc_cpu_getfreq;
+static struct pmf_function *pfunc_slewing_done;
+
+static int g5_pfunc_switch_freq(int speed_mode)
+{
+        struct pmf_args args;
+        u32 done = 0;
+        unsigned long timeout;
+        int rc;
+
+        DBG("g5_pfunc_switch_freq(%d)\n", speed_mode);
+
+        /* If frequency is going up, first ramp up the voltage */
+        if (speed_mode < g5_pmode_cur)
+                g5_switch_volt(speed_mode);
+
+        /* Do it */
+        if (speed_mode == CPUFREQ_HIGH)
+                rc = pmf_call_one(pfunc_cpu_setfreq_high, NULL);
+        else
+                rc = pmf_call_one(pfunc_cpu_setfreq_low, NULL);
+
+        if (rc)
+                printk(KERN_WARNING "cpufreq: pfunc switch error %d\n", rc);
+
+        /* It's an irq GPIO so we should be able to just block here,
+         * I'll do that later after I've properly tested the IRQ code for
+         * platform functions
+         */
+        timeout = jiffies + HZ/10;
+        while(!time_after(jiffies, timeout)) {
+                args.count = 1;
+                args.u[0].p = &done;
+                pmf_call_one(pfunc_slewing_done, &args);
+                if (done)
+                        break;
+                msleep(1);
+        }
+        if (done == 0)
+                printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n");
+
+        /* If frequency is going down, last ramp the voltage */
+        if (speed_mode > g5_pmode_cur)
+                g5_switch_volt(speed_mode);
+
+        g5_pmode_cur = speed_mode;
+        ppc_proc_freq = g5_cpu_freqs[speed_mode].frequency * 1000ul;
+
+        return 0;
+}
+
+static int g5_pfunc_query_freq(void)
+{
+        struct pmf_args args;
+        u32 val = 0;
+
+        args.count = 1;
+        args.u[0].p = &val;
+        pmf_call_one(pfunc_cpu_getfreq, &args);
+        return val ? CPUFREQ_HIGH : CPUFREQ_LOW;
+}
+
+
+/*
+ * Common interface to the cpufreq core
+ */
+
+static int g5_cpufreq_verify(struct cpufreq_policy *policy)
+{
+        return cpufreq_frequency_table_verify(policy, g5_cpu_freqs);
+}
+
+static int g5_cpufreq_target(struct cpufreq_policy *policy,
+        unsigned int target_freq, unsigned int relation)
+{
+        unsigned int newstate = 0;
+        struct cpufreq_freqs freqs;
+        int rc;
+
+        if (cpufreq_frequency_table_target(policy, g5_cpu_freqs,
+                        target_freq, relation, &newstate))
+                return -EINVAL;
+
+        if (g5_pmode_cur == newstate)
+                return 0;
+
+        mutex_lock(&g5_switch_mutex);
+
+        freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency;
+        freqs.new = g5_cpu_freqs[newstate].frequency;
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+        rc = g5_switch_freq(newstate);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+
+        mutex_unlock(&g5_switch_mutex);
+
+        return rc;
+}
+
+static unsigned int g5_cpufreq_get_speed(unsigned int cpu)
+{
+        return g5_cpu_freqs[g5_pmode_cur].frequency;
+}
+
+static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
+{
+        policy->cpuinfo.transition_latency = transition_latency;
+        policy->cur = g5_cpu_freqs[g5_query_freq()].frequency;
+        /* secondary CPUs are tied to the primary one by the
+         * cpufreq core if in the secondary policy we tell it that
+         * it actually must be one policy together with all others. */
+        cpumask_copy(policy->cpus, cpu_online_mask);
+        cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu);
+
+        return cpufreq_frequency_table_cpuinfo(policy,
+                g5_cpu_freqs);
+}
+
+
+static struct cpufreq_driver g5_cpufreq_driver = {
+        .name           = "powermac",
+        .owner          = THIS_MODULE,
+        .flags          = CPUFREQ_CONST_LOOPS,
+        .init           = g5_cpufreq_cpu_init,
+        .verify         = g5_cpufreq_verify,
+        .target         = g5_cpufreq_target,
+        .get            = g5_cpufreq_get_speed,
+        .attr           = g5_cpu_freqs_attr,
+};
+
+
+#ifdef CONFIG_PMAC_SMU
+
+static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
+{
+        struct device_node *cpunode;
+        unsigned int psize, ssize;
+        unsigned long max_freq;
+        char *freq_method, *volt_method;
+        const u32 *valp;
+        u32 pvr_hi;
+        int use_volts_vdnap = 0;
+        int use_volts_smu = 0;
+        int rc = -ENODEV;
+
+        /* Check supported platforms */
+        if (of_machine_is_compatible("PowerMac8,1") ||
+            of_machine_is_compatible("PowerMac8,2") ||
+            of_machine_is_compatible("PowerMac9,1"))
+                use_volts_smu = 1;
+        else if (of_machine_is_compatible("PowerMac11,2"))
+                use_volts_vdnap = 1;
+        else
+                return -ENODEV;
+
+        /* Get first CPU node */
+        for (cpunode = NULL;
+             (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
+                const u32 *reg = of_get_property(cpunode, "reg", NULL);
+                if (reg == NULL || (*reg) != 0)
+                        continue;
+                if (!strcmp(cpunode->type, "cpu"))
+                        break;
+        }
+        if (cpunode == NULL) {
+                printk(KERN_ERR "cpufreq: Can't find any CPU 0 node\n");
+                return -ENODEV;
+        }
+
+        /* Check 970FX for now */
+        valp = of_get_property(cpunode, "cpu-version", NULL);
+        if (!valp) {
+                DBG("No cpu-version property !\n");
+                goto bail_noprops;
+        }
+        pvr_hi = (*valp) >> 16;
+        if (pvr_hi != 0x3c && pvr_hi != 0x44) {
+                printk(KERN_ERR "cpufreq: Unsupported CPU version\n");
+                goto bail_noprops;
+        }
+
+        /* Look for the powertune data in the device-tree */
+        g5_pmode_data = of_get_property(cpunode, "power-mode-data",&psize);
+        if (!g5_pmode_data) {
+                DBG("No power-mode-data !\n");
+                goto bail_noprops;
+        }
+        g5_pmode_max = psize / sizeof(u32) - 1;
+
+        if (use_volts_smu) {
+                const struct smu_sdbp_header *shdr;
+
+                /* Look for the FVT table */
+                shdr = smu_get_sdb_partition(SMU_SDB_FVT_ID, NULL);
+                if (!shdr)
+                        goto bail_noprops;
+                g5_fvt_table = (struct smu_sdbp_fvt *)&shdr[1];
+                ssize = (shdr->len * sizeof(u32)) -
+                        sizeof(struct smu_sdbp_header);
+                g5_fvt_count = ssize / sizeof(struct smu_sdbp_fvt);
+                g5_fvt_cur = 0;
+
+                /* Sanity checking */
+                if (g5_fvt_count < 1 || g5_pmode_max < 1)
+                        goto bail_noprops;
+
+                g5_switch_volt = g5_smu_switch_volt;
+                volt_method = "SMU";
+        } else if (use_volts_vdnap) {
+                struct device_node *root;
+
+                root = of_find_node_by_path("/");
+                if (root == NULL) {
+                        printk(KERN_ERR "cpufreq: Can't find root of "
+                               "device tree\n");
+                        goto bail_noprops;
+                }
+                pfunc_set_vdnap0 = pmf_find_function(root, "set-vdnap0");
+                pfunc_vdnap0_complete =
+                        pmf_find_function(root, "slewing-done");
+                if (pfunc_set_vdnap0 == NULL ||
+                    pfunc_vdnap0_complete == NULL) {
+                        printk(KERN_ERR "cpufreq: Can't find required "
+                               "platform function\n");
+                        goto bail_noprops;
+                }
+
+                g5_switch_volt = g5_vdnap_switch_volt;
+                volt_method = "GPIO";
+        } else {
+                g5_switch_volt = g5_dummy_switch_volt;
+                volt_method = "none";
+        }
+
+        /*
+         * From what I see, clock-frequency is always the maximal frequency.
+         * The current driver can not slew sysclk yet, so we really only deal
+         * with powertune steps for now. We also only implement full freq and
+         * half freq in this version. So far, I haven't yet seen a machine
+         * supporting anything else.
+         */
+        valp = of_get_property(cpunode, "clock-frequency", NULL);
+        if (!valp)
+                return -ENODEV;
+        max_freq = (*valp)/1000;
+        g5_cpu_freqs[0].frequency = max_freq;
+        g5_cpu_freqs[1].frequency = max_freq/2;
+
+        /* Set callbacks */
+        transition_latency = 12000;
+        g5_switch_freq = g5_scom_switch_freq;
+        g5_query_freq = g5_scom_query_freq;
+        freq_method = "SCOM";
+
+        /* Force apply current frequency to make sure everything is in
+         * sync (voltage is right for example). Firmware may leave us with
+         * a strange setting ...
+         */
+        g5_switch_volt(CPUFREQ_HIGH);
+        msleep(10);
+        g5_pmode_cur = -1;
+        g5_switch_freq(g5_query_freq());
+
+        printk(KERN_INFO "Registering G5 CPU frequency driver\n");
+        printk(KERN_INFO "Frequency method: %s, Voltage method: %s\n",
+               freq_method, volt_method);
+        printk(KERN_INFO "Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n",
+                g5_cpu_freqs[1].frequency/1000,
+                g5_cpu_freqs[0].frequency/1000,
+                g5_cpu_freqs[g5_pmode_cur].frequency/1000);
+
+        rc = cpufreq_register_driver(&g5_cpufreq_driver);
+
+        /* We keep the CPU node on hold... hopefully, Apple G5 don't have
+         * hotplug CPU with a dynamic device-tree ...
+         */
+        return rc;
+
+ bail_noprops:
+        of_node_put(cpunode);
+
+        return rc;
+}
+
+#endif /* CONFIG_PMAC_SMU */
+
+
+static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
+{
+        struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
+        const u8 *eeprom = NULL;
+        const u32 *valp;
+        u64 max_freq, min_freq, ih, il;
+        int has_volt = 1, rc = 0;
+
+        DBG("cpufreq: Initializing for PowerMac7,2, PowerMac7,3 and"
+            " RackMac3,1...\n");
+
+        /* Get first CPU node */
+        for (cpunode = NULL;
+             (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
+                if (!strcmp(cpunode->type, "cpu"))
+                        break;
+        }
+        if (cpunode == NULL) {
+                printk(KERN_ERR "cpufreq: Can't find any CPU node\n");
+                return -ENODEV;
+        }
+
+        /* Lookup the cpuid eeprom node */
+        cpuid = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/cpuid@a0");
+        if (cpuid != NULL)
+                eeprom = of_get_property(cpuid, "cpuid", NULL);
+        if (eeprom == NULL) {
+                printk(KERN_ERR "cpufreq: Can't find cpuid EEPROM !\n");
+                rc = -ENODEV;
+                goto bail;
+        }
+
+        /* Lookup the i2c hwclock */
+        for (hwclock = NULL;
+             (hwclock = of_find_node_by_name(hwclock, "i2c-hwclock")) != NULL;){
+                const char *loc = of_get_property(hwclock,
+                                "hwctrl-location", NULL);
+                if (loc == NULL)
+                        continue;
+                if (strcmp(loc, "CPU CLOCK"))
+                        continue;
+                if (!of_get_property(hwclock, "platform-get-frequency", NULL))
+                        continue;
+                break;
+        }
+        if (hwclock == NULL) {
+                printk(KERN_ERR "cpufreq: Can't find i2c clock chip !\n");
+                rc = -ENODEV;
+                goto bail;
+        }
+
+        DBG("cpufreq: i2c clock chip found: %s\n", hwclock->full_name);
+
+        /* Now get all the platform functions */
+        pfunc_cpu_getfreq =
+                pmf_find_function(hwclock, "get-frequency");
+        pfunc_cpu_setfreq_high =
+                pmf_find_function(hwclock, "set-frequency-high");
+        pfunc_cpu_setfreq_low =
+                pmf_find_function(hwclock, "set-frequency-low");
+        pfunc_slewing_done =
+                pmf_find_function(hwclock, "slewing-done");
+        pfunc_cpu0_volt_high =
+                pmf_find_function(hwclock, "set-voltage-high-0");
+        pfunc_cpu0_volt_low =
+                pmf_find_function(hwclock, "set-voltage-low-0");
+        pfunc_cpu1_volt_high =
+                pmf_find_function(hwclock, "set-voltage-high-1");
+        pfunc_cpu1_volt_low =
+                pmf_find_function(hwclock, "set-voltage-low-1");
+
+        /* Check we have minimum requirements */
+        if (pfunc_cpu_getfreq == NULL || pfunc_cpu_setfreq_high == NULL ||
+            pfunc_cpu_setfreq_low == NULL || pfunc_slewing_done == NULL) {
+                printk(KERN_ERR "cpufreq: Can't find platform functions !\n");
+                rc = -ENODEV;
+                goto bail;
+        }
+
+        /* Check that we have complete sets */
+        if (pfunc_cpu0_volt_high == NULL || pfunc_cpu0_volt_low == NULL) {
+                pmf_put_function(pfunc_cpu0_volt_high);
+                pmf_put_function(pfunc_cpu0_volt_low);
+                pfunc_cpu0_volt_high = pfunc_cpu0_volt_low = NULL;
+                has_volt = 0;
+        }
+        if (!has_volt ||
+            pfunc_cpu1_volt_high == NULL || pfunc_cpu1_volt_low == NULL) {
+                pmf_put_function(pfunc_cpu1_volt_high);
+                pmf_put_function(pfunc_cpu1_volt_low);
+                pfunc_cpu1_volt_high = pfunc_cpu1_volt_low = NULL;
+        }
+
+        /* Note: The device tree also contains a "platform-set-values"
+         * function for which I haven't quite figured out the usage. It
+         * might have to be called on init and/or wakeup, I'm not too sure
+         * but things seem to work fine without it so far ...
+         */
+
+        /* Get max frequency from device-tree */
+        valp = of_get_property(cpunode, "clock-frequency", NULL);
+        if (!valp) {
+                printk(KERN_ERR "cpufreq: Can't find CPU frequency !\n");
+                rc = -ENODEV;
+                goto bail;
+        }
+
+        max_freq = (*valp)/1000;
+
+        /* Now calculate reduced frequency by using the cpuid input freq
+         * ratio. This requires 64 bits math unless we are willing to lose
+         * some precision
+         */
+        ih = *((u32 *)(eeprom + 0x10));
+        il = *((u32 *)(eeprom + 0x20));
+
+        /* Check for machines with no useful settings */
+        if (il == ih) {
+                printk(KERN_WARNING "cpufreq: No low frequency mode available"
+                       " on this model !\n");
+                rc = -ENODEV;
+                goto bail;
+        }
+
+        min_freq = 0;
+        if (ih != 0 && il != 0)
+                min_freq = (max_freq * il) / ih;
+
+        /* Sanity check */
+        if (min_freq >= max_freq || min_freq < 1000) {
+                printk(KERN_ERR "cpufreq: Can't calculate low frequency !\n");
+                rc = -ENXIO;
+                goto bail;
+        }
+        g5_cpu_freqs[0].frequency = max_freq;
+        g5_cpu_freqs[1].frequency = min_freq;
+
+        /* Set callbacks */
+        transition_latency = CPUFREQ_ETERNAL;
+        g5_switch_volt = g5_pfunc_switch_volt;
+        g5_switch_freq = g5_pfunc_switch_freq;
+        g5_query_freq = g5_pfunc_query_freq;
+
+        /* Force apply current frequency to make sure everything is in
+         * sync (voltage is right for example). Firmware may leave us with
+         * a strange setting ...
+         */
+        g5_switch_volt(CPUFREQ_HIGH);
+        msleep(10);
+        g5_pmode_cur = -1;
+        g5_switch_freq(g5_query_freq());
+
+        printk(KERN_INFO "Registering G5 CPU frequency driver\n");
+        printk(KERN_INFO "Frequency method: i2c/pfunc, "
+               "Voltage method: %s\n", has_volt ? "i2c/pfunc" : "none");
+        printk(KERN_INFO "Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n",
+                g5_cpu_freqs[1].frequency/1000,
+                g5_cpu_freqs[0].frequency/1000,
+                g5_cpu_freqs[g5_pmode_cur].frequency/1000);
+
+        rc = cpufreq_register_driver(&g5_cpufreq_driver);
+ bail:
+        if (rc != 0) {
+                pmf_put_function(pfunc_cpu_getfreq);
+                pmf_put_function(pfunc_cpu_setfreq_high);
+                pmf_put_function(pfunc_cpu_setfreq_low);
+                pmf_put_function(pfunc_slewing_done);
+                pmf_put_function(pfunc_cpu0_volt_high);
+                pmf_put_function(pfunc_cpu0_volt_low);
+                pmf_put_function(pfunc_cpu1_volt_high);
+                pmf_put_function(pfunc_cpu1_volt_low);
+        }
+        of_node_put(hwclock);
+        of_node_put(cpuid);
+        of_node_put(cpunode);
+
+        return rc;
+}
+
+static int __init g5_cpufreq_init(void)
+{
+        struct device_node *cpus;
+        int rc = 0;
+
+        cpus = of_find_node_by_path("/cpus");
+        if (cpus == NULL) {
+                DBG("No /cpus node !\n");
+                return -ENODEV;
+        }
+
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
+                rc = g5_pm72_cpufreq_init(cpus);
+#ifdef CONFIG_PMAC_SMU
+        else
+                rc = g5_neo2_cpufreq_init(cpus);
+#endif /* CONFIG_PMAC_SMU */
+
+        of_node_put(cpus);
+        return rc;
+}
+
+module_init(g5_cpufreq_init);
+
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index ea0222a45b7b..ea8e10382ec5 100644
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -58,7 +58,7 @@ static int powernow_k6_get_cpu_multiplier(void)
         msrval = POWERNOW_IOPORT + 0x0;
         wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
 
-        return clock_ratio[(invalue >> 5)&7].index;
+        return clock_ratio[(invalue >> 5)&7].driver_data;
 }
 
 
@@ -75,13 +75,13 @@ static void powernow_k6_set_state(struct cpufreq_policy *policy,
         unsigned long msrval;
         struct cpufreq_freqs freqs;
 
-        if (clock_ratio[best_i].index > max_multiplier) {
+        if (clock_ratio[best_i].driver_data > max_multiplier) {
                 printk(KERN_ERR PFX "invalid target frequency\n");
                 return;
         }
 
         freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
-        freqs.new = busfreq * clock_ratio[best_i].index;
+        freqs.new = busfreq * clock_ratio[best_i].driver_data;
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
@@ -156,7 +156,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
 
         /* table init */
         for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
-                f = clock_ratio[i].index;
+                f = clock_ratio[i].driver_data;
                 if (f > max_multiplier)
                         clock_ratio[i].frequency = CPUFREQ_ENTRY_INVALID;
                 else
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 53888dacbe58..b9f80b713fda 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -186,7 +186,7 @@ static int get_ranges(unsigned char *pst)
                 fid = *pst++;
 
                 powernow_table[j].frequency = (fsb * fid_codes[fid]) / 10;
-                powernow_table[j].index = fid; /* lower 8 bits */
+                powernow_table[j].driver_data = fid; /* lower 8 bits */
 
                 speed = powernow_table[j].frequency;
 
@@ -203,7 +203,7 @@ static int get_ranges(unsigned char *pst)
                         maximum_speed = speed;
 
                 vid = *pst++;
-                powernow_table[j].index |= (vid << 8); /* upper 8 bits */
+                powernow_table[j].driver_data |= (vid << 8); /* upper 8 bits */
 
                 pr_debug("   FID: 0x%x (%d.%dx [%dMHz])  "
                          "VID: 0x%x (%d.%03dV)\n", fid, fid_codes[fid] / 10,
@@ -212,7 +212,7 @@ static int get_ranges(unsigned char *pst)
                          mobile_vid_table[vid]%1000);
         }
         powernow_table[number_scales].frequency = CPUFREQ_TABLE_END;
-        powernow_table[number_scales].index = 0;
+        powernow_table[number_scales].driver_data = 0;
 
         return 0;
 }
@@ -260,8 +260,8 @@ static void change_speed(struct cpufreq_policy *policy, unsigned int index)
          * vid are the upper 8 bits.
          */
 
-        fid = powernow_table[index].index & 0xFF;
-        vid = (powernow_table[index].index & 0xFF00) >> 8;
+        fid = powernow_table[index].driver_data & 0xFF;
+        vid = (powernow_table[index].driver_data & 0xFF00) >> 8;
 
         rdmsrl(MSR_K7_FID_VID_STATUS, fidvidstatus.val);
         cfid = fidvidstatus.bits.CFID;
@@ -373,8 +373,8 @@ static int powernow_acpi_init(void)
                 fid = pc.bits.fid;
 
                 powernow_table[i].frequency = fsb * fid_codes[fid] / 10;
-                powernow_table[i].index = fid; /* lower 8 bits */
-                powernow_table[i].index |= (vid << 8); /* upper 8 bits */
+                powernow_table[i].driver_data = fid; /* lower 8 bits */
+                powernow_table[i].driver_data |= (vid << 8); /* upper 8 bits */
 
                 speed = powernow_table[i].frequency;
                 speed_mhz = speed / 1000;
@@ -417,7 +417,7 @@ static int powernow_acpi_init(void)
         }
 
         powernow_table[i].frequency = CPUFREQ_TABLE_END;
-        powernow_table[i].index = 0;
+        powernow_table[i].driver_data = 0;
 
         /* notify BIOS that we exist */
         acpi_processor_notify_smm(THIS_MODULE);
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index b828efe4b2f8..78f018f2a5de 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -584,9 +584,9 @@ static void print_basics(struct powernow_k8_data *data)
                                 CPUFREQ_ENTRY_INVALID) {
                                 printk(KERN_INFO PFX
                                         "fid 0x%x (%d MHz), vid 0x%x\n",
-                                        data->powernow_table[j].index & 0xff,
+                                        data->powernow_table[j].driver_data & 0xff,
                                         data->powernow_table[j].frequency/1000,
-                                        data->powernow_table[j].index >> 8);
+                                        data->powernow_table[j].driver_data >> 8);
                 }
         }
         if (data->batps)
@@ -632,13 +632,13 @@ static int fill_powernow_table(struct powernow_k8_data *data,
 
         for (j = 0; j < data->numps; j++) {
                 int freq;
-                powernow_table[j].index = pst[j].fid; /* lower 8 bits */
-                powernow_table[j].index |= (pst[j].vid << 8); /* upper 8 bits */
+                powernow_table[j].driver_data = pst[j].fid; /* lower 8 bits */
+                powernow_table[j].driver_data |= (pst[j].vid << 8); /* upper 8 bits */
                 freq = find_khz_freq_from_fid(pst[j].fid);
                 powernow_table[j].frequency = freq;
         }
         powernow_table[data->numps].frequency = CPUFREQ_TABLE_END;
-        powernow_table[data->numps].index = 0;
+        powernow_table[data->numps].driver_data = 0;
 
         if (query_current_values_with_pending_wait(data)) {
                 kfree(powernow_table);
@@ -810,7 +810,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
 
         powernow_table[data->acpi_data.state_count].frequency =
                 CPUFREQ_TABLE_END;
-        powernow_table[data->acpi_data.state_count].index = 0;
+        powernow_table[data->acpi_data.state_count].driver_data = 0;
         data->powernow_table = powernow_table;
 
         if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
@@ -865,7 +865,7 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data,
                 pr_debug("   %d : fid 0x%x, vid 0x%x\n", i, fid, vid);
 
                 index = fid | (vid<<8);
-                powernow_table[i].index = index;
+                powernow_table[i].driver_data = index;
 
                 freq = find_khz_freq_from_fid(fid);
                 powernow_table[i].frequency = freq;
@@ -941,8 +941,8 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
          * the cpufreq frequency table in find_psb_table, vid
          * are the upper 8 bits.
          */
-        fid = data->powernow_table[index].index & 0xFF;
-        vid = (data->powernow_table[index].index & 0xFF00) >> 8;
+        fid = data->powernow_table[index].driver_data & 0xFF;
+        vid = (data->powernow_table[index].driver_data & 0xFF00) >> 8;
 
         pr_debug("table matched fid 0x%x, giving vid 0x%x\n", fid, vid);
 
@@ -967,9 +967,9 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
 
         res = transition_fid_vid(data, fid, vid);
         if (res)
-                return res;
-
-        freqs.new = find_khz_freq_from_fid(data->currfid);
+                freqs.new = freqs.old;
+        else
+                freqs.new = find_khz_freq_from_fid(data->currfid);
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         return res;
diff --git a/drivers/cpufreq/ppc-corenet-cpufreq.c b/drivers/cpufreq/ppc-corenet-cpufreq.c
new file mode 100644
index 000000000000..3cae4529f959
--- /dev/null
+++ b/drivers/cpufreq/ppc-corenet-cpufreq.c
@@ -0,0 +1,380 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * CPU Frequency Scaling driver for Freescale PowerPC corenet SoCs.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt)     KBUILD_MODNAME ": " fmt
+
+#include <linux/clk.h>
+#include <linux/cpufreq.h>
+#include <linux/errno.h>
+#include <sysdev/fsl_soc.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
+
+/**
+ * struct cpu_data - per CPU data struct
+ * @clk: the clk of CPU
+ * @parent: the parent node of cpu clock
+ * @table: frequency table
+ */
+struct cpu_data {
+        struct clk *clk;
+        struct device_node *parent;
+        struct cpufreq_frequency_table *table;
+};
+
+/**
+ * struct soc_data - SoC specific data
+ * @freq_mask: mask the disallowed frequencies
+ * @flag: unique flags
+ */
+struct soc_data {
+        u32 freq_mask[4];
+        u32 flag;
+};
+
+#define FREQ_MASK       1
+/* see hardware specification for the allowed frqeuencies */
+static const struct soc_data sdata[] = {
+        { /* used by p2041 and p3041 */
+                .freq_mask = {0x8, 0x8, 0x2, 0x2},
+                .flag = FREQ_MASK,
+        },
+        { /* used by p5020 */
+                .freq_mask = {0x8, 0x2},
+                .flag = FREQ_MASK,
+        },
+        { /* used by p4080, p5040 */
+                .freq_mask = {0},
+                .flag = 0,
+        },
+};
+
+/*
+ * the minimum allowed core frequency, in Hz
+ * for chassis v1.0, >= platform frequency
+ * for chassis v2.0, >= platform frequency / 2
+ */
+static u32 min_cpufreq;
+static const u32 *fmask;
+
+/* serialize frequency changes  */
+static DEFINE_MUTEX(cpufreq_lock);
+static DEFINE_PER_CPU(struct cpu_data *, cpu_data);
+
+/* cpumask in a cluster */
+static DEFINE_PER_CPU(cpumask_var_t, cpu_mask);
+
+#ifndef CONFIG_SMP
+static inline const struct cpumask *cpu_core_mask(int cpu)
+{
+        return cpumask_of(0);
+}
+#endif
+
+static unsigned int corenet_cpufreq_get_speed(unsigned int cpu)
+{
+        struct cpu_data *data = per_cpu(cpu_data, cpu);
+
+        return clk_get_rate(data->clk) / 1000;
+}
+
+/* reduce the duplicated frequencies in frequency table */
+static void freq_table_redup(struct cpufreq_frequency_table *freq_table,
+                int count)
+{
+        int i, j;
+
+        for (i = 1; i < count; i++) {
+                for (j = 0; j < i; j++) {
+                        if (freq_table[j].frequency == CPUFREQ_ENTRY_INVALID ||
+                                        freq_table[j].frequency !=
+                                        freq_table[i].frequency)
+                                continue;
+
+                        freq_table[i].frequency = CPUFREQ_ENTRY_INVALID;
+                        break;
+                }
+        }
+}
+
+/* sort the frequencies in frequency table in descenting order */
+static void freq_table_sort(struct cpufreq_frequency_table *freq_table,
+                int count)
+{
+        int i, j, ind;
+        unsigned int freq, max_freq;
+        struct cpufreq_frequency_table table;
+        for (i = 0; i < count - 1; i++) {
+                max_freq = freq_table[i].frequency;
+                ind = i;
+                for (j = i + 1; j < count; j++) {
+                        freq = freq_table[j].frequency;
+                        if (freq == CPUFREQ_ENTRY_INVALID ||
+                                        freq <= max_freq)
+                                continue;
+                        ind = j;
+                        max_freq = freq;
+                }
+
+                if (ind != i) {
+                        /* exchange the frequencies */
+                        table.driver_data = freq_table[i].driver_data;
+                        table.frequency = freq_table[i].frequency;
+                        freq_table[i].driver_data = freq_table[ind].driver_data;
+                        freq_table[i].frequency = freq_table[ind].frequency;
+                        freq_table[ind].driver_data = table.driver_data;
+                        freq_table[ind].frequency = table.frequency;
+                }
+        }
+}
+
+static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy)
+{
+        struct device_node *np;
+        int i, count, ret;
+        u32 freq, mask;
+        struct clk *clk;
+        struct cpufreq_frequency_table *table;
+        struct cpu_data *data;
+        unsigned int cpu = policy->cpu;
+
+        np = of_get_cpu_node(cpu, NULL);
+        if (!np)
+                return -ENODEV;
+
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                pr_err("%s: no memory\n", __func__);
+                goto err_np;
+        }
+
+        data->clk = of_clk_get(np, 0);
+        if (IS_ERR(data->clk)) {
+                pr_err("%s: no clock information\n", __func__);
+                goto err_nomem2;
+        }
+
+        data->parent = of_parse_phandle(np, "clocks", 0);
+        if (!data->parent) {
+                pr_err("%s: could not get clock information\n", __func__);
+                goto err_nomem2;
+        }
+
+        count = of_property_count_strings(data->parent, "clock-names");
+        table = kcalloc(count + 1, sizeof(*table), GFP_KERNEL);
+        if (!table) {
+                pr_err("%s: no memory\n", __func__);
+                goto err_node;
+        }
+
+        if (fmask)
+                mask = fmask[get_hard_smp_processor_id(cpu)];
+        else
+                mask = 0x0;
+
+        for (i = 0; i < count; i++) {
+                clk = of_clk_get(data->parent, i);
+                freq = clk_get_rate(clk);
+                /*
+                 * the clock is valid if its frequency is not masked
+                 * and large than minimum allowed frequency.
+                 */
+                if (freq < min_cpufreq || (mask & (1 << i)))
+                        table[i].frequency = CPUFREQ_ENTRY_INVALID;
+                else
+                        table[i].frequency = freq / 1000;
+                table[i].driver_data = i;
+        }
+        freq_table_redup(table, count);
+        freq_table_sort(table, count);
+        table[i].frequency = CPUFREQ_TABLE_END;
+
+        /* set the min and max frequency properly */
+        ret = cpufreq_frequency_table_cpuinfo(policy, table);
+        if (ret) {
+                pr_err("invalid frequency table: %d\n", ret);
+                goto err_nomem1;
+        }
+
+        data->table = table;
+        per_cpu(cpu_data, cpu) = data;
+
+        /* update ->cpus if we have cluster, no harm if not */
+        cpumask_copy(policy->cpus, per_cpu(cpu_mask, cpu));
+        for_each_cpu(i, per_cpu(cpu_mask, cpu))
+                per_cpu(cpu_data, i) = data;
+
+        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        policy->cur = corenet_cpufreq_get_speed(policy->cpu);
+
+        cpufreq_frequency_table_get_attr(table, cpu);
+        of_node_put(np);
+
+        return 0;
+
+err_nomem1:
+        kfree(table);
+err_node:
+        of_node_put(data->parent);
+err_nomem2:
+        per_cpu(cpu_data, cpu) = NULL;
+        kfree(data);
+err_np:
+        of_node_put(np);
+
+        return -ENODEV;
+}
+
+static int __exit corenet_cpufreq_cpu_exit(struct cpufreq_policy *policy)
+{
+        struct cpu_data *data = per_cpu(cpu_data, policy->cpu);
+        unsigned int cpu;
+
+        cpufreq_frequency_table_put_attr(policy->cpu);
+        of_node_put(data->parent);
+        kfree(data->table);
+        kfree(data);
+
+        for_each_cpu(cpu, per_cpu(cpu_mask, policy->cpu))
+                per_cpu(cpu_data, cpu) = NULL;
+
+        return 0;
+}
+
+static int corenet_cpufreq_verify(struct cpufreq_policy *policy)
+{
+        struct cpufreq_frequency_table *table =
+                per_cpu(cpu_data, policy->cpu)->table;
+
+        return cpufreq_frequency_table_verify(policy, table);
+}
+
+static int corenet_cpufreq_target(struct cpufreq_policy *policy,
+                unsigned int target_freq, unsigned int relation)
+{
+        struct cpufreq_freqs freqs;
+        unsigned int new;
+        struct clk *parent;
+        int ret;
+        struct cpu_data *data = per_cpu(cpu_data, policy->cpu);
+
+        cpufreq_frequency_table_target(policy, data->table,
+                        target_freq, relation, &new);
+
+        if (policy->cur == data->table[new].frequency)
+                return 0;
+
+        freqs.old = policy->cur;
+        freqs.new = data->table[new].frequency;
+
+        mutex_lock(&cpufreq_lock);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
+        parent = of_clk_get(data->parent, data->table[new].driver_data);
+        ret = clk_set_parent(data->clk, parent);
+        if (ret)
+                freqs.new = freqs.old;
+
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+        mutex_unlock(&cpufreq_lock);
+
+        return ret;
+}
+
+static struct freq_attr *corenet_cpufreq_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
+static struct cpufreq_driver ppc_corenet_cpufreq_driver = {
+        .name           = "ppc_cpufreq",
+        .owner          = THIS_MODULE,
+        .flags          = CPUFREQ_CONST_LOOPS,
+        .init           = corenet_cpufreq_cpu_init,
+        .exit           = __exit_p(corenet_cpufreq_cpu_exit),
+        .verify         = corenet_cpufreq_verify,
+        .target         = corenet_cpufreq_target,
+        .get            = corenet_cpufreq_get_speed,
+        .attr           = corenet_cpufreq_attr,
+};
+
+static const struct of_device_id node_matches[] __initdata = {
+        { .compatible = "fsl,p2041-clockgen", .data = &sdata[0], },
+        { .compatible = "fsl,p3041-clockgen", .data = &sdata[0], },
+        { .compatible = "fsl,p5020-clockgen", .data = &sdata[1], },
+        { .compatible = "fsl,p4080-clockgen", .data = &sdata[2], },
+        { .compatible = "fsl,p5040-clockgen", .data = &sdata[2], },
+        { .compatible = "fsl,qoriq-clockgen-2.0", },
+        {}
+};
+
+static int __init ppc_corenet_cpufreq_init(void)
+{
+        int ret;
+        struct device_node  *np;
+        const struct of_device_id *match;
+        const struct soc_data *data;
+        unsigned int cpu;
+
+        np = of_find_matching_node(NULL, node_matches);
+        if (!np)
+                return -ENODEV;
+
+        for_each_possible_cpu(cpu) {
+                if (!alloc_cpumask_var(&per_cpu(cpu_mask, cpu), GFP_KERNEL))
+                        goto err_mask;
+                cpumask_copy(per_cpu(cpu_mask, cpu), cpu_core_mask(cpu));
+        }
+
+        match = of_match_node(node_matches, np);
+        data = match->data;
+        if (data) {
+                if (data->flag)
+                        fmask = data->freq_mask;
+                min_cpufreq = fsl_get_sys_freq();
+        } else {
+                min_cpufreq = fsl_get_sys_freq() / 2;
+        }
+
+        of_node_put(np);
+
+        ret = cpufreq_register_driver(&ppc_corenet_cpufreq_driver);
+        if (!ret)
+                pr_info("Freescale PowerPC corenet CPU frequency scaling driver\n");
+
+        return ret;
+
+err_mask:
+        for_each_possible_cpu(cpu)
+                free_cpumask_var(per_cpu(cpu_mask, cpu));
+
+        return -ENOMEM;
+}
+module_init(ppc_corenet_cpufreq_init);
+
+static void __exit ppc_corenet_cpufreq_exit(void)
+{
+        unsigned int cpu;
+
+        for_each_possible_cpu(cpu)
+                free_cpumask_var(per_cpu(cpu_mask, cpu));
+
+        cpufreq_unregister_driver(&ppc_corenet_cpufreq_driver);
+}
+module_exit(ppc_corenet_cpufreq_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Tang Yuantian <Yuantian.Tang@freescale.com>");
+MODULE_DESCRIPTION("cpufreq driver for Freescale e500mc series SoCs");
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index e577a1dbbfcd..5936f8d6f2cc 100644
--- a/drivers/cpufreq/ppc_cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -106,7 +106,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
         /* initialize frequency table */
         for (i=0; cbe_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
-                cbe_freqs[i].frequency = max_freq / cbe_freqs[i].index;
+                cbe_freqs[i].frequency = max_freq / cbe_freqs[i].driver_data;
                 pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
         }
 
@@ -165,7 +165,7 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy,
                  "1/%d of max frequency\n",
                  policy->cpu,
                  cbe_freqs[cbe_pmode_new].frequency,
-                 cbe_freqs[cbe_pmode_new].index);
+                 cbe_freqs[cbe_pmode_new].driver_data);
 
         rc = set_pmode(policy->cpu, cbe_pmode_new);
 
diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c
index 9e5bc8e388a0..fb3981ac829f 100644
--- a/drivers/cpufreq/pxa2xx-cpufreq.c
+++ b/drivers/cpufreq/pxa2xx-cpufreq.c
@@ -420,7 +420,7 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
         /* Generate pxa25x the run cpufreq_frequency_table struct */
         for (i = 0; i < NUM_PXA25x_RUN_FREQS; i++) {
                 pxa255_run_freq_table[i].frequency = pxa255_run_freqs[i].khz;
-                pxa255_run_freq_table[i].index = i;
+                pxa255_run_freq_table[i].driver_data = i;
         }
         pxa255_run_freq_table[i].frequency = CPUFREQ_TABLE_END;
 
@@ -428,7 +428,7 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
         for (i = 0; i < NUM_PXA25x_TURBO_FREQS; i++) {
                 pxa255_turbo_freq_table[i].frequency =
                         pxa255_turbo_freqs[i].khz;
-                pxa255_turbo_freq_table[i].index = i;
+                pxa255_turbo_freq_table[i].driver_data = i;
         }
         pxa255_turbo_freq_table[i].frequency = CPUFREQ_TABLE_END;
 
@@ -440,9 +440,9 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
                 if (freq > pxa27x_maxfreq)
                         break;
                 pxa27x_freq_table[i].frequency = freq;
-                pxa27x_freq_table[i].index = i;
+                pxa27x_freq_table[i].driver_data = i;
         }
-        pxa27x_freq_table[i].index = i;
+        pxa27x_freq_table[i].driver_data = i;
         pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;
 
         /*
diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c
index 15d60f857ad5..9c92ef032a9e 100644
--- a/drivers/cpufreq/pxa3xx-cpufreq.c
+++ b/drivers/cpufreq/pxa3xx-cpufreq.c
@@ -98,10 +98,10 @@ static int setup_freqs_table(struct cpufreq_policy *policy,
                 return -ENOMEM;
 
         for (i = 0; i < num; i++) {
-                table[i].index = i;
+                table[i].driver_data = i;
                 table[i].frequency = freqs[i].cpufreq_mhz * 1000;
         }
-        table[num].index = i;
+        table[num].driver_data = i;
         table[num].frequency = CPUFREQ_TABLE_END;
 
         pxa3xx_freqs = freqs;
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 4f1881eee3f1..e35865af96e2 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -244,7 +244,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,
         if (ret != 0)
                 goto out;
 
-        idx = s3c_freq->freq_table[i].index;
+        idx = s3c_freq->freq_table[i].driver_data;
 
         if (idx == SOURCE_HCLK)
                 to_dvs = 1;
@@ -312,7 +312,7 @@ static void __init s3c2416_cpufreq_cfg_regulator(struct s3c2416_data *s3c_freq)
                 if (freq->frequency == CPUFREQ_ENTRY_INVALID)
                         continue;
 
-                dvfs = &s3c2416_dvfs_table[freq->index];
+                dvfs = &s3c2416_dvfs_table[freq->driver_data];
                 found = 0;
 
                 /* Check only the min-voltage, more is always ok on S3C2416 */
@@ -462,7 +462,7 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
         freq = s3c_freq->freq_table;
         while (freq->frequency != CPUFREQ_TABLE_END) {
                 /* special handling for dvs mode */
-                if (freq->index == 0) {
+                if (freq->driver_data == 0) {
                         if (!s3c_freq->hclk) {
                                 pr_debug("cpufreq: %dkHz unsupported as it would need unavailable dvs mode\n",
                                          freq->frequency);
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c
index 3c0e78ede0da..3513e7477160 100644
--- a/drivers/cpufreq/s3c24xx-cpufreq.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq.c
@@ -70,7 +70,7 @@ static void s3c_cpufreq_getcur(struct s3c_cpufreq_config *cfg)
         cfg->freq.pclk = pclk = clk_get_rate(clk_pclk);
         cfg->freq.armclk = armclk = clk_get_rate(clk_arm);
 
-        cfg->pll.index = __raw_readl(S3C2410_MPLLCON);
+        cfg->pll.driver_data = __raw_readl(S3C2410_MPLLCON);
         cfg->pll.frequency = fclk;
 
         cfg->freq.hclk_tns = 1000000000 / (cfg->freq.hclk / 10);
@@ -431,7 +431,7 @@ static unsigned int suspend_freq;
 static int s3c_cpufreq_suspend(struct cpufreq_policy *policy)
 {
         suspend_pll.frequency = clk_get_rate(_clk_mpll);
-        suspend_pll.index = __raw_readl(S3C2410_MPLLCON);
+        suspend_pll.driver_data = __raw_readl(S3C2410_MPLLCON);
         suspend_freq = s3c_cpufreq_get(0) * 1000;
 
         return 0;
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index 27cacb524796..13bb4bae64ee 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -87,7 +87,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
         freqs.old = clk_get_rate(armclk) / 1000;
         freqs.new = s3c64xx_freq_table[i].frequency;
         freqs.flags = 0;
-        dvfs = &s3c64xx_dvfs_table[s3c64xx_freq_table[i].index];
+        dvfs = &s3c64xx_dvfs_table[s3c64xx_freq_table[i].driver_data];
 
         if (freqs.old == freqs.new)
                 return 0;
@@ -104,7 +104,8 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
                 if (ret != 0) {
                         pr_err("Failed to set VDDARM for %dkHz: %d\n",
                                freqs.new, ret);
-                        goto err;
+                        freqs.new = freqs.old;
+                        goto post_notify;
                 }
         }
 #endif
@@ -113,10 +114,13 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
         if (ret < 0) {
                 pr_err("Failed to set rate %dkHz: %d\n",
                        freqs.new, ret);
-                goto err;
+                freqs.new = freqs.old;
         }
 
+post_notify:
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+        if (ret)
+                goto err;
 
 #ifdef CONFIG_REGULATOR
         if (vddarm && freqs.new < freqs.old) {
diff --git a/drivers/cpufreq/sc520_freq.c b/drivers/cpufreq/sc520_freq.c
index f740b134d27b..77a210975fc4 100644
--- a/drivers/cpufreq/sc520_freq.c
+++ b/drivers/cpufreq/sc520_freq.c
@@ -71,7 +71,7 @@ static void sc520_freq_set_cpu_state(struct cpufreq_policy *policy,
         local_irq_disable();
 
         clockspeed_reg = *cpuctl & ~0x03;
-        *cpuctl = clockspeed_reg | sc520_freq_table[state].index;
+        *cpuctl = clockspeed_reg | sc520_freq_table[state].driver_data;
 
         local_irq_enable();
 
diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c
index 306ae462bba6..93061a408773 100644
--- a/drivers/cpufreq/sparc-us2e-cpufreq.c
+++ b/drivers/cpufreq/sparc-us2e-cpufreq.c
@@ -308,17 +308,17 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)
         struct cpufreq_frequency_table *table =
                 &us2e_freq_table[cpu].table[0];
 
-        table[0].index = 0;
+        table[0].driver_data = 0;
         table[0].frequency = clock_tick / 1;
-        table[1].index = 1;
+        table[1].driver_data = 1;
         table[1].frequency = clock_tick / 2;
-        table[2].index = 2;
+        table[2].driver_data = 2;
         table[2].frequency = clock_tick / 4;
-        table[2].index = 3;
+        table[2].driver_data = 3;
         table[2].frequency = clock_tick / 6;
-        table[2].index = 4;
+        table[2].driver_data = 4;
         table[2].frequency = clock_tick / 8;
-        table[2].index = 5;
+        table[2].driver_data = 5;
         table[3].frequency = CPUFREQ_TABLE_END;
 
         policy->cpuinfo.transition_latency = 0;
diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
index c71ee142347a..880ee293d61e 100644
--- a/drivers/cpufreq/sparc-us3-cpufreq.c
+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
@@ -169,13 +169,13 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
         struct cpufreq_frequency_table *table =
                 &us3_freq_table[cpu].table[0];
 
-        table[0].index = 0;
+        table[0].driver_data = 0;
         table[0].frequency = clock_tick / 1;
-        table[1].index = 1;
+        table[1].driver_data = 1;
         table[1].frequency = clock_tick / 2;
-        table[2].index = 2;
+        table[2].driver_data = 2;
         table[2].frequency = clock_tick / 32;
-        table[3].index = 0;
+        table[3].driver_data = 0;
         table[3].frequency = CPUFREQ_TABLE_END;
 
         policy->cpuinfo.transition_latency = 0;
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 156829f4576d..c3efa7f2a908 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -250,11 +250,11 @@ static int spear_cpufreq_driver_init(void)
         }
 
         for (i = 0; i < cnt; i++) {
-                freq_tbl[i].index = i;
+                freq_tbl[i].driver_data = i;
                 freq_tbl[i].frequency = be32_to_cpup(val++);
         }
 
-        freq_tbl[i].index = i;
+        freq_tbl[i].driver_data = i;
         freq_tbl[i].frequency = CPUFREQ_TABLE_END;
 
         spear_cpufreq.freq_tbl = freq_tbl;
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 618e6f417b1c..0915e712fbdc 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -79,11 +79,11 @@ static struct cpufreq_driver centrino_driver;
 
 /* Computes the correct form for IA32_PERF_CTL MSR for a particular
    frequency/voltage operating point; frequency in MHz, volts in mV.
-   This is stored as "index" in the structure. */
+   This is stored as "driver_data" in the structure. */
 #define OP(mhz, mv)                                                     \
         {                                                               \
                 .frequency = (mhz) * 1000,                              \
-                .index = (((mhz)/100) << 8) | ((mv - 700) / 16)         \
+                .driver_data = (((mhz)/100) << 8) | ((mv - 700) / 16)           \
         }
 
 /*
@@ -307,7 +307,7 @@ static unsigned extract_clock(unsigned msr, unsigned int cpu, int failsafe)
                 per_cpu(centrino_model, cpu)->op_points[i].frequency
                                                         != CPUFREQ_TABLE_END;
              i++) {
-                if (msr == per_cpu(centrino_model, cpu)->op_points[i].index)
+                if (msr == per_cpu(centrino_model, cpu)->op_points[i].driver_data)
                         return per_cpu(centrino_model, cpu)->
                                                         op_points[i].frequency;
         }
@@ -501,7 +501,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                         break;
                 }
 
-                msr = per_cpu(centrino_model, cpu)->op_points[newstate].index;
+                msr = per_cpu(centrino_model, cpu)->op_points[newstate].driver_data;
 
                 if (first_cpu) {
                         rdmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr, &h);
diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c
index c74c0e130ef4..cd66b85d927c 100644
--- a/drivers/cpufreq/tegra-cpufreq.c
+++ b/drivers/cpufreq/tegra-cpufreq.c
@@ -28,17 +28,16 @@
 #include <linux/io.h>
 #include <linux/suspend.h>
 
-/* Frequency table index must be sequential starting at 0 */
 static struct cpufreq_frequency_table freq_table[] = {
-        { 0, 216000 },
-        { 1, 312000 },
-        { 2, 456000 },
-        { 3, 608000 },
-        { 4, 760000 },
-        { 5, 816000 },
-        { 6, 912000 },
-        { 7, 1000000 },
-        { 8, CPUFREQ_TABLE_END },
+        { .frequency = 216000 },
+        { .frequency = 312000 },
+        { .frequency = 456000 },
+        { .frequency = 608000 },
+        { .frequency = 760000 },
+        { .frequency = 816000 },
+        { .frequency = 912000 },
+        { .frequency = 1000000 },
+        { .frequency = CPUFREQ_TABLE_END },
 };
 
 #define NUM_CPUS        2
@@ -138,12 +137,12 @@ static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
         if (ret) {
                 pr_err("cpu-tegra: Failed to set cpu frequency to %d kHz\n",
                         freqs.new);
-                return ret;
+                freqs.new = freqs.old;
         }
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
-        return 0;
+        return ret;
 }
 
 static unsigned long tegra_cpu_highest_speed(void)
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index e21cdfa4002a..0e2cd5cab4d0 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -1,7 +1,9 @@
 
-config CPU_IDLE
+menuconfig CPU_IDLE
         bool "CPU idle PM support"
         default y if ACPI || PPC_PSERIES
+        select CPU_IDLE_GOV_LADDER if (!NO_HZ && !NO_HZ_IDLE)
+        select CPU_IDLE_GOV_MENU if (NO_HZ || NO_HZ_IDLE)
         help
           CPU idle is a generic framework for supporting software-controlled
           idle processor power management.  It includes modular cross-platform
@@ -9,9 +11,10 @@ config CPU_IDLE
 
           If you're using an ACPI-enabled platform, you should say Y here.
 
+if CPU_IDLE
+
 config CPU_IDLE_MULTIPLE_DRIVERS
         bool "Support multiple cpuidle drivers"
-        depends on CPU_IDLE
         default n
         help
          Allows the cpuidle framework to use different drivers for each CPU.
@@ -19,20 +22,13 @@ config CPU_IDLE_MULTIPLE_DRIVERS
          states. If unsure say N.
 
 config CPU_IDLE_GOV_LADDER
-        bool
-        depends on CPU_IDLE
+        bool "Ladder governor (for periodic timer tick)"
         default y
 
 config CPU_IDLE_GOV_MENU
-        bool
-        depends on CPU_IDLE && NO_HZ
+        bool "Menu governor (for tickless system)"
         default y
 
-config ARCH_NEEDS_CPU_IDLE_COUPLED
-        def_bool n
-
-if CPU_IDLE
-
 config CPU_IDLE_CALXEDA
         bool "CPU Idle Driver for Calxeda processors"
         depends on ARCH_HIGHBANK
@@ -40,4 +36,13 @@ config CPU_IDLE_CALXEDA
         help
           Select this to enable cpuidle on Calxeda processors.
 
+config CPU_IDLE_ZYNQ
+        bool "CPU Idle Driver for Xilinx Zynq processors"
+        depends on ARCH_ZYNQ
+        help
+          Select this to enable cpuidle on Xilinx Zynq processors.
+
 endif
+
+config ARCH_NEEDS_CPU_IDLE_COUPLED
+        def_bool n
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 0d8bd55e776f..8767a7b3eb91 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 
 obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
 obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
+obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
new file mode 100644
index 000000000000..38e03a183591
--- /dev/null
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2012-2013 Xilinx
+ *
+ * CPU idle support for Xilinx Zynq
+ *
+ * based on arch/arm/mach-at91/cpuidle.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The cpu idle uses wait-for-interrupt and RAM self refresh in order
+ * to implement two idle states -
+ * #1 wait-for-interrupt
+ * #2 wait-for-interrupt and RAM self refresh
+ *
+ * Maintainer: Michal Simek <michal.simek@xilinx.com>
+ */
+
+#include <linux/init.h>
+#include <linux/cpu_pm.h>
+#include <linux/cpuidle.h>
+#include <linux/of.h>
+#include <asm/proc-fns.h>
+#include <asm/cpuidle.h>
+
+#define ZYNQ_MAX_STATES         2
+
+/* Actual code that puts the SoC in different idle states */
+static int zynq_enter_idle(struct cpuidle_device *dev,
+                           struct cpuidle_driver *drv, int index)
+{
+        /* Devices must be stopped here */
+        cpu_pm_enter();
+
+        /* Add code for DDR self refresh start */
+        cpu_do_idle();
+
+        /* Add code for DDR self refresh stop */
+        cpu_pm_exit();
+
+        return index;
+}
+
+static struct cpuidle_driver zynq_idle_driver = {
+        .name = "zynq_idle",
+        .owner = THIS_MODULE,
+        .states = {
+                ARM_CPUIDLE_WFI_STATE,
+                {
+                        .enter                  = zynq_enter_idle,
+                        .exit_latency           = 10,
+                        .target_residency       = 10000,
+                        .flags                  = CPUIDLE_FLAG_TIME_VALID |
+                                                  CPUIDLE_FLAG_TIMER_STOP,
+                        .name                   = "RAM_SR",
+                        .desc                   = "WFI and RAM Self Refresh",
+                },
+        },
+        .safe_state_index = 0,
+        .state_count = ZYNQ_MAX_STATES,
+};
+
+/* Initialize CPU idle by registering the idle states */
+static int __init zynq_cpuidle_init(void)
+{
+        if (!of_machine_is_compatible("xlnx,zynq-7000"))
+                return -ENODEV;
+
+        pr_info("Xilinx Zynq CpuIdle Driver started\n");
+
+        return cpuidle_register(&zynq_idle_driver, NULL);
+}
+
+device_initcall(zynq_cpuidle_init);
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index c3a93fece819..fdc432f18022 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -466,7 +466,7 @@ void cpuidle_unregister(struct cpuidle_driver *drv)
         int cpu;
         struct cpuidle_device *device;
 
-        for_each_possible_cpu(cpu) {
+        for_each_cpu(cpu, drv->cpumask) {
                 device = &per_cpu(cpuidle_dev, cpu);
                 cpuidle_unregister_device(device);
         }
@@ -498,7 +498,7 @@ int cpuidle_register(struct cpuidle_driver *drv,
                 return ret;
         }
 
-        for_each_possible_cpu(cpu) {
+        for_each_cpu(cpu, drv->cpumask) {
                 device = &per_cpu(cpuidle_dev, cpu);
                 device->cpu = cpu;
 
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index 8dfaaae94444..3ac499d5a207 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -18,182 +18,249 @@
 
 DEFINE_SPINLOCK(cpuidle_driver_lock);
 
-static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu);
-static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu);
+#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
 
-static void cpuidle_setup_broadcast_timer(void *arg)
+static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers);
+
+/**
+ * __cpuidle_get_cpu_driver - return the cpuidle driver tied to a CPU.
+ * @cpu: the CPU handled by the driver
+ *
+ * Returns a pointer to struct cpuidle_driver or NULL if no driver has been
+ * registered for @cpu.
+ */
+static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
 {
-        int cpu = smp_processor_id();
-        clockevents_notify((long)(arg), &cpu);
+        return per_cpu(cpuidle_drivers, cpu);
 }
 
-static void __cpuidle_driver_init(struct cpuidle_driver *drv, int cpu)
+/**
+ * __cpuidle_unset_driver - unset per CPU driver variables.
+ * @drv: a valid pointer to a struct cpuidle_driver
+ *
+ * For each CPU in the driver's CPU mask, unset the registered driver per CPU
+ * variable. If @drv is different from the registered driver, the corresponding
+ * variable is not cleared.
+ */
+static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv)
 {
-        int i;
-
-        drv->refcnt = 0;
+        int cpu;
 
-        for (i = drv->state_count - 1; i >= 0 ; i--) {
+        for_each_cpu(cpu, drv->cpumask) {
 
-                if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP))
+                if (drv != __cpuidle_get_cpu_driver(cpu))
                         continue;
 
-                drv->bctimer = 1;
-                on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer,
-                                 (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1);
-                break;
+                per_cpu(cpuidle_drivers, cpu) = NULL;
         }
 }
 
-static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu)
+/**
+ * __cpuidle_set_driver - set per CPU driver variables the the given driver.
+ * @drv: a valid pointer to a struct cpuidle_driver
+ *
+ * For each CPU in the driver's cpumask, unset the registered driver per CPU
+ * to @drv.
+ *
+ * Returns 0 on success, -EBUSY if the CPUs have driver(s) already.
+ */
+static inline int __cpuidle_set_driver(struct cpuidle_driver *drv)
 {
-        if (!drv || !drv->state_count)
-                return -EINVAL;
-
-        if (cpuidle_disabled())
-                return -ENODEV;
+        int cpu;
 
-        if (__cpuidle_get_cpu_driver(cpu))
-                return -EBUSY;
+        for_each_cpu(cpu, drv->cpumask) {
 
-        __cpuidle_driver_init(drv, cpu);
+                if (__cpuidle_get_cpu_driver(cpu)) {
+                        __cpuidle_unset_driver(drv);
+                        return -EBUSY;
+                }
 
-        __cpuidle_set_cpu_driver(drv, cpu);
+                per_cpu(cpuidle_drivers, cpu) = drv;
+        }
 
         return 0;
 }
 
-static void __cpuidle_unregister_driver(struct cpuidle_driver *drv, int cpu)
-{
-        if (drv != __cpuidle_get_cpu_driver(cpu))
-                return;
+#else
 
-        if (!WARN_ON(drv->refcnt > 0))
-                __cpuidle_set_cpu_driver(NULL, cpu);
+static struct cpuidle_driver *cpuidle_curr_driver;
 
-        if (drv->bctimer) {
-                drv->bctimer = 0;
-                on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer,
-                                 (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1);
-        }
+/**
+ * __cpuidle_get_cpu_driver - return the global cpuidle driver pointer.
+ * @cpu: ignored without the multiple driver support
+ *
+ * Return a pointer to a struct cpuidle_driver object or NULL if no driver was
+ * previously registered.
+ */
+static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
+{
+        return cpuidle_curr_driver;
 }
 
-#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
+/**
+ * __cpuidle_set_driver - assign the global cpuidle driver variable.
+ * @drv: pointer to a struct cpuidle_driver object
+ *
+ * Returns 0 on success, -EBUSY if the driver is already registered.
+ */
+static inline int __cpuidle_set_driver(struct cpuidle_driver *drv)
+{
+        if (cpuidle_curr_driver)
+                return -EBUSY;
 
-static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers);
+        cpuidle_curr_driver = drv;
 
-static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu)
-{
-        per_cpu(cpuidle_drivers, cpu) = drv;
+        return 0;
 }
 
-static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
+/**
+ * __cpuidle_unset_driver - unset the global cpuidle driver variable.
+ * @drv: a pointer to a struct cpuidle_driver
+ *
+ * Reset the global cpuidle variable to NULL.  If @drv does not match the
+ * registered driver, do nothing.
+ */
+static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv)
 {
-        return per_cpu(cpuidle_drivers, cpu);
+        if (drv == cpuidle_curr_driver)
+                cpuidle_curr_driver = NULL;
 }
 
-static void __cpuidle_unregister_all_cpu_driver(struct cpuidle_driver *drv)
+#endif
+
+/**
+ * cpuidle_setup_broadcast_timer - enable/disable the broadcast timer
+ * @arg: a void pointer used to match the SMP cross call API
+ *
+ * @arg is used as a value of type 'long' with on of the two values:
+ * - CLOCK_EVT_NOTIFY_BROADCAST_ON
+ * - CLOCK_EVT_NOTIFY_BROADCAST_OFF
+ *
+ * Set the broadcast timer notification for the current CPU.  This function
+ * is executed per CPU by an SMP cross call.  It not supposed to be called
+ * directly.
+ */
+static void cpuidle_setup_broadcast_timer(void *arg)
 {
-        int cpu;
-        for_each_present_cpu(cpu)
-                __cpuidle_unregister_driver(drv, cpu);
+        int cpu = smp_processor_id();
+        clockevents_notify((long)(arg), &cpu);
 }
 
-static int __cpuidle_register_all_cpu_driver(struct cpuidle_driver *drv)
+/**
+ * __cpuidle_driver_init - initialize the driver's internal data
+ * @drv: a valid pointer to a struct cpuidle_driver
+ *
+ * Returns 0 on success, a negative error code otherwise.
+ */
+static int __cpuidle_driver_init(struct cpuidle_driver *drv)
 {
-        int ret = 0;
-        int i, cpu;
+        int i;
 
-        for_each_present_cpu(cpu) {
-                ret = __cpuidle_register_driver(drv, cpu);
-                if (ret)
-                        break;
-        }
+        drv->refcnt = 0;
 
-        if (ret)
-                for_each_present_cpu(i) {
-                        if (i == cpu)
-                                break;
-                        __cpuidle_unregister_driver(drv, i);
-                }
+        /*
+         * Use all possible CPUs as the default, because if the kernel boots
+         * with some CPUs offline and then we online one of them, the CPU
+         * notifier has to know which driver to assign.
+         */
+        if (!drv->cpumask)
+                drv->cpumask = (struct cpumask *)cpu_possible_mask;
+
+        /*
+         * Look for the timer stop flag in the different states, so that we know
+         * if the broadcast timer has to be set up.  The loop is in the reverse
+         * order, because usually on of the the deeper states has this flag set.
+         */
+        for (i = drv->state_count - 1; i >= 0 ; i--) {
 
+                if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP))
+                        continue;
 
-        return ret;
+                drv->bctimer = 1;
+                break;
+        }
+
+        return 0;
 }
 
-int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu)
+/**
+ * __cpuidle_register_driver: register the driver
+ * @drv: a valid pointer to a struct cpuidle_driver
+ *
+ * Do some sanity checks, initialize the driver, assign the driver to the
+ * global cpuidle driver variable(s) and set up the broadcast timer if the
+ * cpuidle driver has some states that shut down the local timer.
+ *
+ * Returns 0 on success, a negative error code otherwise:
+ *  * -EINVAL if the driver pointer is NULL or no idle states are available
+ *  * -ENODEV if the cpuidle framework is disabled
+ *  * -EBUSY if the driver is already assigned to the global variable(s)
+ */
+static int __cpuidle_register_driver(struct cpuidle_driver *drv)
 {
         int ret;
 
-        spin_lock(&cpuidle_driver_lock);
-        ret = __cpuidle_register_driver(drv, cpu);
-        spin_unlock(&cpuidle_driver_lock);
+        if (!drv || !drv->state_count)
+                return -EINVAL;
 
-        return ret;
-}
+        if (cpuidle_disabled())
+                return -ENODEV;
 
-void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu)
-{
-        spin_lock(&cpuidle_driver_lock);
-        __cpuidle_unregister_driver(drv, cpu);
-        spin_unlock(&cpuidle_driver_lock);
-}
+        ret = __cpuidle_driver_init(drv);
+        if (ret)
+                return ret;
 
-/**
- * cpuidle_register_driver - registers a driver
- * @drv: the driver
- */
-int cpuidle_register_driver(struct cpuidle_driver *drv)
-{
-        int ret;
+        ret = __cpuidle_set_driver(drv);
+        if (ret)
+                return ret;
 
-        spin_lock(&cpuidle_driver_lock);
-        ret = __cpuidle_register_all_cpu_driver(drv);
-        spin_unlock(&cpuidle_driver_lock);
+        if (drv->bctimer)
+                on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer,
+                                 (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1);
 
-        return ret;
+        return 0;
 }
-EXPORT_SYMBOL_GPL(cpuidle_register_driver);
 
 /**
- * cpuidle_unregister_driver - unregisters a driver
- * @drv: the driver
+ * __cpuidle_unregister_driver - unregister the driver
+ * @drv: a valid pointer to a struct cpuidle_driver
+ *
+ * Check if the driver is no longer in use, reset the global cpuidle driver
+ * variable(s) and disable the timer broadcast notification mechanism if it was
+ * in use.
+ *
  */
-void cpuidle_unregister_driver(struct cpuidle_driver *drv)
+static void __cpuidle_unregister_driver(struct cpuidle_driver *drv)
 {
-        spin_lock(&cpuidle_driver_lock);
-        __cpuidle_unregister_all_cpu_driver(drv);
-        spin_unlock(&cpuidle_driver_lock);
-}
-EXPORT_SYMBOL_GPL(cpuidle_unregister_driver);
-
-#else
-
-static struct cpuidle_driver *cpuidle_curr_driver;
+        if (WARN_ON(drv->refcnt > 0))
+                return;
 
-static inline void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu)
-{
-        cpuidle_curr_driver = drv;
-}
+        if (drv->bctimer) {
+                drv->bctimer = 0;
+                on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer,
+                                 (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1);
+        }
 
-static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
-{
-        return cpuidle_curr_driver;
+        __cpuidle_unset_driver(drv);
 }
 
 /**
  * cpuidle_register_driver - registers a driver
- * @drv: the driver
+ * @drv: a pointer to a valid struct cpuidle_driver
+ *
+ * Register the driver under a lock to prevent concurrent attempts to
+ * [un]register the driver from occuring at the same time.
+ *
+ * Returns 0 on success, a negative error code (returned by
+ * __cpuidle_register_driver()) otherwise.
  */
 int cpuidle_register_driver(struct cpuidle_driver *drv)
 {
-        int ret, cpu;
+        int ret;
 
-        cpu = get_cpu();
         spin_lock(&cpuidle_driver_lock);
-        ret = __cpuidle_register_driver(drv, cpu);
+        ret = __cpuidle_register_driver(drv);
         spin_unlock(&cpuidle_driver_lock);
-        put_cpu();
 
         return ret;
 }
@@ -201,23 +268,24 @@ EXPORT_SYMBOL_GPL(cpuidle_register_driver);
 
 /**
  * cpuidle_unregister_driver - unregisters a driver
- * @drv: the driver
+ * @drv: a pointer to a valid struct cpuidle_driver
+ *
+ * Unregisters the cpuidle driver under a lock to prevent concurrent attempts
+ * to [un]register the driver from occuring at the same time.  @drv has to
+ * match the currently registered driver.
  */
 void cpuidle_unregister_driver(struct cpuidle_driver *drv)
 {
-        int cpu;
-
-        cpu = get_cpu();
         spin_lock(&cpuidle_driver_lock);
-        __cpuidle_unregister_driver(drv, cpu);
+        __cpuidle_unregister_driver(drv);
         spin_unlock(&cpuidle_driver_lock);
-        put_cpu();
 }
 EXPORT_SYMBOL_GPL(cpuidle_unregister_driver);
-#endif
 
 /**
- * cpuidle_get_driver - return the current driver
+ * cpuidle_get_driver - return the driver tied to the current CPU.
+ *
+ * Returns a struct cpuidle_driver pointer, or NULL if no driver is registered.
  */
 struct cpuidle_driver *cpuidle_get_driver(void)
 {
@@ -233,7 +301,11 @@ struct cpuidle_driver *cpuidle_get_driver(void)
 EXPORT_SYMBOL_GPL(cpuidle_get_driver);
 
 /**
- * cpuidle_get_cpu_driver - return the driver tied with a cpu
+ * cpuidle_get_cpu_driver - return the driver registered for a CPU.
+ * @dev: a valid pointer to a struct cpuidle_device
+ *
+ * Returns a struct cpuidle_driver pointer, or NULL if no driver is registered
+ * for the CPU associated with @dev.
  */
 struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev)
 {
@@ -244,6 +316,14 @@ struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev)
 }
 EXPORT_SYMBOL_GPL(cpuidle_get_cpu_driver);
 
+/**
+ * cpuidle_driver_ref - get a reference to the driver.
+ *
+ * Increment the reference counter of the cpuidle driver associated with
+ * the current CPU.
+ *
+ * Returns a pointer to the driver, or NULL if the current CPU has no driver.
+ */
 struct cpuidle_driver *cpuidle_driver_ref(void)
 {
         struct cpuidle_driver *drv;
@@ -257,6 +337,12 @@ struct cpuidle_driver *cpuidle_driver_ref(void)
         return drv;
 }
 
+/**
+ * cpuidle_driver_unref - puts down the refcount for the driver
+ *
+ * Decrement the reference counter of the cpuidle driver associated with
+ * the current CPU.
+ */
 void cpuidle_driver_unref(void)
 {
         struct cpuidle_driver *drv = cpuidle_get_driver();
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index 0f079be13305..31f3adba4cf3 100644
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -67,7 +67,7 @@ comment "DEVFREQ Drivers"
 
 config ARM_EXYNOS4_BUS_DEVFREQ
         bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
-        depends on CPU_EXYNOS4210 || CPU_EXYNOS4212 || CPU_EXYNOS4412
+        depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412
         select ARCH_HAS_OPP
         select DEVFREQ_GOV_SIMPLE_ONDEMAND
         help
@@ -78,4 +78,14 @@ config ARM_EXYNOS4_BUS_DEVFREQ
           To operate with optimal voltages, ASV support is required
           (CONFIG_EXYNOS_ASV).
 
+config ARM_EXYNOS5_BUS_DEVFREQ
+        bool "ARM Exynos5250 Bus DEVFREQ Driver"
+        depends on SOC_EXYNOS5250
+        select ARCH_HAS_OPP
+        select DEVFREQ_GOV_SIMPLE_ONDEMAND
+        help
+          This adds the DEVFREQ driver for Exynos5250 bus interface (vdd_int).
+          It reads PPMU counters of memory controllers and adjusts the
+          operating frequencies and voltages with OPP support.
+
 endif # PM_DEVFREQ
diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile
index 8c464234f7e7..16138c9e0d58 100644
--- a/drivers/devfreq/Makefile
+++ b/drivers/devfreq/Makefile
@@ -5,4 +5,5 @@ obj-$(CONFIG_DEVFREQ_GOV_POWERSAVE)	+= governor_powersave.o
 obj-$(CONFIG_DEVFREQ_GOV_USERSPACE)     += governor_userspace.o
 
 # DEVFREQ Drivers
-obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ)   += exynos4_bus.o
+obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ)   += exynos/
+obj-$(CONFIG_ARM_EXYNOS5_BUS_DEVFREQ)   += exynos/
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 3b367973a802..44c407986f64 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -271,6 +271,7 @@ void devfreq_monitor_suspend(struct devfreq *devfreq)
                 return;
         }
 
+        devfreq_update_status(devfreq, devfreq->previous_freq);
         devfreq->stop_polling = true;
         mutex_unlock(&devfreq->lock);
         cancel_delayed_work_sync(&devfreq->work);
@@ -287,6 +288,8 @@ EXPORT_SYMBOL(devfreq_monitor_suspend);
  */
 void devfreq_monitor_resume(struct devfreq *devfreq)
 {
+        unsigned long freq;
+
         mutex_lock(&devfreq->lock);
         if (!devfreq->stop_polling)
                 goto out;
@@ -295,8 +298,14 @@ void devfreq_monitor_resume(struct devfreq *devfreq)
                         devfreq->profile->polling_ms)
                 queue_delayed_work(devfreq_wq, &devfreq->work,
                         msecs_to_jiffies(devfreq->profile->polling_ms));
+
+        devfreq->last_stat_updated = jiffies;
         devfreq->stop_polling = false;
 
+        if (devfreq->profile->get_cur_freq &&
+                !devfreq->profile->get_cur_freq(devfreq->dev.parent, &freq))
+                devfreq->previous_freq = freq;
+
 out:
         mutex_unlock(&devfreq->lock);
 }
@@ -518,6 +527,8 @@ EXPORT_SYMBOL(devfreq_add_device);
 /**
  * devfreq_remove_device() - Remove devfreq feature from a device.
  * @devfreq:    the devfreq instance to be removed
+ *
+ * The opposite of devfreq_add_device().
  */
 int devfreq_remove_device(struct devfreq *devfreq)
 {
@@ -533,6 +544,10 @@ EXPORT_SYMBOL(devfreq_remove_device);
 /**
  * devfreq_suspend_device() - Suspend devfreq of a device.
  * @devfreq: the devfreq instance to be suspended
+ *
+ * This function is intended to be called by the pm callbacks
+ * (e.g., runtime_suspend, suspend) of the device driver that
+ * holds the devfreq.
  */
 int devfreq_suspend_device(struct devfreq *devfreq)
 {
@@ -550,6 +565,10 @@ EXPORT_SYMBOL(devfreq_suspend_device);
 /**
  * devfreq_resume_device() - Resume devfreq of a device.
  * @devfreq: the devfreq instance to be resumed
+ *
+ * This function is intended to be called by the pm callbacks
+ * (e.g., runtime_resume, resume) of the device driver that
+ * holds the devfreq.
  */
 int devfreq_resume_device(struct devfreq *devfreq)
 {
@@ -905,11 +924,11 @@ static ssize_t show_trans_table(struct device *dev, struct device_attribute *att
 {
         struct devfreq *devfreq = to_devfreq(dev);
         ssize_t len;
-        int i, j, err;
+        int i, j;
         unsigned int max_state = devfreq->profile->max_state;
 
-        err = devfreq_update_status(devfreq, devfreq->previous_freq);
-        if (err)
+        if (!devfreq->stop_polling &&
+                        devfreq_update_status(devfreq, devfreq->previous_freq))
                 return 0;
 
         len = sprintf(buf, "   From  :   To\n");
diff --git a/drivers/devfreq/exynos/Makefile b/drivers/devfreq/exynos/Makefile
new file mode 100644
index 000000000000..bfaaf5b0d61d
--- /dev/null
+++ b/drivers/devfreq/exynos/Makefile
@@ -0,0 +1,3 @@
+# Exynos DEVFREQ Drivers
+obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ)   += exynos4_bus.o
+obj-$(CONFIG_ARM_EXYNOS5_BUS_DEVFREQ)   += exynos_ppmu.o exynos5_bus.o
diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos/exynos4_bus.c
index 3f37f3b3f268..c5f86d8caca3 100644
--- a/drivers/devfreq/exynos4_bus.c
+++ b/drivers/devfreq/exynos/exynos4_bus.c
@@ -974,6 +974,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this,
                         rcu_read_unlock();
                         dev_err(data->dev, "%s: unable to find a min freq\n",
                                 __func__);
+                        mutex_unlock(&data->lock);
                         return PTR_ERR(opp);
                 }
                 new_oppinfo.rate = opp_get_freq(opp);
diff --git a/drivers/devfreq/exynos/exynos5_bus.c b/drivers/devfreq/exynos/exynos5_bus.c
new file mode 100644
index 000000000000..574b16b59be5
--- /dev/null
+++ b/drivers/devfreq/exynos/exynos5_bus.c
@@ -0,0 +1,503 @@
+/*
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com/
+ *
+ * EXYNOS5 INT clock frequency scaling support using DEVFREQ framework
+ * Based on work done by Jonghwan Choi <jhbird.choi@samsung.com>
+ * Support for only EXYNOS5250 is present.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/devfreq.h>
+#include <linux/io.h>
+#include <linux/opp.h>
+#include <linux/slab.h>
+#include <linux/suspend.h>
+#include <linux/opp.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/pm_qos.h>
+#include <linux/regulator/consumer.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+
+#include "exynos_ppmu.h"
+
+#define MAX_SAFEVOLT                    1100000 /* 1.10V */
+/* Assume that the bus is saturated if the utilization is 25% */
+#define INT_BUS_SATURATION_RATIO        25
+
+enum int_level_idx {
+        LV_0,
+        LV_1,
+        LV_2,
+        LV_3,
+        LV_4,
+        _LV_END
+};
+
+enum exynos_ppmu_list {
+        PPMU_RIGHT,
+        PPMU_END,
+};
+
+struct busfreq_data_int {
+        struct device *dev;
+        struct devfreq *devfreq;
+        struct regulator *vdd_int;
+        struct exynos_ppmu ppmu[PPMU_END];
+        unsigned long curr_freq;
+        bool disabled;
+
+        struct notifier_block pm_notifier;
+        struct mutex lock;
+        struct pm_qos_request int_req;
+        struct clk *int_clk;
+};
+
+struct int_bus_opp_table {
+        unsigned int idx;
+        unsigned long clk;
+        unsigned long volt;
+};
+
+static struct int_bus_opp_table exynos5_int_opp_table[] = {
+        {LV_0, 266000, 1025000},
+        {LV_1, 200000, 1025000},
+        {LV_2, 160000, 1025000},
+        {LV_3, 133000, 1025000},
+        {LV_4, 100000, 1025000},
+        {0, 0, 0},
+};
+
+static void busfreq_mon_reset(struct busfreq_data_int *data)
+{
+        unsigned int i;
+
+        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
+                void __iomem *ppmu_base = data->ppmu[i].hw_base;
+
+                /* Reset the performance and cycle counters */
+                exynos_ppmu_reset(ppmu_base);
+
+                /* Setup count registers to monitor read/write transactions */
+                data->ppmu[i].event[PPMU_PMNCNT3] = RDWR_DATA_COUNT;
+                exynos_ppmu_setevent(ppmu_base, PPMU_PMNCNT3,
+                                        data->ppmu[i].event[PPMU_PMNCNT3]);
+
+                exynos_ppmu_start(ppmu_base);
+        }
+}
+
+static void exynos5_read_ppmu(struct busfreq_data_int *data)
+{
+        int i, j;
+
+        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
+                void __iomem *ppmu_base = data->ppmu[i].hw_base;
+
+                exynos_ppmu_stop(ppmu_base);
+
+                /* Update local data from PPMU */
+                data->ppmu[i].ccnt = __raw_readl(ppmu_base + PPMU_CCNT);
+
+                for (j = PPMU_PMNCNT0; j < PPMU_PMNCNT_MAX; j++) {
+                        if (data->ppmu[i].event[j] == 0)
+                                data->ppmu[i].count[j] = 0;
+                        else
+                                data->ppmu[i].count[j] =
+                                        exynos_ppmu_read(ppmu_base, j);
+                }
+        }
+
+        busfreq_mon_reset(data);
+}
+
+static int exynos5_int_setvolt(struct busfreq_data_int *data,
+                                unsigned long volt)
+{
+        return regulator_set_voltage(data->vdd_int, volt, MAX_SAFEVOLT);
+}
+
+static int exynos5_busfreq_int_target(struct device *dev, unsigned long *_freq,
+                              u32 flags)
+{
+        int err = 0;
+        struct platform_device *pdev = container_of(dev, struct platform_device,
+                                                    dev);
+        struct busfreq_data_int *data = platform_get_drvdata(pdev);
+        struct opp *opp;
+        unsigned long old_freq, freq;
+        unsigned long volt;
+
+        rcu_read_lock();
+        opp = devfreq_recommended_opp(dev, _freq, flags);
+        if (IS_ERR(opp)) {
+                rcu_read_unlock();
+                dev_err(dev, "%s: Invalid OPP.\n", __func__);
+                return PTR_ERR(opp);
+        }
+
+        freq = opp_get_freq(opp);
+        volt = opp_get_voltage(opp);
+        rcu_read_unlock();
+
+        old_freq = data->curr_freq;
+
+        if (old_freq == freq)
+                return 0;
+
+        dev_dbg(dev, "targetting %lukHz %luuV\n", freq, volt);
+
+        mutex_lock(&data->lock);
+
+        if (data->disabled)
+                goto out;
+
+        if (freq > exynos5_int_opp_table[0].clk)
+                pm_qos_update_request(&data->int_req, freq * 16 / 1000);
+        else
+                pm_qos_update_request(&data->int_req, -1);
+
+        if (old_freq < freq)
+                err = exynos5_int_setvolt(data, volt);
+        if (err)
+                goto out;
+
+        err = clk_set_rate(data->int_clk, freq * 1000);
+
+        if (err)
+                goto out;
+
+        if (old_freq > freq)
+                err = exynos5_int_setvolt(data, volt);
+        if (err)
+                goto out;
+
+        data->curr_freq = freq;
+out:
+        mutex_unlock(&data->lock);
+        return err;
+}
+
+static int exynos5_get_busier_dmc(struct busfreq_data_int *data)
+{
+        int i, j;
+        int busy = 0;
+        unsigned int temp = 0;
+
+        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
+                for (j = PPMU_PMNCNT0; j < PPMU_PMNCNT_MAX; j++) {
+                        if (data->ppmu[i].count[j] > temp) {
+                                temp = data->ppmu[i].count[j];
+                                busy = i;
+                        }
+                }
+        }
+
+        return busy;
+}
+
+static int exynos5_int_get_dev_status(struct device *dev,
+                                      struct devfreq_dev_status *stat)
+{
+        struct platform_device *pdev = container_of(dev, struct platform_device,
+                                                    dev);
+        struct busfreq_data_int *data = platform_get_drvdata(pdev);
+        int busier_dmc;
+
+        exynos5_read_ppmu(data);
+        busier_dmc = exynos5_get_busier_dmc(data);
+
+        stat->current_frequency = data->curr_freq;
+
+        /* Number of cycles spent on memory access */
+        stat->busy_time = data->ppmu[busier_dmc].count[PPMU_PMNCNT3];
+        stat->busy_time *= 100 / INT_BUS_SATURATION_RATIO;
+        stat->total_time = data->ppmu[busier_dmc].ccnt;
+
+        return 0;
+}
+static void exynos5_int_exit(struct device *dev)
+{
+        struct platform_device *pdev = container_of(dev, struct platform_device,
+                                                    dev);
+        struct busfreq_data_int *data = platform_get_drvdata(pdev);
+
+        devfreq_unregister_opp_notifier(dev, data->devfreq);
+}
+
+static struct devfreq_dev_profile exynos5_devfreq_int_profile = {
+        .initial_freq           = 160000,
+        .polling_ms             = 100,
+        .target                 = exynos5_busfreq_int_target,
+        .get_dev_status         = exynos5_int_get_dev_status,
+        .exit                   = exynos5_int_exit,
+};
+
+static int exynos5250_init_int_tables(struct busfreq_data_int *data)
+{
+        int i, err = 0;
+
+        for (i = LV_0; i < _LV_END; i++) {
+                err = opp_add(data->dev, exynos5_int_opp_table[i].clk,
+                                exynos5_int_opp_table[i].volt);
+                if (err) {
+                        dev_err(data->dev, "Cannot add opp entries.\n");
+                        return err;
+                }
+        }
+
+        return 0;
+}
+
+static int exynos5_busfreq_int_pm_notifier_event(struct notifier_block *this,
+                unsigned long event, void *ptr)
+{
+        struct busfreq_data_int *data = container_of(this,
+                                        struct busfreq_data_int, pm_notifier);
+        struct opp *opp;
+        unsigned long maxfreq = ULONG_MAX;
+        unsigned long freq;
+        unsigned long volt;
+        int err = 0;
+
+        switch (event) {
+        case PM_SUSPEND_PREPARE:
+                /* Set Fastest and Deactivate DVFS */
+                mutex_lock(&data->lock);
+
+                data->disabled = true;
+
+                rcu_read_lock();
+                opp = opp_find_freq_floor(data->dev, &maxfreq);
+                if (IS_ERR(opp)) {
+                        rcu_read_unlock();
+                        err = PTR_ERR(opp);
+                        goto unlock;
+                }
+                freq = opp_get_freq(opp);
+                volt = opp_get_voltage(opp);
+                rcu_read_unlock();
+
+                err = exynos5_int_setvolt(data, volt);
+                if (err)
+                        goto unlock;
+
+                err = clk_set_rate(data->int_clk, freq * 1000);
+
+                if (err)
+                        goto unlock;
+
+                data->curr_freq = freq;
+unlock:
+                mutex_unlock(&data->lock);
+                if (err)
+                        return NOTIFY_BAD;
+                return NOTIFY_OK;
+        case PM_POST_RESTORE:
+        case PM_POST_SUSPEND:
+                /* Reactivate */
+                mutex_lock(&data->lock);
+                data->disabled = false;
+                mutex_unlock(&data->lock);
+                return NOTIFY_OK;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static int exynos5_busfreq_int_probe(struct platform_device *pdev)
+{
+        struct busfreq_data_int *data;
+        struct opp *opp;
+        struct device *dev = &pdev->dev;
+        struct device_node *np;
+        unsigned long initial_freq;
+        unsigned long initial_volt;
+        int err = 0;
+        int i;
+
+        data = devm_kzalloc(&pdev->dev, sizeof(struct busfreq_data_int),
+                                GFP_KERNEL);
+        if (data == NULL) {
+                dev_err(dev, "Cannot allocate memory.\n");
+                return -ENOMEM;
+        }
+
+        np = of_find_compatible_node(NULL, NULL, "samsung,exynos5250-ppmu");
+        if (np == NULL) {
+                pr_err("Unable to find PPMU node\n");
+                return -ENOENT;
+        }
+
+        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
+                /* map PPMU memory region */
+                data->ppmu[i].hw_base = of_iomap(np, i);
+                if (data->ppmu[i].hw_base == NULL) {
+                        dev_err(&pdev->dev, "failed to map memory region\n");
+                        return -ENOMEM;
+                }
+        }
+        data->pm_notifier.notifier_call = exynos5_busfreq_int_pm_notifier_event;
+        data->dev = dev;
+        mutex_init(&data->lock);
+
+        err = exynos5250_init_int_tables(data);
+        if (err)
+                goto err_regulator;
+
+        data->vdd_int = regulator_get(dev, "vdd_int");
+        if (IS_ERR(data->vdd_int)) {
+                dev_err(dev, "Cannot get the regulator \"vdd_int\"\n");
+                err = PTR_ERR(data->vdd_int);
+                goto err_regulator;
+        }
+
+        data->int_clk = clk_get(dev, "int_clk");
+        if (IS_ERR(data->int_clk)) {
+                dev_err(dev, "Cannot get clock \"int_clk\"\n");
+                err = PTR_ERR(data->int_clk);
+                goto err_clock;
+        }
+
+        rcu_read_lock();
+        opp = opp_find_freq_floor(dev,
+                        &exynos5_devfreq_int_profile.initial_freq);
+        if (IS_ERR(opp)) {
+                rcu_read_unlock();
+                dev_err(dev, "Invalid initial frequency %lu kHz.\n",
+                       exynos5_devfreq_int_profile.initial_freq);
+                err = PTR_ERR(opp);
+                goto err_opp_add;
+        }
+        initial_freq = opp_get_freq(opp);
+        initial_volt = opp_get_voltage(opp);
+        rcu_read_unlock();
+        data->curr_freq = initial_freq;
+
+        err = clk_set_rate(data->int_clk, initial_freq * 1000);
+        if (err) {
+                dev_err(dev, "Failed to set initial frequency\n");
+                goto err_opp_add;
+        }
+
+        err = exynos5_int_setvolt(data, initial_volt);
+        if (err)
+                goto err_opp_add;
+
+        platform_set_drvdata(pdev, data);
+
+        busfreq_mon_reset(data);
+
+        data->devfreq = devfreq_add_device(dev, &exynos5_devfreq_int_profile,
+                                           "simple_ondemand", NULL);
+
+        if (IS_ERR(data->devfreq)) {
+                err = PTR_ERR(data->devfreq);
+                goto err_devfreq_add;
+        }
+
+        devfreq_register_opp_notifier(dev, data->devfreq);
+
+        err = register_pm_notifier(&data->pm_notifier);
+        if (err) {
+                dev_err(dev, "Failed to setup pm notifier\n");
+                goto err_devfreq_add;
+        }
+
+        /* TODO: Add a new QOS class for int/mif bus */
+        pm_qos_add_request(&data->int_req, PM_QOS_NETWORK_THROUGHPUT, -1);
+
+        return 0;
+
+err_devfreq_add:
+        devfreq_remove_device(data->devfreq);
+        platform_set_drvdata(pdev, NULL);
+err_opp_add:
+        clk_put(data->int_clk);
+err_clock:
+        regulator_put(data->vdd_int);
+err_regulator:
+        return err;
+}
+
+static int exynos5_busfreq_int_remove(struct platform_device *pdev)
+{
+        struct busfreq_data_int *data = platform_get_drvdata(pdev);
+
+        pm_qos_remove_request(&data->int_req);
+        unregister_pm_notifier(&data->pm_notifier);
+        devfreq_remove_device(data->devfreq);
+        regulator_put(data->vdd_int);
+        clk_put(data->int_clk);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static int exynos5_busfreq_int_resume(struct device *dev)
+{
+        struct platform_device *pdev = container_of(dev, struct platform_device,
+                                                    dev);
+        struct busfreq_data_int *data = platform_get_drvdata(pdev);
+
+        busfreq_mon_reset(data);
+        return 0;
+}
+
+static const struct dev_pm_ops exynos5_busfreq_int_pm = {
+        .resume = exynos5_busfreq_int_resume,
+};
+
+/* platform device pointer for exynos5 devfreq device. */
+static struct platform_device *exynos5_devfreq_pdev;
+
+static struct platform_driver exynos5_busfreq_int_driver = {
+        .probe          = exynos5_busfreq_int_probe,
+        .remove         = exynos5_busfreq_int_remove,
+        .driver         = {
+                .name           = "exynos5-bus-int",
+                .owner          = THIS_MODULE,
+                .pm             = &exynos5_busfreq_int_pm,
+        },
+};
+
+static int __init exynos5_busfreq_int_init(void)
+{
+        int ret;
+
+        ret = platform_driver_register(&exynos5_busfreq_int_driver);
+        if (ret < 0)
+                goto out;
+
+        exynos5_devfreq_pdev =
+                platform_device_register_simple("exynos5-bus-int", -1, NULL, 0);
+        if (IS_ERR_OR_NULL(exynos5_devfreq_pdev)) {
+                ret = PTR_ERR(exynos5_devfreq_pdev);
+                goto out1;
+        }
+
+        return 0;
+out1:
+        platform_driver_unregister(&exynos5_busfreq_int_driver);
+out:
+        return ret;
+}
+late_initcall(exynos5_busfreq_int_init);
+
+static void __exit exynos5_busfreq_int_exit(void)
+{
+        platform_device_unregister(exynos5_devfreq_pdev);
+        platform_driver_unregister(&exynos5_busfreq_int_driver);
+}
+module_exit(exynos5_busfreq_int_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("EXYNOS5 busfreq driver with devfreq framework");
diff --git a/drivers/devfreq/exynos/exynos_ppmu.c b/drivers/devfreq/exynos/exynos_ppmu.c
new file mode 100644
index 000000000000..85fc5ac1036a
--- /dev/null
+++ b/drivers/devfreq/exynos/exynos_ppmu.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com/
+ *
+ * EXYNOS - PPMU support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/io.h>
+
+#include "exynos_ppmu.h"
+
+void exynos_ppmu_reset(void __iomem *ppmu_base)
+{
+        __raw_writel(PPMU_CYCLE_RESET | PPMU_COUNTER_RESET, ppmu_base);
+        __raw_writel(PPMU_ENABLE_CYCLE  |
+                     PPMU_ENABLE_COUNT0 |
+                     PPMU_ENABLE_COUNT1 |
+                     PPMU_ENABLE_COUNT2 |
+                     PPMU_ENABLE_COUNT3,
+                     ppmu_base + PPMU_CNTENS);
+}
+
+void exynos_ppmu_setevent(void __iomem *ppmu_base, unsigned int ch,
+                        unsigned int evt)
+{
+        __raw_writel(evt, ppmu_base + PPMU_BEVTSEL(ch));
+}
+
+void exynos_ppmu_start(void __iomem *ppmu_base)
+{
+        __raw_writel(PPMU_ENABLE, ppmu_base);
+}
+
+void exynos_ppmu_stop(void __iomem *ppmu_base)
+{
+        __raw_writel(PPMU_DISABLE, ppmu_base);
+}
+
+unsigned int exynos_ppmu_read(void __iomem *ppmu_base, unsigned int ch)
+{
+        unsigned int total;
+
+        if (ch == PPMU_PMNCNT3)
+                total = ((__raw_readl(ppmu_base + PMCNT_OFFSET(ch)) << 8) |
+                          __raw_readl(ppmu_base + PMCNT_OFFSET(ch + 1)));
+        else
+                total = __raw_readl(ppmu_base + PMCNT_OFFSET(ch));
+
+        return total;
+}
diff --git a/drivers/devfreq/exynos/exynos_ppmu.h b/drivers/devfreq/exynos/exynos_ppmu.h
new file mode 100644
index 000000000000..7dfb221eaccd
--- /dev/null
+++ b/drivers/devfreq/exynos/exynos_ppmu.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com/
+ *
+ * EXYNOS PPMU header
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __DEVFREQ_EXYNOS_PPMU_H
+#define __DEVFREQ_EXYNOS_PPMU_H __FILE__
+
+#include <linux/ktime.h>
+
+/* For PPMU Control */
+#define PPMU_ENABLE             BIT(0)
+#define PPMU_DISABLE            0x0
+#define PPMU_CYCLE_RESET        BIT(1)
+#define PPMU_COUNTER_RESET      BIT(2)
+
+#define PPMU_ENABLE_COUNT0      BIT(0)
+#define PPMU_ENABLE_COUNT1      BIT(1)
+#define PPMU_ENABLE_COUNT2      BIT(2)
+#define PPMU_ENABLE_COUNT3      BIT(3)
+#define PPMU_ENABLE_CYCLE       BIT(31)
+
+#define PPMU_CNTENS             0x10
+#define PPMU_FLAG               0x50
+#define PPMU_CCNT_OVERFLOW      BIT(31)
+#define PPMU_CCNT               0x100
+
+#define PPMU_PMCNT0             0x110
+#define PPMU_PMCNT_OFFSET       0x10
+#define PMCNT_OFFSET(x)         (PPMU_PMCNT0 + (PPMU_PMCNT_OFFSET * x))
+
+#define PPMU_BEVT0SEL           0x1000
+#define PPMU_BEVTSEL_OFFSET     0x100
+#define PPMU_BEVTSEL(x)         (PPMU_BEVT0SEL + (ch * PPMU_BEVTSEL_OFFSET))
+
+/* For Event Selection */
+#define RD_DATA_COUNT           0x5
+#define WR_DATA_COUNT           0x6
+#define RDWR_DATA_COUNT         0x7
+
+enum ppmu_counter {
+        PPMU_PMNCNT0,
+        PPMU_PMCCNT1,
+        PPMU_PMNCNT2,
+        PPMU_PMNCNT3,
+        PPMU_PMNCNT_MAX,
+};
+
+struct bus_opp_table {
+        unsigned int idx;
+        unsigned long clk;
+        unsigned long volt;
+};
+
+struct exynos_ppmu {
+        void __iomem *hw_base;
+        unsigned int ccnt;
+        unsigned int event[PPMU_PMNCNT_MAX];
+        unsigned int count[PPMU_PMNCNT_MAX];
+        unsigned long long ns;
+        ktime_t reset_time;
+        bool ccnt_overflow;
+        bool count_overflow[PPMU_PMNCNT_MAX];
+};
+
+void exynos_ppmu_reset(void __iomem *ppmu_base);
+void exynos_ppmu_setevent(void __iomem *ppmu_base, unsigned int ch,
+                        unsigned int evt);
+void exynos_ppmu_start(void __iomem *ppmu_base);
+void exynos_ppmu_stop(void __iomem *ppmu_base);
+unsigned int exynos_ppmu_read(void __iomem *ppmu_base, unsigned int ch);
+#endif /* __DEVFREQ_EXYNOS_PPMU_H */
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index a0de82e21a7c..a975ebebea8a 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -1405,7 +1405,7 @@ static int dma_runtime_idle(struct device *dev)
                         return -EAGAIN;
         }
 
-        return pm_schedule_suspend(dev, 0);
+        return 0;
 }
 
 /******************************************************************************
diff --git a/drivers/gpio/gpio-langwell.c b/drivers/gpio/gpio-langwell.c
index f4b72456faaf..bfa1af1b519f 100644
--- a/drivers/gpio/gpio-langwell.c
+++ b/drivers/gpio/gpio-langwell.c
@@ -300,11 +300,7 @@ static const struct irq_domain_ops lnw_gpio_irq_ops = {
 
 static int lnw_gpio_runtime_idle(struct device *dev)
 {
-        int err = pm_schedule_suspend(dev, 500);
-
-        if (!err)
-                return 0;
-
+        pm_schedule_suspend(dev, 500);
         return -EBUSY;
 }
 
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 48e31ed69dbf..f32ca293ae0e 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -435,7 +435,7 @@ static const struct dev_pm_ops i2c_device_pm_ops = {
         SET_RUNTIME_PM_OPS(
                 pm_generic_runtime_suspend,
                 pm_generic_runtime_resume,
-                pm_generic_runtime_idle
+                NULL
         )
 };
 
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 13f7866de46e..3598b0ecf8c7 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -886,12 +886,6 @@ static int ab8500_gpadc_runtime_resume(struct device *dev)
         return ret;
 }
 
-static int ab8500_gpadc_runtime_idle(struct device *dev)
-{
-        pm_runtime_suspend(dev);
-        return 0;
-}
-
 static int ab8500_gpadc_suspend(struct device *dev)
 {
         struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);
@@ -1039,7 +1033,7 @@ static int ab8500_gpadc_remove(struct platform_device *pdev)
 static const struct dev_pm_ops ab8500_gpadc_pm_ops = {
         SET_RUNTIME_PM_OPS(ab8500_gpadc_runtime_suspend,
                            ab8500_gpadc_runtime_resume,
-                           ab8500_gpadc_runtime_idle)
+                           NULL)
         SET_SYSTEM_SLEEP_PM_OPS(ab8500_gpadc_suspend,
                                 ab8500_gpadc_resume)
 
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index a292a1deff9a..3c157faee645 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -1725,9 +1725,9 @@ static long round_clock_rate(u8 clock, unsigned long rate)
 
 /* CPU FREQ table, may be changed due to if MAX_OPP is supported. */
 static struct cpufreq_frequency_table db8500_cpufreq_table[] = {
-        { .frequency = 200000, .index = ARM_EXTCLK,},
-        { .frequency = 400000, .index = ARM_50_OPP,},
-        { .frequency = 800000, .index = ARM_100_OPP,},
+        { .frequency = 200000, .driver_data = ARM_EXTCLK,},
+        { .frequency = 400000, .driver_data = ARM_50_OPP,},
+        { .frequency = 800000, .driver_data = ARM_100_OPP,},
         { .frequency = CPUFREQ_TABLE_END,}, /* To be used for MAX_OPP. */
         { .frequency = CPUFREQ_TABLE_END,},
 };
@@ -1902,7 +1902,7 @@ static int set_armss_rate(unsigned long rate)
                 return -EINVAL;
 
         /* Set the new arm opp. */
-        return db8500_prcmu_set_arm_opp(db8500_cpufreq_table[i].index);
+        return db8500_prcmu_set_arm_opp(db8500_cpufreq_table[i].driver_data);
 }
 
 static int set_plldsi_rate(unsigned long rate)
@@ -3106,7 +3106,7 @@ static void db8500_prcmu_update_cpufreq(void)
 {
         if (prcmu_has_arm_maxopp()) {
                 db8500_cpufreq_table[3].frequency = 1000000;
-                db8500_cpufreq_table[3].index = ARM_MAX_OPP;
+                db8500_cpufreq_table[3].driver_data = ARM_MAX_OPP;
         }
 }
 
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index e219c97a02a4..9d5c71125576 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -164,7 +164,7 @@ static int mmc_runtime_resume(struct device *dev)
 
 static int mmc_runtime_idle(struct device *dev)
 {
-        return pm_runtime_suspend(dev);
+        return 0;
 }
 
 #endif /* !CONFIG_PM_RUNTIME */
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 546c67c2bbbf..6d67492a9247 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -211,7 +211,7 @@ static const struct dev_pm_ops sdio_bus_pm_ops = {
         SET_RUNTIME_PM_OPS(
                 pm_generic_runtime_suspend,
                 pm_generic_runtime_resume,
-                pm_generic_runtime_idle
+                NULL
         )
 };
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 79277fb36c6b..e6515e21afa3 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1050,26 +1050,22 @@ static int pci_pm_runtime_idle(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        int ret = 0;
 
         /*
          * If pci_dev->driver is not set (unbound), the device should
          * always remain in D0 regardless of the runtime PM status
          */
         if (!pci_dev->driver)
-                goto out;
+                return 0;
 
         if (!pm)
                 return -ENOSYS;
 
-        if (pm->runtime_idle) {
-                int ret = pm->runtime_idle(dev);
-                if (ret)
-                        return ret;
-        }
+        if (pm->runtime_idle)
+                ret = pm->runtime_idle(dev);
 
-out:
-        pm_runtime_suspend(dev);
-        return 0;
+        return ret;
 }
 
 #else /* !CONFIG_PM_RUNTIME */
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 95cebf0185de..9357aa779048 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -211,6 +211,12 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
         res->start = -1;
         res->end = -1;
 
+        if (!rule->map) {
+                res->flags |= IORESOURCE_DISABLED;
+                pnp_dbg(&dev->dev, "  dma %d disabled\n", idx);
+                goto __add;
+        }
+
         for (i = 0; i < 8; i++) {
                 if (rule->map & (1 << xtab[i])) {
                         res->start = res->end = xtab[i];
@@ -218,11 +224,9 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                                 goto __add;
                 }
         }
-#ifdef MAX_DMA_CHANNELS
-        res->start = res->end = MAX_DMA_CHANNELS;
-#endif
-        res->flags |= IORESOURCE_DISABLED;
-        pnp_dbg(&dev->dev, "  disable dma %d\n", idx);
+
+        pnp_dbg(&dev->dev, "  couldn't assign dma %d\n", idx);
+        return -EBUSY;
 
 __add:
         pnp_add_dma_resource(dev, res->start, res->flags);
diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index 6b2238bb6a81..db9973bb53f1 100644
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -27,7 +27,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/power/smartreflex.h>
 
-#define SMARTREFLEX_NAME_LEN    16
+#define DRIVER_NAME     "smartreflex"
+#define SMARTREFLEX_NAME_LEN    32
 #define NVALUE_NAME_LEN         40
 #define SR_DISABLE_TIMEOUT      200
 
@@ -207,12 +208,11 @@ static void sr_stop_vddautocomp(struct omap_sr *sr)
 static int sr_late_init(struct omap_sr *sr_info)
 {
         struct omap_sr_data *pdata = sr_info->pdev->dev.platform_data;
-        struct resource *mem;
         int ret = 0;
 
         if (sr_class->notify && sr_class->notify_flags && sr_info->irq) {
-                ret = request_irq(sr_info->irq, sr_interrupt,
-                                  0, sr_info->name, sr_info);
+                ret = devm_request_irq(&sr_info->pdev->dev, sr_info->irq,
+                                       sr_interrupt, 0, sr_info->name, sr_info);
                 if (ret)
                         goto error;
                 disable_irq(sr_info->irq);
@@ -224,14 +224,10 @@ static int sr_late_init(struct omap_sr *sr_info)
         return ret;
 
 error:
-        iounmap(sr_info->base);
-        mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mem->start, resource_size(mem));
         list_del(&sr_info->node);
         dev_err(&sr_info->pdev->dev, "%s: ERROR in registering"
                 "interrupt handler. Smartreflex will"
                 "not function as desired\n", __func__);
-        kfree(sr_info);
 
         return ret;
 }
@@ -341,9 +337,9 @@ static struct omap_sr_nvalue_table *sr_retrieve_nvalue_row(
 /* Public Functions */
 
 /**
- * sr_configure_errgen() - Configures the smrtreflex to perform AVS using the
+ * sr_configure_errgen() - Configures the SmartReflex to perform AVS using the
  *                       error generator module.
- * @voltdm:     VDD pointer to which the SR module to be configured belongs to.
+ * @sr:                 SR module to be configured.
  *
  * This API is to be called from the smartreflex class driver to
  * configure the error generator module inside the smartreflex module.
@@ -352,17 +348,17 @@ static struct omap_sr_nvalue_table *sr_retrieve_nvalue_row(
  * SR CLASS 2 can choose between ERROR module and MINMAXAVG
  * module. Returns 0 on success and error value in case of failure.
  */
-int sr_configure_errgen(struct voltagedomain *voltdm)
+int sr_configure_errgen(struct omap_sr *sr)
 {
         u32 sr_config, sr_errconfig, errconfig_offs;
         u32 vpboundint_en, vpboundint_st;
         u32 senp_en = 0, senn_en = 0;
         u8 senp_shift, senn_shift;
-        struct omap_sr *sr = _sr_lookup(voltdm);
 
-        if (IS_ERR(sr)) {
-                pr_warning("%s: omap_sr struct for voltdm not found\n", __func__);
-                return PTR_ERR(sr);
+        if (!sr) {
+                pr_warn("%s: NULL omap_sr from %pF\n", __func__,
+                        (void *)_RET_IP_);
+                return -EINVAL;
         }
 
         if (!sr->clk_length)
@@ -414,22 +410,22 @@ int sr_configure_errgen(struct voltagedomain *voltdm)
 
 /**
  * sr_disable_errgen() - Disables SmartReflex AVS module's errgen component
- * @voltdm:     VDD pointer to which the SR module to be configured belongs to.
+ * @sr:                 SR module to be configured.
  *
  * This API is to be called from the smartreflex class driver to
  * disable the error generator module inside the smartreflex module.
  *
  * Returns 0 on success and error value in case of failure.
  */
-int sr_disable_errgen(struct voltagedomain *voltdm)
+int sr_disable_errgen(struct omap_sr *sr)
 {
         u32 errconfig_offs;
         u32 vpboundint_en, vpboundint_st;
-        struct omap_sr *sr = _sr_lookup(voltdm);
 
-        if (IS_ERR(sr)) {
-                pr_warning("%s: omap_sr struct for voltdm not found\n", __func__);
-                return PTR_ERR(sr);
+        if (!sr) {
+                pr_warn("%s: NULL omap_sr from %pF\n", __func__,
+                        (void *)_RET_IP_);
+                return -EINVAL;
         }
 
         switch (sr->ip_type) {
@@ -449,19 +445,24 @@ int sr_disable_errgen(struct voltagedomain *voltdm)
                 return -EINVAL;
         }
 
-        /* Disable the interrupts of ERROR module */
-        sr_modify_reg(sr, errconfig_offs, vpboundint_en | vpboundint_st, 0);
-
         /* Disable the Sensor and errorgen */
         sr_modify_reg(sr, SRCONFIG, SRCONFIG_SENENABLE | SRCONFIG_ERRGEN_EN, 0);
 
+        /*
+         * Disable the interrupts of ERROR module
+         * NOTE: modify is a read, modify,write - an implicit OCP barrier
+         * which is required is present here - sequencing is critical
+         * at this point (after errgen is disabled, vpboundint disable)
+         */
+        sr_modify_reg(sr, errconfig_offs, vpboundint_en | vpboundint_st, 0);
+
         return 0;
 }
 
 /**
- * sr_configure_minmax() - Configures the smrtreflex to perform AVS using the
+ * sr_configure_minmax() - Configures the SmartReflex to perform AVS using the
  *                       minmaxavg module.
- * @voltdm:     VDD pointer to which the SR module to be configured belongs to.
+ * @sr:                 SR module to be configured.
  *
  * This API is to be called from the smartreflex class driver to
  * configure the minmaxavg module inside the smartreflex module.
@@ -470,16 +471,16 @@ int sr_disable_errgen(struct voltagedomain *voltdm)
  * SR CLASS 2 can choose between ERROR module and MINMAXAVG
  * module. Returns 0 on success and error value in case of failure.
  */
-int sr_configure_minmax(struct voltagedomain *voltdm)
+int sr_configure_minmax(struct omap_sr *sr)
 {
         u32 sr_config, sr_avgwt;
         u32 senp_en = 0, senn_en = 0;
         u8 senp_shift, senn_shift;
-        struct omap_sr *sr = _sr_lookup(voltdm);
 
-        if (IS_ERR(sr)) {
-                pr_warning("%s: omap_sr struct for voltdm not found\n", __func__);
-                return PTR_ERR(sr);
+        if (!sr) {
+                pr_warn("%s: NULL omap_sr from %pF\n", __func__,
+                        (void *)_RET_IP_);
+                return -EINVAL;
         }
 
         if (!sr->clk_length)
@@ -546,7 +547,7 @@ int sr_configure_minmax(struct voltagedomain *voltdm)
 
 /**
  * sr_enable() - Enables the smartreflex module.
- * @voltdm:     VDD pointer to which the SR module to be configured belongs to.
+ * @sr:         pointer to which the SR module to be configured belongs to.
  * @volt:       The voltage at which the Voltage domain associated with
  *              the smartreflex module is operating at.
  *              This is required only to program the correct Ntarget value.
@@ -555,16 +556,16 @@ int sr_configure_minmax(struct voltagedomain *voltdm)
  * enable a smartreflex module. Returns 0 on success. Returns error
  * value if the voltage passed is wrong or if ntarget value is wrong.
  */
-int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
+int sr_enable(struct omap_sr *sr, unsigned long volt)
 {
         struct omap_volt_data *volt_data;
-        struct omap_sr *sr = _sr_lookup(voltdm);
         struct omap_sr_nvalue_table *nvalue_row;
         int ret;
 
-        if (IS_ERR(sr)) {
-                pr_warning("%s: omap_sr struct for voltdm not found\n", __func__);
-                return PTR_ERR(sr);
+        if (!sr) {
+                pr_warn("%s: NULL omap_sr from %pF\n", __func__,
+                        (void *)_RET_IP_);
+                return -EINVAL;
         }
 
         volt_data = omap_voltage_get_voltdata(sr->voltdm, volt);
@@ -606,17 +607,16 @@ int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
 
 /**
  * sr_disable() - Disables the smartreflex module.
- * @voltdm:     VDD pointer to which the SR module to be configured belongs to.
+ * @sr:         pointer to which the SR module to be configured belongs to.
  *
  * This API is to be called from the smartreflex class driver to
  * disable a smartreflex module.
  */
-void sr_disable(struct voltagedomain *voltdm)
+void sr_disable(struct omap_sr *sr)
 {
-        struct omap_sr *sr = _sr_lookup(voltdm);
-
-        if (IS_ERR(sr)) {
-                pr_warning("%s: omap_sr struct for voltdm not found\n", __func__);
+        if (!sr) {
+                pr_warn("%s: NULL omap_sr from %pF\n", __func__,
+                        (void *)_RET_IP_);
                 return;
         }
 
@@ -847,34 +847,33 @@ static int __init omap_sr_probe(struct platform_device *pdev)
         struct dentry *nvalue_dir;
         int i, ret = 0;
 
-        sr_info = kzalloc(sizeof(struct omap_sr), GFP_KERNEL);
+        sr_info = devm_kzalloc(&pdev->dev, sizeof(struct omap_sr), GFP_KERNEL);
         if (!sr_info) {
                 dev_err(&pdev->dev, "%s: unable to allocate sr_info\n",
                         __func__);
                 return -ENOMEM;
         }
 
+        sr_info->name = devm_kzalloc(&pdev->dev,
+                                     SMARTREFLEX_NAME_LEN, GFP_KERNEL);
+        if (!sr_info->name) {
+                dev_err(&pdev->dev, "%s: unable to allocate SR instance name\n",
+                        __func__);
+                return -ENOMEM;
+        }
+
         platform_set_drvdata(pdev, sr_info);
 
         if (!pdata) {
                 dev_err(&pdev->dev, "%s: platform data missing\n", __func__);
-                ret = -EINVAL;
-                goto err_free_devinfo;
+                return -EINVAL;
         }
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!mem) {
-                dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
-                ret = -ENODEV;
-                goto err_free_devinfo;
-        }
-
-        mem = request_mem_region(mem->start, resource_size(mem),
-                                        dev_name(&pdev->dev));
-        if (!mem) {
-                dev_err(&pdev->dev, "%s: no mem region\n", __func__);
-                ret = -EBUSY;
-                goto err_free_devinfo;
+        sr_info->base = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(sr_info->base)) {
+                dev_err(&pdev->dev, "%s: ioremap fail\n", __func__);
+                return PTR_ERR(sr_info->base);
         }
 
         irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
@@ -882,13 +881,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_irq_safe(&pdev->dev);
 
-        sr_info->name = kasprintf(GFP_KERNEL, "%s", pdata->name);
-        if (!sr_info->name) {
-                dev_err(&pdev->dev, "%s: Unable to alloc SR instance name\n",
-                        __func__);
-                ret = -ENOMEM;
-                goto err_release_region;
-        }
+        snprintf(sr_info->name, SMARTREFLEX_NAME_LEN, "%s", pdata->name);
 
         sr_info->pdev = pdev;
         sr_info->srid = pdev->id;
@@ -905,13 +898,6 @@ static int __init omap_sr_probe(struct platform_device *pdev)
         sr_info->autocomp_active = false;
         sr_info->ip_type = pdata->ip_type;
 
-        sr_info->base = ioremap(mem->start, resource_size(mem));
-        if (!sr_info->base) {
-                dev_err(&pdev->dev, "%s: ioremap fail\n", __func__);
-                ret = -ENOMEM;
-                goto err_free_name;
-        }
-
         if (irq)
                 sr_info->irq = irq->start;
 
@@ -927,7 +913,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 ret = sr_late_init(sr_info);
                 if (ret) {
                         pr_warning("%s: Error in SR late init\n", __func__);
-                        goto err_iounmap;
+                        goto err_list_del;
                 }
         }
 
@@ -938,7 +924,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                         ret = PTR_ERR(sr_dbg_dir);
                         pr_err("%s:sr debugfs dir creation failed(%d)\n",
                                 __func__, ret);
-                        goto err_iounmap;
+                        goto err_list_del;
                 }
         }
 
@@ -991,16 +977,8 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 
 err_debugfs:
         debugfs_remove_recursive(sr_info->dbg_dir);
-err_iounmap:
+err_list_del:
         list_del(&sr_info->node);
-        iounmap(sr_info->base);
-err_free_name:
-        kfree(sr_info->name);
-err_release_region:
-        release_mem_region(mem->start, resource_size(mem));
-err_free_devinfo:
-        kfree(sr_info);
-
         return ret;
 }
 
@@ -1008,7 +986,6 @@ static int omap_sr_remove(struct platform_device *pdev)
 {
         struct omap_sr_data *pdata = pdev->dev.platform_data;
         struct omap_sr *sr_info;
-        struct resource *mem;
 
         if (!pdata) {
                 dev_err(&pdev->dev, "%s: platform data missing\n", __func__);
@@ -1027,13 +1004,8 @@ static int omap_sr_remove(struct platform_device *pdev)
         if (sr_info->dbg_dir)
                 debugfs_remove_recursive(sr_info->dbg_dir);
 
+        pm_runtime_disable(&pdev->dev);
         list_del(&sr_info->node);
-        iounmap(sr_info->base);
-        kfree(sr_info->name);
-        kfree(sr_info);
-        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mem->start, resource_size(mem));
-
         return 0;
 }
 
@@ -1064,7 +1036,7 @@ static struct platform_driver smartreflex_driver = {
         .remove         = omap_sr_remove,
         .shutdown       = omap_sr_shutdown,
         .driver         = {
-                .name   = "smartreflex",
+                .name   = DRIVER_NAME,
         },
 };
 
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index 42539ee2cb11..4c5aabe21755 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -229,8 +229,6 @@ static int scsi_runtime_resume(struct device *dev)
 
 static int scsi_runtime_idle(struct device *dev)
 {
-        int err;
-
         dev_dbg(dev, "scsi_runtime_idle\n");
 
         /* Insert hooks here for targets, hosts, and transport classes */
@@ -240,14 +238,11 @@ static int scsi_runtime_idle(struct device *dev)
 
                 if (sdev->request_queue->dev) {
                         pm_runtime_mark_last_busy(dev);
-                        err = pm_runtime_autosuspend(dev);
-                } else {
-                        err = pm_runtime_suspend(dev);
+                        pm_runtime_autosuspend(dev);
+                        return -EBUSY;
                 }
-        } else {
-                err = pm_runtime_suspend(dev);
         }
-        return err;
+        return 0;
 }
 
 int scsi_autopm_get_device(struct scsi_device *sdev)
diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
index 7715de2629c1..74727851820d 100644
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
@@ -63,12 +63,12 @@ void clk_rate_table_build(struct clk *clk,
                 else
                         freq = clk->parent->rate * mult / div;
 
-                freq_table[i].index = i;
+                freq_table[i].driver_data = i;
                 freq_table[i].frequency = freq;
         }
 
         /* Termination entry */
-        freq_table[i].index = i;
+        freq_table[i].driver_data = i;
         freq_table[i].frequency = CPUFREQ_TABLE_END;
 }
 
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index afe9282629b9..8afa5a4589f2 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c
@@ -25,7 +25,7 @@
 static int default_platform_runtime_idle(struct device *dev)
 {
         /* suspend synchronously to disable clocks immediately */
-        return pm_runtime_suspend(dev);
+        return 0;
 }
 
 static struct dev_pm_domain default_pm_domain = {
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 32b7bb111eb6..095cfaded1c0 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -223,7 +223,7 @@ static const struct dev_pm_ops spi_pm = {
         SET_RUNTIME_PM_OPS(
                 pm_generic_runtime_suspend,
                 pm_generic_runtime_resume,
-                pm_generic_runtime_idle
+                NULL
         )
 };
 
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index c6dc1846943f..119d486a5cf7 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -20,6 +20,7 @@
 #include <asm/cacheflush.h>
 #include <linux/fdtable.h>
 #include <linux/file.h>
+#include <linux/freezer.h>
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/miscdevice.h>
@@ -2140,13 +2141,13 @@ retry:
                         if (!binder_has_proc_work(proc, thread))
                                 ret = -EAGAIN;
                 } else
-                        ret = wait_event_interruptible_exclusive(proc->wait, binder_has_proc_work(proc, thread));
+                        ret = wait_event_freezable_exclusive(proc->wait, binder_has_proc_work(proc, thread));
         } else {
                 if (non_block) {
                         if (!binder_has_thread_work(thread))
                                 ret = -EAGAIN;
                 } else
-                        ret = wait_event_interruptible(thread->wait, binder_has_thread_work(thread));
+                        ret = wait_event_freezable(thread->wait, binder_has_thread_work(thread));
         }
 
         binder_lock(__func__);
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index e266eca0ec76..4a82267af83f 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -1252,13 +1252,8 @@ static int serial_hsu_resume(struct pci_dev *pdev)
 #ifdef CONFIG_PM_RUNTIME
 static int serial_hsu_runtime_idle(struct device *dev)
 {
-        int err;
-
-        err = pm_schedule_suspend(dev, 500);
-        if (err)
-                return -EBUSY;
-
-        return 0;
+        pm_schedule_suspend(dev, 500);
+        return -EBUSY;
 }
 
 static int serial_hsu_runtime_suspend(struct device *dev)
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 6eab440e1542..7609ac4aed1c 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1765,7 +1765,8 @@ int usb_runtime_idle(struct device *dev)
          */
         if (autosuspend_check(udev) == 0)
                 pm_runtime_autosuspend(dev);
-        return 0;
+        /* Tell the core not to suspend it, though. */
+        return -EBUSY;
 }
 
 int usb_set_usb2_hardware_lpm(struct usb_device *udev, int enable)
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 5fd3fee58f8b..d6b0fadf53e9 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -141,7 +141,6 @@ static const struct dev_pm_ops usb_port_pm_ops = {
 #ifdef CONFIG_PM_RUNTIME
         .runtime_suspend =      usb_port_runtime_suspend,
         .runtime_resume =       usb_port_runtime_resume,
-        .runtime_idle =         pm_generic_runtime_idle,
 #endif
 };