242 files changed, 4649 insertions, 2749 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index 468e4d48f884..d5a0d33c571f 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -200,3 +200,27 @@ Description:	address and size of the percpu note.
                 note of cpu#.
 
                 crash_notes_size: size of the note of cpu#.
+
+
+What:           /sys/devices/system/cpu/intel_pstate/max_perf_pct
+                /sys/devices/system/cpu/intel_pstate/min_perf_pct
+                /sys/devices/system/cpu/intel_pstate/no_turbo
+Date:           February 2013
+Contact:        linux-pm@vger.kernel.org
+Description:    Parameters for the Intel P-state driver
+
+                Logic for selecting the current P-state in Intel
+                Sandybridge+ processors. The three knobs control
+                limits for the P-state that will be requested by the
+                driver.
+
+                max_perf_pct: limits the maximum P state that will be requested by
+                the driver stated as a percentage of the available performance.
+
+                min_perf_pct: limits the minimum P state that will be requested by
+                the driver stated as a percentage of the available performance.
+
+                no_turbo: limits the driver to selecting P states below the turbo
+                frequency range.
+
+                More details can be found in Documentation/cpu-freq/intel-pstate.txt
diff --git a/Documentation/acpi/namespace.txt b/Documentation/acpi/namespace.txt
index 260f6a3661fa..1860cb3865c6 100644
--- a/Documentation/acpi/namespace.txt
+++ b/Documentation/acpi/namespace.txt
@@ -235,10 +235,6 @@ Wysocki <rafael.j.wysocki@intel.com>.
       named object's type in the second column).  In that case the object's
       directory in sysfs will contain the 'path' attribute whose value is
       the full path to the node from the namespace root.
-      struct acpi_device objects are created for the ACPI namespace nodes
-      whose _STA control methods return PRESENT or FUNCTIONING.  The power
-      resource nodes or nodes without _STA are assumed to be both PRESENT
-      and FUNCTIONING.
    F:
       The struct acpi_device object is created for a fixed hardware
       feature (as indicated by the fixed feature flag's name in the second
@@ -340,7 +336,7 @@ Wysocki <rafael.j.wysocki@intel.com>.
      | +-------------+-------+----------------+
      |   |
      |   | +- - - - - - - +- - - - - - +- - - - - - - -+
-     |   +-| * PNP0C0D:00 | \_SB_.LID0 | acpi:PNP0C0D: |
+     |   +-| PNP0C0D:00 | \_SB_.LID0 | acpi:PNP0C0D: |
      |   | +- - - - - - - +- - - - - - +- - - - - - - -+
      |   |
      |   | +------------+------------+-----------------------+
@@ -390,6 +386,3 @@ Wysocki <rafael.j.wysocki@intel.com>.
             attribute (as described earlier in this document).
    NOTE: N/A indicates the device object does not have the 'path' or the
          'modalias' attribute.
-   NOTE: The PNP0C0D device listed above is highlighted (marked by "*")
-         to indicate it will be created only when its _STA methods return
-         PRESENT or FUNCTIONING.
diff --git a/Documentation/cpu-freq/boost.txt b/Documentation/cpu-freq/boost.txt
index 9b4edfcf486f..dd62e1334f0a 100644
--- a/Documentation/cpu-freq/boost.txt
+++ b/Documentation/cpu-freq/boost.txt
@@ -17,8 +17,8 @@ Introduction
 Some CPUs support a functionality to raise the operating frequency of
 some cores in a multi-core package if certain conditions apply, mostly
 if the whole chip is not fully utilized and below it's intended thermal
-budget. This is done without operating system control by a combination
-of hardware and firmware.
+budget. The decision about boost disable/enable is made either at hardware
+(e.g. x86) or software (e.g ARM).
 On Intel CPUs this is called "Turbo Boost", AMD calls it "Turbo-Core",
 in technical documentation "Core performance boost". In Linux we use
 the term "boost" for convenience.
@@ -48,24 +48,24 @@ be desirable:
 User controlled switch
 ----------------------
 
-To allow the user to toggle the boosting functionality, the acpi-cpufreq
-driver exports a sysfs knob to disable it. There is a file:
+To allow the user to toggle the boosting functionality, the cpufreq core
+driver exports a sysfs knob to enable or disable it. There is a file:
 /sys/devices/system/cpu/cpufreq/boost
 which can either read "0" (boosting disabled) or "1" (boosting enabled).
-Reading the file is always supported, even if the processor does not
-support boosting. In this case the file will be read-only and always
-reads as "0". Explicitly changing the permissions and writing to that
-file anyway will return EINVAL.
+The file is exported only when cpufreq driver supports boosting.
+Explicitly changing the permissions and writing to that file anyway will
+return EINVAL.
 
 On supported CPUs one can write either a "0" or a "1" into this file.
 This will either disable the boost functionality on all cores in the
-whole system (0) or will allow the hardware to boost at will (1).
+whole system (0) or will allow the software or hardware to boost at will
+(1).
 
 Writing a "1" does not explicitly boost the system, but just allows the
-CPU (and the firmware) to boost at their discretion. Some implementations
-take external factors like the chip's temperature into account, so
-boosting once does not necessarily mean that it will occur every time
-even using the exact same software setup.
+CPU to boost at their discretion. Some implementations take external
+factors like the chip's temperature into account, so boosting once does
+not necessarily mean that it will occur every time even using the exact
+same software setup.
 
 
 AMD legacy cpb switch
diff --git a/Documentation/cpu-freq/intel-pstate.txt b/Documentation/cpu-freq/intel-pstate.txt
new file mode 100644
index 000000000000..e742d21dbd96
--- /dev/null
+++ b/Documentation/cpu-freq/intel-pstate.txt
@@ -0,0 +1,40 @@
+Intel P-state driver
+--------------------
+
+This driver implements a scaling driver with an internal governor for
+Intel Core processors.  The driver follows the same model as the
+Transmeta scaling driver (longrun.c) and implements the setpolicy()
+instead of target().  Scaling drivers that implement setpolicy() are
+assumed to implement internal governors by the cpufreq core. All the
+logic for selecting the current P state is contained within the
+driver; no external governor is used by the cpufreq core.
+
+Intel SandyBridge+ processors are supported.
+
+New sysfs files for controlling P state selection have been added to
+/sys/devices/system/cpu/intel_pstate/
+
+      max_perf_pct: limits the maximum P state that will be requested by
+      the driver stated as a percentage of the available performance.
+
+      min_perf_pct: limits the minimum P state that will be  requested by
+      the driver stated as a percentage of the available performance.
+
+      no_turbo: limits the driver to selecting P states below the turbo
+      frequency range.
+
+For contemporary Intel processors, the frequency is controlled by the
+processor itself and the P-states exposed to software are related to
+performance levels.  The idea that frequency can be set to a single
+frequency is fiction for Intel Core processors. Even if the scaling
+driver selects a single P state the actual frequency the processor
+will run at is selected by the processor itself.
+
+New debugfs files have also been added to /sys/kernel/debug/pstate_snb/
+
+      deadband
+      d_gain_pct
+      i_gain_pct
+      p_gain_pct
+      sample_rate_ms
+      setpoint
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 44738564b2ee..be6ba33d4ff1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -343,6 +343,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         no: ACPI OperationRegions are not marked as reserved,
                         no further checks are performed.
 
+        acpi_no_memhotplug [ACPI] Disable memory hotplug.  Useful for kdump
+                           kernels.
+
         add_efi_memmap  [EFI; X86] Include EFI memory map in
                         kernel's map of available physical RAM.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 6270a0b2b99d..c9f0da19048b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -257,6 +257,7 @@ F:	Documentation/ABI/testing/sysfs-bus-acpi
 F:      drivers/pci/*acpi*
 F:      drivers/pci/*/*acpi*
 F:      drivers/pci/*/*/*acpi*
+F:      tools/power/acpi
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:      Robert Moore <robert.moore@intel.com>
@@ -271,6 +272,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 S:      Supported
 F:      drivers/acpi/acpica/
 F:      include/acpi/
+F:      tools/power/acpi/
 
 ACPI FAN DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 72ae5d3a87d2..f18be40e5b21 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -303,6 +303,11 @@ void __init exynos_cpuidle_init(void)
         platform_device_register(&exynos_cpuidle);
 }
 
+void __init exynos_cpufreq_init(void)
+{
+        platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
+}
+
 void __init exynos_init_late(void)
 {
         if (of_machine_is_compatible("samsung,exynos5440"))
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 0c31b34f0de5..f76967b1c551 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -22,6 +22,7 @@ void exynos_init_io(void);
 void exynos4_restart(enum reboot_mode mode, const char *cmd);
 void exynos5_restart(enum reboot_mode mode, const char *cmd);
 void exynos_cpuidle_init(void);
+void exynos_cpufreq_init(void);
 void exynos_init_late(void);
 
 void exynos_firmware_init(void);
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index da65b036af2b..f57cb91f02aa 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -172,8 +172,8 @@ static int exynos4_enter_lowpower(struct cpuidle_device *dev,
 {
         int new_index = index;
 
-        /* This mode only can be entered when other core's are offline */
-        if (num_online_cpus() > 1)
+        /* AFTR can only be entered when cores other than CPU0 are offline */
+        if (num_online_cpus() > 1 || dev->cpu != 0)
                 new_index = drv->safe_state_index;
 
         if (new_index == 0)
@@ -235,10 +235,6 @@ static int exynos_cpuidle_probe(struct platform_device *pdev)
                 device = &per_cpu(exynos4_cpuidle_device, cpu_id);
                 device->cpu = cpu_id;
 
-                /* Support IDLE only */
-                if (cpu_id != 0)
-                        device->state_count = 1;
-
                 ret = cpuidle_register_device(device);
                 if (ret) {
                         dev_err(&pdev->dev, "failed to register cpuidle device\n");
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 4603e6bd424b..d3e54b7644d7 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -22,6 +22,7 @@
 static void __init exynos4_dt_machine_init(void)
 {
         exynos_cpuidle_init();
+        exynos_cpufreq_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 65a46465ac5e..37ea261f0f6c 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -44,6 +44,7 @@ static void __init exynos5_dt_machine_init(void)
         }
 
         exynos_cpuidle_init();
+        exynos_cpufreq_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c
index 172ebd0ee0a2..9fa6a990cf03 100644
--- a/arch/arm/mach-sa1100/clock.c
+++ b/arch/arm/mach-sa1100/clock.c
@@ -33,6 +33,13 @@ struct clk clk_##_name = {				\
 
 static DEFINE_SPINLOCK(clocks_lock);
 
+/* Dummy clk routine to build generic kernel parts that may be using them */
+unsigned long clk_get_rate(struct clk *clk)
+{
+        return 0;
+}
+EXPORT_SYMBOL(clk_get_rate);
+
 static void clk_gpio27_enable(struct clk *clk)
 {
         /*
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c
index 916ffe770bcf..84715fcbba08 100644
--- a/arch/ia64/hp/common/aml_nfw.c
+++ b/arch/ia64/hp/common/aml_nfw.c
@@ -23,8 +23,7 @@
  */
 
 #include <linux/module.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <asm/sal.h>
 
 MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index bfa19311e09c..07d209c9507f 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -60,7 +60,6 @@
 
 #define PREFIX                  "ACPI: "
 
-u32 acpi_rsdt_forced;
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c
index a166e38bd683..94134a5aecaa 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -28,7 +28,6 @@ struct cpuidle_driver pseries_idle_driver = {
 #define MAX_IDLE_STATE_COUNT    2
 
 static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;
-static struct cpuidle_device __percpu *pseries_cpuidle_devices;
 static struct cpuidle_state *cpuidle_state_table;
 
 static inline void idle_loop_prolog(unsigned long *in_purr)
@@ -191,7 +190,7 @@ static int pseries_cpuidle_add_cpu_notifier(struct notifier_block *n,
 {
         int hotcpu = (unsigned long)hcpu;
         struct cpuidle_device *dev =
-                        per_cpu_ptr(pseries_cpuidle_devices, hotcpu);
+                        per_cpu_ptr(cpuidle_devices, hotcpu);
 
         if (dev && cpuidle_get_driver()) {
                 switch (action) {
@@ -248,50 +247,6 @@ static int pseries_cpuidle_driver_init(void)
         return 0;
 }
 
-/* pseries_idle_devices_uninit(void)
- * unregister cpuidle devices and de-allocate memory
- */
-static void pseries_idle_devices_uninit(void)
-{
-        int i;
-        struct cpuidle_device *dev;
-
-        for_each_possible_cpu(i) {
-                dev = per_cpu_ptr(pseries_cpuidle_devices, i);
-                cpuidle_unregister_device(dev);
-        }
-
-        free_percpu(pseries_cpuidle_devices);
-        return;
-}
-
-/* pseries_idle_devices_init()
- * allocate, initialize and register cpuidle device
- */
-static int pseries_idle_devices_init(void)
-{
-        int i;
-        struct cpuidle_driver *drv = &pseries_idle_driver;
-        struct cpuidle_device *dev;
-
-        pseries_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (pseries_cpuidle_devices == NULL)
-                return -ENOMEM;
-
-        for_each_possible_cpu(i) {
-                dev = per_cpu_ptr(pseries_cpuidle_devices, i);
-                dev->state_count = drv->state_count;
-                dev->cpu = i;
-                if (cpuidle_register_device(dev)) {
-                        printk(KERN_DEBUG \
-                                "cpuidle_register_device %d failed!\n", i);
-                        return -EIO;
-                }
-        }
-
-        return 0;
-}
-
 /*
  * pseries_idle_probe()
  * Choose state table for shared versus dedicated partition
@@ -327,19 +282,12 @@ static int __init pseries_processor_idle_init(void)
                 return retval;
 
         pseries_cpuidle_driver_init();
-        retval = cpuidle_register_driver(&pseries_idle_driver);
+        retval = cpuidle_register(&pseries_idle_driver, NULL);
         if (retval) {
                 printk(KERN_DEBUG "Registration of pseries driver failed.\n");
                 return retval;
         }
 
-        retval = pseries_idle_devices_init();
-        if (retval) {
-                pseries_idle_devices_uninit();
-                cpuidle_unregister_driver(&pseries_idle_driver);
-                return retval;
-        }
-
         register_cpu_notifier(&setup_hotplug_notifier);
         printk(KERN_DEBUG "pseries_idle_driver registered\n");
 
@@ -350,8 +298,7 @@ static void __exit pseries_processor_idle_exit(void)
 {
 
         unregister_cpu_notifier(&setup_hotplug_notifier);
-        pseries_idle_devices_uninit();
-        cpuidle_unregister_driver(&pseries_idle_driver);
+        cpuidle_unregister(&pseries_idle_driver);
 
         return;
 }
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d359d0fffa50..1dac94265b59 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -46,7 +46,6 @@
 
 #include "sleep.h" /* To include x86_acpi_suspend_lowlevel */
 static int __initdata acpi_force = 0;
-u32 acpi_rsdt_forced;
 int acpi_disabled;
 EXPORT_SYMBOL(acpi_disabled);
 
@@ -1562,7 +1561,7 @@ static int __init parse_acpi(char *arg)
         }
         /* acpi=rsdt use RSDT instead of XSDT */
         else if (strcmp(arg, "rsdt") == 0) {
-                acpi_rsdt_forced = 1;
+                acpi_gbl_do_not_use_xsdt = TRUE;
         }
         /* "acpi=noirq" disables ACPI interrupt routing */
         else if (strcmp(arg, "noirq") == 0) {
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 5d5b9eb2b7a4..2c621a6b901a 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -20,9 +20,7 @@
 #include <asm/apic.h>
 #include <asm/ipi.h>
 
-#ifdef CONFIG_ACPI
-#include <acpi/acpi_bus.h>
-#endif
+#include <linux/acpi.h>
 
 static struct apic apic_physflat;
 static struct apic apic_flat;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index a43f068ebec1..6ad4658de705 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -37,9 +37,6 @@
 #include <linux/kthread.h>
 #include <linux/jiffies.h>      /* time_after() */
 #include <linux/slab.h>
-#ifdef CONFIG_ACPI
-#include <acpi/acpi_bus.h>
-#endif
 #include <linux/bootmem.h>
 #include <linux/dmar.h>
 #include <linux/hpet.h>
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 082e88129712..248642f4bab7 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -12,7 +12,6 @@
 
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/acpi.h>
 #include <linux/sfi_acpi.h>
 #include <linux/bitmap.h>
 #include <linux/dmi.h>
diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
index 5c90975cdf0f..43984bc1665a 100644
--- a/arch/x86/pci/mmconfig_32.c
+++ b/arch/x86/pci/mmconfig_32.c
@@ -14,7 +14,6 @@
 #include <linux/rcupdate.h>
 #include <asm/e820.h>
 #include <asm/pci_x86.h>
-#include <acpi/acpi.h>
 
 /* Assume systems with more busses have correct MCFG */
 #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index 649a12befba9..08e350e757dc 100644
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -15,8 +15,7 @@
 #include <linux/power_supply.h>
 #include <linux/olpc-ec.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <asm/olpc.h>
 
 #define DRV_NAME                        "olpc-xo15-sci"
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 3c2e4aa529c4..e7515aa43d6b 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -32,8 +32,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #define PREFIX "ACPI: "
 
diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c
index 5d33c5415405..c4a5d87ede7e 100644
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
@@ -9,7 +9,6 @@
 
 #include <linux/module.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/cper.h>
 #include <linux/ratelimit.h>
 #include <linux/edac.h>
@@ -21,11 +20,9 @@
 #define EXT_ELOG_ENTRY_MASK     GENMASK_ULL(51, 0) /* elog entry address mask */
 
 #define EXTLOG_DSM_REV          0x0
-#define EXTLOG_FN_QUERY         0x0
 #define EXTLOG_FN_ADDR          0x1
 
 #define FLAG_OS_OPTIN           BIT(0)
-#define EXTLOG_QUERY_L1_EXIST   BIT(1)
 #define ELOG_ENTRY_VALID        (1ULL<<63)
 #define ELOG_ENTRY_LEN          0x1000
 
@@ -46,7 +43,7 @@ struct extlog_l1_head {
 
 static int old_edac_report_status;
 
-static u8 extlog_dsm_uuid[] = "663E35AF-CC10-41A4-88EA-5470AF055295";
+static u8 extlog_dsm_uuid[] __initdata = "663E35AF-CC10-41A4-88EA-5470AF055295";
 
 /* L1 table related physical address */
 static u64 elog_base;
@@ -156,62 +153,27 @@ static int extlog_print(struct notifier_block *nb, unsigned long val,
         return NOTIFY_STOP;
 }
 
-static int extlog_get_dsm(acpi_handle handle, int rev, int func, u64 *ret)
+static bool __init extlog_get_l1addr(void)
 {
-        struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
-        struct acpi_object_list input;
-        union acpi_object params[4], *obj;
         u8 uuid[16];
-        int i;
+        acpi_handle handle;
+        union acpi_object *obj;
 
         acpi_str_to_uuid(extlog_dsm_uuid, uuid);
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = 16;
-        params[0].buffer.pointer = uuid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = rev;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf)))
-                return -1;
-
-        *ret = 0;
-        obj = (union acpi_object *)buf.pointer;
-        if (obj->type == ACPI_TYPE_INTEGER) {
-                *ret = obj->integer.value;
-        } else if (obj->type == ACPI_TYPE_BUFFER) {
-                if (obj->buffer.length <= 8) {
-                        for (i = 0; i < obj->buffer.length; i++)
-                                *ret |= (obj->buffer.pointer[i] << (i * 8));
-                }
-        }
-        kfree(buf.pointer);
-
-        return 0;
-}
-
-static bool extlog_get_l1addr(void)
-{
-        acpi_handle handle;
-        u64 ret;
 
         if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
                 return false;
-
-        if (extlog_get_dsm(handle, EXTLOG_DSM_REV, EXTLOG_FN_QUERY, &ret) ||
-            !(ret & EXTLOG_QUERY_L1_EXIST))
+        if (!acpi_check_dsm(handle, uuid, EXTLOG_DSM_REV, 1 << EXTLOG_FN_ADDR))
                 return false;
-
-        if (extlog_get_dsm(handle, EXTLOG_DSM_REV, EXTLOG_FN_ADDR, &ret))
+        obj = acpi_evaluate_dsm_typed(handle, uuid, EXTLOG_DSM_REV,
+                                      EXTLOG_FN_ADDR, NULL, ACPI_TYPE_INTEGER);
+        if (!obj) {
                 return false;
+        } else {
+                l1_dirbase = obj->integer.value;
+                ACPI_FREE(obj);
+        }
 
-        l1_dirbase = ret;
         /* Spec says L1 directory must be 4K aligned, bail out if it isn't */
         if (l1_dirbase & ((1 << 12) - 1)) {
                 pr_warn(FW_BUG "L1 Directory is invalid at physical %llx\n",
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 551dad712ffe..b67be85ff0fc 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -180,14 +180,14 @@ static unsigned long acpi_meminfo_end_pfn(struct acpi_memory_info *info)
 
 static int acpi_bind_memblk(struct memory_block *mem, void *arg)
 {
-        return acpi_bind_one(&mem->dev, (acpi_handle)arg);
+        return acpi_bind_one(&mem->dev, arg);
 }
 
 static int acpi_bind_memory_blocks(struct acpi_memory_info *info,
-                                   acpi_handle handle)
+                                   struct acpi_device *adev)
 {
         return walk_memory_range(acpi_meminfo_start_pfn(info),
-                                 acpi_meminfo_end_pfn(info), (void *)handle,
+                                 acpi_meminfo_end_pfn(info), adev,
                                  acpi_bind_memblk);
 }
 
@@ -197,8 +197,7 @@ static int acpi_unbind_memblk(struct memory_block *mem, void *arg)
         return 0;
 }
 
-static void acpi_unbind_memory_blocks(struct acpi_memory_info *info,
-                                      acpi_handle handle)
+static void acpi_unbind_memory_blocks(struct acpi_memory_info *info)
 {
         walk_memory_range(acpi_meminfo_start_pfn(info),
                           acpi_meminfo_end_pfn(info), NULL, acpi_unbind_memblk);
@@ -242,9 +241,9 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
                 if (result && result != -EEXIST)
                         continue;
 
-                result = acpi_bind_memory_blocks(info, handle);
+                result = acpi_bind_memory_blocks(info, mem_device->device);
                 if (result) {
-                        acpi_unbind_memory_blocks(info, handle);
+                        acpi_unbind_memory_blocks(info);
                         return -ENODEV;
                 }
 
@@ -285,7 +284,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
                 if (nid == NUMA_NO_NODE)
                         nid = memory_add_physaddr_to_nid(info->start_addr);
 
-                acpi_unbind_memory_blocks(info, handle);
+                acpi_unbind_memory_blocks(info);
                 remove_memory(nid, info->start_addr, info->length);
                 list_del(&info->list);
                 kfree(info);
@@ -361,7 +360,19 @@ static void acpi_memory_device_remove(struct acpi_device *device)
         acpi_memory_device_free(mem_device);
 }
 
+static bool __initdata acpi_no_memhotplug;
+
 void __init acpi_memory_hotplug_init(void)
 {
+        if (acpi_no_memhotplug)
+                return;
+
         acpi_scan_add_handler_with_hotplug(&memory_device_handler, "memory");
 }
+
+static int __init disable_acpi_memory_hotplug(char *str)
+{
+        acpi_no_memhotplug = true;
+        return 1;
+}
+__setup("acpi_no_memhotplug", disable_acpi_memory_hotplug);
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 509452a62f96..df96a0fe4890 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -28,8 +28,7 @@
 #include <linux/cpu.h>
 #include <linux/clockchips.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <asm/mwait.h>
 
 #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 3c1d6b0c09a4..c9311be29a64 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -212,7 +212,7 @@ 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;
+        int apic_id, cpu_index, device_declaration = 0;
         acpi_status status = AE_OK;
         static int cpu0_initialized;
         unsigned long long value;
@@ -258,18 +258,21 @@ static int acpi_processor_get_info(struct acpi_device *device)
                 device_declaration = 1;
                 pr->acpi_id = value;
         }
-        pr->apic_id = acpi_get_apicid(pr->handle, device_declaration,
-                                        pr->acpi_id);
-        cpu_index = acpi_map_cpuid(pr->apic_id, 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;
+        apic_id = acpi_get_apicid(pr->handle, device_declaration, pr->acpi_id);
+        if (apic_id < 0) {
+                acpi_handle_err(pr->handle, "failed to get CPU APIC ID.\n");
+                return -ENODEV;
         }
+        pr->apic_id = apic_id;
 
-        cpu0_initialized = 1;
-
+        cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id);
+        if (!cpu0_initialized) {
+                cpu0_initialized = 1;
+                /* Handle UP system running SMP kernel, with no LAPIC in MADT */
+                if ((cpu_index == -1) && (num_online_cpus() == 1))
+                        cpu_index = 0;
+        }
         pr->id = cpu_index;
 
         /*
@@ -282,6 +285,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
                 if (ret)
                         return ret;
         }
+
         /*
          * On some boxes several processors use the same processor bus id.
          * But they are located in different scope. For example:
@@ -395,7 +399,7 @@ static int acpi_processor_add(struct acpi_device *device,
                 goto err;
         }
 
-        result = acpi_bind_one(dev, pr->handle);
+        result = acpi_bind_one(dev, device);
         if (result)
                 goto err;
 
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index a9fd0b872062..2bf3ca2b8a7a 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -113,7 +113,6 @@ void acpi_db_display_handlers(void);
 ACPI_HW_DEPENDENT_RETURN_VOID(void
                               acpi_db_generate_gpe(char *gpe_arg,
                                                    char *block_arg))
-
 ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))
 
 /*
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 41abe552c7a3..0fb0adf435d6 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -71,9 +71,8 @@ acpi_status acpi_ev_init_global_lock_handler(void);
 
 ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
                             acpi_ev_acquire_global_lock(u16 timeout))
-
 ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))
- acpi_status acpi_ev_remove_global_lock_handler(void);
+acpi_status acpi_ev_remove_global_lock_handler(void);
 
 /*
  * evgpe - Low-level GPE support
@@ -133,7 +132,7 @@ acpi_status acpi_ev_gpe_initialize(void);
 ACPI_HW_DEPENDENT_RETURN_VOID(void
                               acpi_ev_update_gpes(acpi_owner_id table_owner_id))
 
- acpi_status
+acpi_status
 acpi_ev_match_gpe_method(acpi_handle obj_handle,
                          u32 level, void *context, void **return_value);
 
@@ -149,7 +148,9 @@ acpi_status
 acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                        struct acpi_gpe_block_info *gpe_block, void *context);
 
-struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);
+acpi_status
+acpi_ev_get_gpe_xrupt_block(u32 interrupt_number,
+                            struct acpi_gpe_xrupt_info **gpe_xrupt_block);
 
 acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
 
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index e9f1fc7f99c7..24db8e153bf0 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -119,6 +119,24 @@ bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);
 u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);
 
 /*
+ * Optionally ignore an XSDT if present and use the RSDT instead.
+ * Although the ACPI specification requires that an XSDT be used instead
+ * of the RSDT, the XSDT has been found to be corrupt or ill-formed on
+ * some machines. Default behavior is to use the XSDT if present.
+ */
+u8 ACPI_INIT_GLOBAL(acpi_gbl_do_not_use_xsdt, FALSE);
+
+/*
+ * Optionally use 32-bit FADT addresses if and when there is a conflict
+ * (address mismatch) between the 32-bit and 64-bit versions of the
+ * address. Although ACPICA adheres to the ACPI specification which
+ * requires the use of the corresponding 64-bit address if it is non-zero,
+ * some machines have been found to have a corrupted non-zero 64-bit
+ * address. Default is FALSE, do not favor the 32-bit addresses.
+ */
+u8 ACPI_INIT_GLOBAL(acpi_gbl_use32_bit_fadt_addresses, FALSE);
+
+/*
  * Optionally truncate I/O addresses to 16 bits. Provides compatibility
  * with other ACPI implementations. NOTE: During ACPICA initialization,
  * this value is set to TRUE if any Windows OSI strings have been
@@ -484,6 +502,18 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;
 
 /*****************************************************************************
  *
+ * Application globals
+ *
+ ****************************************************************************/
+
+#ifdef ACPI_APPLICATION
+
+ACPI_FILE ACPI_INIT_GLOBAL(acpi_gbl_debug_file, NULL);
+
+#endif                          /* ACPI_APPLICATION */
+
+/*****************************************************************************
+ *
  * Info/help support
  *
  ****************************************************************************/
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 53ed1a8ba4f0..d95ca5449ace 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -1038,15 +1038,16 @@ struct acpi_external_list {
         struct acpi_external_list *next;
         u32 value;
         u16 length;
+        u16 flags;
         u8 type;
-        u8 flags;
-        u8 resolved;
-        u8 emitted;
 };
 
 /* Values for Flags field above */
 
-#define ACPI_IPATH_ALLOCATED    0x01
+#define ACPI_EXT_RESOLVED_REFERENCE         0x01        /* Object was resolved during cross ref */
+#define ACPI_EXT_ORIGIN_FROM_FILE           0x02        /* External came from a file */
+#define ACPI_EXT_INTERNAL_PATH_ALLOCATED    0x04        /* Deallocate internal path on completion */
+#define ACPI_EXT_EXTERNAL_EMITTED           0x08        /* External() statement has been emitted */
 
 struct acpi_external_file {
         char *path;
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 2d4c07322576..e7a57c554e84 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -105,7 +105,7 @@ acpi_ds_create_external_region(acpi_status lookup_status,
          * operation_region not found. Generate an External for it, and
          * insert the name into the namespace.
          */
-        acpi_dm_add_to_external_list(op, path, ACPI_TYPE_REGION, 0);
+        acpi_dm_add_op_to_external_list(op, path, ACPI_TYPE_REGION, 0, 0);
         status = acpi_ns_lookup(walk_state->scope_info, path, ACPI_TYPE_REGION,
                                 ACPI_IMODE_LOAD_PASS1, ACPI_NS_SEARCH_PARENT,
                                 walk_state, node);
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index ade44e49deb4..d7f53fb2979a 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -727,27 +727,26 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
                 index++;
         }
 
-        index--;
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                          "NumOperands %d, ArgCount %d, Index %d\n",
+                          walk_state->num_operands, arg_count, index));
 
-        /* It is the appropriate order to get objects from the Result stack */
+        /* Create the interpreter arguments, in reverse order */
 
+        index--;
         for (i = 0; i < arg_count; i++) {
                 arg = arguments[index];
-
-                /* Force the filling of the operand stack in inverse order */
-
-                walk_state->operand_index = (u8) index;
+                walk_state->operand_index = (u8)index;
 
                 status = acpi_ds_create_operand(walk_state, arg, index);
                 if (ACPI_FAILURE(status)) {
                         goto cleanup;
                 }
 
-                index--;
-
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "Arg #%u (%p) done, Arg1=%p\n", index, arg,
-                                  first_arg));
+                                  "Created Arg #%u (%p) %u args total\n",
+                                  index, arg, arg_count));
+                index--;
         }
 
         return_ACPI_STATUS(status);
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 95e681a36f9c..2dbe109727c8 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -181,8 +181,8 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                          * Target of Scope() not found. Generate an External for it, and
                          * insert the name into the namespace.
                          */
-                        acpi_dm_add_to_external_list(op, path, ACPI_TYPE_DEVICE,
-                                                     0);
+                        acpi_dm_add_op_to_external_list(op, path,
+                                                        ACPI_TYPE_DEVICE, 0, 0);
                         status =
                             acpi_ns_lookup(walk_state->scope_info, path,
                                            object_type, ACPI_IMODE_LOAD_PASS1,
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index a9e76bc4ad97..a31e549e64cc 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -87,9 +87,9 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
                 return_ACPI_STATUS(status);
         }
 
-        gpe_xrupt_block = acpi_ev_get_gpe_xrupt_block(interrupt_number);
-        if (!gpe_xrupt_block) {
-                status = AE_NO_MEMORY;
+        status =
+            acpi_ev_get_gpe_xrupt_block(interrupt_number, &gpe_xrupt_block);
+        if (ACPI_FAILURE(status)) {
                 goto unlock_and_exit;
         }
 
@@ -112,7 +112,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 
 unlock_and_exit:
-        status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index d3f5e1e2a2b1..4d764e847a08 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -197,8 +197,9 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
  * FUNCTION:    acpi_ev_get_gpe_xrupt_block
  *
  * PARAMETERS:  interrupt_number            - Interrupt for a GPE block
+ *              gpe_xrupt_block             - Where the block is returned
  *
- * RETURN:      A GPE interrupt block
+ * RETURN:      Status
  *
  * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
  *              block per unique interrupt level used for GPEs. Should be
@@ -207,7 +208,9 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
  *
  ******************************************************************************/
 
-struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)
+acpi_status
+acpi_ev_get_gpe_xrupt_block(u32 interrupt_number,
+                            struct acpi_gpe_xrupt_info ** gpe_xrupt_block)
 {
         struct acpi_gpe_xrupt_info *next_gpe_xrupt;
         struct acpi_gpe_xrupt_info *gpe_xrupt;
@@ -221,7 +224,8 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)
         next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
         while (next_gpe_xrupt) {
                 if (next_gpe_xrupt->interrupt_number == interrupt_number) {
-                        return_PTR(next_gpe_xrupt);
+                        *gpe_xrupt_block = next_gpe_xrupt;
+                        return_ACPI_STATUS(AE_OK);
                 }
 
                 next_gpe_xrupt = next_gpe_xrupt->next;
@@ -231,7 +235,7 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)
 
         gpe_xrupt = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_xrupt_info));
         if (!gpe_xrupt) {
-                return_PTR(NULL);
+                return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
         gpe_xrupt->interrupt_number = interrupt_number;
@@ -250,6 +254,7 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)
         } else {
                 acpi_gbl_gpe_xrupt_list_head = gpe_xrupt;
         }
+
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 
         /* Install new interrupt handler if not SCI_INT */
@@ -259,14 +264,15 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)
                                                            acpi_ev_gpe_xrupt_handler,
                                                            gpe_xrupt);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not install GPE interrupt handler at level 0x%X",
-                                    interrupt_number));
-                        return_PTR(NULL);
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not install GPE interrupt handler at level 0x%X",
+                                        interrupt_number));
+                        return_ACPI_STATUS(status);
                 }
         }
 
-        return_PTR(gpe_xrupt);
+        *gpe_xrupt_block = gpe_xrupt;
+        return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index acd34f599313..7ca6925a87ca 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -124,7 +124,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         }
 
         if (!source_desc) {
-                ACPI_ERROR((AE_INFO, "No object attached to node %p", node));
+                ACPI_ERROR((AE_INFO, "No object attached to node [%4.4s] %p",
+                            node->name.ascii, node));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index e973e311f856..1f0c28ba50df 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -84,7 +84,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
                            acpi_object_type return_type)
 {
         acpi_status status;
-        u8 must_free = FALSE;
+        u8 free_buffer_on_error = FALSE;
 
         ACPI_FUNCTION_TRACE(acpi_evaluate_object_typed);
 
@@ -95,14 +95,13 @@ acpi_evaluate_object_typed(acpi_handle handle,
         }
 
         if (return_buffer->length == ACPI_ALLOCATE_BUFFER) {
-                must_free = TRUE;
+                free_buffer_on_error = TRUE;
         }
 
         /* Evaluate the object */
 
-        status =
-            acpi_evaluate_object(handle, pathname, external_params,
-                                 return_buffer);
+        status = acpi_evaluate_object(handle, pathname,
+                                      external_params, return_buffer);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -135,11 +134,15 @@ acpi_evaluate_object_typed(acpi_handle handle,
                                            pointer)->type),
                     acpi_ut_get_type_name(return_type)));
 
-        if (must_free) {
-
-                /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
-
-                ACPI_FREE_BUFFER(*return_buffer);
+        if (free_buffer_on_error) {
+                /*
+                 * Free a buffer created via ACPI_ALLOCATE_BUFFER.
+                 * Note: We use acpi_os_free here because acpi_os_allocate was used
+                 * to allocate the buffer. This purposefully bypasses the
+                 * (optionally enabled) allocation tracking mechanism since we
+                 * only want to track internal allocations.
+                 */
+                acpi_os_free(return_buffer->pointer);
                 return_buffer->pointer = NULL;
         }
 
diff --git a/drivers/acpi/acpica/psopinfo.c b/drivers/acpi/acpica/psopinfo.c
index 9ba5301e5751..b0c9787dbe61 100644
--- a/drivers/acpi/acpica/psopinfo.c
+++ b/drivers/acpi/acpica/psopinfo.c
@@ -71,6 +71,10 @@ static const u8 acpi_gbl_argument_count[] =
 
 const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 {
+#ifdef ACPI_DEBUG_OUTPUT
+        const char *opcode_name = "Unknown AML opcode";
+#endif
+
         ACPI_FUNCTION_NAME(ps_get_opcode_info);
 
         /*
@@ -92,11 +96,54 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
                 return (&acpi_gbl_aml_op_info
                         [acpi_gbl_long_op_index[(u8)opcode]]);
         }
+#if defined ACPI_ASL_COMPILER && defined ACPI_DEBUG_OUTPUT
+#include "asldefine.h"
+
+        switch (opcode) {
+        case AML_RAW_DATA_BYTE:
+                opcode_name = "-Raw Data Byte-";
+                break;
+
+        case AML_RAW_DATA_WORD:
+                opcode_name = "-Raw Data Word-";
+                break;
+
+        case AML_RAW_DATA_DWORD:
+                opcode_name = "-Raw Data Dword-";
+                break;
+
+        case AML_RAW_DATA_QWORD:
+                opcode_name = "-Raw Data Qword-";
+                break;
+
+        case AML_RAW_DATA_BUFFER:
+                opcode_name = "-Raw Data Buffer-";
+                break;
+
+        case AML_RAW_DATA_CHAIN:
+                opcode_name = "-Raw Data Buffer Chain-";
+                break;
+
+        case AML_PACKAGE_LENGTH:
+                opcode_name = "-Package Length-";
+                break;
+
+        case AML_UNASSIGNED_OPCODE:
+                opcode_name = "-Unassigned Opcode-";
+                break;
+
+        case AML_DEFAULT_ARG_OP:
+                opcode_name = "-Default Arg-";
+                break;
+
+        default:
+                break;
+        }
+#endif
 
         /* Unknown AML opcode */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Unknown AML opcode [%4.4X]\n", opcode));
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%4.4X]\n", opcode_name, opcode));
 
         return (&acpi_gbl_aml_op_info[_UNK]);
 }
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 9d99f2189693..8f89263ac47e 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -56,10 +56,11 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
 
 static void acpi_tb_convert_fadt(void);
 
-static void acpi_tb_validate_fadt(void);
-
 static void acpi_tb_setup_fadt_registers(void);
 
+static u64
+acpi_tb_select_address(char *register_name, u32 address32, u64 address64);
+
 /* Table for conversion of FADT to common internal format and FADT validation */
 
 typedef struct acpi_fadt_info {
@@ -175,6 +176,7 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
  *              space_id            - ACPI Space ID for this register
  *              byte_width          - Width of this register
  *              address             - Address of the register
+ *              register_name       - ASCII name of the ACPI register
  *
  * RETURN:      None
  *
@@ -220,6 +222,68 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_tb_select_address
+ *
+ * PARAMETERS:  register_name       - ASCII name of the ACPI register
+ *              address32           - 32-bit address of the register
+ *              address64           - 64-bit address of the register
+ *
+ * RETURN:      The resolved 64-bit address
+ *
+ * DESCRIPTION: Select between 32-bit and 64-bit versions of addresses within
+ *              the FADT. Used for the FACS and DSDT addresses.
+ *
+ * NOTES:
+ *
+ * Check for FACS and DSDT address mismatches. An address mismatch between
+ * the 32-bit and 64-bit address fields (FIRMWARE_CTRL/X_FIRMWARE_CTRL and
+ * DSDT/X_DSDT) could be a corrupted address field or it might indicate
+ * the presence of two FACS or two DSDT tables.
+ *
+ * November 2013:
+ * By default, as per the ACPICA specification, a valid 64-bit address is
+ * used regardless of the value of the 32-bit address. However, this
+ * behavior can be overridden via the acpi_gbl_use32_bit_fadt_addresses flag.
+ *
+ ******************************************************************************/
+
+static u64
+acpi_tb_select_address(char *register_name, u32 address32, u64 address64)
+{
+
+        if (!address64) {
+
+                /* 64-bit address is zero, use 32-bit address */
+
+                return ((u64)address32);
+        }
+
+        if (address32 && (address64 != (u64)address32)) {
+
+                /* Address mismatch between 32-bit and 64-bit versions */
+
+                ACPI_BIOS_WARNING((AE_INFO,
+                                   "32/64X %s address mismatch in FADT: "
+                                   "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
+                                   register_name, address32,
+                                   ACPI_FORMAT_UINT64(address64),
+                                   acpi_gbl_use32_bit_fadt_addresses ? 32 :
+                                   64));
+
+                /* 32-bit address override */
+
+                if (acpi_gbl_use32_bit_fadt_addresses) {
+                        return ((u64)address32);
+                }
+        }
+
+        /* Default is to use the 64-bit address */
+
+        return (address64);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_tb_parse_fadt
  *
  * PARAMETERS:  table_index         - Index for the FADT
@@ -331,10 +395,6 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 
         acpi_tb_convert_fadt();
 
-        /* Validate FADT values now, before we make any changes */
-
-        acpi_tb_validate_fadt();
-
         /* Initialize the global ACPI register structures */
 
         acpi_tb_setup_fadt_registers();
@@ -344,66 +404,55 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
  *
  * FUNCTION:    acpi_tb_convert_fadt
  *
- * PARAMETERS:  None, uses acpi_gbl_FADT
+ * PARAMETERS:  none - acpi_gbl_FADT is used.
  *
  * RETURN:      None
  *
  * DESCRIPTION: Converts all versions of the FADT to a common internal format.
- *              Expand 32-bit addresses to 64-bit as necessary.
+ *              Expand 32-bit addresses to 64-bit as necessary. Also validate
+ *              important fields within the FADT.
  *
- * NOTE:        acpi_gbl_FADT must be of size (struct acpi_table_fadt),
- *              and must contain a copy of the actual FADT.
+ * NOTE:        acpi_gbl_FADT must be of size (struct acpi_table_fadt), and must
+ *              contain a copy of the actual BIOS-provided FADT.
  *
  * Notes on 64-bit register addresses:
  *
  * After this FADT conversion, later ACPICA code will only use the 64-bit "X"
  * fields of the FADT for all ACPI register addresses.
  *
- * The 64-bit "X" fields are optional extensions to the original 32-bit FADT
+ * The 64-bit X fields are optional extensions to the original 32-bit FADT
  * V1.0 fields. Even if they are present in the FADT, they are optional and
  * are unused if the BIOS sets them to zero. Therefore, we must copy/expand
- * 32-bit V1.0 fields if the corresponding X field is zero.
+ * 32-bit V1.0 fields to the 64-bit X fields if the the 64-bit X field is
+ * originally zero.
  *
- * For ACPI 1.0 FADTs, all 32-bit address fields are expanded to the
- * corresponding "X" fields in the internal FADT.
+ * For ACPI 1.0 FADTs (that contain no 64-bit addresses), all 32-bit address
+ * fields are expanded to the corresponding 64-bit X fields in the internal
+ * common FADT.
  *
  * For ACPI 2.0+ FADTs, all valid (non-zero) 32-bit address fields are expanded
- * to the corresponding 64-bit X fields. For compatibility with other ACPI
- * implementations, we ignore the 64-bit field if the 32-bit field is valid,
- * regardless of whether the host OS is 32-bit or 64-bit.
+ * to the corresponding 64-bit X fields, if the 64-bit field is originally
+ * zero. Adhering to the ACPI specification, we completely ignore the 32-bit
+ * field if the 64-bit field is valid, regardless of whether the host OS is
+ * 32-bit or 64-bit.
+ *
+ * Possible additional checks:
+ *  (acpi_gbl_FADT.pm1_event_length >= 4)
+ *  (acpi_gbl_FADT.pm1_control_length >= 2)
+ *  (acpi_gbl_FADT.pm_timer_length >= 4)
+ *  Gpe block lengths must be multiple of 2
  *
  ******************************************************************************/
 
 static void acpi_tb_convert_fadt(void)
 {
+        char *name;
         struct acpi_generic_address *address64;
         u32 address32;
+        u8 length;
         u32 i;
 
         /*
-         * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
-         * Later code will always use the X 64-bit field. Also, check for an
-         * address mismatch between the 32-bit and 64-bit address fields
-         * (FIRMWARE_CTRL/X_FIRMWARE_CTRL, DSDT/X_DSDT) which would indicate
-         * the presence of two FACS or two DSDT tables.
-         */
-        if (!acpi_gbl_FADT.Xfacs) {
-                acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;
-        } else if (acpi_gbl_FADT.facs &&
-                   (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {
-                ACPI_WARNING((AE_INFO,
-                    "32/64 FACS address mismatch in FADT - two FACS tables!"));
-        }
-
-        if (!acpi_gbl_FADT.Xdsdt) {
-                acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
-        } else if (acpi_gbl_FADT.dsdt &&
-                   (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {
-                ACPI_WARNING((AE_INFO,
-                    "32/64 DSDT address mismatch in FADT - two DSDT tables!"));
-        }
-
-        /*
          * For ACPI 1.0 FADTs (revision 1 or 2), ensure that reserved fields which
          * should be zero are indeed zero. This will workaround BIOSs that
          * inadvertently place values in these fields.
@@ -421,119 +470,24 @@ static void acpi_tb_convert_fadt(void)
                 acpi_gbl_FADT.boot_flags = 0;
         }
 
-        /* Update the local FADT table header length */
-
-        acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
-
         /*
-         * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
-         * generic address structures as necessary. Later code will always use
-         * the 64-bit address structures.
-         *
-         * March 2009:
-         * We now always use the 32-bit address if it is valid (non-null). This
-         * is not in accordance with the ACPI specification which states that
-         * the 64-bit address supersedes the 32-bit version, but we do this for
-         * compatibility with other ACPI implementations. Most notably, in the
-         * case where both the 32 and 64 versions are non-null, we use the 32-bit
-         * version. This is the only address that is guaranteed to have been
-         * tested by the BIOS manufacturer.
+         * Now we can update the local FADT length to the length of the
+         * current FADT version as defined by the ACPI specification.
+         * Thus, we will have a common FADT internally.
          */
-        for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
-                address32 = *ACPI_ADD_PTR(u32,
-                                          &acpi_gbl_FADT,
-                                          fadt_info_table[i].address32);
-
-                address64 = ACPI_ADD_PTR(struct acpi_generic_address,
-                                         &acpi_gbl_FADT,
-                                         fadt_info_table[i].address64);
-
-                /*
-                 * If both 32- and 64-bit addresses are valid (non-zero),
-                 * they must match.
-                 */
-                if (address64->address && address32 &&
-                    (address64->address != (u64)address32)) {
-                        ACPI_BIOS_ERROR((AE_INFO,
-                                         "32/64X address mismatch in FADT/%s: "
-                                         "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                         fadt_info_table[i].name, address32,
-                                         ACPI_FORMAT_UINT64(address64->
-                                                            address)));
-                }
-
-                /* Always use 32-bit address if it is valid (non-null) */
-
-                if (address32) {
-                        /*
-                         * Copy the 32-bit address to the 64-bit GAS structure. The
-                         * Space ID is always I/O for 32-bit legacy address fields
-                        */
-                        acpi_tb_init_generic_address(address64,
-                                                     ACPI_ADR_SPACE_SYSTEM_IO,
-                                                     *ACPI_ADD_PTR(u8,
-                                                                   &acpi_gbl_FADT,
-                                                                   fadt_info_table
-                                                                   [i].length),
-                                                     (u64) address32,
-                                                     fadt_info_table[i].name);
-                }
-        }
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_validate_fadt
- *
- * PARAMETERS:  table           - Pointer to the FADT to be validated
- *
- * RETURN:      None
- *
- * DESCRIPTION: Validate various important fields within the FADT. If a problem
- *              is found, issue a message, but no status is returned.
- *              Used by both the table manager and the disassembler.
- *
- * Possible additional checks:
- * (acpi_gbl_FADT.pm1_event_length >= 4)
- * (acpi_gbl_FADT.pm1_control_length >= 2)
- * (acpi_gbl_FADT.pm_timer_length >= 4)
- * Gpe block lengths must be multiple of 2
- *
- ******************************************************************************/
-
-static void acpi_tb_validate_fadt(void)
-{
-        char *name;
-        struct acpi_generic_address *address64;
-        u8 length;
-        u32 i;
+        acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
 
         /*
-         * Check for FACS and DSDT address mismatches. An address mismatch between
-         * the 32-bit and 64-bit address fields (FIRMWARE_CTRL/X_FIRMWARE_CTRL and
-         * DSDT/X_DSDT) would indicate the presence of two FACS or two DSDT tables.
+         * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
+         * Later ACPICA code will always use the X 64-bit field.
          */
-        if (acpi_gbl_FADT.facs &&
-            (acpi_gbl_FADT.Xfacs != (u64)acpi_gbl_FADT.facs)) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "32/64X FACS address mismatch in FADT - "
-                                   "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                   acpi_gbl_FADT.facs,
-                                   ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
-
-                acpi_gbl_FADT.Xfacs = (u64)acpi_gbl_FADT.facs;
-        }
-
-        if (acpi_gbl_FADT.dsdt &&
-            (acpi_gbl_FADT.Xdsdt != (u64)acpi_gbl_FADT.dsdt)) {
-                ACPI_BIOS_WARNING((AE_INFO,
-                                   "32/64X DSDT address mismatch in FADT - "
-                                   "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                   acpi_gbl_FADT.dsdt,
-                                   ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
+        acpi_gbl_FADT.Xfacs = acpi_tb_select_address("FACS",
+                                                     acpi_gbl_FADT.facs,
+                                                     acpi_gbl_FADT.Xfacs);
 
-                acpi_gbl_FADT.Xdsdt = (u64)acpi_gbl_FADT.dsdt;
-        }
+        acpi_gbl_FADT.Xdsdt = acpi_tb_select_address("DSDT",
+                                                     acpi_gbl_FADT.dsdt,
+                                                     acpi_gbl_FADT.Xdsdt);
 
         /* If Hardware Reduced flag is set, we are all done */
 
@@ -545,18 +499,95 @@ static void acpi_tb_validate_fadt(void)
 
         for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
                 /*
-                 * Generate pointer to the 64-bit address, get the register
-                 * length (width) and the register name
+                 * Get the 32-bit and 64-bit addresses, as well as the register
+                 * length and register name.
                  */
+                address32 = *ACPI_ADD_PTR(u32,
+                                          &acpi_gbl_FADT,
+                                          fadt_info_table[i].address32);
+
                 address64 = ACPI_ADD_PTR(struct acpi_generic_address,
                                          &acpi_gbl_FADT,
                                          fadt_info_table[i].address64);
-                length =
-                    *ACPI_ADD_PTR(u8, &acpi_gbl_FADT,
-                                  fadt_info_table[i].length);
+
+                length = *ACPI_ADD_PTR(u8,
+                                       &acpi_gbl_FADT,
+                                       fadt_info_table[i].length);
+
                 name = fadt_info_table[i].name;
 
                 /*
+                 * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
+                 * generic address structures as necessary. Later code will always use
+                 * the 64-bit address structures.
+                 *
+                 * November 2013:
+                 * Now always use the 64-bit address if it is valid (non-zero), in
+                 * accordance with the ACPI specification which states that a 64-bit
+                 * address supersedes the 32-bit version. This behavior can be
+                 * overridden by the acpi_gbl_use32_bit_fadt_addresses flag.
+                 *
+                 * During 64-bit address construction and verification,
+                 * these cases are handled:
+                 *
+                 * Address32 zero, Address64 [don't care]   - Use Address64
+                 *
+                 * Address32 non-zero, Address64 zero       - Copy/use Address32
+                 * Address32 non-zero == Address64 non-zero - Use Address64
+                 * Address32 non-zero != Address64 non-zero - Warning, use Address64
+                 *
+                 * Override: if acpi_gbl_use32_bit_fadt_addresses is TRUE, and:
+                 * Address32 non-zero != Address64 non-zero - Warning, copy/use Address32
+                 *
+                 * Note: space_id is always I/O for 32-bit legacy address fields
+                 */
+                if (address32) {
+                        if (!address64->address) {
+
+                                /* 64-bit address is zero, use 32-bit address */
+
+                                acpi_tb_init_generic_address(address64,
+                                                             ACPI_ADR_SPACE_SYSTEM_IO,
+                                                             *ACPI_ADD_PTR(u8,
+                                                                           &acpi_gbl_FADT,
+                                                                           fadt_info_table
+                                                                           [i].
+                                                                           length),
+                                                             (u64)address32,
+                                                             name);
+                        } else if (address64->address != (u64)address32) {
+
+                                /* Address mismatch */
+
+                                ACPI_BIOS_WARNING((AE_INFO,
+                                                   "32/64X address mismatch in FADT/%s: "
+                                                   "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
+                                                   name, address32,
+                                                   ACPI_FORMAT_UINT64
+                                                   (address64->address),
+                                                   acpi_gbl_use32_bit_fadt_addresses
+                                                   ? 32 : 64));
+
+                                if (acpi_gbl_use32_bit_fadt_addresses) {
+
+                                        /* 32-bit address override */
+
+                                        acpi_tb_init_generic_address(address64,
+                                                                     ACPI_ADR_SPACE_SYSTEM_IO,
+                                                                     *ACPI_ADD_PTR
+                                                                     (u8,
+                                                                      &acpi_gbl_FADT,
+                                                                      fadt_info_table
+                                                                      [i].
+                                                                      length),
+                                                                     (u64)
+                                                                     address32,
+                                                                     name);
+                                }
+                        }
+                }
+
+                /*
                  * For each extended field, check for length mismatch between the
                  * legacy length field and the corresponding 64-bit X length field.
                  * Note: If the legacy length field is > 0xFF bits, ignore this
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 3d6bb83aa7e7..6412d3c301cb 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -49,69 +49,11 @@
 ACPI_MODULE_NAME("tbutils")
 
 /* Local prototypes */
+static acpi_status acpi_tb_validate_xsdt(acpi_physical_address address);
+
 static acpi_physical_address
 acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size);
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_check_xsdt
- *
- * PARAMETERS:  address                    - Pointer to the XSDT
- *
- * RETURN:      status
- *              AE_OK - XSDT is okay
- *              AE_NO_MEMORY - can't map XSDT
- *              AE_INVALID_TABLE_LENGTH - invalid table length
- *              AE_NULL_ENTRY - XSDT has NULL entry
- *
- * DESCRIPTION: validate XSDT
-******************************************************************************/
-
-static acpi_status
-acpi_tb_check_xsdt(acpi_physical_address address)
-{
-        struct acpi_table_header *table;
-        u32 length;
-        u64 xsdt_entry_address;
-        u8 *table_entry;
-        u32 table_count;
-        int i;
-
-        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
-        if (!table)
-                return AE_NO_MEMORY;
-
-        length = table->length;
-        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
-        if (length < sizeof(struct acpi_table_header))
-                return AE_INVALID_TABLE_LENGTH;
-
-        table = acpi_os_map_memory(address, length);
-        if (!table)
-                return AE_NO_MEMORY;
-
-        /* Calculate the number of tables described in XSDT */
-        table_count =
-                (u32) ((table->length -
-                sizeof(struct acpi_table_header)) / sizeof(u64));
-        table_entry =
-                ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
-        for (i = 0; i < table_count; i++) {
-                ACPI_MOVE_64_TO_64(&xsdt_entry_address, table_entry);
-                if (!xsdt_entry_address) {
-                        /* XSDT has NULL entry */
-                        break;
-                }
-                table_entry += sizeof(u64);
-        }
-        acpi_os_unmap_memory(table, length);
-
-        if (i < table_count)
-                return AE_NULL_ENTRY;
-        else
-                return AE_OK;
-}
-
 #if (!ACPI_REDUCED_HARDWARE)
 /*******************************************************************************
  *
@@ -383,7 +325,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
          * Get the table physical address (32-bit for RSDT, 64-bit for XSDT):
          * Note: Addresses are 32-bit aligned (not 64) in both RSDT and XSDT
          */
-        if (table_entry_size == sizeof(u32)) {
+        if (table_entry_size == ACPI_RSDT_ENTRY_SIZE) {
                 /*
                  * 32-bit platform, RSDT: Return 32-bit table entry
                  * 64-bit platform, RSDT: Expand 32-bit to 64-bit and return
@@ -415,6 +357,87 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_tb_validate_xsdt
+ *
+ * PARAMETERS:  address             - Physical address of the XSDT (from RSDP)
+ *
+ * RETURN:      Status. AE_OK if the table appears to be valid.
+ *
+ * DESCRIPTION: Validate an XSDT to ensure that it is of minimum size and does
+ *              not contain any NULL entries. A problem that is seen in the
+ *              field is that the XSDT exists, but is actually useless because
+ *              of one or more (or all) NULL entries.
+ *
+ ******************************************************************************/
+
+static acpi_status acpi_tb_validate_xsdt(acpi_physical_address xsdt_address)
+{
+        struct acpi_table_header *table;
+        u8 *next_entry;
+        acpi_physical_address address;
+        u32 length;
+        u32 entry_count;
+        acpi_status status;
+        u32 i;
+
+        /* Get the XSDT length */
+
+        table =
+            acpi_os_map_memory(xsdt_address, sizeof(struct acpi_table_header));
+        if (!table) {
+                return (AE_NO_MEMORY);
+        }
+
+        length = table->length;
+        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
+
+        /*
+         * Minimum XSDT length is the size of the standard ACPI header
+         * plus one physical address entry
+         */
+        if (length < (sizeof(struct acpi_table_header) + ACPI_XSDT_ENTRY_SIZE)) {
+                return (AE_INVALID_TABLE_LENGTH);
+        }
+
+        /* Map the entire XSDT */
+
+        table = acpi_os_map_memory(xsdt_address, length);
+        if (!table) {
+                return (AE_NO_MEMORY);
+        }
+
+        /* Get the number of entries and pointer to first entry */
+
+        status = AE_OK;
+        next_entry = ACPI_ADD_PTR(u8, table, sizeof(struct acpi_table_header));
+        entry_count = (u32)((table->length - sizeof(struct acpi_table_header)) /
+                            ACPI_XSDT_ENTRY_SIZE);
+
+        /* Validate each entry (physical address) within the XSDT */
+
+        for (i = 0; i < entry_count; i++) {
+                address =
+                    acpi_tb_get_root_table_entry(next_entry,
+                                                 ACPI_XSDT_ENTRY_SIZE);
+                if (!address) {
+
+                        /* Detected a NULL entry, XSDT is invalid */
+
+                        status = AE_NULL_ENTRY;
+                        break;
+                }
+
+                next_entry += ACPI_XSDT_ENTRY_SIZE;
+        }
+
+        /* Unmap table */
+
+        acpi_os_unmap_memory(table, length);
+        return (status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_tb_parse_root_table
  *
  * PARAMETERS:  rsdp                    - Pointer to the RSDP
@@ -438,16 +461,14 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
         u32 table_count;
         struct acpi_table_header *table;
         acpi_physical_address address;
-        acpi_physical_address uninitialized_var(rsdt_address);
         u32 length;
         u8 *table_entry;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(tb_parse_root_table);
 
-        /*
-         * Map the entire RSDP and extract the address of the RSDT or XSDT
-         */
+        /* Map the entire RSDP and extract the address of the RSDT or XSDT */
+
         rsdp = acpi_os_map_memory(rsdp_address, sizeof(struct acpi_table_rsdp));
         if (!rsdp) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
@@ -457,24 +478,22 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
                                    ACPI_CAST_PTR(struct acpi_table_header,
                                                  rsdp));
 
-        /* Differentiate between RSDT and XSDT root tables */
+        /* Use XSDT if present and not overridden. Otherwise, use RSDT */
 
-        if (rsdp->revision > 1 && rsdp->xsdt_physical_address
-                        && !acpi_rsdt_forced) {
+        if ((rsdp->revision > 1) &&
+            rsdp->xsdt_physical_address && !acpi_gbl_do_not_use_xsdt) {
                 /*
-                 * Root table is an XSDT (64-bit physical addresses). We must use the
-                 * XSDT if the revision is > 1 and the XSDT pointer is present, as per
-                 * the ACPI specification.
+                 * RSDP contains an XSDT (64-bit physical addresses). We must use
+                 * the XSDT if the revision is > 1 and the XSDT pointer is present,
+                 * as per the ACPI specification.
                  */
                 address = (acpi_physical_address) rsdp->xsdt_physical_address;
-                table_entry_size = sizeof(u64);
-                rsdt_address = (acpi_physical_address)
-                                        rsdp->rsdt_physical_address;
+                table_entry_size = ACPI_XSDT_ENTRY_SIZE;
         } else {
                 /* Root table is an RSDT (32-bit physical addresses) */
 
                 address = (acpi_physical_address) rsdp->rsdt_physical_address;
-                table_entry_size = sizeof(u32);
+                table_entry_size = ACPI_RSDT_ENTRY_SIZE;
         }
 
         /*
@@ -483,15 +502,25 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
          */
         acpi_os_unmap_memory(rsdp, sizeof(struct acpi_table_rsdp));
 
-        if (table_entry_size == sizeof(u64)) {
-                if (acpi_tb_check_xsdt(address) == AE_NULL_ENTRY) {
-                        /* XSDT has NULL entry, RSDT is used */
-                        address = rsdt_address;
-                        table_entry_size = sizeof(u32);
-                        ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, "
-                                        "using RSDT"));
+        /*
+         * If it is present and used, validate the XSDT for access/size
+         * and ensure that all table entries are at least non-NULL
+         */
+        if (table_entry_size == ACPI_XSDT_ENTRY_SIZE) {
+                status = acpi_tb_validate_xsdt(address);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_BIOS_WARNING((AE_INFO,
+                                           "XSDT is invalid (%s), using RSDT",
+                                           acpi_format_exception(status)));
+
+                        /* Fall back to the RSDT */
+
+                        address =
+                            (acpi_physical_address) rsdp->rsdt_physical_address;
+                        table_entry_size = ACPI_RSDT_ENTRY_SIZE;
                 }
         }
+
         /* Map the RSDT/XSDT table header to get the full table length */
 
         table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
@@ -501,12 +530,14 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
 
         acpi_tb_print_table_header(address, table);
 
-        /* Get the length of the full table, verify length and map entire table */
-
+        /*
+         * Validate length of the table, and map entire table.
+         * Minimum length table must contain at least one entry.
+         */
         length = table->length;
         acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
 
-        if (length < sizeof(struct acpi_table_header)) {
+        if (length < (sizeof(struct acpi_table_header) + table_entry_size)) {
                 ACPI_BIOS_ERROR((AE_INFO,
                                  "Invalid table length 0x%X in RSDT/XSDT",
                                  length));
@@ -526,22 +557,21 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
                 return_ACPI_STATUS(status);
         }
 
-        /* Calculate the number of tables described in the root table */
+        /* Get the number of entries and pointer to first entry */
 
         table_count = (u32)((table->length - sizeof(struct acpi_table_header)) /
                             table_entry_size);
+        table_entry = ACPI_ADD_PTR(u8, table, sizeof(struct acpi_table_header));
+
         /*
          * First two entries in the table array are reserved for the DSDT
          * and FACS, which are not actually present in the RSDT/XSDT - they
          * come from the FADT
          */
-        table_entry =
-            ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
         acpi_gbl_root_table_list.current_table_count = 2;
 
-        /*
-         * Initialize the root table array from the RSDT/XSDT
-         */
+        /* Initialize the root table array from the RSDT/XSDT */
+
         for (i = 0; i < table_count; i++) {
                 if (acpi_gbl_root_table_list.current_table_count >=
                     acpi_gbl_root_table_list.max_table_count) {
@@ -584,7 +614,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
                 acpi_tb_install_table(acpi_gbl_root_table_list.tables[i].
                                       address, NULL, i);
 
-                /* Special case for FADT - get the DSDT and FACS */
+                /* Special case for FADT - validate it then get the DSDT and FACS */
 
                 if (ACPI_COMPARE_NAME
                     (&acpi_gbl_root_table_list.tables[i].signature,
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index e0a2e2779c2e..2c2b6ae5dfc4 100644
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -224,10 +224,11 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
 
         while (range_info) {
                 /*
-                 * Check if the requested Address/Length overlaps this address_range.
-                 * Four cases to consider:
+                 * Check if the requested address/length overlaps this
+                 * address range. There are four cases to consider:
                  *
-                 * 1) Input address/length is contained completely in the address range
+                 * 1) Input address/length is contained completely in the
+                 *    address range
                  * 2) Input address/length overlaps range at the range start
                  * 3) Input address/length overlaps range at the range end
                  * 4) Input address/length completely encompasses the range
@@ -244,11 +245,17 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
                                                                   region_node);
 
                                 ACPI_WARNING((AE_INFO,
-                                              "0x%p-0x%p %s conflicts with Region %s %d",
+                                              "%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%s)",
+                                              acpi_ut_get_region_name(space_id),
                                               ACPI_CAST_PTR(void, address),
                                               ACPI_CAST_PTR(void, end_address),
-                                              acpi_ut_get_region_name(space_id),
-                                              pathname, overlap_count));
+                                              ACPI_CAST_PTR(void,
+                                                            range_info->
+                                                            start_address),
+                                              ACPI_CAST_PTR(void,
+                                                            range_info->
+                                                            end_address),
+                                              pathname));
                                 ACPI_FREE(pathname);
                         }
                 }
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 814267f52715..1851762fc5b5 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -302,9 +302,13 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
                 return (AE_BUFFER_OVERFLOW);
 
         case ACPI_ALLOCATE_BUFFER:
-
-                /* Allocate a new buffer */
-
+                /*
+                 * Allocate a new buffer. We directectly call acpi_os_allocate here to
+                 * purposefully bypass the (optionally enabled) internal allocation
+                 * tracking mechanism since we only want to track internal
+                 * allocations. Note: The caller should use acpi_os_free to free this
+                 * buffer created via ACPI_ALLOCATE_BUFFER.
+                 */
                 buffer->pointer = acpi_os_allocate(required_length);
                 break;
 
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index 366bfec4b770..cacd2fd9e665 100644
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -248,12 +248,12 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
         ACPI_FUNCTION_NAME(os_acquire_object);
 
         if (!cache) {
-                return (NULL);
+                return_PTR(NULL);
         }
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
         if (ACPI_FAILURE(status)) {
-                return (NULL);
+                return_PTR(NULL);
         }
 
         ACPI_MEM_TRACKING(cache->requests++);
@@ -276,7 +276,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
                 status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
                 if (ACPI_FAILURE(status)) {
-                        return (NULL);
+                        return_PTR(NULL);
                 }
 
                 /* Clear (zero) the previously used Object */
@@ -299,15 +299,15 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
                 status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
                 if (ACPI_FAILURE(status)) {
-                        return (NULL);
+                        return_PTR(NULL);
                 }
 
                 object = ACPI_ALLOCATE_ZEROED(cache->object_size);
                 if (!object) {
-                        return (NULL);
+                        return_PTR(NULL);
                 }
         }
 
-        return (object);
+        return_PTR(object);
 }
 #endif                          /* ACPI_USE_LOCAL_CACHE */
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 03ae8affe48f..d971c8631263 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -194,9 +194,9 @@ acpi_debug_print(u32 requested_debug_level,
          */
         acpi_os_printf("%9s-%04ld ", module_name, line_number);
 
-#ifdef ACPI_EXEC_APP
+#ifdef ACPI_APPLICATION
         /*
-         * For acpi_exec only, emit the thread ID and nesting level.
+         * For acpi_exec/iASL only, emit the thread ID and nesting level.
          * Note: nesting level is really only useful during a single-thread
          * execution. Otherwise, multiple threads will keep resetting the
          * level.
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 81f9a9584451..030cb0dc673c 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -388,11 +388,7 @@ acpi_status acpi_ut_init_globals(void)
 /* Public globals */
 
 ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
-
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
-
 ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
-
 ACPI_EXPORT_SYMBOL(acpi_gpe_count)
-
 ACPI_EXPORT_SYMBOL(acpi_current_gpe_count)
diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 75efea0539c1..246ef68681f4 100644
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -122,8 +122,16 @@ acpi_status __init acpi_initialize_subsystem(void)
 
         /* If configured, initialize the AML debugger */
 
-        ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
-        return_ACPI_STATUS(status);
+#ifdef ACPI_DEBUGGER
+        status = acpi_db_initialize();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During Debugger initialization"));
+                return_ACPI_STATUS(status);
+        }
+#endif
+
+        return_ACPI_STATUS(AE_OK);
 }
 
 ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_subsystem)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index e55584a072c6..8678dfe5366b 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -34,7 +34,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/kref.h>
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index 21ba34a73883..e5bcd919d4e6 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -8,7 +8,6 @@
 
 #include <linux/cper.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 
 struct apei_exec_context;
 
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 7dcc8a824aae..1be6f5564485 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -33,7 +33,6 @@
 #include <linux/nmi.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
-#include <acpi/acpi.h>
 #include <asm/unaligned.h>
 
 #include "apei-internal.h"
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 46766ef7ef5d..dab7cb7349df 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 5876a49dfd38..470e7542bf31 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -36,8 +36,7 @@
 #include <linux/suspend.h>
 #include <asm/unaligned.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/power_supply.h>
 
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 078c4f7fe2dd..10e4964d051a 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -30,7 +30,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/dmi.h>
 
 #include "internal.h"
@@ -323,6 +322,56 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                      DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),
                 },
         },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "HP ProBook 2013 models",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP ProBook "),
+                     DMI_MATCH(DMI_PRODUCT_NAME, " G1"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "HP EliteBook 2013 models",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook "),
+                     DMI_MATCH(DMI_PRODUCT_NAME, " G1"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "HP ZBook 14",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 14"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "HP ZBook 15",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 15"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "HP ZBook 17",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 17"),
+                },
+        },
+        {
+        .callback = dmi_disable_osi_win8,
+        .ident = "HP EliteBook 8780w",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),
+                },
+        },
 
         /*
          * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0710004055c8..384da5ab5955 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -37,8 +37,6 @@
 #include <asm/mpspec.h>
 #endif
 #include <linux/pci.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/apei.h>
 #include <linux/dmi.h>
 #include <linux/suspend.h>
@@ -52,9 +50,6 @@ struct acpi_device *acpi_root;
 struct proc_dir_entry *acpi_root_dir;
 EXPORT_SYMBOL(acpi_root_dir);
 
-#define STRUCT_TO_INT(s)        (*((int*)&s))
-
-
 #ifdef CONFIG_X86
 static int set_copy_dsdt(const struct dmi_system_id *id)
 {
@@ -115,18 +110,16 @@ int acpi_bus_get_status(struct acpi_device *device)
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
-        STRUCT_TO_INT(device->status) = (int) sta;
+        acpi_set_device_status(device, sta);
 
         if (device->status.functional && !device->status.present) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] status [%08x]: "
                        "functional but not present;\n",
-                        device->pnp.bus_id,
-                        (u32) STRUCT_TO_INT(device->status)));
+                        device->pnp.bus_id, (u32)sta));
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] status [%08x]\n",
-                          device->pnp.bus_id,
-                          (u32) STRUCT_TO_INT(device->status)));
+                          device->pnp.bus_id, (u32)sta));
         return 0;
 }
 EXPORT_SYMBOL(acpi_bus_get_status);
@@ -339,58 +332,6 @@ static void acpi_bus_osc_support(void)
                              Notification Handling
    -------------------------------------------------------------------------- */
 
-static void acpi_bus_check_device(acpi_handle handle)
-{
-        struct acpi_device *device;
-        acpi_status status;
-        struct acpi_device_status old_status;
-
-        if (acpi_bus_get_device(handle, &device))
-                return;
-        if (!device)
-                return;
-
-        old_status = device->status;
-
-        /*
-         * Make sure this device's parent is present before we go about
-         * messing with the device.
-         */
-        if (device->parent && !device->parent->status.present) {
-                device->status = device->parent->status;
-                return;
-        }
-
-        status = acpi_bus_get_status(device);
-        if (ACPI_FAILURE(status))
-                return;
-
-        if (STRUCT_TO_INT(old_status) == STRUCT_TO_INT(device->status))
-                return;
-
-        /*
-         * Device Insertion/Removal
-         */
-        if ((device->status.present) && !(old_status.present)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device insertion detected\n"));
-                /* TBD: Handle device insertion */
-        } else if (!(device->status.present) && (old_status.present)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device removal detected\n"));
-                /* TBD: Handle device removal */
-        }
-}
-
-static void acpi_bus_check_scope(acpi_handle handle)
-{
-        /* Status Change? */
-        acpi_bus_check_device(handle);
-
-        /*
-         * TBD: Enumerate child devices within this device's scope and
-         *       run acpi_bus_check_device()'s on them.
-         */
-}
-
 /**
  * acpi_bus_notify
  * ---------------
@@ -407,19 +348,11 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
         switch (type) {
 
         case ACPI_NOTIFY_BUS_CHECK:
-                acpi_bus_check_scope(handle);
-                /*
-                 * TBD: We'll need to outsource certain events to non-ACPI
-                 *      drivers via the device manager (device.c).
-                 */
+                /* TBD */
                 break;
 
         case ACPI_NOTIFY_DEVICE_CHECK:
-                acpi_bus_check_device(handle);
-                /*
-                 * TBD: We'll need to outsource certain events to non-ACPI
-                 *      drivers via the device manager (device.c).
-                 */
+                /* TBD */
                 break;
 
         case ACPI_NOTIFY_DEVICE_WAKE:
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index c971929d75c2..11c11f6b8fa1 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -31,8 +31,7 @@
 #include <linux/seq_file.h>
 #include <linux/input.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <acpi/button.h>
 
 #define PREFIX "ACPI: "
@@ -101,7 +100,6 @@ struct acpi_button {
         struct input_dev *input;
         char phys[32];                  /* for input device */
         unsigned long pushed;
-        bool wakeup_enabled;
 };
 
 static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
@@ -407,16 +405,6 @@ static int acpi_button_add(struct acpi_device *device)
                 lid_device = device;
         }
 
-        if (device->wakeup.flags.valid) {
-                /* Button's GPE is run-wake GPE */
-                acpi_enable_gpe(device->wakeup.gpe_device,
-                                device->wakeup.gpe_number);
-                if (!device_may_wakeup(&device->dev)) {
-                        device_set_wakeup_enable(&device->dev, true);
-                        button->wakeup_enabled = true;
-                }
-        }
-
         printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
         return 0;
 
@@ -433,13 +421,6 @@ static int acpi_button_remove(struct acpi_device *device)
 {
         struct acpi_button *button = acpi_driver_data(device);
 
-        if (device->wakeup.flags.valid) {
-                acpi_disable_gpe(device->wakeup.gpe_device,
-                                device->wakeup.gpe_number);
-                if (button->wakeup_enabled)
-                        device_set_wakeup_enable(&device->dev, false);
-        }
-
         acpi_button_remove_fs(device);
         input_unregister_device(button->input);
         kfree(button);
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index e23151667655..0b6ae6eb5c4a 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -27,8 +27,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 #include <linux/acpi.h>
-
-#include "internal.h"
+#include <linux/container.h>
 
 #include "internal.h"
 
@@ -44,19 +43,65 @@ static const struct acpi_device_id container_device_ids[] = {
         {"", 0},
 };
 
-static int container_device_attach(struct acpi_device *device,
+static int acpi_container_offline(struct container_dev *cdev)
+{
+        struct acpi_device *adev = ACPI_COMPANION(&cdev->dev);
+        struct acpi_device *child;
+
+        /* Check all of the dependent devices' physical companions. */
+        list_for_each_entry(child, &adev->children, node)
+                if (!acpi_scan_is_offline(child, false))
+                        return -EBUSY;
+
+        return 0;
+}
+
+static void acpi_container_release(struct device *dev)
+{
+        kfree(to_container_dev(dev));
+}
+
+static int container_device_attach(struct acpi_device *adev,
                                    const struct acpi_device_id *not_used)
 {
-        /* This is necessary for container hotplug to work. */
+        struct container_dev *cdev;
+        struct device *dev;
+        int ret;
+
+        cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
+        if (!cdev)
+                return -ENOMEM;
+
+        cdev->offline = acpi_container_offline;
+        dev = &cdev->dev;
+        dev->bus = &container_subsys;
+        dev_set_name(dev, "%s", dev_name(&adev->dev));
+        ACPI_COMPANION_SET(dev, adev);
+        dev->release = acpi_container_release;
+        ret = device_register(dev);
+        if (ret)
+                return ret;
+
+        adev->driver_data = dev;
         return 1;
 }
 
+static void container_device_detach(struct acpi_device *adev)
+{
+        struct device *dev = acpi_driver_data(adev);
+
+        adev->driver_data = NULL;
+        if (dev)
+                device_unregister(dev);
+}
+
 static struct acpi_scan_handler container_handler = {
         .ids = container_device_ids,
         .attach = container_device_attach,
+        .detach = container_device_detach,
         .hotplug = {
                 .enabled = true,
-                .mode = AHM_CONTAINER,
+                .demand_offline = true,
         },
 };
 
diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
index 12b62f2cdb3f..c68e72414a67 100644
--- a/drivers/acpi/custom_method.c
+++ b/drivers/acpi/custom_method.c
@@ -7,7 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/uaccess.h>
 #include <linux/debugfs.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #include "internal.h"
 
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index b55d6a20dc0e..6b1919f6bd82 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -5,7 +5,7 @@
 #include <linux/export.h>
 #include <linux/init.h>
 #include <linux/debugfs.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debugfs");
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index b3480cf7db1a..d49f1e464703 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -256,6 +256,8 @@ int acpi_bus_init_power(struct acpi_device *device)
                 return -EINVAL;
 
         device->power.state = ACPI_STATE_UNKNOWN;
+        if (!acpi_device_is_present(device))
+                return 0;
 
         result = acpi_device_get_power(device, &state);
         if (result)
@@ -302,15 +304,18 @@ int acpi_device_fix_up_power(struct acpi_device *device)
         return ret;
 }
 
-int acpi_bus_update_power(acpi_handle handle, int *state_p)
+int acpi_device_update_power(struct acpi_device *device, int *state_p)
 {
-        struct acpi_device *device;
         int state;
         int result;
 
-        result = acpi_bus_get_device(handle, &device);
-        if (result)
+        if (device->power.state == ACPI_STATE_UNKNOWN) {
+                result = acpi_bus_init_power(device);
+                if (!result && state_p)
+                        *state_p = device->power.state;
+
                 return result;
+        }
 
         result = acpi_device_get_power(device, &state);
         if (result)
@@ -338,6 +343,15 @@ int acpi_bus_update_power(acpi_handle handle, int *state_p)
 
         return 0;
 }
+
+int acpi_bus_update_power(acpi_handle handle, int *state_p)
+{
+        struct acpi_device *device;
+        int result;
+
+        result = acpi_bus_get_device(handle, &device);
+        return result ? result : acpi_device_update_power(device, state_p);
+}
 EXPORT_SYMBOL_GPL(acpi_bus_update_power);
 
 bool acpi_bus_power_manageable(acpi_handle handle)
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index dcd73ccb514c..c431c88faaff 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -32,8 +32,8 @@
 #include <linux/jiffies.h>
 #include <linux/stddef.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+
+#include "internal.h"
 
 #define PREFIX "ACPI: "
 
@@ -323,14 +323,11 @@ static int dock_present(struct dock_station *ds)
  */
 static void dock_create_acpi_device(acpi_handle handle)
 {
-        struct acpi_device *device;
+        struct acpi_device *device = NULL;
         int ret;
 
-        if (acpi_bus_get_device(handle, &device)) {
-                /*
-                 * no device created for this object,
-                 * so we should create one.
-                 */
+        acpi_bus_get_device(handle, &device);
+        if (!acpi_device_enumerated(device)) {
                 ret = acpi_bus_scan(handle);
                 if (ret)
                         pr_debug("error adding bus, %x\n", -ret);
@@ -898,9 +895,6 @@ find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
 
 void __init acpi_dock_init(void)
 {
-        if (acpi_disabled)
-                return;
-
         /* look for dock stations and bays */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                 ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index ba5b56db9d27..959d41acc108 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -39,10 +39,9 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <asm/io.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/dmi.h>
+#include <asm/io.h>
 
 #include "internal.h"
 
@@ -91,10 +90,6 @@ static unsigned int ec_storm_threshold  __read_mostly = 8;
 module_param(ec_storm_threshold, uint, 0644);
 MODULE_PARM_DESC(ec_storm_threshold, "Maxim false GPE numbers not considered as GPE storm");
 
-/* If we find an EC via the ECDT, we need to keep a ptr to its context */
-/* External interfaces use first EC only, so remember */
-typedef int (*acpi_ec_query_func) (void *data);
-
 struct acpi_ec_query_handler {
         struct list_head node;
         acpi_ec_query_func func;
@@ -387,27 +382,6 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
         return acpi_ec_transaction(ec, &t);
 }
 
-/*
- * Externally callable EC access functions. For now, assume 1 EC only
- */
-int ec_burst_enable(void)
-{
-        if (!first_ec)
-                return -ENODEV;
-        return acpi_ec_burst_enable(first_ec);
-}
-
-EXPORT_SYMBOL(ec_burst_enable);
-
-int ec_burst_disable(void)
-{
-        if (!first_ec)
-                return -ENODEV;
-        return acpi_ec_burst_disable(first_ec);
-}
-
-EXPORT_SYMBOL(ec_burst_disable);
-
 int ec_read(u8 addr, u8 *val)
 {
         int err;
@@ -779,9 +753,9 @@ static int ec_install_handlers(struct acpi_ec *ec)
                         pr_err("Fail in evaluating the _REG object"
                                 " of EC device. Broken bios is suspected.\n");
                 } else {
+                        acpi_disable_gpe(NULL, ec->gpe);
                         acpi_remove_gpe_handler(NULL, ec->gpe,
                                 &acpi_ec_gpe_handler);
-                        acpi_disable_gpe(NULL, ec->gpe);
                         return -ENODEV;
                 }
         }
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index 4e7b798900f2..b4c216bab22b 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -105,7 +105,7 @@ static const struct file_operations acpi_ec_io_ops = {
         .llseek = default_llseek,
 };
 
-int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)
+static int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)
 {
         struct dentry *dev_dir;
         char name[64];
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index cae3b387b867..ef2d730734dc 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/gfp.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index ba3da88cee45..1fb62900f32a 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -29,8 +29,7 @@
 #include <linux/types.h>
 #include <asm/uaccess.h>
 #include <linux/thermal.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #define PREFIX "ACPI: "
 
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index a22a295edb69..0c789224d40d 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -37,7 +37,7 @@ int register_acpi_bus_type(struct acpi_bus_type *type)
 {
         if (acpi_disabled)
                 return -ENODEV;
-        if (type && type->match && type->find_device) {
+        if (type && type->match && type->find_companion) {
                 down_write(&bus_type_sem);
                 list_add_tail(&type->list, &bus_type_list);
                 up_write(&bus_type_sem);
@@ -82,109 +82,74 @@ static struct acpi_bus_type *acpi_get_bus_type(struct device *dev)
 #define FIND_CHILD_MIN_SCORE    1
 #define FIND_CHILD_MAX_SCORE    2
 
-static acpi_status acpi_dev_present(acpi_handle handle, u32 lvl_not_used,
-                                  void *not_used, void **ret_p)
-{
-        struct acpi_device *adev = NULL;
-
-        acpi_bus_get_device(handle, &adev);
-        if (adev) {
-                *ret_p = handle;
-                return AE_CTRL_TERMINATE;
-        }
-        return AE_OK;
-}
-
-static int do_find_child_checks(acpi_handle handle, bool is_bridge)
+static int find_child_checks(struct acpi_device *adev, bool check_children)
 {
         bool sta_present = true;
         unsigned long long sta;
         acpi_status status;
 
-        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+        status = acpi_evaluate_integer(adev->handle, "_STA", NULL, &sta);
         if (status == AE_NOT_FOUND)
                 sta_present = false;
         else if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_ENABLED))
                 return -ENODEV;
 
-        if (is_bridge) {
-                void *test = NULL;
+        if (check_children && list_empty(&adev->children))
+                return -ENODEV;
 
-                /* Check if this object has at least one child device. */
-                acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,
-                                    acpi_dev_present, NULL, NULL, &test);
-                if (!test)
-                        return -ENODEV;
-        }
         return sta_present ? FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;
 }
 
-struct find_child_context {
-        u64 addr;
-        bool is_bridge;
-        acpi_handle ret;
-        int ret_score;
-};
-
-static acpi_status do_find_child(acpi_handle handle, u32 lvl_not_used,
-                                 void *data, void **not_used)
-{
-        struct find_child_context *context = data;
-        unsigned long long addr;
-        acpi_status status;
-        int score;
-
-        status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &addr);
-        if (ACPI_FAILURE(status) || addr != context->addr)
-                return AE_OK;
-
-        if (!context->ret) {
-                /* This is the first matching object.  Save its handle. */
-                context->ret = handle;
-                return AE_OK;
-        }
-        /*
-         * There is more than one matching object with the same _ADR value.
-         * That really is unexpected, so we are kind of beyond the scope of the
-         * spec here.  We have to choose which one to return, though.
-         *
-         * First, check if the previously found object is good enough and return
-         * its handle if so.  Second, check the same for the object that we've
-         * just found.
-         */
-        if (!context->ret_score) {
-                score = do_find_child_checks(context->ret, context->is_bridge);
-                if (score == FIND_CHILD_MAX_SCORE)
-                        return AE_CTRL_TERMINATE;
-                else
-                        context->ret_score = score;
-        }
-        score = do_find_child_checks(handle, context->is_bridge);
-        if (score == FIND_CHILD_MAX_SCORE) {
-                context->ret = handle;
-                return AE_CTRL_TERMINATE;
-        } else if (score > context->ret_score) {
-                context->ret = handle;
-                context->ret_score = score;
-        }
-        return AE_OK;
-}
-
-acpi_handle acpi_find_child(acpi_handle parent, u64 addr, bool is_bridge)
+struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
+                                           u64 address, bool check_children)
 {
-        if (parent) {
-                struct find_child_context context = {
-                        .addr = addr,
-                        .is_bridge = is_bridge,
-                };
-
-                acpi_walk_namespace(ACPI_TYPE_DEVICE, parent, 1, do_find_child,
-                                    NULL, &context, NULL);
-                return context.ret;
+        struct acpi_device *adev, *ret = NULL;
+        int ret_score = 0;
+
+        if (!parent)
+                return NULL;
+
+        list_for_each_entry(adev, &parent->children, node) {
+                unsigned long long addr;
+                acpi_status status;
+                int score;
+
+                status = acpi_evaluate_integer(adev->handle, METHOD_NAME__ADR,
+                                               NULL, &addr);
+                if (ACPI_FAILURE(status) || addr != address)
+                        continue;
+
+                if (!ret) {
+                        /* This is the first matching object.  Save it. */
+                        ret = adev;
+                        continue;
+                }
+                /*
+                 * There is more than one matching device object with the same
+                 * _ADR value.  That really is unexpected, so we are kind of
+                 * beyond the scope of the spec here.  We have to choose which
+                 * one to return, though.
+                 *
+                 * First, check if the previously found object is good enough
+                 * and return it if so.  Second, do the same for the object that
+                 * we've just found.
+                 */
+                if (!ret_score) {
+                        ret_score = find_child_checks(ret, check_children);
+                        if (ret_score == FIND_CHILD_MAX_SCORE)
+                                return ret;
+                }
+                score = find_child_checks(adev, check_children);
+                if (score == FIND_CHILD_MAX_SCORE) {
+                        return adev;
+                } else if (score > ret_score) {
+                        ret = adev;
+                        ret_score = score;
+                }
         }
-        return NULL;
+        return ret;
 }
-EXPORT_SYMBOL_GPL(acpi_find_child);
+EXPORT_SYMBOL_GPL(acpi_find_child_device);
 
 static void acpi_physnode_link_name(char *buf, unsigned int node_id)
 {
@@ -195,9 +160,8 @@ static void acpi_physnode_link_name(char *buf, unsigned int node_id)
                 strcpy(buf, PHYSICAL_NODE_STRING);
 }
 
-int acpi_bind_one(struct device *dev, acpi_handle handle)
+int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev)
 {
-        struct acpi_device *acpi_dev = NULL;
         struct acpi_device_physical_node *physical_node, *pn;
         char physical_node_name[PHYSICAL_NODE_NAME_SIZE];
         struct list_head *physnode_list;
@@ -205,14 +169,12 @@ int acpi_bind_one(struct device *dev, acpi_handle handle)
         int retval = -EINVAL;
 
         if (ACPI_COMPANION(dev)) {
-                if (handle) {
+                if (acpi_dev) {
                         dev_warn(dev, "ACPI companion already set\n");
                         return -EINVAL;
                 } else {
                         acpi_dev = ACPI_COMPANION(dev);
                 }
-        } else {
-                acpi_bus_get_device(handle, &acpi_dev);
         }
         if (!acpi_dev)
                 return -EINVAL;
@@ -322,29 +284,22 @@ int acpi_unbind_one(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(acpi_unbind_one);
 
-void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr)
-{
-        struct acpi_device *adev;
-
-        if (!acpi_bus_get_device(acpi_get_child(parent, addr), &adev))
-                ACPI_COMPANION_SET(dev, adev);
-}
-EXPORT_SYMBOL_GPL(acpi_preset_companion);
-
 static int acpi_platform_notify(struct device *dev)
 {
         struct acpi_bus_type *type = acpi_get_bus_type(dev);
-        acpi_handle handle;
         int ret;
 
         ret = acpi_bind_one(dev, NULL);
         if (ret && type) {
-                ret = type->find_device(dev, &handle);
-                if (ret) {
+                struct acpi_device *adev;
+
+                adev = type->find_companion(dev);
+                if (!adev) {
                         DBG("Unable to get handle for %s\n", dev_name(dev));
+                        ret = -ENODEV;
                         goto out;
                 }
-                ret = acpi_bind_one(dev, handle);
+                ret = acpi_bind_one(dev, adev);
                 if (ret)
                         goto out;
         }
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index 13b1d39d7cdf..aafe3ca829c2 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -25,8 +25,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/hed.h>
 
 static struct acpi_device_id acpi_hed_ids[] = {
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a29739c0ba79..dedbb2d802f1 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -28,7 +28,6 @@ int init_acpi_device_notify(void);
 int acpi_scan_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);
@@ -73,6 +72,9 @@ void acpi_lpss_init(void);
 static inline void acpi_lpss_init(void) {}
 #endif
 
+bool acpi_queue_hotplug_work(struct work_struct *work);
+bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent);
+
 /* --------------------------------------------------------------------------
                      Device Node Initialization / Removal
    -------------------------------------------------------------------------- */
@@ -85,9 +87,9 @@ 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_bind_one(struct device *dev, struct acpi_device *adev);
 int acpi_unbind_one(struct device *dev);
-void acpi_bus_device_eject(void *data, u32 ost_src);
+bool acpi_device_is_present(struct acpi_device *adev);
 
 /* --------------------------------------------------------------------------
                                   Power Resource
@@ -105,6 +107,8 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
 int acpi_power_on_resources(struct acpi_device *device, int state);
 int acpi_power_transition(struct acpi_device *device, int state);
 
+int acpi_device_update_power(struct acpi_device *device, int *state_p);
+
 int acpi_wakeup_device_init(void);
 void acpi_early_processor_set_pdc(void);
 
@@ -127,12 +131,21 @@ struct acpi_ec {
 
 extern struct acpi_ec *first_ec;
 
+/* If we find an EC via the ECDT, we need to keep a ptr to its context */
+/* External interfaces use first EC only, so remember */
+typedef int (*acpi_ec_query_func) (void *data);
+
 int acpi_ec_init(void);
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
 void acpi_ec_block_transactions(void);
 void acpi_ec_unblock_transactions(void);
 void acpi_ec_unblock_transactions_early(void);
+int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
+                              acpi_handle handle, acpi_ec_query_func func,
+                              void *data);
+void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);
+
 
 /*--------------------------------------------------------------------------
                                   Suspend/Resume
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index a2343a1d9e0b..9e6816ef280a 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -29,7 +29,6 @@
 #include <linux/errno.h>
 #include <linux/acpi.h>
 #include <linux/numa.h>
-#include <acpi/acpi_bus.h>
 
 #define PREFIX "ACPI: "
 
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
index 386a9fe497b4..de4fe03873c5 100644
--- a/drivers/acpi/nvs.c
+++ b/drivers/acpi/nvs.c
@@ -12,7 +12,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
+
+#include "internal.h"
 
 /* ACPI NVS regions, APEI may use it */
 
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 54a20ff4b864..fc1aa7909690 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -39,7 +39,6 @@
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <linux/efi.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
@@ -49,9 +48,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/processor.h>
 #include "internal.h"
 
 #define _COMPONENT              ACPI_OS_SERVICES
@@ -544,7 +540,7 @@ static u64 acpi_tables_addr;
 static int all_tables_size;
 
 /* Copied from acpica/tbutils.c:acpi_tb_checksum() */
-u8 __init acpi_table_checksum(u8 *buffer, u32 length)
+static u8 __init acpi_table_checksum(u8 *buffer, u32 length)
 {
         u8 sum = 0;
         u8 *end = buffer + length;
@@ -1215,6 +1211,10 @@ acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src)
         return AE_OK;
 }
 
+bool acpi_queue_hotplug_work(struct work_struct *work)
+{
+        return queue_work(kacpi_hotplug_wq, work);
+}
 
 acpi_status
 acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
@@ -1282,7 +1282,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
                 jiffies = MAX_SCHEDULE_TIMEOUT;
         else
                 jiffies = msecs_to_jiffies(timeout);
-        
+
         ret = down_timeout(sem, jiffies);
         if (ret)
                 status = AE_TIME;
@@ -1794,7 +1794,7 @@ acpi_status __init acpi_os_initialize1(void)
 {
         kacpid_wq = alloc_workqueue("kacpid", 0, 1);
         kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);
-        kacpi_hotplug_wq = alloc_workqueue("kacpi_hotplug", 0, 1);
+        kacpi_hotplug_wq = alloc_ordered_workqueue("kacpi_hotplug", 0);
         BUG_ON(!kacpid_wq);
         BUG_ON(!kacpi_notify_wq);
         BUG_ON(!kacpi_hotplug_wq);
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 41c5e1b799ef..52d45ea2bc4f 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -37,8 +37,6 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 
 #define PREFIX "ACPI: "
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 2652a614deeb..9418c7a1f786 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -39,9 +39,9 @@
 #include <linux/pci.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include "internal.h"
 
 #define PREFIX "ACPI: "
 
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 5b01bd6d5ea0..c1c4102e6478 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -35,9 +35,7 @@
 #include <linux/pci-aspm.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/apei.h>
+#include <acpi/apei.h>  /* for acpi_hest_init() */
 
 #include "internal.h"
 
@@ -51,6 +49,12 @@ static int acpi_pci_root_add(struct acpi_device *device,
                              const struct acpi_device_id *not_used);
 static void acpi_pci_root_remove(struct acpi_device *device);
 
+static int acpi_pci_root_scan_dependent(struct acpi_device *adev)
+{
+        acpiphp_check_host_bridge(adev->handle);
+        return 0;
+}
+
 #define ACPI_PCIE_REQ_SUPPORT (OSC_PCI_EXT_CONFIG_SUPPORT \
                                 | OSC_PCI_ASPM_SUPPORT \
                                 | OSC_PCI_CLOCK_PM_SUPPORT \
@@ -66,7 +70,8 @@ static struct acpi_scan_handler pci_root_handler = {
         .attach = acpi_pci_root_add,
         .detach = acpi_pci_root_remove,
         .hotplug = {
-                .ignore = true,
+                .enabled = true,
+                .scan_dependent = acpi_pci_root_scan_dependent,
         },
 };
 
@@ -630,116 +635,9 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 void __init acpi_pci_root_init(void)
 {
         acpi_hest_init();
-
-        if (!acpi_pci_disabled) {
-                pci_acpi_crs_quirks();
-                acpi_scan_add_handler(&pci_root_handler);
-        }
-}
-/* Support root bridge hotplug */
-
-static void handle_root_bridge_insertion(acpi_handle handle)
-{
-        struct acpi_device *device;
-
-        if (!acpi_bus_get_device(handle, &device)) {
-                dev_printk(KERN_DEBUG, &device->dev,
-                           "acpi device already exists; ignoring notify\n");
+        if (acpi_pci_disabled)
                 return;
-        }
-
-        if (acpi_bus_scan(handle))
-                acpi_handle_err(handle, "cannot add bridge to acpi list\n");
-}
-
-static void hotplug_event_root(void *data, u32 type)
-{
-        acpi_handle handle = data;
-        struct acpi_pci_root *root;
-
-        acpi_scan_lock_acquire();
-
-        root = acpi_pci_find_root(handle);
-
-        switch (type) {
-        case ACPI_NOTIFY_BUS_CHECK:
-                /* bus enumerate */
-                acpi_handle_printk(KERN_DEBUG, handle,
-                                   "Bus check notify on %s\n", __func__);
-                if (root)
-                        acpiphp_check_host_bridge(handle);
-                else
-                        handle_root_bridge_insertion(handle);
-
-                break;
-
-        case ACPI_NOTIFY_DEVICE_CHECK:
-                /* device check */
-                acpi_handle_printk(KERN_DEBUG, handle,
-                                   "Device check notify on %s\n", __func__);
-                if (!root)
-                        handle_root_bridge_insertion(handle);
-                break;
-
-        case ACPI_NOTIFY_EJECT_REQUEST:
-                /* request device eject */
-                acpi_handle_printk(KERN_DEBUG, handle,
-                                   "Device eject notify on %s\n", __func__);
-                if (!root)
-                        break;
-
-                get_device(&root->device->dev);
-
-                acpi_scan_lock_release();
-
-                acpi_bus_device_eject(root->device, ACPI_NOTIFY_EJECT_REQUEST);
-                return;
-        default:
-                acpi_handle_warn(handle,
-                                 "notify_handler: unknown event type 0x%x\n",
-                                 type);
-                break;
-        }
-
-        acpi_scan_lock_release();
-}
-
-static void handle_hotplug_event_root(acpi_handle handle, u32 type,
-                                        void *context)
-{
-        acpi_hotplug_execute(hotplug_event_root, handle, type);
-}
-
-static acpi_status __init
-find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
-{
-        acpi_status status;
-        int *count = (int *)context;
-
-        if (!acpi_is_root_bridge(handle))
-                return AE_OK;
-
-        (*count)++;
-
-        status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
-                                        handle_hotplug_event_root, NULL);
-        if (ACPI_FAILURE(status))
-                acpi_handle_printk(KERN_DEBUG, handle,
-                        "notify handler is not installed, exit status: %u\n",
-                         (unsigned int)status);
-        else
-                acpi_handle_printk(KERN_DEBUG, handle,
-                                   "notify handler is installed\n");
-
-        return AE_OK;
-}
-
-void __init acpi_pci_root_hp_init(void)
-{
-        int num = 0;
-
-        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                ACPI_UINT32_MAX, find_root_bridges, NULL, &num, NULL);
 
-        printk(KERN_DEBUG "Found %d acpi root devices\n", num);
+        pci_acpi_crs_quirks();
+        acpi_scan_add_handler_with_hotplug(&pci_root_handler, "pci_root");
 }
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index d678a180ca2a..139d9e479370 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -35,6 +35,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/dmi.h>
+#include <linux/pci-acpi.h>
 
 static bool debug;
 static int check_sta_before_sun;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index c2ad391d8041..ad7da686e6e6 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -42,8 +42,7 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 #include <linux/sysfs.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include "sleep.h"
 #include "internal.h"
 
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 6a5b152ad4d0..50fe34ffe932 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -3,12 +3,11 @@
 #include <linux/export.h>
 #include <linux/suspend.h>
 #include <linux/bcd.h>
+#include <linux/acpi.h>
 #include <asm/uaccess.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-
 #include "sleep.h"
+#include "internal.h"
 
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index b3171f30b319..34e7b3c6a08d 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -10,8 +10,7 @@
 #include <linux/export.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
-
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <acpi/processor.h>
 
 #include "internal.h"
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 146ab7e2b81d..c1c35623550f 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -224,9 +224,9 @@ static int __acpi_processor_start(struct acpi_device *device)
 
 static int acpi_processor_start(struct device *dev)
 {
-        struct acpi_device *device;
+        struct acpi_device *device = ACPI_COMPANION(dev);
 
-        if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))
+        if (!device)
                 return -ENODEV;
 
         return __acpi_processor_start(device);
@@ -234,10 +234,10 @@ static int acpi_processor_start(struct device *dev)
 
 static int acpi_processor_stop(struct device *dev)
 {
-        struct acpi_device *device;
+        struct acpi_device *device = ACPI_COMPANION(dev);
         struct acpi_processor *pr;
 
-        if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))
+        if (!device)
                 return 0;
 
         acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index f90c56c8379e..3dca36d4ad26 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -35,6 +35,7 @@
 #include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/syscore_ops.h>
+#include <acpi/processor.h>
 
 /*
  * Include the apic definitions for x86 to have the APIC timer related defines
@@ -46,9 +47,6 @@
 #include <asm/apic.h>
 #endif
 
-#include <acpi/acpi_bus.h>
-#include <acpi/processor.h>
-
 #define PREFIX "ACPI: "
 
 #define ACPI_PROCESSOR_CLASS            "processor"
@@ -213,7 +211,7 @@ static int acpi_processor_suspend(void)
 
 static void acpi_processor_resume(void)
 {
-        u32 resumed_bm_rld;
+        u32 resumed_bm_rld = 0;
 
         acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &resumed_bm_rld);
         if (resumed_bm_rld == saved_bm_rld)
@@ -598,7 +596,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                 case ACPI_STATE_C2:
                         if (!cx->address)
                                 break;
-                        cx->valid = 1; 
+                        cx->valid = 1;
                         break;
 
                 case ACPI_STATE_C3:
@@ -780,6 +778,13 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         if (unlikely(!pr))
                 return -EINVAL;
 
+#ifdef CONFIG_HOTPLUG_CPU
+        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+            !pr->flags.has_cst &&
+            !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
+                return acpi_idle_enter_c1(dev, drv, CPUIDLE_DRIVER_STATE_START);
+#endif
+
         /*
          * Must be done before busmaster disable as we might need to
          * access HPET !
@@ -821,6 +826,13 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         if (unlikely(!pr))
                 return -EINVAL;
 
+#ifdef CONFIG_HOTPLUG_CPU
+        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+            !pr->flags.has_cst &&
+            !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
+                return acpi_idle_enter_c1(dev, drv, CPUIDLE_DRIVER_STATE_START);
+#endif
+
         if (!cx->bm_sts_skip && acpi_idle_bm_check()) {
                 if (drv->safe_state_index >= 0) {
                         return drv->states[drv->safe_state_index].enter(dev,
@@ -917,12 +929,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
                 if (!cx->valid)
                         continue;
 
-#ifdef CONFIG_HOTPLUG_CPU
-                if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-                    !pr->flags.has_cst &&
-                    !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
-                        continue;
-#endif
                 per_cpu(acpi_cstate[count], dev->cpu) = cx;
 
                 count++;
@@ -930,8 +936,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
                         break;
         }
 
-        dev->state_count = count;
-
         if (!count)
                 return -EINVAL;
 
@@ -972,13 +976,6 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
                 if (!cx->valid)
                         continue;
 
-#ifdef CONFIG_HOTPLUG_CPU
-                if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-                    !pr->flags.has_cst &&
-                    !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
-                        continue;
-#endif
-
                 state = &drv->states[count];
                 snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);
                 strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 60a7c28fc167..ff90054f04fd 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -31,15 +31,12 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
-
+#include <linux/acpi.h>
+#include <acpi/processor.h>
 #ifdef CONFIG_X86
 #include <asm/cpufeature.h>
 #endif
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/processor.h>
-
 #define PREFIX "ACPI: "
 
 #define ACPI_PROCESSOR_CLASS            "processor"
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index d1d2e7fb5b30..e003663b2f8e 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -30,12 +30,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
-
-#include <asm/uaccess.h>
-
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 #include <acpi/processor.h>
-#include <acpi/acpi_drivers.h>
+#include <asm/uaccess.h>
 
 #define PREFIX "ACPI: "
 
@@ -186,14 +183,14 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state)
 
 #endif
 
-/* thermal coolign device callbacks */
+/* thermal cooling device callbacks */
 static int acpi_processor_max_state(struct acpi_processor *pr)
 {
         int max_state = 0;
 
         /*
          * There exists four states according to
-         * cpufreq_thermal_reduction_ptg. 0, 1, 2, 3
+         * cpufreq_thermal_reduction_pctg. 0, 1, 2, 3
          */
         max_state += cpufreq_get_max_state(pr->id);
         if (pr->flags.throttling)
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index e7dd2c1fee79..28baa05b8018 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -32,14 +32,11 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/cpufreq.h>
-
+#include <linux/acpi.h>
+#include <acpi/processor.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/processor.h>
-
 #define PREFIX "ACPI: "
 
 #define ACPI_PROCESSOR_CLASS            "processor"
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index b78bc605837e..26e5b5060523 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -8,8 +8,7 @@
  * the Free Software Foundation version 2.
  */
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index fd39459926b1..e00365ccb897 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -12,13 +12,12 @@
 #include <linux/dmi.h>
 #include <linux/nls.h>
 
-#include <acpi/acpi_drivers.h>
+#include <asm/pgtable.h>
 
 #include "internal.h"
 
 #define _COMPONENT              ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("scan");
-#define STRUCT_TO_INT(s)        (*((int*)&s))
 extern struct acpi_device *acpi_root;
 
 #define ACPI_BUS_CLASS                  "system_bus"
@@ -27,6 +26,8 @@ extern struct acpi_device *acpi_root;
 
 #define ACPI_IS_ROOT_DEVICE(device)    (!(device)->parent)
 
+#define INVALID_ACPI_HANDLE     ((acpi_handle)empty_zero_page)
+
 /*
  * If set, devices will be hot-removed even if they cannot be put offline
  * gracefully (from the kernel's standpoint).
@@ -85,6 +86,9 @@ int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,
  * Creates hid/cid(s) string needed for modalias and uevent
  * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
  * char *modalias: "acpi:IBM0001:ACPI0001"
+ * Return: 0: no _HID and no _CID
+ *         -EINVAL: output error
+ *         -ENOMEM: output is truncated
 */
 static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
                            int size)
@@ -101,8 +105,10 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
 
         list_for_each_entry(id, &acpi_dev->pnp.ids, list) {
                 count = snprintf(&modalias[len], size, "%s:", id->id);
-                if (count < 0 || count >= size)
-                        return -EINVAL;
+                if (count < 0)
+                        return EINVAL;
+                if (count >= size)
+                        return -ENOMEM;
                 len += count;
                 size -= count;
         }
@@ -111,20 +117,96 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
         return len;
 }
 
+/*
+ * Creates uevent modalias field for ACPI enumerated devices.
+ * Because the other buses does not support ACPI HIDs & CIDs.
+ * e.g. for a device with hid:IBM0001 and cid:ACPI0001 you get:
+ * "acpi:IBM0001:ACPI0001"
+ */
+int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct acpi_device *acpi_dev;
+        int len;
+
+        acpi_dev = ACPI_COMPANION(dev);
+        if (!acpi_dev)
+                return -ENODEV;
+
+        /* Fall back to bus specific way of modalias exporting */
+        if (list_empty(&acpi_dev->pnp.ids))
+                return -ENODEV;
+
+        if (add_uevent_var(env, "MODALIAS="))
+                return -ENOMEM;
+        len = create_modalias(acpi_dev, &env->buf[env->buflen - 1],
+                                sizeof(env->buf) - env->buflen);
+        if (len <= 0)
+                return len;
+        env->buflen += len;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_device_uevent_modalias);
+
+/*
+ * Creates modalias sysfs attribute for ACPI enumerated devices.
+ * Because the other buses does not support ACPI HIDs & CIDs.
+ * e.g. for a device with hid:IBM0001 and cid:ACPI0001 you get:
+ * "acpi:IBM0001:ACPI0001"
+ */
+int acpi_device_modalias(struct device *dev, char *buf, int size)
+{
+        struct acpi_device *acpi_dev;
+        int len;
+
+        acpi_dev = ACPI_COMPANION(dev);
+        if (!acpi_dev)
+                return -ENODEV;
+
+        /* Fall back to bus specific way of modalias exporting */
+        if (list_empty(&acpi_dev->pnp.ids))
+                return -ENODEV;
+
+        len = create_modalias(acpi_dev, buf, size -1);
+        if (len <= 0)
+                return len;
+        buf[len++] = '\n';
+        return len;
+}
+EXPORT_SYMBOL_GPL(acpi_device_modalias);
+
 static ssize_t
 acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, char *buf) {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
         int len;
 
-        /* Device has no HID and no CID or string is >1024 */
         len = create_modalias(acpi_dev, buf, 1024);
         if (len <= 0)
-                return 0;
+                return len;
         buf[len++] = '\n';
         return len;
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
 
+bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent)
+{
+        struct acpi_device_physical_node *pn;
+        bool offline = true;
+
+        mutex_lock(&adev->physical_node_lock);
+
+        list_for_each_entry(pn, &adev->physical_node_list, node)
+                if (device_supports_offline(pn->dev) && !pn->dev->offline) {
+                        if (uevent)
+                                kobject_uevent(&pn->dev->kobj, KOBJ_CHANGE);
+
+                        offline = false;
+                        break;
+                }
+
+        mutex_unlock(&adev->physical_node_lock);
+        return offline;
+}
+
 static acpi_status acpi_bus_offline(acpi_handle handle, u32 lvl, void *data,
                                     void **ret_p)
 {
@@ -195,19 +277,11 @@ static acpi_status acpi_bus_online(acpi_handle handle, u32 lvl, void *data,
         return AE_OK;
 }
 
-static int acpi_scan_hot_remove(struct acpi_device *device)
+static int acpi_scan_try_to_offline(struct acpi_device *device)
 {
         acpi_handle handle = device->handle;
-        struct device *errdev;
+        struct device *errdev = NULL;
         acpi_status status;
-        unsigned long long sta;
-
-        /* If there is no handle, the device node has been unregistered. */
-        if (!handle) {
-                dev_dbg(&device->dev, "ACPI handle missing\n");
-                put_device(&device->dev);
-                return -EINVAL;
-        }
 
         /*
          * Carry out two passes here and ignore errors in the first pass,
@@ -218,7 +292,6 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
          *
          * If the first pass is successful, the second one isn't needed, though.
          */
-        errdev = NULL;
         status = acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
                                      NULL, acpi_bus_offline, (void *)false,
                                      (void **)&errdev);
@@ -226,7 +299,6 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
                 dev_warn(errdev, "Offline disabled.\n");
                 acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
                                     acpi_bus_online, NULL, NULL, NULL);
-                put_device(&device->dev);
                 return -EPERM;
         }
         acpi_bus_offline(handle, 0, (void *)false, (void **)&errdev);
@@ -245,20 +317,32 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
                         acpi_walk_namespace(ACPI_TYPE_ANY, handle,
                                             ACPI_UINT32_MAX, acpi_bus_online,
                                             NULL, NULL, NULL);
-                        put_device(&device->dev);
                         return -EBUSY;
                 }
         }
+        return 0;
+}
+
+static int acpi_scan_hot_remove(struct acpi_device *device)
+{
+        acpi_handle handle = device->handle;
+        unsigned long long sta;
+        acpi_status status;
+
+        if (device->handler->hotplug.demand_offline && !acpi_force_hot_remove) {
+                if (!acpi_scan_is_offline(device, true))
+                        return -EBUSY;
+        } else {
+                int error = acpi_scan_try_to_offline(device);
+                if (error)
+                        return error;
+        }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                 "Hot-removing device %s...\n", dev_name(&device->dev)));
 
         acpi_bus_trim(device);
 
-        /* Device node has been unregistered. */
-        put_device(&device->dev);
-        device = NULL;
-
         acpi_evaluate_lck(handle, 0);
         /*
          * TBD: _EJD support.
@@ -285,115 +369,127 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
         return 0;
 }
 
-void acpi_bus_device_eject(void *data, u32 ost_src)
+static int acpi_scan_device_not_present(struct acpi_device *adev)
 {
-        struct acpi_device *device = data;
-        acpi_handle handle = device->handle;
-        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
-        int error;
+        if (!acpi_device_enumerated(adev)) {
+                dev_warn(&adev->dev, "Still not present\n");
+                return -EALREADY;
+        }
+        acpi_bus_trim(adev);
+        return 0;
+}
 
-        lock_device_hotplug();
-        mutex_lock(&acpi_scan_lock);
+static int acpi_scan_device_check(struct acpi_device *adev)
+{
+        int error;
 
-        if (ost_src == ACPI_NOTIFY_EJECT_REQUEST)
-                acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST,
-                                          ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+        acpi_bus_get_status(adev);
+        if (adev->status.present || adev->status.functional) {
+                /*
+                 * This function is only called for device objects for which
+                 * matching scan handlers exist.  The only situation in which
+                 * the scan handler is not attached to this device object yet
+                 * is when the device has just appeared (either it wasn't
+                 * present at all before or it was removed and then added
+                 * again).
+                 */
+                if (adev->handler) {
+                        dev_warn(&adev->dev, "Already enumerated\n");
+                        return -EALREADY;
+                }
+                error = acpi_bus_scan(adev->handle);
+                if (error) {
+                        dev_warn(&adev->dev, "Namespace scan failure\n");
+                        return error;
+                }
+                if (!adev->handler) {
+                        dev_warn(&adev->dev, "Enumeration failure\n");
+                        error = -ENODEV;
+                }
+        } else {
+                error = acpi_scan_device_not_present(adev);
+        }
+        return error;
+}
 
-        if (device->handler && device->handler->hotplug.mode == AHM_CONTAINER)
-                kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
+static int acpi_scan_bus_check(struct acpi_device *adev)
+{
+        struct acpi_scan_handler *handler = adev->handler;
+        struct acpi_device *child;
+        int error;
 
-        error = acpi_scan_hot_remove(device);
-        if (error == -EPERM) {
-                goto err_support;
-        } else if (error) {
-                goto err_out;
+        acpi_bus_get_status(adev);
+        if (!(adev->status.present || adev->status.functional)) {
+                acpi_scan_device_not_present(adev);
+                return 0;
         }
+        if (handler && handler->hotplug.scan_dependent)
+                return handler->hotplug.scan_dependent(adev);
 
- out:
-        mutex_unlock(&acpi_scan_lock);
-        unlock_device_hotplug();
-        return;
-
- err_support:
-        ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
- err_out:
-        acpi_evaluate_hotplug_ost(handle, ost_src, ost_code, NULL);
-        goto out;
+        error = acpi_bus_scan(adev->handle);
+        if (error) {
+                dev_warn(&adev->dev, "Namespace scan failure\n");
+                return error;
+        }
+        list_for_each_entry(child, &adev->children, node) {
+                error = acpi_scan_bus_check(child);
+                if (error)
+                        return error;
+        }
+        return 0;
 }
 
-static void acpi_scan_bus_device_check(void *data, u32 ost_source)
+static void acpi_device_hotplug(void *data, u32 src)
 {
-        acpi_handle handle = data;
-        struct acpi_device *device = NULL;
         u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
+        struct acpi_device *adev = data;
         int error;
 
         lock_device_hotplug();
         mutex_lock(&acpi_scan_lock);
 
-        if (ost_source != ACPI_NOTIFY_BUS_CHECK) {
-                acpi_bus_get_device(handle, &device);
-                if (device) {
-                        dev_warn(&device->dev, "Attempt to re-insert\n");
-                        goto out;
-                }
-        }
-        error = acpi_bus_scan(handle);
-        if (error) {
-                acpi_handle_warn(handle, "Namespace scan failure\n");
-                goto out;
-        }
-        error = acpi_bus_get_device(handle, &device);
-        if (error) {
-                acpi_handle_warn(handle, "Missing device node object\n");
+        /*
+         * The device object's ACPI handle cannot become invalid as long as we
+         * are holding acpi_scan_lock, but it may have become invalid before
+         * that lock was acquired.
+         */
+        if (adev->handle == INVALID_ACPI_HANDLE)
                 goto out;
-        }
-        ost_code = ACPI_OST_SC_SUCCESS;
-        if (device->handler && device->handler->hotplug.mode == AHM_CONTAINER)
-                kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
 
- out:
-        acpi_evaluate_hotplug_ost(handle, ost_source, ost_code, NULL);
-        mutex_unlock(&acpi_scan_lock);
-        unlock_device_hotplug();
-}
-
-static void acpi_hotplug_unsupported(acpi_handle handle, u32 type)
-{
-        u32 ost_status;
-
-        switch (type) {
+        switch (src) {
         case ACPI_NOTIFY_BUS_CHECK:
-                acpi_handle_debug(handle,
-                        "ACPI_NOTIFY_BUS_CHECK event: unsupported\n");
-                ost_status = ACPI_OST_SC_INSERT_NOT_SUPPORTED;
+                error = acpi_scan_bus_check(adev);
                 break;
         case ACPI_NOTIFY_DEVICE_CHECK:
-                acpi_handle_debug(handle,
-                        "ACPI_NOTIFY_DEVICE_CHECK event: unsupported\n");
-                ost_status = ACPI_OST_SC_INSERT_NOT_SUPPORTED;
+                error = acpi_scan_device_check(adev);
                 break;
         case ACPI_NOTIFY_EJECT_REQUEST:
-                acpi_handle_debug(handle,
-                        "ACPI_NOTIFY_EJECT_REQUEST event: unsupported\n");
-                ost_status = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
+        case ACPI_OST_EC_OSPM_EJECT:
+                error = acpi_scan_hot_remove(adev);
                 break;
         default:
-                /* non-hotplug event; possibly handled by other handler */
-                return;
+                error = -EINVAL;
+                break;
         }
+        if (!error)
+                ost_code = ACPI_OST_SC_SUCCESS;
 
-        acpi_evaluate_hotplug_ost(handle, type, ost_status, NULL);
+ out:
+        acpi_evaluate_hotplug_ost(adev->handle, src, ost_code, NULL);
+        put_device(&adev->dev);
+        mutex_unlock(&acpi_scan_lock);
+        unlock_device_hotplug();
 }
 
 static void acpi_hotplug_notify_cb(acpi_handle handle, u32 type, void *data)
 {
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
         struct acpi_scan_handler *handler = data;
         struct acpi_device *adev;
         acpi_status status;
 
-        if (!handler->hotplug.enabled)
-                return acpi_hotplug_unsupported(handle, type);
+        if (acpi_bus_get_device(handle, &adev))
+                goto err_out;
 
         switch (type) {
         case ACPI_NOTIFY_BUS_CHECK:
@@ -404,27 +500,27 @@ static void acpi_hotplug_notify_cb(acpi_handle handle, u32 type, void *data)
                 break;
         case ACPI_NOTIFY_EJECT_REQUEST:
                 acpi_handle_debug(handle, "ACPI_NOTIFY_EJECT_REQUEST event\n");
-                if (acpi_bus_get_device(handle, &adev))
+                if (!handler->hotplug.enabled) {
+                        acpi_handle_err(handle, "Eject disabled\n");
+                        ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
                         goto err_out;
-
-                get_device(&adev->dev);
-                status = acpi_hotplug_execute(acpi_bus_device_eject, adev, type);
-                if (ACPI_SUCCESS(status))
-                        return;
-
-                put_device(&adev->dev);
-                goto err_out;
+                }
+                acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST,
+                                          ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+                break;
         default:
                 /* non-hotplug event; possibly handled by other handler */
                 return;
         }
-        status = acpi_hotplug_execute(acpi_scan_bus_device_check, handle, type);
+        get_device(&adev->dev);
+        status = acpi_hotplug_execute(acpi_device_hotplug, adev, type);
         if (ACPI_SUCCESS(status))
                 return;
 
+        put_device(&adev->dev);
+
  err_out:
-        acpi_evaluate_hotplug_ost(handle, type,
-                                  ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
+        acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
 }
 
 static ssize_t real_power_state_show(struct device *dev,
@@ -475,7 +571,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
         acpi_evaluate_hotplug_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
                                   ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
         get_device(&acpi_device->dev);
-        status = acpi_hotplug_execute(acpi_bus_device_eject, acpi_device,
+        status = acpi_hotplug_execute(acpi_device_hotplug, acpi_device,
                                       ACPI_OST_EC_OSPM_EJECT);
         if (ACPI_SUCCESS(status))
                 return count;
@@ -567,6 +663,20 @@ acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
 
+static ssize_t status_show(struct device *dev, struct device_attribute *attr,
+                                char *buf) {
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        acpi_status status;
+        unsigned long long sta;
+
+        status = acpi_evaluate_integer(acpi_dev->handle, "_STA", NULL, &sta);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+
+        return sprintf(buf, "%llu\n", sta);
+}
+static DEVICE_ATTR_RO(status);
+
 static int acpi_device_setup_files(struct acpi_device *dev)
 {
         struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
@@ -622,6 +732,12 @@ static int acpi_device_setup_files(struct acpi_device *dev)
                 dev->pnp.sun = (unsigned long)-1;
         }
 
+        if (acpi_has_method(dev->handle, "_STA")) {
+                result = device_create_file(&dev->dev, &dev_attr_status);
+                if (result)
+                        goto end;
+        }
+
         /*
          * If device has _EJ0, 'eject' file is created that is used to trigger
          * hot-removal function from userland.
@@ -677,6 +793,8 @@ static void acpi_device_remove_files(struct acpi_device *dev)
                 device_remove_file(&dev->dev, &dev_attr_adr);
         device_remove_file(&dev->dev, &dev_attr_modalias);
         device_remove_file(&dev->dev, &dev_attr_hid);
+        if (acpi_has_method(dev->handle, "_STA"))
+                device_remove_file(&dev->dev, &dev_attr_status);
         if (dev->handle)
                 device_remove_file(&dev->dev, &dev_attr_path);
 }
@@ -782,8 +900,8 @@ static int acpi_device_uevent(struct device *dev, struct kobj_uevent_env *env)
                 return -ENOMEM;
         len = create_modalias(acpi_dev, &env->buf[env->buflen - 1],
                               sizeof(env->buf) - env->buflen);
-        if (len >= (sizeof(env->buf) - env->buflen))
-                return -ENOMEM;
+        if (len <= 0)
+                return len;
         env->buflen += len;
         return 0;
 }
@@ -907,9 +1025,91 @@ struct bus_type acpi_bus_type = {
         .uevent         = acpi_device_uevent,
 };
 
-static void acpi_bus_data_handler(acpi_handle handle, void *context)
+static void acpi_device_del(struct acpi_device *device)
+{
+        mutex_lock(&acpi_device_lock);
+        if (device->parent)
+                list_del(&device->node);
+
+        list_del(&device->wakeup_list);
+        mutex_unlock(&acpi_device_lock);
+
+        acpi_power_add_remove_device(device, false);
+        acpi_device_remove_files(device);
+        if (device->remove)
+                device->remove(device);
+
+        device_del(&device->dev);
+}
+
+static LIST_HEAD(acpi_device_del_list);
+static DEFINE_MUTEX(acpi_device_del_lock);
+
+static void acpi_device_del_work_fn(struct work_struct *work_not_used)
+{
+        for (;;) {
+                struct acpi_device *adev;
+
+                mutex_lock(&acpi_device_del_lock);
+
+                if (list_empty(&acpi_device_del_list)) {
+                        mutex_unlock(&acpi_device_del_lock);
+                        break;
+                }
+                adev = list_first_entry(&acpi_device_del_list,
+                                        struct acpi_device, del_list);
+                list_del(&adev->del_list);
+
+                mutex_unlock(&acpi_device_del_lock);
+
+                acpi_device_del(adev);
+                /*
+                 * Drop references to all power resources that might have been
+                 * used by the device.
+                 */
+                acpi_power_transition(adev, ACPI_STATE_D3_COLD);
+                put_device(&adev->dev);
+        }
+}
+
+/**
+ * acpi_scan_drop_device - Drop an ACPI device object.
+ * @handle: Handle of an ACPI namespace node, not used.
+ * @context: Address of the ACPI device object to drop.
+ *
+ * This is invoked by acpi_ns_delete_node() during the removal of the ACPI
+ * namespace node the device object pointed to by @context is attached to.
+ *
+ * The unregistration is carried out asynchronously to avoid running
+ * acpi_device_del() under the ACPICA's namespace mutex and the list is used to
+ * ensure the correct ordering (the device objects must be unregistered in the
+ * same order in which the corresponding namespace nodes are deleted).
+ */
+static void acpi_scan_drop_device(acpi_handle handle, void *context)
 {
-        /* Intentionally empty. */
+        static DECLARE_WORK(work, acpi_device_del_work_fn);
+        struct acpi_device *adev = context;
+
+        mutex_lock(&acpi_device_del_lock);
+
+        /*
+         * Use the ACPI hotplug workqueue which is ordered, so this work item
+         * won't run after any hotplug work items submitted subsequently.  That
+         * prevents attempts to register device objects identical to those being
+         * deleted from happening concurrently (such attempts result from
+         * hotplug events handled via the ACPI hotplug workqueue).  It also will
+         * run after all of the work items submitted previosuly, which helps
+         * those work items to ensure that they are not accessing stale device
+         * objects.
+         */
+        if (list_empty(&acpi_device_del_list))
+                acpi_queue_hotplug_work(&work);
+
+        list_add_tail(&adev->del_list, &acpi_device_del_list);
+        /* Make acpi_ns_validate_handle() return NULL for this handle. */
+        adev->handle = INVALID_ACPI_HANDLE;
+
+        mutex_unlock(&acpi_device_del_lock);
 }
 
 int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
@@ -919,7 +1119,7 @@ int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
         if (!device)
                 return -EINVAL;
 
-        status = acpi_get_data(handle, acpi_bus_data_handler, (void **)device);
+        status = acpi_get_data(handle, acpi_scan_drop_device, (void **)device);
         if (ACPI_FAILURE(status) || !*device) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n",
                                   handle));
@@ -939,7 +1139,7 @@ int acpi_device_add(struct acpi_device *device,
         if (device->handle) {
                 acpi_status status;
 
-                status = acpi_attach_data(device->handle, acpi_bus_data_handler,
+                status = acpi_attach_data(device->handle, acpi_scan_drop_device,
                                           device);
                 if (ACPI_FAILURE(status)) {
                         acpi_handle_err(device->handle,
@@ -957,6 +1157,7 @@ int acpi_device_add(struct acpi_device *device,
         INIT_LIST_HEAD(&device->node);
         INIT_LIST_HEAD(&device->wakeup_list);
         INIT_LIST_HEAD(&device->physical_node_list);
+        INIT_LIST_HEAD(&device->del_list);
         mutex_init(&device->physical_node_lock);
 
         new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
@@ -1020,37 +1221,10 @@ int acpi_device_add(struct acpi_device *device,
         mutex_unlock(&acpi_device_lock);
 
  err_detach:
-        acpi_detach_data(device->handle, acpi_bus_data_handler);
+        acpi_detach_data(device->handle, acpi_scan_drop_device);
         return result;
 }
 
-static void acpi_device_unregister(struct acpi_device *device)
-{
-        mutex_lock(&acpi_device_lock);
-        if (device->parent)
-                list_del(&device->node);
-
-        list_del(&device->wakeup_list);
-        mutex_unlock(&acpi_device_lock);
-
-        acpi_detach_data(device->handle, acpi_bus_data_handler);
-
-        acpi_power_add_remove_device(device, false);
-        acpi_device_remove_files(device);
-        if (device->remove)
-                device->remove(device);
-
-        device_del(&device->dev);
-        /*
-         * Transition the device to D3cold to drop the reference counts of all
-         * power resources the device depends on and turn off the ones that have
-         * no more references.
-         */
-        acpi_device_set_power(device, ACPI_STATE_D3_COLD);
-        device->handle = NULL;
-        put_device(&device->dev);
-}
-
 /* --------------------------------------------------------------------------
                                  Driver Management
    -------------------------------------------------------------------------- */
@@ -1624,11 +1798,13 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
         device->device_type = type;
         device->handle = handle;
         device->parent = acpi_bus_get_parent(handle);
-        STRUCT_TO_INT(device->status) = sta;
+        acpi_set_device_status(device, sta);
         acpi_device_get_busid(device);
         acpi_set_pnp_ids(handle, &device->pnp, type);
         acpi_bus_get_flags(device);
         device->flags.match_driver = false;
+        device->flags.initialized = true;
+        device->flags.visited = false;
         device_initialize(&device->dev);
         dev_set_uevent_suppress(&device->dev, true);
 }
@@ -1713,6 +1889,15 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
         return 0;
 }
 
+bool acpi_device_is_present(struct acpi_device *adev)
+{
+        if (adev->status.present || adev->status.functional)
+                return true;
+
+        adev->flags.initialized = false;
+        return false;
+}
+
 static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
                                        char *idstr,
                                        const struct acpi_device_id **matchid)
@@ -1772,7 +1957,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
          */
         list_for_each_entry(hwid, &pnp.ids, list) {
                 handler = acpi_scan_match_handler(hwid->id, NULL);
-                if (handler && !handler->hotplug.ignore) {
+                if (handler) {
                         acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
                                         acpi_hotplug_notify_cb, handler);
                         break;
@@ -1806,18 +1991,6 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
 
         acpi_scan_init_hotplug(handle, type);
 
-        if (!(sta & ACPI_STA_DEVICE_PRESENT) &&
-            !(sta & ACPI_STA_DEVICE_FUNCTIONING)) {
-                struct acpi_device_wakeup wakeup;
-
-                if (acpi_has_method(handle, "_PRW")) {
-                        acpi_bus_extract_wakeup_device_power_package(handle,
-                                                                     &wakeup);
-                        acpi_power_resources_list_free(&wakeup.resources);
-                }
-                return AE_CTRL_DEPTH;
-        }
-
         acpi_add_single_object(&device, handle, type, sta);
         if (!device)
                 return AE_CTRL_DEPTH;
@@ -1852,36 +2025,40 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
         return ret;
 }
 
-static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
-                                          void *not_used, void **ret_not_used)
+static void acpi_bus_attach(struct acpi_device *device)
 {
-        struct acpi_device *device;
-        unsigned long long sta_not_used;
+        struct acpi_device *child;
         int ret;
 
-        /*
-         * Ignore errors ignored by acpi_bus_check_add() to avoid terminating
-         * namespace walks prematurely.
-         */
-        if (acpi_bus_type_and_status(handle, &ret, &sta_not_used))
-                return AE_OK;
-
-        if (acpi_bus_get_device(handle, &device))
-                return AE_CTRL_DEPTH;
-
+        acpi_bus_get_status(device);
+        /* Skip devices that are not present. */
+        if (!acpi_device_is_present(device)) {
+                device->flags.visited = false;
+                return;
+        }
         if (device->handler)
-                return AE_OK;
+                goto ok;
 
+        if (!device->flags.initialized) {
+                acpi_bus_update_power(device, NULL);
+                device->flags.initialized = true;
+        }
+        device->flags.visited = false;
         ret = acpi_scan_attach_handler(device);
         if (ret < 0)
-                return AE_CTRL_DEPTH;
+                return;
 
         device->flags.match_driver = true;
-        if (ret > 0)
-                return AE_OK;
+        if (!ret) {
+                ret = device_attach(&device->dev);
+                if (ret < 0)
+                        return;
+        }
+        device->flags.visited = true;
 
-        ret = device_attach(&device->dev);
-        return ret >= 0 ? AE_OK : AE_CTRL_DEPTH;
+ ok:
+        list_for_each_entry(child, &device->children, node)
+                acpi_bus_attach(child);
 }
 
 /**
@@ -1901,75 +2078,48 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
 int acpi_bus_scan(acpi_handle handle)
 {
         void *device = NULL;
-        int error = 0;
 
         if (ACPI_SUCCESS(acpi_bus_check_add(handle, 0, NULL, &device)))
                 acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
                                     acpi_bus_check_add, NULL, NULL, &device);
 
-        if (!device)
-                error = -ENODEV;
-        else if (ACPI_SUCCESS(acpi_bus_device_attach(handle, 0, NULL, NULL)))
-                acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
-                                    acpi_bus_device_attach, NULL, NULL, NULL);
-
-        return error;
-}
-EXPORT_SYMBOL(acpi_bus_scan);
-
-static acpi_status acpi_bus_device_detach(acpi_handle handle, u32 lvl_not_used,
-                                          void *not_used, void **ret_not_used)
-{
-        struct acpi_device *device = NULL;
-
-        if (!acpi_bus_get_device(handle, &device)) {
-                struct acpi_scan_handler *dev_handler = device->handler;
-
-                if (dev_handler) {
-                        if (dev_handler->detach)
-                                dev_handler->detach(device);
-
-                        device->handler = NULL;
-                } else {
-                        device_release_driver(&device->dev);
-                }
+        if (device) {
+                acpi_bus_attach(device);
+                return 0;
         }
-        return AE_OK;
-}
-
-static acpi_status acpi_bus_remove(acpi_handle handle, u32 lvl_not_used,
-                                   void *not_used, void **ret_not_used)
-{
-        struct acpi_device *device = NULL;
-
-        if (!acpi_bus_get_device(handle, &device))
-                acpi_device_unregister(device);
-
-        return AE_OK;
+        return -ENODEV;
 }
+EXPORT_SYMBOL(acpi_bus_scan);
 
 /**
- * acpi_bus_trim - Remove ACPI device node and all of its descendants
- * @start: Root of the ACPI device nodes subtree to remove.
+ * acpi_bus_trim - Detach scan handlers and drivers from ACPI device objects.
+ * @adev: Root of the ACPI namespace scope to walk.
  *
  * Must be called under acpi_scan_lock.
  */
-void acpi_bus_trim(struct acpi_device *start)
+void acpi_bus_trim(struct acpi_device *adev)
 {
+        struct acpi_scan_handler *handler = adev->handler;
+        struct acpi_device *child;
+
+        list_for_each_entry_reverse(child, &adev->children, node)
+                acpi_bus_trim(child);
+
+        if (handler) {
+                if (handler->detach)
+                        handler->detach(adev);
+
+                adev->handler = NULL;
+        } else {
+                device_release_driver(&adev->dev);
+        }
         /*
-         * Execute acpi_bus_device_detach() as a post-order callback to detach
-         * all ACPI drivers from the device nodes being removed.
-         */
-        acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL,
-                            acpi_bus_device_detach, NULL, NULL);
-        acpi_bus_device_detach(start->handle, 0, NULL, NULL);
-        /*
-         * Execute acpi_bus_remove() as a post-order callback to remove device
-         * nodes in the given namespace scope.
+         * Most likely, the device is going away, so put it into D3cold before
+         * that.
          */
-        acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL,
-                            acpi_bus_remove, NULL, NULL);
-        acpi_bus_remove(start->handle, 0, NULL, NULL);
+        acpi_device_set_power(adev, ACPI_STATE_D3_COLD);
+        adev->flags.initialized = false;
+        adev->flags.visited = false;
 }
 EXPORT_SYMBOL_GPL(acpi_bus_trim);
 
@@ -2047,14 +2197,14 @@ int __init acpi_scan_init(void)
 
         result = acpi_bus_scan_fixed();
         if (result) {
-                acpi_device_unregister(acpi_root);
+                acpi_detach_data(acpi_root->handle, acpi_scan_drop_device);
+                acpi_device_del(acpi_root);
+                put_device(&acpi_root->dev);
                 goto out;
         }
 
         acpi_update_all_gpes();
 
-        acpi_pci_root_hp_init();
-
  out:
         mutex_unlock(&acpi_scan_lock);
         return result;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721e949e606e..b718806657cd 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -18,12 +18,8 @@
 #include <linux/reboot.h>
 #include <linux/acpi.h>
 #include <linux/module.h>
-
 #include <asm/io.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-
 #include "internal.h"
 #include "sleep.h"
 
@@ -670,11 +666,8 @@ static void acpi_hibernation_leave(void)
         /* Reprogram control registers */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
         /* Check the hardware signature */
-        if (facs && s4_hardware_signature != facs->hardware_signature) {
-                printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
-                        "cannot resume!\n");
-                panic("ACPI S4 hardware signature mismatch");
-        }
+        if (facs && s4_hardware_signature != facs->hardware_signature)
+                pr_crit("ACPI: Hardware changed while hibernated, success doubtful!\n");
         /* Restore the NVS memory area */
         suspend_nvs_restore();
         /* Allow EC transactions to happen. */
@@ -806,9 +799,6 @@ int __init acpi_sleep_init(void)
         char *pos = supported;
         int i;
 
-        if (acpi_disabled)
-                return 0;
-
         acpi_sleep_dmi_check();
 
         sleep_states[ACPI_STATE_S0] = 1;
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 6dbc3ca45223..443dc9366052 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -5,7 +5,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #include "internal.h"
 
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index d67a1fe07f0e..5837f857ac2e 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -278,12 +278,13 @@ acpi_table_parse_madt(enum acpi_madt_type id,
 
 /**
  * acpi_table_parse - find table with @id, run @handler on it
- *
  * @id: table id to find
  * @handler: handler to run
  *
  * Scan the ACPI System Descriptor Table (STD) for a table matching @id,
- * run @handler on it.  Return 0 if table found, return on if not.
+ * run @handler on it.
+ *
+ * Return 0 if table found, -errno if not.
  */
 int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
 {
@@ -293,7 +294,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
         if (acpi_disabled)
                 return -ENODEV;
 
-        if (!handler)
+        if (!id || !handler)
                 return -EINVAL;
 
         if (strncmp(id, ACPI_SIG_MADT, 4) == 0)
@@ -306,7 +307,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
                 early_acpi_os_unmap_memory(table, tbl_size);
                 return 0;
         } else
-                return 1;
+                return -ENODEV;
 }
 
 /* 
@@ -351,7 +352,7 @@ int __init acpi_table_init(void)
 
         status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
         if (ACPI_FAILURE(status))
-                return 1;
+                return -EINVAL;
 
         check_multiple_madt();
         return 0;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0d9f46b5ae6d..8349a555b92b 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -41,10 +41,9 @@
 #include <linux/kmod.h>
 #include <linux/reboot.h>
 #include <linux/device.h>
-#include <asm/uaccess.h>
 #include <linux/thermal.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
+#include <asm/uaccess.h>
 
 #define PREFIX "ACPI: "
 
@@ -862,7 +861,7 @@ acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal,
         return acpi_thermal_cooling_device_cb(thermal, cdev, false);
 }
 
-static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
+static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
         .bind = acpi_thermal_bind_cooling_device,
         .unbind = acpi_thermal_unbind_cooling_device,
         .get_temp = thermal_get_temp,
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 6d408bfbbb1d..0347a37eb438 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -30,8 +30,6 @@
 #include <linux/types.h>
 #include <linux/hardirq.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 
 #include "internal.h"
 
@@ -574,3 +572,100 @@ acpi_status acpi_evaluate_lck(acpi_handle handle, int lock)
 
         return status;
 }
+
+/**
+ * acpi_evaluate_dsm - evaluate device's _DSM method
+ * @handle: ACPI device handle
+ * @uuid: UUID of requested functions, should be 16 bytes
+ * @rev: revision number of requested function
+ * @func: requested function number
+ * @argv4: the function specific parameter
+ *
+ * Evaluate device's _DSM method with specified UUID, revision id and
+ * function number. Caller needs to free the returned object.
+ *
+ * Though ACPI defines the fourth parameter for _DSM should be a package,
+ * some old BIOSes do expect a buffer or an integer etc.
+ */
+union acpi_object *
+acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, int rev, int func,
+                  union acpi_object *argv4)
+{
+        acpi_status ret;
+        struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
+        union acpi_object params[4];
+        struct acpi_object_list input = {
+                .count = 4,
+                .pointer = params,
+        };
+
+        params[0].type = ACPI_TYPE_BUFFER;
+        params[0].buffer.length = 16;
+        params[0].buffer.pointer = (char *)uuid;
+        params[1].type = ACPI_TYPE_INTEGER;
+        params[1].integer.value = rev;
+        params[2].type = ACPI_TYPE_INTEGER;
+        params[2].integer.value = func;
+        if (argv4) {
+                params[3] = *argv4;
+        } else {
+                params[3].type = ACPI_TYPE_PACKAGE;
+                params[3].package.count = 0;
+                params[3].package.elements = NULL;
+        }
+
+        ret = acpi_evaluate_object(handle, "_DSM", &input, &buf);
+        if (ACPI_SUCCESS(ret))
+                return (union acpi_object *)buf.pointer;
+
+        if (ret != AE_NOT_FOUND)
+                acpi_handle_warn(handle,
+                                "failed to evaluate _DSM (0x%x)\n", ret);
+
+        return NULL;
+}
+EXPORT_SYMBOL(acpi_evaluate_dsm);
+
+/**
+ * acpi_check_dsm - check if _DSM method supports requested functions.
+ * @handle: ACPI device handle
+ * @uuid: UUID of requested functions, should be 16 bytes at least
+ * @rev: revision number of requested functions
+ * @funcs: bitmap of requested functions
+ * @exclude: excluding special value, used to support i915 and nouveau
+ *
+ * Evaluate device's _DSM method to check whether it supports requested
+ * functions. Currently only support 64 functions at maximum, should be
+ * enough for now.
+ */
+bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs)
+{
+        int i;
+        u64 mask = 0;
+        union acpi_object *obj;
+
+        if (funcs == 0)
+                return false;
+
+        obj = acpi_evaluate_dsm(handle, uuid, rev, 0, NULL);
+        if (!obj)
+                return false;
+
+        /* For compatibility, old BIOSes may return an integer */
+        if (obj->type == ACPI_TYPE_INTEGER)
+                mask = obj->integer.value;
+        else if (obj->type == ACPI_TYPE_BUFFER)
+                for (i = 0; i < obj->buffer.length && i < 8; i++)
+                        mask |= (((u8)obj->buffer.pointer[i]) << (i * 8));
+        ACPI_FREE(obj);
+
+        /*
+         * Bit 0 indicates whether there's support for any functions other than
+         * function 0 for the specified UUID and revision.
+         */
+        if ((mask & 0x1) && (mask & funcs) == funcs)
+                return true;
+
+        return false;
+}
+EXPORT_SYMBOL(acpi_check_dsm);
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 995e91bcb97b..b727d105046d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -37,12 +37,11 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/slab.h>
-#include <asm/uaccess.h>
 #include <linux/dmi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/suspend.h>
+#include <linux/acpi.h>
 #include <acpi/video.h>
+#include <asm/uaccess.h>
 
 #include "internal.h"
 
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 84875fd4c74f..f0447d3daf2c 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -50,7 +50,7 @@ static bool acpi_video_caps_checked;
 
 static acpi_status
 acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context,
-                          void **retyurn_value)
+                          void **return_value)
 {
         long *cap = context;
 
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 7bfbe40bc43b..1638401ab282 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -5,7 +5,6 @@
 
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 4372cfa883c9..9e69a5308693 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -20,8 +20,6 @@
 #include <scsi/scsi_device.h>
 #include "libata.h"
 
-#include <acpi/acpi_bus.h>
-
 unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
 module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);
 MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");
@@ -180,12 +178,12 @@ static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
 /* bind acpi handle to pata port */
 void ata_acpi_bind_port(struct ata_port *ap)
 {
-        acpi_handle host_handle = ACPI_HANDLE(ap->host->dev);
+        struct acpi_device *host_companion = ACPI_COMPANION(ap->host->dev);
 
-        if (libata_noacpi || ap->flags & ATA_FLAG_ACPI_SATA || !host_handle)
+        if (libata_noacpi || ap->flags & ATA_FLAG_ACPI_SATA || !host_companion)
                 return;
 
-        acpi_preset_companion(&ap->tdev, host_handle, ap->port_no);
+        acpi_preset_companion(&ap->tdev, host_companion, ap->port_no);
 
         if (ata_acpi_gtm(ap, &ap->__acpi_init_gtm) == 0)
                 ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
@@ -198,17 +196,17 @@ void ata_acpi_bind_port(struct ata_port *ap)
 void ata_acpi_bind_dev(struct ata_device *dev)
 {
         struct ata_port *ap = dev->link->ap;
-        acpi_handle port_handle = ACPI_HANDLE(&ap->tdev);
-        acpi_handle host_handle = ACPI_HANDLE(ap->host->dev);
-        acpi_handle parent_handle;
+        struct acpi_device *port_companion = ACPI_COMPANION(&ap->tdev);
+        struct acpi_device *host_companion = ACPI_COMPANION(ap->host->dev);
+        struct acpi_device *parent;
         u64 adr;
 
         /*
-         * For both sata/pata devices, host handle is required.
-         * For pata device, port handle is also required.
+         * For both sata/pata devices, host companion device is required.
+         * For pata device, port companion device is also required.
          */
-        if (libata_noacpi || !host_handle ||
-                        (!(ap->flags & ATA_FLAG_ACPI_SATA) && !port_handle))
+        if (libata_noacpi || !host_companion ||
+                        (!(ap->flags & ATA_FLAG_ACPI_SATA) && !port_companion))
                 return;
 
         if (ap->flags & ATA_FLAG_ACPI_SATA) {
@@ -216,13 +214,13 @@ void ata_acpi_bind_dev(struct ata_device *dev)
                         adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
                 else
                         adr = SATA_ADR(ap->port_no, dev->link->pmp);
-                parent_handle = host_handle;
+                parent = host_companion;
         } else {
                 adr = dev->devno;
-                parent_handle = port_handle;
+                parent = port_companion;
         }
 
-        acpi_preset_companion(&dev->tdev, parent_handle, adr);
+        acpi_preset_companion(&dev->tdev, parent, adr);
 
         register_hotplug_dock_device(ata_dev_acpi_handle(dev),
                                      &ata_acpi_dev_dock_ops, dev, NULL, NULL);
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index 73212c9c6d5b..62c9ac80c6e9 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -12,11 +12,10 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/gfp.h>
-#include <scsi/scsi_host.h>
-#include <acpi/acpi_bus.h>
-
+#include <linux/acpi.h>
 #include <linux/libata.h>
 #include <linux/ata.h>
+#include <scsi/scsi_host.h>
 
 #define DRV_NAME        "pata_acpi"
 #define DRV_VERSION     "0.2.3"
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 870ecfd503af..04b314e0fa51 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -4,7 +4,7 @@ obj-y			:= component.o core.o bus.o dd.o syscore.o \
                            driver.o class.o platform.o \
                            cpu.o firmware.o init.o map.o devres.o \
                            attribute_container.o transport_class.o \
-                           topology.o
+                           topology.o container.o
 obj-$(CONFIG_DEVTMPFS)  += devtmpfs.o
 obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y                   += power/
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 2cbc6774f4cd..24f424249d9b 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -100,6 +100,7 @@ static inline int hypervisor_init(void) { return 0; }
 #endif
 extern int platform_bus_init(void);
 extern void cpu_dev_init(void);
+extern void container_dev_init(void);
 
 struct kobject *virtual_device_parent(struct device *dev);
 
diff --git a/drivers/base/container.c b/drivers/base/container.c
new file mode 100644
index 000000000000..ecbfbe2e908f
--- /dev/null
+++ b/drivers/base/container.c
@@ -0,0 +1,44 @@
+/*
+ * System bus type for containers.
+ *
+ * Copyright (C) 2013, Intel Corporation
+ * Author: 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/container.h>
+
+#include "base.h"
+
+#define CONTAINER_BUS_NAME      "container"
+
+static int trivial_online(struct device *dev)
+{
+        return 0;
+}
+
+static int container_offline(struct device *dev)
+{
+        struct container_dev *cdev = to_container_dev(dev);
+
+        return cdev->offline ? cdev->offline(cdev) : 0;
+}
+
+struct bus_type container_subsys = {
+        .name = CONTAINER_BUS_NAME,
+        .dev_name = CONTAINER_BUS_NAME,
+        .online = trivial_online,
+        .offline = container_offline,
+};
+
+void __init container_dev_init(void)
+{
+        int ret;
+
+        ret = subsys_system_register(&container_subsys, NULL);
+        if (ret)
+                pr_err("%s() failed: %d\n", __func__, ret);
+}
diff --git a/drivers/base/init.c b/drivers/base/init.c
index c16f0b808a17..da033d3bab3c 100644
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -33,4 +33,5 @@ void __init driver_init(void)
         platform_bus_init();
         cpu_dev_init();
         memory_dev_init();
+        container_dev_init();
 }
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 3a94b799f166..bc78848dd59a 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -677,7 +677,17 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
                              char *buf)
 {
         struct platform_device  *pdev = to_platform_device(dev);
-        int len = snprintf(buf, PAGE_SIZE, "platform:%s\n", pdev->name);
+        int len;
+
+        len = of_device_get_modalias(dev, buf, PAGE_SIZE -1);
+        if (len != -ENODEV)
+                return len;
+
+        len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
+        if (len != -ENODEV)
+                return len;
+
+        len = snprintf(buf, PAGE_SIZE, "platform:%s\n", pdev->name);
 
         return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
 }
@@ -699,6 +709,10 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
         if (rc != -ENODEV)
                 return rc;
 
+        rc = acpi_device_uevent_modalias(dev, env);
+        if (rc != -ENODEV)
+                return rc;
+
         add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
                         pdev->name);
         return 0;
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 9d8fde709390..e870bbe9ec4e 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -33,6 +33,21 @@ struct pm_clock_entry {
 };
 
 /**
+ * pm_clk_enable - Enable a clock, reporting any errors
+ * @dev: The device for the given clock
+ * @clk: The clock being enabled.
+ */
+static inline int __pm_clk_enable(struct device *dev, struct clk *clk)
+{
+        int ret = clk_enable(clk);
+        if (ret)
+                dev_err(dev, "%s: failed to enable clk %p, error %d\n",
+                        __func__, clk, ret);
+
+        return ret;
+}
+
+/**
  * pm_clk_acquire - Acquire a device clock.
  * @dev: Device whose clock is to be acquired.
  * @ce: PM clock entry corresponding to the clock.
@@ -43,6 +58,7 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce)
         if (IS_ERR(ce->clk)) {
                 ce->status = PCE_STATUS_ERROR;
         } else {
+                clk_prepare(ce->clk);
                 ce->status = PCE_STATUS_ACQUIRED;
                 dev_dbg(dev, "Clock %s managed by runtime PM.\n", ce->con_id);
         }
@@ -99,10 +115,12 @@ static void __pm_clk_remove(struct pm_clock_entry *ce)
 
         if (ce->status < PCE_STATUS_ERROR) {
                 if (ce->status == PCE_STATUS_ENABLED)
-                        clk_disable_unprepare(ce->clk);
+                        clk_disable(ce->clk);
 
-                if (ce->status >= PCE_STATUS_ACQUIRED)
+                if (ce->status >= PCE_STATUS_ACQUIRED) {
+                        clk_unprepare(ce->clk);
                         clk_put(ce->clk);
+                }
         }
 
         kfree(ce->con_id);
@@ -249,6 +267,7 @@ int pm_clk_resume(struct device *dev)
         struct pm_subsys_data *psd = dev_to_psd(dev);
         struct pm_clock_entry *ce;
         unsigned long flags;
+        int ret;
 
         dev_dbg(dev, "%s()\n", __func__);
 
@@ -259,8 +278,9 @@ int pm_clk_resume(struct device *dev)
 
         list_for_each_entry(ce, &psd->clock_list, node) {
                 if (ce->status < PCE_STATUS_ERROR) {
-                        clk_enable(ce->clk);
-                        ce->status = PCE_STATUS_ENABLED;
+                        ret = __pm_clk_enable(dev, ce->clk);
+                        if (!ret)
+                                ce->status = PCE_STATUS_ENABLED;
                 }
         }
 
@@ -376,7 +396,7 @@ int pm_clk_resume(struct device *dev)
         spin_lock_irqsave(&psd->lock, flags);
 
         list_for_each_entry(ce, &psd->clock_list, node)
-                clk_enable(ce->clk);
+                __pm_clk_enable(dev, ce->clk);
 
         spin_unlock_irqrestore(&psd->lock, flags);
 
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index 5ee030a864f9..a2e55bfdf572 100644
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -10,7 +10,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/export.h>
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 /**
  * pm_generic_runtime_suspend - Generic runtime suspend callback for subsystems.
  * @dev: Device to suspend.
@@ -48,7 +48,7 @@ int pm_generic_runtime_resume(struct device *dev)
         return ret;
 }
 EXPORT_SYMBOL_GPL(pm_generic_runtime_resume);
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
 
 #ifdef CONFIG_PM_SLEEP
 /**
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 46118f845948..dd9dfa15e9d1 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -531,6 +531,7 @@ static int apm_suspend_notifier(struct notifier_block *nb,
 {
         struct apm_user *as;
         int err;
+        unsigned long apm_event;
 
         /* short-cut emergency suspends */
         if (atomic_read(&userspace_notification_inhibit))
@@ -538,6 +539,9 @@ static int apm_suspend_notifier(struct notifier_block *nb,
 
         switch (event) {
         case PM_SUSPEND_PREPARE:
+        case PM_HIBERNATION_PREPARE:
+                apm_event = (event == PM_SUSPEND_PREPARE) ?
+                        APM_USER_SUSPEND : APM_USER_HIBERNATION;
                 /*
                  * Queue an event to all "writer" users that we want
                  * to suspend and need their ack.
@@ -550,7 +554,7 @@ static int apm_suspend_notifier(struct notifier_block *nb,
                             as->writer && as->suser) {
                                 as->suspend_state = SUSPEND_PENDING;
                                 atomic_inc(&suspend_acks_pending);
-                                queue_add_event(&as->queue, APM_USER_SUSPEND);
+                                queue_add_event(&as->queue, apm_event);
                         }
                 }
 
@@ -601,11 +605,14 @@ static int apm_suspend_notifier(struct notifier_block *nb,
                 return notifier_from_errno(err);
 
         case PM_POST_SUSPEND:
+        case PM_POST_HIBERNATION:
+                apm_event = (event == PM_POST_SUSPEND) ?
+                        APM_NORMAL_RESUME : APM_HIBERNATION_RESUME;
                 /*
                  * Anyone on the APM queues will think we're still suspended.
                  * Send a message so everyone knows we're now awake again.
                  */
-                queue_event(APM_NORMAL_RESUME);
+                queue_event(apm_event);
 
                 /*
                  * Finally, wake up anyone who is sleeping on the suspend.
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 5d9c31dfc905..d5d4cd82b9f7 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -34,15 +34,12 @@
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/io.h>
-
+#include <linux/acpi.h>
+#include <linux/hpet.h>
 #include <asm/current.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
 
-#include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <linux/hpet.h>
-
 /*
  * The High Precision Event Timer driver.
  * This driver is closely modelled after the rtc.c driver.
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index 64420b3396a2..b9a57fa4b710 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -23,7 +23,7 @@
 #include <linux/security.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <acpi/acpi.h>
+#include <linux/acpi.h>
 
 #include "tpm.h"
 #include "tpm_eventlog.h"
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 2db4419831be..b3ea223585bd 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -1,16 +1,6 @@
 #include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include "tpm.h"
 
-static const u8 tpm_ppi_uuid[] = {
-        0xA6, 0xFA, 0xDD, 0x3D,
-        0x1B, 0x36,
-        0xB4, 0x4E,
-        0xA4, 0x24,
-        0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53
-};
-static char *tpm_device_name = "TPM";
-
 #define TPM_PPI_REVISION_ID     1
 #define TPM_PPI_FN_VERSION      1
 #define TPM_PPI_FN_SUBREQ       2
@@ -24,250 +14,178 @@ static char *tpm_device_name = "TPM";
 #define PPI_VS_REQ_END          255
 #define PPI_VERSION_LEN         3
 
+static const u8 tpm_ppi_uuid[] = {
+        0xA6, 0xFA, 0xDD, 0x3D,
+        0x1B, 0x36,
+        0xB4, 0x4E,
+        0xA4, 0x24,
+        0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53
+};
+
+static char tpm_ppi_version[PPI_VERSION_LEN + 1];
+static acpi_handle tpm_ppi_handle;
+
 static acpi_status ppi_callback(acpi_handle handle, u32 level, void *context,
                                 void **return_value)
 {
-        acpi_status status = AE_OK;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
 
-        if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer))) {
-                if (strstr(buffer.pointer, context) != NULL) {
-                        *return_value = handle;
-                        status = AE_CTRL_TERMINATE;
-                }
-                kfree(buffer.pointer);
+        if (!acpi_check_dsm(handle, tpm_ppi_uuid, TPM_PPI_REVISION_ID,
+                            1 << TPM_PPI_FN_VERSION))
+                return AE_OK;
+
+        /* Cache version string */
+        obj = acpi_evaluate_dsm_typed(handle, tpm_ppi_uuid,
+                                      TPM_PPI_REVISION_ID, TPM_PPI_FN_VERSION,
+                                      NULL, ACPI_TYPE_STRING);
+        if (obj) {
+                strlcpy(tpm_ppi_version, obj->string.pointer,
+                        PPI_VERSION_LEN + 1);
+                ACPI_FREE(obj);
         }
 
-        return status;
+        *return_value = handle;
+
+        return AE_CTRL_TERMINATE;
 }
 
-static inline void ppi_assign_params(union acpi_object params[4],
-                                     u64 function_num)
+static inline union acpi_object *
+tpm_eval_dsm(int func, acpi_object_type type, union acpi_object *argv4)
 {
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(tpm_ppi_uuid);
-        params[0].buffer.pointer = (char *)tpm_ppi_uuid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = TPM_PPI_REVISION_ID;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = function_num;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
+        BUG_ON(!tpm_ppi_handle);
+        return acpi_evaluate_dsm_typed(tpm_ppi_handle, tpm_ppi_uuid,
+                                       TPM_PPI_REVISION_ID, func, argv4, type);
 }
 
 static ssize_t tpm_show_ppi_version(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        acpi_handle handle;
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object params[4];
-        union acpi_object *obj;
-
-        input.count = 4;
-        ppi_assign_params(params, TPM_PPI_FN_VERSION);
-        input.pointer = params;
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, ppi_callback, NULL,
-                                     tpm_device_name, &handle);
-        if (ACPI_FAILURE(status))
-                return -ENXIO;
-
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                         ACPI_TYPE_STRING);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
-        obj = (union acpi_object *)output.pointer;
-        status = scnprintf(buf, PAGE_SIZE, "%s\n", obj->string.pointer);
-        kfree(output.pointer);
-        return status;
+        return scnprintf(buf, PAGE_SIZE, "%s\n", tpm_ppi_version);
 }
 
 static ssize_t tpm_show_ppi_request(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        acpi_handle handle;
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object params[4];
-        union acpi_object *ret_obj;
-
-        input.count = 4;
-        ppi_assign_params(params, TPM_PPI_FN_GETREQ);
-        input.pointer = params;
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, ppi_callback, NULL,
-                                     tpm_device_name, &handle);
-        if (ACPI_FAILURE(status))
+        ssize_t size = -EINVAL;
+        union acpi_object *obj;
+
+        obj = tpm_eval_dsm(TPM_PPI_FN_GETREQ, ACPI_TYPE_PACKAGE, NULL);
+        if (!obj)
                 return -ENXIO;
 
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                            ACPI_TYPE_PACKAGE);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
         /*
          * output.pointer should be of package type, including two integers.
          * The first is function return code, 0 means success and 1 means
          * error. The second is pending TPM operation requested by the OS, 0
          * means none and >0 means operation value.
          */
-        ret_obj = ((union acpi_object *)output.pointer)->package.elements;
-        if (ret_obj->type == ACPI_TYPE_INTEGER) {
-                if (ret_obj->integer.value) {
-                        status = -EFAULT;
-                        goto cleanup;
-                }
-                ret_obj++;
-                if (ret_obj->type == ACPI_TYPE_INTEGER)
-                        status = scnprintf(buf, PAGE_SIZE, "%llu\n",
-                                           ret_obj->integer.value);
+        if (obj->package.count == 2 &&
+            obj->package.elements[0].type == ACPI_TYPE_INTEGER &&
+            obj->package.elements[1].type == ACPI_TYPE_INTEGER) {
+                if (obj->package.elements[0].integer.value)
+                        size = -EFAULT;
                 else
-                        status = -EINVAL;
-        } else {
-                status = -EINVAL;
+                        size = scnprintf(buf, PAGE_SIZE, "%llu\n",
+                                 obj->package.elements[1].integer.value);
         }
-cleanup:
-        kfree(output.pointer);
-        return status;
+
+        ACPI_FREE(obj);
+
+        return size;
 }
 
 static ssize_t tpm_store_ppi_request(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
 {
-        char version[PPI_VERSION_LEN + 1];
-        acpi_handle handle;
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object params[4];
-        union acpi_object obj;
         u32 req;
         u64 ret;
+        int func = TPM_PPI_FN_SUBREQ;
+        union acpi_object *obj, tmp;
+        union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
 
-        input.count = 4;
-        ppi_assign_params(params, TPM_PPI_FN_VERSION);
-        input.pointer = params;
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, ppi_callback, NULL,
-                                     tpm_device_name, &handle);
-        if (ACPI_FAILURE(status))
-                return -ENXIO;
-
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                            ACPI_TYPE_STRING);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
-        strlcpy(version,
-                ((union acpi_object *)output.pointer)->string.pointer,
-                PPI_VERSION_LEN + 1);
-        kfree(output.pointer);
-        output.length = ACPI_ALLOCATE_BUFFER;
-        output.pointer = NULL;
         /*
          * the function to submit TPM operation request to pre-os environment
          * is updated with function index from SUBREQ to SUBREQ2 since PPI
          * version 1.1
          */
-        if (strcmp(version, "1.1") < 0)
-                params[2].integer.value = TPM_PPI_FN_SUBREQ;
-        else
-                params[2].integer.value = TPM_PPI_FN_SUBREQ2;
+        if (acpi_check_dsm(tpm_ppi_handle, tpm_ppi_uuid, TPM_PPI_REVISION_ID,
+                           1 << TPM_PPI_FN_SUBREQ2))
+                func = TPM_PPI_FN_SUBREQ2;
+
         /*
          * PPI spec defines params[3].type as ACPI_TYPE_PACKAGE. Some BIOS
          * accept buffer/string/integer type, but some BIOS accept buffer/
          * string/package type. For PPI version 1.0 and 1.1, use buffer type
          * for compatibility, and use package type since 1.2 according to spec.
          */
-        if (strcmp(version, "1.2") < 0) {
-                params[3].type = ACPI_TYPE_BUFFER;
-                params[3].buffer.length = sizeof(req);
-                sscanf(buf, "%d", &req);
-                params[3].buffer.pointer = (char *)&req;
+        if (strcmp(tpm_ppi_version, "1.2") < 0) {
+                if (sscanf(buf, "%d", &req) != 1)
+                        return -EINVAL;
+                argv4.type = ACPI_TYPE_BUFFER;
+                argv4.buffer.length = sizeof(req);
+                argv4.buffer.pointer = (u8 *)&req;
+        } else {
+                tmp.type = ACPI_TYPE_INTEGER;
+                if (sscanf(buf, "%llu", &tmp.integer.value) != 1)
+                        return -EINVAL;
+        }
+
+        obj = tpm_eval_dsm(func, ACPI_TYPE_INTEGER, &argv4);
+        if (!obj) {
+                return -ENXIO;
         } else {
-                params[3].package.count = 1;
-                obj.type = ACPI_TYPE_INTEGER;
-                sscanf(buf, "%llu", &obj.integer.value);
-                params[3].package.elements = &obj;
+                ret = obj->integer.value;
+                ACPI_FREE(obj);
         }
 
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                            ACPI_TYPE_INTEGER);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
-        ret = ((union acpi_object *)output.pointer)->integer.value;
         if (ret == 0)
-                status = (acpi_status)count;
-        else if (ret == 1)
-                status = -EPERM;
-        else
-                status = -EFAULT;
-        kfree(output.pointer);
-        return status;
+                return (acpi_status)count;
+
+        return (ret == 1) ? -EPERM : -EFAULT;
 }
 
 static ssize_t tpm_show_ppi_transition_action(struct device *dev,
                                               struct device_attribute *attr,
                                               char *buf)
 {
-        char version[PPI_VERSION_LEN + 1];
-        acpi_handle handle;
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object params[4];
         u32 ret;
-        char *info[] = {
+        acpi_status status;
+        union acpi_object *obj = NULL;
+        union acpi_object tmp = {
+                .buffer.type = ACPI_TYPE_BUFFER,
+                .buffer.length = 0,
+                .buffer.pointer = NULL
+        };
+
+        static char *info[] = {
                 "None",
                 "Shutdown",
                 "Reboot",
                 "OS Vendor-specific",
                 "Error",
         };
-        input.count = 4;
-        ppi_assign_params(params, TPM_PPI_FN_VERSION);
-        input.pointer = params;
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, ppi_callback, NULL,
-                                     tpm_device_name, &handle);
-        if (ACPI_FAILURE(status))
-                return -ENXIO;
 
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                            ACPI_TYPE_STRING);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
-        strlcpy(version,
-                ((union acpi_object *)output.pointer)->string.pointer,
-                PPI_VERSION_LEN + 1);
         /*
          * PPI spec defines params[3].type as empty package, but some platforms
          * (e.g. Capella with PPI 1.0) need integer/string/buffer type, so for
          * compatibility, define params[3].type as buffer, if PPI version < 1.2
          */
-        if (strcmp(version, "1.2") < 0) {
-                params[3].type = ACPI_TYPE_BUFFER;
-                params[3].buffer.length =  0;
-                params[3].buffer.pointer = NULL;
+        if (strcmp(tpm_ppi_version, "1.2") < 0)
+                obj = &tmp;
+        obj = tpm_eval_dsm(TPM_PPI_FN_GETACT, ACPI_TYPE_INTEGER, obj);
+        if (!obj) {
+                return -ENXIO;
+        } else {
+                ret = obj->integer.value;
+                ACPI_FREE(obj);
         }
-        params[2].integer.value = TPM_PPI_FN_GETACT;
-        kfree(output.pointer);
-        output.length = ACPI_ALLOCATE_BUFFER;
-        output.pointer = NULL;
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                            ACPI_TYPE_INTEGER);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
-        ret = ((union acpi_object *)output.pointer)->integer.value;
+
         if (ret < ARRAY_SIZE(info) - 1)
                 status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret, info[ret]);
         else
                 status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret,
                                    info[ARRAY_SIZE(info)-1]);
-        kfree(output.pointer);
         return status;
 }
 
@@ -275,27 +193,14 @@ static ssize_t tpm_show_ppi_response(struct device *dev,
                                      struct device_attribute *attr,
                                      char *buf)
 {
-        acpi_handle handle;
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object params[4];
-        union acpi_object *ret_obj;
-        u64 req;
-
-        input.count = 4;
-        ppi_assign_params(params, TPM_PPI_FN_GETRSP);
-        input.pointer = params;
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, ppi_callback, NULL,
-                                     tpm_device_name, &handle);
-        if (ACPI_FAILURE(status))
+        acpi_status status = -EINVAL;
+        union acpi_object *obj, *ret_obj;
+        u64 req, res;
+
+        obj = tpm_eval_dsm(TPM_PPI_FN_GETRSP, ACPI_TYPE_PACKAGE, NULL);
+        if (!obj)
                 return -ENXIO;
 
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                            ACPI_TYPE_PACKAGE);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
         /*
          * parameter output.pointer should be of package type, including
          * 3 integers. The first means function return code, the second means
@@ -303,115 +208,82 @@ static ssize_t tpm_show_ppi_response(struct device *dev,
          * the most recent TPM operation request. Only if the first is 0, and
          * the second integer is not 0, the response makes sense.
          */
-        ret_obj = ((union acpi_object *)output.pointer)->package.elements;
-        if (ret_obj->type != ACPI_TYPE_INTEGER) {
-                status = -EINVAL;
+        ret_obj = obj->package.elements;
+        if (obj->package.count < 3 ||
+            ret_obj[0].type != ACPI_TYPE_INTEGER ||
+            ret_obj[1].type != ACPI_TYPE_INTEGER ||
+            ret_obj[2].type != ACPI_TYPE_INTEGER)
                 goto cleanup;
-        }
-        if (ret_obj->integer.value) {
+
+        if (ret_obj[0].integer.value) {
                 status = -EFAULT;
                 goto cleanup;
         }
-        ret_obj++;
-        if (ret_obj->type != ACPI_TYPE_INTEGER) {
-                status = -EINVAL;
-                goto cleanup;
-        }
-        if (ret_obj->integer.value) {
-                req = ret_obj->integer.value;
-                ret_obj++;
-                if (ret_obj->type != ACPI_TYPE_INTEGER) {
-                        status = -EINVAL;
-                        goto cleanup;
-                }
-                if (ret_obj->integer.value == 0)
+
+        req = ret_obj[1].integer.value;
+        res = ret_obj[2].integer.value;
+        if (req) {
+                if (res == 0)
                         status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
                                            "0: Success");
-                else if (ret_obj->integer.value == 0xFFFFFFF0)
+                else if (res == 0xFFFFFFF0)
                         status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
                                            "0xFFFFFFF0: User Abort");
-                else if (ret_obj->integer.value == 0xFFFFFFF1)
+                else if (res == 0xFFFFFFF1)
                         status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
                                            "0xFFFFFFF1: BIOS Failure");
-                else if (ret_obj->integer.value >= 1 &&
-                         ret_obj->integer.value <= 0x00000FFF)
+                else if (res >= 1 && res <= 0x00000FFF)
                         status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n",
-                                           req, ret_obj->integer.value,
-                                           "Corresponding TPM error");
+                                           req, res, "Corresponding TPM error");
                 else
                         status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n",
-                                           req, ret_obj->integer.value,
-                                           "Error");
+                                           req, res, "Error");
         } else {
                 status = scnprintf(buf, PAGE_SIZE, "%llu: %s\n",
-                                   ret_obj->integer.value, "No Recent Request");
+                                   req, "No Recent Request");
         }
+
 cleanup:
-        kfree(output.pointer);
+        ACPI_FREE(obj);
         return status;
 }
 
 static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
 {
-        char *str = buf;
-        char version[PPI_VERSION_LEN + 1];
-        acpi_handle handle;
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object params[4];
-        union acpi_object obj;
         int i;
         u32 ret;
-        char *info[] = {
+        char *str = buf;
+        union acpi_object *obj, tmp;
+        union acpi_object argv = ACPI_INIT_DSM_ARGV4(1, &tmp);
+
+        static char *info[] = {
                 "Not implemented",
                 "BIOS only",
                 "Blocked for OS by BIOS",
                 "User required",
                 "User not required",
         };
-        input.count = 4;
-        ppi_assign_params(params, TPM_PPI_FN_VERSION);
-        input.pointer = params;
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, ppi_callback, NULL,
-                                     tpm_device_name, &handle);
-        if (ACPI_FAILURE(status))
-                return -ENXIO;
 
-        status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
-                                         ACPI_TYPE_STRING);
-        if (ACPI_FAILURE(status))
-                return -ENOMEM;
-
-        strlcpy(version,
-                ((union acpi_object *)output.pointer)->string.pointer,
-                PPI_VERSION_LEN + 1);
-        kfree(output.pointer);
-        output.length = ACPI_ALLOCATE_BUFFER;
-        output.pointer = NULL;
-        if (strcmp(version, "1.2") < 0)
+        if (!acpi_check_dsm(tpm_ppi_handle, tpm_ppi_uuid, TPM_PPI_REVISION_ID,
+                            1 << TPM_PPI_FN_GETOPR))
                 return -EPERM;
 
-        params[2].integer.value = TPM_PPI_FN_GETOPR;
-        params[3].package.count = 1;
-        obj.type = ACPI_TYPE_INTEGER;
-        params[3].package.elements = &obj;
+        tmp.integer.type = ACPI_TYPE_INTEGER;
         for (i = start; i <= end; i++) {
-                obj.integer.value = i;
-                status = acpi_evaluate_object_typed(handle, "_DSM",
-                         &input, &output, ACPI_TYPE_INTEGER);
-                if (ACPI_FAILURE(status))
+                tmp.integer.value = i;
+                obj = tpm_eval_dsm(TPM_PPI_FN_GETOPR, ACPI_TYPE_INTEGER, &argv);
+                if (!obj) {
                         return -ENOMEM;
+                } else {
+                        ret = obj->integer.value;
+                        ACPI_FREE(obj);
+                }
 
-                ret = ((union acpi_object *)output.pointer)->integer.value;
                 if (ret > 0 && ret < ARRAY_SIZE(info))
                         str += scnprintf(str, PAGE_SIZE, "%d %d: %s\n",
                                          i, ret, info[ret]);
-                kfree(output.pointer);
-                output.length = ACPI_ALLOCATE_BUFFER;
-                output.pointer = NULL;
         }
+
         return str - buf;
 }
 
@@ -453,6 +325,12 @@ static struct attribute_group ppi_attr_grp = {
 
 int tpm_add_ppi(struct kobject *parent)
 {
+        /* Cache TPM ACPI handle and version string */
+        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
+                            ppi_callback, NULL, NULL, &tpm_ppi_handle);
+        if (tpm_ppi_handle == NULL)
+                return -ENODEV;
+
         return sysfs_create_group(parent, &ppi_attr_grp);
 }
 
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 38093e272377..d100926aca0a 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -20,6 +20,10 @@ if CPU_FREQ
 config CPU_FREQ_GOV_COMMON
         bool
 
+config CPU_FREQ_BOOST_SW
+        bool
+        depends on THERMAL
+
 config CPU_FREQ_STAT
         tristate "CPU frequency translation statistics"
         default y
@@ -181,7 +185,8 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config GENERIC_CPUFREQ_CPU0
         tristate "Generic CPU0 cpufreq driver"
-        depends on HAVE_CLK && REGULATOR && PM_OPP && OF
+        depends on HAVE_CLK && REGULATOR && OF
+        select PM_OPP
         help
           This adds a generic cpufreq driver for CPU0 frequency management.
           It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index ce52ed949249..31297499a60a 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -4,7 +4,8 @@
 
 config ARM_BIG_LITTLE_CPUFREQ
         tristate "Generic ARM big LITTLE CPUfreq driver"
-        depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK
+        depends on ARM && BIG_LITTLE && ARM_CPU_TOPOLOGY && HAVE_CLK
+        select PM_OPP
         help
           This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.
 
@@ -54,7 +55,8 @@ config ARM_EXYNOS5250_CPUFREQ
 config ARM_EXYNOS5440_CPUFREQ
         bool "SAMSUNG EXYNOS5440"
         depends on SOC_EXYNOS5440
-        depends on HAVE_CLK && PM_OPP && OF
+        depends on HAVE_CLK && OF
+        select PM_OPP
         default y
         help
           This adds the CPUFreq driver for Samsung EXYNOS5440
@@ -64,6 +66,21 @@ config ARM_EXYNOS5440_CPUFREQ
 
           If in doubt, say N.
 
+config ARM_EXYNOS_CPU_FREQ_BOOST_SW
+        bool "EXYNOS Frequency Overclocking - Software"
+        depends on ARM_EXYNOS_CPUFREQ
+        select CPU_FREQ_BOOST_SW
+        select EXYNOS_THERMAL
+        help
+          This driver supports software managed overclocking (BOOST).
+          It allows usage of special frequencies for Samsung Exynos
+          processors if thermal conditions are appropriate.
+
+          It reguires, for safe operation, thermal framework with properly
+          defined trip points.
+
+          If in doubt, say N.
+
 config ARM_HIGHBANK_CPUFREQ
         tristate "Calxeda Highbank-based"
         depends on ARCH_HIGHBANK
@@ -79,11 +96,11 @@ config ARM_HIGHBANK_CPUFREQ
           If in doubt, say N.
 
 config ARM_IMX6Q_CPUFREQ
-        tristate "Freescale i.MX6Q cpufreq support"
-        depends on SOC_IMX6Q
+        tristate "Freescale i.MX6 cpufreq support"
+        depends on ARCH_MXC
         depends on REGULATOR_ANATOP
         help
-          This adds cpufreq driver support for Freescale i.MX6Q SOC.
+          This adds cpufreq driver support for Freescale i.MX6 series SoCs.
 
           If in doubt, say N.
 
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index caf41ebea184..79e5608e71b5 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -80,7 +80,6 @@ static struct acpi_processor_performance __percpu *acpi_perf_data;
 static struct cpufreq_driver acpi_cpufreq_driver;
 
 static unsigned int acpi_pstate_strict;
-static bool boost_enabled, boost_supported;
 static struct msr __percpu *msrs;
 
 static bool boost_state(unsigned int cpu)
@@ -133,49 +132,16 @@ static void boost_set_msrs(bool enable, const struct cpumask *cpumask)
         wrmsr_on_cpus(cpumask, msr_addr, msrs);
 }
 
-static ssize_t _store_boost(const char *buf, size_t count)
+static int _store_boost(int val)
 {
-        int ret;
-        unsigned long val = 0;
-
-        if (!boost_supported)
-                return -EINVAL;
-
-        ret = kstrtoul(buf, 10, &val);
-        if (ret || (val > 1))
-                return -EINVAL;
-
-        if ((val && boost_enabled) || (!val && !boost_enabled))
-                return count;
-
         get_online_cpus();
-
         boost_set_msrs(val, cpu_online_mask);
-
         put_online_cpus();
-
-        boost_enabled = val;
         pr_debug("Core Boosting %sabled.\n", val ? "en" : "dis");
 
-        return count;
-}
-
-static ssize_t store_global_boost(struct kobject *kobj, struct attribute *attr,
-                                  const char *buf, size_t count)
-{
-        return _store_boost(buf, count);
-}
-
-static ssize_t show_global_boost(struct kobject *kobj,
-                                 struct attribute *attr, char *buf)
-{
-        return sprintf(buf, "%u\n", boost_enabled);
+        return 0;
 }
 
-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);
@@ -186,15 +152,32 @@ static ssize_t show_freqdomain_cpus(struct cpufreq_policy *policy, char *buf)
 cpufreq_freq_attr_ro(freqdomain_cpus);
 
 #ifdef CONFIG_X86_ACPI_CPUFREQ_CPB
+static ssize_t store_boost(const char *buf, size_t count)
+{
+        int ret;
+        unsigned long val = 0;
+
+        if (!acpi_cpufreq_driver.boost_supported)
+                return -EINVAL;
+
+        ret = kstrtoul(buf, 10, &val);
+        if (ret || (val > 1))
+                return -EINVAL;
+
+        _store_boost((int) val);
+
+        return count;
+}
+
 static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
                          size_t count)
 {
-        return _store_boost(buf, count);
+        return store_boost(buf, count);
 }
 
 static ssize_t show_cpb(struct cpufreq_policy *policy, char *buf)
 {
-        return sprintf(buf, "%u\n", boost_enabled);
+        return sprintf(buf, "%u\n", acpi_cpufreq_driver.boost_enabled);
 }
 
 cpufreq_freq_attr_rw(cpb);
@@ -554,7 +537,7 @@ static int boost_notify(struct notifier_block *nb, unsigned long action,
         switch (action) {
         case CPU_UP_PREPARE:
         case CPU_UP_PREPARE_FROZEN:
-                boost_set_msrs(boost_enabled, cpumask);
+                boost_set_msrs(acpi_cpufreq_driver.boost_enabled, cpumask);
                 break;
 
         case CPU_DOWN_PREPARE:
@@ -911,6 +894,7 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
         .resume         = acpi_cpufreq_resume,
         .name           = "acpi-cpufreq",
         .attr           = acpi_cpufreq_attr,
+        .set_boost      = _store_boost,
 };
 
 static void __init acpi_cpufreq_boost_init(void)
@@ -921,33 +905,22 @@ static void __init acpi_cpufreq_boost_init(void)
                 if (!msrs)
                         return;
 
-                boost_supported = true;
-                boost_enabled = boost_state(0);
-
+                acpi_cpufreq_driver.boost_supported = true;
+                acpi_cpufreq_driver.boost_enabled = boost_state(0);
                 get_online_cpus();
 
                 /* Force all MSRs to the same value */
-                boost_set_msrs(boost_enabled, cpu_online_mask);
+                boost_set_msrs(acpi_cpufreq_driver.boost_enabled,
+                               cpu_online_mask);
 
                 register_cpu_notifier(&boost_nb);
 
                 put_online_cpus();
-        } else
-                global_boost.attr.mode = 0444;
-
-        /* 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 (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");
+        }
 }
 
 static void __exit acpi_cpufreq_boost_exit(void)
 {
-        cpufreq_sysfs_remove_file(&(global_boost.attr));
-
         if (msrs) {
                 unregister_cpu_notifier(&boost_nb);
 
@@ -993,12 +966,11 @@ static int __init acpi_cpufreq_init(void)
                         *iter = &cpb;
         }
 #endif
+        acpi_cpufreq_boost_init();
 
         ret = cpufreq_register_driver(&acpi_cpufreq_driver);
         if (ret)
                 free_acpi_perf_data();
-        else
-                acpi_cpufreq_boost_init();
 
         return ret;
 }
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index 5519933813ea..72f87e9317e3 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -488,7 +488,8 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy)
 static struct cpufreq_driver bL_cpufreq_driver = {
         .name                   = "arm-big-little",
         .flags                  = CPUFREQ_STICKY |
-                                        CPUFREQ_HAVE_GOVERNOR_PER_POLICY,
+                                        CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
+                                        CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify                 = cpufreq_generic_frequency_table_verify,
         .target_index           = bL_cpufreq_set_target,
         .get                    = bL_cpufreq_get_rate,
diff --git a/drivers/cpufreq/at32ap-cpufreq.c b/drivers/cpufreq/at32ap-cpufreq.c
index 7c03dd84f66a..a1c79f549edb 100644
--- a/drivers/cpufreq/at32ap-cpufreq.c
+++ b/drivers/cpufreq/at32ap-cpufreq.c
@@ -21,17 +21,8 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 
-static struct clk *cpuclk;
 static struct cpufreq_frequency_table *freq_table;
 
-static unsigned int at32_get_speed(unsigned int cpu)
-{
-        /* No SMP support */
-        if (cpu)
-                return 0;
-        return (unsigned int)((clk_get_rate(cpuclk) + 500) / 1000);
-}
-
 static unsigned int     ref_freq;
 static unsigned long    loops_per_jiffy_ref;
 
@@ -39,7 +30,7 @@ static int at32_set_target(struct cpufreq_policy *policy, unsigned int index)
 {
         unsigned int old_freq, new_freq;
 
-        old_freq = at32_get_speed(0);
+        old_freq = policy->cur;
         new_freq = freq_table[index].frequency;
 
         if (!ref_freq) {
@@ -50,7 +41,7 @@ static int at32_set_target(struct cpufreq_policy *policy, unsigned int index)
         if (old_freq < new_freq)
                 boot_cpu_data.loops_per_jiffy = cpufreq_scale(
                                 loops_per_jiffy_ref, ref_freq, new_freq);
-        clk_set_rate(cpuclk, new_freq * 1000);
+        clk_set_rate(policy->clk, new_freq * 1000);
         if (new_freq < old_freq)
                 boot_cpu_data.loops_per_jiffy = cpufreq_scale(
                                 loops_per_jiffy_ref, ref_freq, new_freq);
@@ -61,6 +52,7 @@ static int at32_set_target(struct cpufreq_policy *policy, unsigned int index)
 static int at32_cpufreq_driver_init(struct cpufreq_policy *policy)
 {
         unsigned int frequency, rate, min_freq;
+        static struct clk *cpuclk;
         int retval, steps, i;
 
         if (policy->cpu != 0)
@@ -103,6 +95,7 @@ static int at32_cpufreq_driver_init(struct cpufreq_policy *policy)
                 frequency /= 2;
         }
 
+        policy->clk = cpuclk;
         freq_table[steps - 1].frequency = CPUFREQ_TABLE_END;
 
         retval = cpufreq_table_validate_and_show(policy, freq_table);
@@ -123,7 +116,7 @@ static struct cpufreq_driver at32_driver = {
         .init           = at32_cpufreq_driver_init,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = at32_set_target,
-        .get            = at32_get_speed,
+        .get            = cpufreq_generic_get,
         .flags          = CPUFREQ_STICKY,
 };
 
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index d4585ce2346c..bb7b3082efb3 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -30,11 +30,6 @@ static struct clk *cpu_clk;
 static struct regulator *cpu_reg;
 static struct cpufreq_frequency_table *freq_table;
 
-static unsigned int cpu0_get_speed(unsigned int cpu)
-{
-        return clk_get_rate(cpu_clk) / 1000;
-}
-
 static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index)
 {
         struct dev_pm_opp *opp;
@@ -44,7 +39,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index)
         int ret;
 
         freq_Hz = clk_round_rate(cpu_clk, freq_table[index].frequency * 1000);
-        if (freq_Hz < 0)
+        if (freq_Hz <= 0)
                 freq_Hz = freq_table[index].frequency * 1000;
 
         freq_exact = freq_Hz;
@@ -100,6 +95,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index)
 
 static int cpu0_cpufreq_init(struct cpufreq_policy *policy)
 {
+        policy->clk = cpu_clk;
         return cpufreq_generic_init(policy, freq_table, transition_latency);
 }
 
@@ -107,7 +103,7 @@ static struct cpufreq_driver cpu0_cpufreq_driver = {
         .flags = CPUFREQ_STICKY,
         .verify = cpufreq_generic_frequency_table_verify,
         .target_index = cpu0_set_target,
-        .get = cpu0_get_speed,
+        .get = cpufreq_generic_get,
         .init = cpu0_cpufreq_init,
         .exit = cpufreq_generic_exit,
         .name = "generic_cpu0",
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 8d19f7c06010..08ca8c9f41cd 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -39,7 +39,7 @@ static struct cpufreq_driver *cpufreq_driver;
 static DEFINE_PER_CPU(struct cpufreq_policy *, cpufreq_cpu_data);
 static DEFINE_PER_CPU(struct cpufreq_policy *, cpufreq_cpu_data_fallback);
 static DEFINE_RWLOCK(cpufreq_driver_lock);
-static DEFINE_MUTEX(cpufreq_governor_lock);
+DEFINE_MUTEX(cpufreq_governor_lock);
 static LIST_HEAD(cpufreq_policy_list);
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -176,6 +176,20 @@ int cpufreq_generic_init(struct cpufreq_policy *policy,
 }
 EXPORT_SYMBOL_GPL(cpufreq_generic_init);
 
+unsigned int cpufreq_generic_get(unsigned int cpu)
+{
+        struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
+
+        if (!policy || IS_ERR(policy->clk)) {
+                pr_err("%s: No %s associated to cpu: %d\n", __func__,
+                                policy ? "clk" : "policy", cpu);
+                return 0;
+        }
+
+        return clk_get_rate(policy->clk) / 1000;
+}
+EXPORT_SYMBOL_GPL(cpufreq_generic_get);
+
 struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)
 {
         struct cpufreq_policy *policy = NULL;
@@ -320,10 +334,51 @@ void cpufreq_notify_transition(struct cpufreq_policy *policy,
 }
 EXPORT_SYMBOL_GPL(cpufreq_notify_transition);
 
+/* Do post notifications when there are chances that transition has failed */
+void cpufreq_notify_post_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, int transition_failed)
+{
+        cpufreq_notify_transition(policy, freqs, CPUFREQ_POSTCHANGE);
+        if (!transition_failed)
+                return;
+
+        swap(freqs->old, freqs->new);
+        cpufreq_notify_transition(policy, freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, freqs, CPUFREQ_POSTCHANGE);
+}
+EXPORT_SYMBOL_GPL(cpufreq_notify_post_transition);
+
 
 /*********************************************************************
  *                          SYSFS INTERFACE                          *
  *********************************************************************/
+ssize_t show_boost(struct kobject *kobj,
+                                 struct attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", cpufreq_driver->boost_enabled);
+}
+
+static ssize_t store_boost(struct kobject *kobj, struct attribute *attr,
+                                  const char *buf, size_t count)
+{
+        int ret, enable;
+
+        ret = sscanf(buf, "%d", &enable);
+        if (ret != 1 || enable < 0 || enable > 1)
+                return -EINVAL;
+
+        if (cpufreq_boost_trigger_state(enable)) {
+                pr_err("%s: Cannot %s BOOST!\n", __func__,
+                       enable ? "enable" : "disable");
+                return -EINVAL;
+        }
+
+        pr_debug("%s: cpufreq BOOST %s\n", __func__,
+                 enable ? "enabled" : "disabled");
+
+        return count;
+}
+define_one_global_rw(boost);
 
 static struct cpufreq_governor *__find_governor(const char *str_governor)
 {
@@ -929,6 +984,9 @@ static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy)
         struct kobject *kobj;
         struct completion *cmp;
 
+        blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                        CPUFREQ_REMOVE_POLICY, policy);
+
         down_read(&policy->rwsem);
         kobj = &policy->kobj;
         cmp = &policy->kobj_unregister;
@@ -1051,6 +1109,11 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif,
                 goto err_set_policy_cpu;
         }
 
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
+        for_each_cpu(j, policy->cpus)
+                per_cpu(cpufreq_cpu_data, j) = policy;
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
         if (cpufreq_driver->get) {
                 policy->cur = cpufreq_driver->get(policy->cpu);
                 if (!policy->cur) {
@@ -1059,6 +1122,46 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif,
                 }
         }
 
+        /*
+         * Sometimes boot loaders set CPU frequency to a value outside of
+         * frequency table present with cpufreq core. In such cases CPU might be
+         * unstable if it has to run on that frequency for long duration of time
+         * and so its better to set it to a frequency which is specified in
+         * freq-table. This also makes cpufreq stats inconsistent as
+         * cpufreq-stats would fail to register because current frequency of CPU
+         * isn't found in freq-table.
+         *
+         * Because we don't want this change to effect boot process badly, we go
+         * for the next freq which is >= policy->cur ('cur' must be set by now,
+         * otherwise we will end up setting freq to lowest of the table as 'cur'
+         * is initialized to zero).
+         *
+         * We are passing target-freq as "policy->cur - 1" otherwise
+         * __cpufreq_driver_target() would simply fail, as policy->cur will be
+         * equal to target-freq.
+         */
+        if ((cpufreq_driver->flags & CPUFREQ_NEED_INITIAL_FREQ_CHECK)
+            && has_target()) {
+                /* Are we running at unknown frequency ? */
+                ret = cpufreq_frequency_table_get_index(policy, policy->cur);
+                if (ret == -EINVAL) {
+                        /* Warn user and fix it */
+                        pr_warn("%s: CPU%d: Running at unlisted freq: %u KHz\n",
+                                __func__, policy->cpu, policy->cur);
+                        ret = __cpufreq_driver_target(policy, policy->cur - 1,
+                                CPUFREQ_RELATION_L);
+
+                        /*
+                         * Reaching here after boot in a few seconds may not
+                         * mean that system will remain stable at "unknown"
+                         * frequency for longer duration. Hence, a BUG_ON().
+                         */
+                        BUG_ON(ret);
+                        pr_warn("%s: CPU%d: Unlisted initial frequency changed to: %u KHz\n",
+                                __func__, policy->cpu, policy->cur);
+                }
+        }
+
         /* related cpus should atleast have policy->cpus */
         cpumask_or(policy->related_cpus, policy->related_cpus, policy->cpus);
 
@@ -1085,15 +1188,12 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif,
         }
 #endif
 
-        write_lock_irqsave(&cpufreq_driver_lock, flags);
-        for_each_cpu(j, policy->cpus)
-                per_cpu(cpufreq_cpu_data, j) = policy;
-        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
-
         if (!frozen) {
                 ret = cpufreq_add_dev_interface(policy, dev);
                 if (ret)
                         goto err_out_unregister;
+                blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                                CPUFREQ_CREATE_POLICY, policy);
         }
 
         write_lock_irqsave(&cpufreq_driver_lock, flags);
@@ -1115,12 +1215,12 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif,
         return 0;
 
 err_out_unregister:
+err_get_freq:
         write_lock_irqsave(&cpufreq_driver_lock, flags);
         for_each_cpu(j, policy->cpus)
                 per_cpu(cpufreq_cpu_data, j) = NULL;
         write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
-err_get_freq:
         if (cpufreq_driver->exit)
                 cpufreq_driver->exit(policy);
 err_set_policy_cpu:
@@ -1725,17 +1825,8 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
                         pr_err("%s: Failed to change cpu frequency: %d\n",
                                         __func__, retval);
 
-                if (notify) {
-                        /*
-                         * Notify with old freq in case we failed to change
-                         * frequency
-                         */
-                        if (retval)
-                                freqs.new = freqs.old;
-
-                        cpufreq_notify_transition(policy, &freqs,
-                                        CPUFREQ_POSTCHANGE);
-                }
+                if (notify)
+                        cpufreq_notify_post_transition(policy, &freqs, retval);
         }
 
 out:
@@ -2120,6 +2211,73 @@ static struct notifier_block __refdata cpufreq_cpu_notifier = {
 };
 
 /*********************************************************************
+ *               BOOST                                               *
+ *********************************************************************/
+static int cpufreq_boost_set_sw(int state)
+{
+        struct cpufreq_frequency_table *freq_table;
+        struct cpufreq_policy *policy;
+        int ret = -EINVAL;
+
+        list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {
+                freq_table = cpufreq_frequency_get_table(policy->cpu);
+                if (freq_table) {
+                        ret = cpufreq_frequency_table_cpuinfo(policy,
+                                                        freq_table);
+                        if (ret) {
+                                pr_err("%s: Policy frequency update failed\n",
+                                       __func__);
+                                break;
+                        }
+                        policy->user_policy.max = policy->max;
+                        __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
+                }
+        }
+
+        return ret;
+}
+
+int cpufreq_boost_trigger_state(int state)
+{
+        unsigned long flags;
+        int ret = 0;
+
+        if (cpufreq_driver->boost_enabled == state)
+                return 0;
+
+        write_lock_irqsave(&cpufreq_driver_lock, flags);
+        cpufreq_driver->boost_enabled = state;
+        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
+        ret = cpufreq_driver->set_boost(state);
+        if (ret) {
+                write_lock_irqsave(&cpufreq_driver_lock, flags);
+                cpufreq_driver->boost_enabled = !state;
+                write_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
+                pr_err("%s: Cannot %s BOOST\n", __func__,
+                       state ? "enable" : "disable");
+        }
+
+        return ret;
+}
+
+int cpufreq_boost_supported(void)
+{
+        if (likely(cpufreq_driver))
+                return cpufreq_driver->boost_supported;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cpufreq_boost_supported);
+
+int cpufreq_boost_enabled(void)
+{
+        return cpufreq_driver->boost_enabled;
+}
+EXPORT_SYMBOL_GPL(cpufreq_boost_enabled);
+
+/*********************************************************************
  *               REGISTER / UNREGISTER CPUFREQ DRIVER                *
  *********************************************************************/
 
@@ -2159,9 +2317,25 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
         cpufreq_driver = driver_data;
         write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
+        if (cpufreq_boost_supported()) {
+                /*
+                 * Check if driver provides function to enable boost -
+                 * if not, use cpufreq_boost_set_sw as default
+                 */
+                if (!cpufreq_driver->set_boost)
+                        cpufreq_driver->set_boost = cpufreq_boost_set_sw;
+
+                ret = cpufreq_sysfs_create_file(&boost.attr);
+                if (ret) {
+                        pr_err("%s: cannot register global BOOST sysfs file\n",
+                                __func__);
+                        goto err_null_driver;
+                }
+        }
+
         ret = subsys_interface_register(&cpufreq_interface);
         if (ret)
-                goto err_null_driver;
+                goto err_boost_unreg;
 
         if (!(cpufreq_driver->flags & CPUFREQ_STICKY)) {
                 int i;
@@ -2188,6 +2362,9 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
         return 0;
 err_if_unreg:
         subsys_interface_unregister(&cpufreq_interface);
+err_boost_unreg:
+        if (cpufreq_boost_supported())
+                cpufreq_sysfs_remove_file(&boost.attr);
 err_null_driver:
         write_lock_irqsave(&cpufreq_driver_lock, flags);
         cpufreq_driver = NULL;
@@ -2214,6 +2391,9 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)
         pr_debug("unregistering driver %s\n", driver->name);
 
         subsys_interface_unregister(&cpufreq_interface);
+        if (cpufreq_boost_supported())
+                cpufreq_sysfs_remove_file(&boost.attr);
+
         unregister_hotcpu_notifier(&cpufreq_cpu_notifier);
 
         down_write(&cpufreq_rwsem);
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index e6be63561fa6..ba43991ba98a 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -119,8 +119,9 @@ void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,
 {
         int i;
 
+        mutex_lock(&cpufreq_governor_lock);
         if (!policy->governor_enabled)
-                return;
+                goto out_unlock;
 
         if (!all_cpus) {
                 /*
@@ -135,6 +136,9 @@ void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,
                 for_each_cpu(i, policy->cpus)
                         __gov_queue_work(i, dbs_data, delay);
         }
+
+out_unlock:
+        mutex_unlock(&cpufreq_governor_lock);
 }
 EXPORT_SYMBOL_GPL(gov_queue_work);
 
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index b5f2b8618949..bfb9ae14142c 100644
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -257,6 +257,8 @@ static ssize_t show_sampling_rate_min_gov_pol				\
         return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);       \
 }
 
+extern struct mutex cpufreq_governor_lock;
+
 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_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 4cf0d2805cb2..5793e1447fb1 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -151,44 +151,36 @@ static int freq_table_get_index(struct cpufreq_stats *stat, unsigned int freq)
         return -1;
 }
 
-/* should be called late in the CPU removal sequence so that the stats
- * memory is still available in case someone tries to use it.
- */
-static void cpufreq_stats_free_table(unsigned int cpu)
+static void __cpufreq_stats_free_table(struct cpufreq_policy *policy)
 {
-        struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, cpu);
+        struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu);
 
-        if (stat) {
-                pr_debug("%s: Free stat table\n", __func__);
-                kfree(stat->time_in_state);
-                kfree(stat);
-                per_cpu(cpufreq_stats_table, cpu) = NULL;
-        }
+        if (!stat)
+                return;
+
+        pr_debug("%s: Free stat table\n", __func__);
+
+        sysfs_remove_group(&policy->kobj, &stats_attr_group);
+        kfree(stat->time_in_state);
+        kfree(stat);
+        per_cpu(cpufreq_stats_table, policy->cpu) = NULL;
 }
 
-/* must be called early in the CPU removal sequence (before
- * cpufreq_remove_dev) so that policy is still valid.
- */
-static void cpufreq_stats_free_sysfs(unsigned int cpu)
+static void cpufreq_stats_free_table(unsigned int cpu)
 {
-        struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
+        struct cpufreq_policy *policy;
 
+        policy = cpufreq_cpu_get(cpu);
         if (!policy)
                 return;
 
-        if (!cpufreq_frequency_get_table(cpu))
-                goto put_ref;
-
-        if (!policy_is_shared(policy)) {
-                pr_debug("%s: Free sysfs stat\n", __func__);
-                sysfs_remove_group(&policy->kobj, &stats_attr_group);
-        }
+        if (cpufreq_frequency_get_table(policy->cpu))
+                __cpufreq_stats_free_table(policy);
 
-put_ref:
         cpufreq_cpu_put(policy);
 }
 
-static int cpufreq_stats_create_table(struct cpufreq_policy *policy,
+static int __cpufreq_stats_create_table(struct cpufreq_policy *policy,
                 struct cpufreq_frequency_table *table)
 {
         unsigned int i, j, count = 0, ret = 0;
@@ -261,6 +253,26 @@ error_get_fail:
         return ret;
 }
 
+static void cpufreq_stats_create_table(unsigned int cpu)
+{
+        struct cpufreq_policy *policy;
+        struct cpufreq_frequency_table *table;
+
+        /*
+         * "likely(!policy)" because normally cpufreq_stats will be registered
+         * before cpufreq driver
+         */
+        policy = cpufreq_cpu_get(cpu);
+        if (likely(!policy))
+                return;
+
+        table = cpufreq_frequency_get_table(policy->cpu);
+        if (likely(table))
+                __cpufreq_stats_create_table(policy, table);
+
+        cpufreq_cpu_put(policy);
+}
+
 static void cpufreq_stats_update_policy_cpu(struct cpufreq_policy *policy)
 {
         struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table,
@@ -277,7 +289,7 @@ static void cpufreq_stats_update_policy_cpu(struct cpufreq_policy *policy)
 static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
                 unsigned long val, void *data)
 {
-        int ret;
+        int ret = 0;
         struct cpufreq_policy *policy = data;
         struct cpufreq_frequency_table *table;
         unsigned int cpu = policy->cpu;
@@ -287,15 +299,16 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
                 return 0;
         }
 
-        if (val != CPUFREQ_NOTIFY)
-                return 0;
         table = cpufreq_frequency_get_table(cpu);
         if (!table)
                 return 0;
-        ret = cpufreq_stats_create_table(policy, table);
-        if (ret)
-                return ret;
-        return 0;
+
+        if (val == CPUFREQ_CREATE_POLICY)
+                ret = __cpufreq_stats_create_table(policy, table);
+        else if (val == CPUFREQ_REMOVE_POLICY)
+                __cpufreq_stats_free_table(policy);
+
+        return ret;
 }
 
 static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
@@ -334,29 +347,6 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
         return 0;
 }
 
-static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
-                                               unsigned long action,
-                                               void *hcpu)
-{
-        unsigned int cpu = (unsigned long)hcpu;
-
-        switch (action) {
-        case CPU_DOWN_PREPARE:
-                cpufreq_stats_free_sysfs(cpu);
-                break;
-        case CPU_DEAD:
-                cpufreq_stats_free_table(cpu);
-                break;
-        }
-        return NOTIFY_OK;
-}
-
-/* priority=1 so this will get called before cpufreq_remove_dev */
-static struct notifier_block cpufreq_stat_cpu_notifier __refdata = {
-        .notifier_call = cpufreq_stat_cpu_callback,
-        .priority = 1,
-};
-
 static struct notifier_block notifier_policy_block = {
         .notifier_call = cpufreq_stat_notifier_policy
 };
@@ -376,14 +366,14 @@ static int __init cpufreq_stats_init(void)
         if (ret)
                 return ret;
 
-        register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
+        for_each_online_cpu(cpu)
+                cpufreq_stats_create_table(cpu);
 
         ret = cpufreq_register_notifier(&notifier_trans_block,
                                 CPUFREQ_TRANSITION_NOTIFIER);
         if (ret) {
                 cpufreq_unregister_notifier(&notifier_policy_block,
                                 CPUFREQ_POLICY_NOTIFIER);
-                unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
                 for_each_online_cpu(cpu)
                         cpufreq_stats_free_table(cpu);
                 return ret;
@@ -399,11 +389,8 @@ static void __exit cpufreq_stats_exit(void)
                         CPUFREQ_POLICY_NOTIFIER);
         cpufreq_unregister_notifier(&notifier_trans_block,
                         CPUFREQ_TRANSITION_NOTIFIER);
-        unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
-        for_each_online_cpu(cpu) {
+        for_each_online_cpu(cpu)
                 cpufreq_stats_free_table(cpu);
-                cpufreq_stats_free_sysfs(cpu);
-        }
 }
 
 MODULE_AUTHOR("Zou Nan hai <nanhai.zou@intel.com>");
diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index 5e8a854381b7..2cf33848d86e 100644
--- a/drivers/cpufreq/davinci-cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -58,14 +58,6 @@ static int davinci_verify_speed(struct cpufreq_policy *policy)
         return 0;
 }
 
-static unsigned int davinci_getspeed(unsigned int cpu)
-{
-        if (cpu)
-                return 0;
-
-        return clk_get_rate(cpufreq.armclk) / 1000;
-}
-
 static int davinci_target(struct cpufreq_policy *policy, unsigned int idx)
 {
         struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;
@@ -73,7 +65,7 @@ static int davinci_target(struct cpufreq_policy *policy, unsigned int idx)
         unsigned int old_freq, new_freq;
         int ret = 0;
 
-        old_freq = davinci_getspeed(0);
+        old_freq = policy->cur;
         new_freq = pdata->freq_table[idx].frequency;
 
         /* if moving to higher frequency, up the voltage beforehand */
@@ -116,6 +108,8 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
                         return result;
         }
 
+        policy->clk = cpufreq.armclk;
+
         /*
          * Time measurement across the target() function yields ~1500-1800us
          * time taken with no drivers on notification list.
@@ -126,10 +120,10 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver davinci_driver = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = davinci_verify_speed,
         .target_index   = davinci_target,
-        .get            = davinci_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = davinci_cpu_init,
         .exit           = cpufreq_generic_exit,
         .name           = "davinci",
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 0e67ab96321a..412a78bb0c94 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -26,32 +26,18 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
         return clk_set_rate(armss_clk, freq_table[index].frequency * 1000);
 }
 
-static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
-{
-        int i = 0;
-        unsigned long freq = clk_get_rate(armss_clk) / 1000;
-
-        /* The value is rounded to closest frequency in the defined table. */
-        while (freq_table[i + 1].frequency != CPUFREQ_TABLE_END) {
-                if (freq < freq_table[i].frequency +
-                   (freq_table[i + 1].frequency - freq_table[i].frequency) / 2)
-                        return freq_table[i].frequency;
-                i++;
-        }
-
-        return freq_table[i].frequency;
-}
-
 static int dbx500_cpufreq_init(struct cpufreq_policy *policy)
 {
+        policy->clk = armss_clk;
         return cpufreq_generic_init(policy, freq_table, 20 * 1000);
 }
 
 static struct cpufreq_driver dbx500_cpufreq_driver = {
-        .flags  = CPUFREQ_STICKY | CPUFREQ_CONST_LOOPS,
+        .flags  = CPUFREQ_STICKY | CPUFREQ_CONST_LOOPS |
+                        CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify = cpufreq_generic_frequency_table_verify,
         .target_index = dbx500_cpufreq_target,
-        .get    = dbx500_cpufreq_getspeed,
+        .get    = cpufreq_generic_get,
         .init   = dbx500_cpufreq_init,
         .name   = "DBX500",
         .attr   = cpufreq_generic_attr,
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index f3c22874da75..fcd2914d081a 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -17,6 +17,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/cpufreq.h>
 #include <linux/suspend.h>
+#include <linux/platform_device.h>
 
 #include <plat/cpu.h>
 
@@ -30,11 +31,6 @@ static unsigned int locking_frequency;
 static bool frequency_locked;
 static DEFINE_MUTEX(cpufreq_lock);
 
-static unsigned int exynos_getspeed(unsigned int cpu)
-{
-        return clk_get_rate(exynos_info->cpu_clk) / 1000;
-}
-
 static int exynos_cpufreq_get_index(unsigned int freq)
 {
         struct cpufreq_frequency_table *freq_table = exynos_info->freq_table;
@@ -214,25 +210,29 @@ static struct notifier_block exynos_cpufreq_nb = {
 
 static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
+        policy->clk = exynos_info->cpu_clk;
         return cpufreq_generic_init(policy, exynos_info->freq_table, 100000);
 }
 
 static struct cpufreq_driver exynos_driver = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = exynos_target,
-        .get            = exynos_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = exynos_cpufreq_cpu_init,
         .exit           = cpufreq_generic_exit,
         .name           = "exynos_cpufreq",
         .attr           = cpufreq_generic_attr,
+#ifdef CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW
+        .boost_supported = true,
+#endif
 #ifdef CONFIG_PM
         .suspend        = exynos_cpufreq_suspend,
         .resume         = exynos_cpufreq_resume,
 #endif
 };
 
-static int __init exynos_cpufreq_init(void)
+static int exynos_cpufreq_probe(struct platform_device *pdev)
 {
         int ret = -EINVAL;
 
@@ -263,7 +263,7 @@ static int __init exynos_cpufreq_init(void)
                 goto err_vdd_arm;
         }
 
-        locking_frequency = exynos_getspeed(0);
+        locking_frequency = clk_get_rate(exynos_info->cpu_clk) / 1000;
 
         register_pm_notifier(&exynos_cpufreq_nb);
 
@@ -281,4 +281,12 @@ err_vdd_arm:
         kfree(exynos_info);
         return -EINVAL;
 }
-late_initcall(exynos_cpufreq_init);
+
+static struct platform_driver exynos_cpufreq_platdrv = {
+        .driver = {
+                .name   = "exynos-cpufreq",
+                .owner  = THIS_MODULE,
+        },
+        .probe = exynos_cpufreq_probe,
+};
+module_platform_driver(exynos_cpufreq_platdrv);
diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c
index 869e48297e28..7c11ace3b3fc 100644
--- a/drivers/cpufreq/exynos4x12-cpufreq.c
+++ b/drivers/cpufreq/exynos4x12-cpufreq.c
@@ -30,7 +30,7 @@ static unsigned int exynos4x12_volt_table[] = {
 };
 
 static struct cpufreq_frequency_table exynos4x12_freq_table[] = {
-        {L0, CPUFREQ_ENTRY_INVALID},
+        {CPUFREQ_BOOST_FREQ, 1500 * 1000},
         {L1, 1400 * 1000},
         {L2, 1300 * 1000},
         {L3, 1200 * 1000},
diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c
index 5ee2ce1ad424..5f90b82a4082 100644
--- a/drivers/cpufreq/exynos5250-cpufreq.c
+++ b/drivers/cpufreq/exynos5250-cpufreq.c
@@ -101,12 +101,12 @@ static void set_clkdiv(unsigned int div_index)
                 cpu_relax();
 }
 
-static void set_apll(unsigned int new_index,
-                             unsigned int old_index)
+static void set_apll(unsigned int index)
 {
-        unsigned int tmp, pdiv;
+        unsigned int tmp;
+        unsigned int freq = apll_freq_5250[index].freq;
 
-        /* 1. MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */
+        /* MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */
         clk_set_parent(moutcore, mout_mpll);
 
         do {
@@ -115,24 +115,9 @@ static void set_apll(unsigned int new_index,
                 tmp &= 0x7;
         } while (tmp != 0x2);
 
-        /* 2. Set APLL Lock time */
-        pdiv = ((apll_freq_5250[new_index].mps >> 8) & 0x3f);
-
-        __raw_writel((pdiv * 250), EXYNOS5_APLL_LOCK);
+        clk_set_rate(mout_apll, freq * 1000);
 
-        /* 3. Change PLL PMS values */
-        tmp = __raw_readl(EXYNOS5_APLL_CON0);
-        tmp &= ~((0x3ff << 16) | (0x3f << 8) | (0x7 << 0));
-        tmp |= apll_freq_5250[new_index].mps;
-        __raw_writel(tmp, EXYNOS5_APLL_CON0);
-
-        /* 4. wait_lock_time */
-        do {
-                cpu_relax();
-                tmp = __raw_readl(EXYNOS5_APLL_CON0);
-        } while (!(tmp & (0x1 << 29)));
-
-        /* 5. MUX_CORE_SEL = APLL */
+        /* MUX_CORE_SEL = APLL */
         clk_set_parent(moutcore, mout_apll);
 
         do {
@@ -140,55 +125,17 @@ static void set_apll(unsigned int new_index,
                 tmp = __raw_readl(EXYNOS5_CLKMUX_STATCPU);
                 tmp &= (0x7 << 16);
         } while (tmp != (0x1 << 16));
-
-}
-
-static bool exynos5250_pms_change(unsigned int old_index, unsigned int new_index)
-{
-        unsigned int old_pm = apll_freq_5250[old_index].mps >> 8;
-        unsigned int new_pm = apll_freq_5250[new_index].mps >> 8;
-
-        return (old_pm == new_pm) ? 0 : 1;
 }
 
 static void exynos5250_set_frequency(unsigned int old_index,
                                   unsigned int new_index)
 {
-        unsigned int tmp;
-
         if (old_index > new_index) {
-                if (!exynos5250_pms_change(old_index, new_index)) {
-                        /* 1. Change the system clock divider values */
-                        set_clkdiv(new_index);
-                        /* 2. Change just s value in apll m,p,s value */
-                        tmp = __raw_readl(EXYNOS5_APLL_CON0);
-                        tmp &= ~(0x7 << 0);
-                        tmp |= apll_freq_5250[new_index].mps & 0x7;
-                        __raw_writel(tmp, EXYNOS5_APLL_CON0);
-
-                } else {
-                        /* Clock Configuration Procedure */
-                        /* 1. Change the system clock divider values */
-                        set_clkdiv(new_index);
-                        /* 2. Change the apll m,p,s value */
-                        set_apll(new_index, old_index);
-                }
+                set_clkdiv(new_index);
+                set_apll(new_index);
         } else if (old_index < new_index) {
-                if (!exynos5250_pms_change(old_index, new_index)) {
-                        /* 1. Change just s value in apll m,p,s value */
-                        tmp = __raw_readl(EXYNOS5_APLL_CON0);
-                        tmp &= ~(0x7 << 0);
-                        tmp |= apll_freq_5250[new_index].mps & 0x7;
-                        __raw_writel(tmp, EXYNOS5_APLL_CON0);
-                        /* 2. Change the system clock divider values */
-                        set_clkdiv(new_index);
-                } else {
-                        /* Clock Configuration Procedure */
-                        /* 1. Change the apll m,p,s value */
-                        set_apll(new_index, old_index);
-                        /* 2. Change the system clock divider values */
-                        set_clkdiv(new_index);
-                }
+                set_apll(new_index);
+                set_clkdiv(new_index);
         }
 }
 
@@ -221,7 +168,6 @@ int exynos5250_cpufreq_init(struct exynos_dvfs_info *info)
         info->volt_table = exynos5250_volt_table;
         info->freq_table = exynos5250_freq_table;
         info->set_freq = exynos5250_set_frequency;
-        info->need_apll_change = exynos5250_pms_change;
 
         return 0;
 
diff --git a/drivers/cpufreq/exynos5440-cpufreq.c b/drivers/cpufreq/exynos5440-cpufreq.c
index 76bef8b078cb..49b756015316 100644
--- a/drivers/cpufreq/exynos5440-cpufreq.c
+++ b/drivers/cpufreq/exynos5440-cpufreq.c
@@ -100,7 +100,6 @@ struct exynos_dvfs_data {
         struct resource *mem;
         int irq;
         struct clk *cpu_clk;
-        unsigned int cur_frequency;
         unsigned int latency;
         struct cpufreq_frequency_table *freq_table;
         unsigned int freq_count;
@@ -165,7 +164,7 @@ static int init_div_table(void)
         return 0;
 }
 
-static void exynos_enable_dvfs(void)
+static void exynos_enable_dvfs(unsigned int cur_frequency)
 {
         unsigned int tmp, i, cpu;
         struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table;
@@ -184,18 +183,18 @@ static void exynos_enable_dvfs(void)
 
         /* Set initial performance index */
         for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++)
-                if (freq_table[i].frequency == dvfs_info->cur_frequency)
+                if (freq_table[i].frequency == cur_frequency)
                         break;
 
         if (freq_table[i].frequency == CPUFREQ_TABLE_END) {
                 dev_crit(dvfs_info->dev, "Boot up frequency not supported\n");
                 /* Assign the highest frequency */
                 i = 0;
-                dvfs_info->cur_frequency = freq_table[i].frequency;
+                cur_frequency = freq_table[i].frequency;
         }
 
         dev_info(dvfs_info->dev, "Setting dvfs initial frequency = %uKHZ",
-                                                dvfs_info->cur_frequency);
+                                                cur_frequency);
 
         for (cpu = 0; cpu < CONFIG_NR_CPUS; cpu++) {
                 tmp = __raw_readl(dvfs_info->base + XMU_C0_3_PSTATE + cpu * 4);
@@ -209,11 +208,6 @@ static void exynos_enable_dvfs(void)
                                 dvfs_info->base + XMU_DVFS_CTRL);
 }
 
-static unsigned int exynos_getspeed(unsigned int cpu)
-{
-        return dvfs_info->cur_frequency;
-}
-
 static int exynos_target(struct cpufreq_policy *policy, unsigned int index)
 {
         unsigned int tmp;
@@ -222,7 +216,7 @@ static int exynos_target(struct cpufreq_policy *policy, unsigned int index)
 
         mutex_lock(&cpufreq_lock);
 
-        freqs.old = dvfs_info->cur_frequency;
+        freqs.old = policy->cur;
         freqs.new = freq_table[index].frequency;
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
@@ -250,7 +244,7 @@ static void exynos_cpufreq_work(struct work_struct *work)
                 goto skip_work;
 
         mutex_lock(&cpufreq_lock);
-        freqs.old = dvfs_info->cur_frequency;
+        freqs.old = policy->cur;
 
         cur_pstate = __raw_readl(dvfs_info->base + XMU_P_STATUS);
         if (cur_pstate >> C0_3_PSTATE_VALID_SHIFT & 0x1)
@@ -260,10 +254,9 @@ static void exynos_cpufreq_work(struct work_struct *work)
 
         if (likely(index < dvfs_info->freq_count)) {
                 freqs.new = freq_table[index].frequency;
-                dvfs_info->cur_frequency = freqs.new;
         } else {
                 dev_crit(dvfs_info->dev, "New frequency out of range\n");
-                freqs.new = dvfs_info->cur_frequency;
+                freqs.new = freqs.old;
         }
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
@@ -307,15 +300,17 @@ static void exynos_sort_descend_freq_table(void)
 
 static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
+        policy->clk = dvfs_info->cpu_clk;
         return cpufreq_generic_init(policy, dvfs_info->freq_table,
                         dvfs_info->latency);
 }
 
 static struct cpufreq_driver exynos_driver = {
-        .flags          = CPUFREQ_STICKY | CPUFREQ_ASYNC_NOTIFICATION,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_ASYNC_NOTIFICATION |
+                                CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = exynos_target,
-        .get            = exynos_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = exynos_cpufreq_cpu_init,
         .exit           = cpufreq_generic_exit,
         .name           = CPUFREQ_NAME,
@@ -335,6 +330,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
         int ret = -EINVAL;
         struct device_node *np;
         struct resource res;
+        unsigned int cur_frequency;
 
         np =  pdev->dev.of_node;
         if (!np)
@@ -391,13 +387,13 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
                 goto err_free_table;
         }
 
-        dvfs_info->cur_frequency = clk_get_rate(dvfs_info->cpu_clk);
-        if (!dvfs_info->cur_frequency) {
+        cur_frequency = clk_get_rate(dvfs_info->cpu_clk);
+        if (!cur_frequency) {
                 dev_err(dvfs_info->dev, "Failed to get clock rate\n");
                 ret = -EINVAL;
                 goto err_free_table;
         }
-        dvfs_info->cur_frequency /= 1000;
+        cur_frequency /= 1000;
 
         INIT_WORK(&dvfs_info->irq_work, exynos_cpufreq_work);
         ret = devm_request_irq(dvfs_info->dev, dvfs_info->irq,
@@ -414,7 +410,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
                 goto err_free_table;
         }
 
-        exynos_enable_dvfs();
+        exynos_enable_dvfs(cur_frequency);
         ret = cpufreq_register_driver(&exynos_driver);
         if (ret) {
                 dev_err(dvfs_info->dev,
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index 3458d27f63b4..8e54f97899ba 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -32,6 +32,10 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
 
                         continue;
                 }
+                if (!cpufreq_boost_enabled()
+                    && table[i].driver_data == CPUFREQ_BOOST_FREQ)
+                        continue;
+
                 pr_debug("table entry %u: %u kHz, %u driver_data\n",
                                         i, freq, table[i].driver_data);
                 if (freq < min_freq)
@@ -178,11 +182,34 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
 }
 EXPORT_SYMBOL_GPL(cpufreq_frequency_table_target);
 
+int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
+                unsigned int freq)
+{
+        struct cpufreq_frequency_table *table;
+        int i;
+
+        table = cpufreq_frequency_get_table(policy->cpu);
+        if (unlikely(!table)) {
+                pr_debug("%s: Unable to find frequency table\n", __func__);
+                return -ENOENT;
+        }
+
+        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
+                if (table[i].frequency == freq)
+                        return i;
+        }
+
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(cpufreq_frequency_table_get_index);
+
 static DEFINE_PER_CPU(struct cpufreq_frequency_table *, cpufreq_show_table);
+
 /**
  * show_available_freqs - show available frequencies for the specified CPU
  */
-static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf)
+static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf,
+                                    bool show_boost)
 {
         unsigned int i = 0;
         unsigned int cpu = policy->cpu;
@@ -197,6 +224,20 @@ static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf)
         for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
                 if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
                         continue;
+                /*
+                 * show_boost = true and driver_data = BOOST freq
+                 * display BOOST freqs
+                 *
+                 * show_boost = false and driver_data = BOOST freq
+                 * show_boost = true and driver_data != BOOST freq
+                 * continue - do not display anything
+                 *
+                 * show_boost = false and driver_data != BOOST freq
+                 * display NON BOOST freqs
+                 */
+                if (show_boost ^ (table[i].driver_data == CPUFREQ_BOOST_FREQ))
+                        continue;
+
                 count += sprintf(&buf[count], "%d ", table[i].frequency);
         }
         count += sprintf(&buf[count], "\n");
@@ -205,16 +246,39 @@ static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf)
 
 }
 
-struct freq_attr cpufreq_freq_attr_scaling_available_freqs = {
-        .attr = { .name = "scaling_available_frequencies",
-                  .mode = 0444,
-                },
-        .show = show_available_freqs,
-};
+#define cpufreq_attr_available_freq(_name)        \
+struct freq_attr cpufreq_freq_attr_##_name##_freqs =     \
+__ATTR_RO(_name##_frequencies)
+
+/**
+ * show_scaling_available_frequencies - show available normal frequencies for
+ * the specified CPU
+ */
+static ssize_t scaling_available_frequencies_show(struct cpufreq_policy *policy,
+                                                  char *buf)
+{
+        return show_available_freqs(policy, buf, false);
+}
+cpufreq_attr_available_freq(scaling_available);
 EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_available_freqs);
 
+/**
+ * show_available_boost_freqs - show available boost frequencies for
+ * the specified CPU
+ */
+static ssize_t scaling_boost_frequencies_show(struct cpufreq_policy *policy,
+                                              char *buf)
+{
+        return show_available_freqs(policy, buf, true);
+}
+cpufreq_attr_available_freq(scaling_boost);
+EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_boost_freqs);
+
 struct freq_attr *cpufreq_generic_attr[] = {
         &cpufreq_freq_attr_scaling_available_freqs,
+#ifdef CONFIG_CPU_FREQ_BOOST_SW
+        &cpufreq_freq_attr_scaling_boost_freqs,
+#endif
         NULL,
 };
 EXPORT_SYMBOL_GPL(cpufreq_generic_attr);
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 4b3f18e5f36b..ce69059be1fc 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -35,10 +35,8 @@ static struct device *cpu_dev;
 static struct cpufreq_frequency_table *freq_table;
 static unsigned int transition_latency;
 
-static unsigned int imx6q_get_speed(unsigned int cpu)
-{
-        return clk_get_rate(arm_clk) / 1000;
-}
+static u32 *imx6_soc_volt;
+static u32 soc_opp_count;
 
 static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
 {
@@ -69,23 +67,22 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
 
         /* scaling up?  scale voltage before frequency */
         if (new_freq > old_freq) {
+                ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
+                if (ret) {
+                        dev_err(cpu_dev, "failed to scale vddpu up: %d\n", ret);
+                        return ret;
+                }
+                ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);
+                if (ret) {
+                        dev_err(cpu_dev, "failed to scale vddsoc up: %d\n", ret);
+                        return ret;
+                }
                 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;
                 }
-
-                /*
-                 * Need to increase vddpu and vddsoc for safety
-                 * if we are about to run at 1.2 GHz.
-                 */
-                if (new_freq == FREQ_1P2_GHZ / 1000) {
-                        regulator_set_voltage_tol(pu_reg,
-                                        PU_SOC_VOLTAGE_HIGH, 0);
-                        regulator_set_voltage_tol(soc_reg,
-                                        PU_SOC_VOLTAGE_HIGH, 0);
-                }
         }
 
         /*
@@ -120,12 +117,15 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
                                  "failed to scale vddarm down: %d\n", ret);
                         ret = 0;
                 }
-
-                if (old_freq == FREQ_1P2_GHZ / 1000) {
-                        regulator_set_voltage_tol(pu_reg,
-                                        PU_SOC_VOLTAGE_NORMAL, 0);
-                        regulator_set_voltage_tol(soc_reg,
-                                        PU_SOC_VOLTAGE_NORMAL, 0);
+                ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);
+                if (ret) {
+                        dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);
+                        ret = 0;
+                }
+                ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
+                if (ret) {
+                        dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);
+                        ret = 0;
                 }
         }
 
@@ -134,13 +134,15 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
 
 static int imx6q_cpufreq_init(struct cpufreq_policy *policy)
 {
+        policy->clk = arm_clk;
         return cpufreq_generic_init(policy, freq_table, transition_latency);
 }
 
 static struct cpufreq_driver imx6q_cpufreq_driver = {
+        .flags = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify = cpufreq_generic_frequency_table_verify,
         .target_index = imx6q_set_target,
-        .get = imx6q_get_speed,
+        .get = cpufreq_generic_get,
         .init = imx6q_cpufreq_init,
         .exit = cpufreq_generic_exit,
         .name = "imx6q-cpufreq",
@@ -153,6 +155,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
         struct dev_pm_opp *opp;
         unsigned long min_volt, max_volt;
         int num, ret;
+        const struct property *prop;
+        const __be32 *val;
+        u32 nr, i, j;
 
         cpu_dev = get_cpu_device(0);
         if (!cpu_dev) {
@@ -187,12 +192,25 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                 goto put_node;
         }
 
-        /* We expect an OPP table supplied by platform */
+        /*
+         * We expect an OPP table supplied by platform.
+         * Just, incase the platform did not supply the OPP
+         * table, it will try to get it.
+         */
         num = dev_pm_opp_get_opp_count(cpu_dev);
         if (num < 0) {
-                ret = num;
-                dev_err(cpu_dev, "no OPP table is found: %d\n", ret);
-                goto put_node;
+                ret = of_init_opp_table(cpu_dev);
+                if (ret < 0) {
+                        dev_err(cpu_dev, "failed to init OPP table: %d\n", ret);
+                        goto put_node;
+                }
+
+                num = dev_pm_opp_get_opp_count(cpu_dev);
+                if (num < 0) {
+                        ret = num;
+                        dev_err(cpu_dev, "no OPP table is found: %d\n", ret);
+                        goto put_node;
+                }
         }
 
         ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table);
@@ -201,10 +219,62 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                 goto put_node;
         }
 
+        /* Make imx6_soc_volt array's size same as arm opp number */
+        imx6_soc_volt = devm_kzalloc(cpu_dev, sizeof(*imx6_soc_volt) * num, GFP_KERNEL);
+        if (imx6_soc_volt == NULL) {
+                ret = -ENOMEM;
+                goto free_freq_table;
+        }
+
+        prop = of_find_property(np, "fsl,soc-operating-points", NULL);
+        if (!prop || !prop->value)
+                goto soc_opp_out;
+
+        /*
+         * Each OPP is a set of tuples consisting of frequency and
+         * voltage like <freq-kHz vol-uV>.
+         */
+        nr = prop->length / sizeof(u32);
+        if (nr % 2 || (nr / 2) < num)
+                goto soc_opp_out;
+
+        for (j = 0; j < num; j++) {
+                val = prop->value;
+                for (i = 0; i < nr / 2; i++) {
+                        unsigned long freq = be32_to_cpup(val++);
+                        unsigned long volt = be32_to_cpup(val++);
+                        if (freq_table[j].frequency == freq) {
+                                imx6_soc_volt[soc_opp_count++] = volt;
+                                break;
+                        }
+                }
+        }
+
+soc_opp_out:
+        /* use fixed soc opp volt if no valid soc opp info found in dtb */
+        if (soc_opp_count != num) {
+                dev_warn(cpu_dev, "can NOT find valid fsl,soc-operating-points property in dtb, use default value!\n");
+                for (j = 0; j < num; j++)
+                        imx6_soc_volt[j] = PU_SOC_VOLTAGE_NORMAL;
+                if (freq_table[num - 1].frequency * 1000 == FREQ_1P2_GHZ)
+                        imx6_soc_volt[num - 1] = PU_SOC_VOLTAGE_HIGH;
+        }
+
         if (of_property_read_u32(np, "clock-latency", &transition_latency))
                 transition_latency = CPUFREQ_ETERNAL;
 
         /*
+         * Calculate the ramp time for max voltage change in the
+         * VDDSOC and VDDPU regulators.
+         */
+        ret = regulator_set_voltage_time(soc_reg, imx6_soc_volt[0], imx6_soc_volt[num - 1]);
+        if (ret > 0)
+                transition_latency += ret * 1000;
+        ret = regulator_set_voltage_time(pu_reg, imx6_soc_volt[0], imx6_soc_volt[num - 1]);
+        if (ret > 0)
+                transition_latency += ret * 1000;
+
+        /*
          * OPP is maintained in order of increasing frequency, and
          * freq_table initialised from OPP is therefore sorted in the
          * same order.
@@ -221,18 +291,6 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
         if (ret > 0)
                 transition_latency += ret * 1000;
 
-        /* Count vddpu and vddsoc latency in for 1.2 GHz support */
-        if (freq_table[num].frequency == FREQ_1P2_GHZ / 1000) {
-                ret = regulator_set_voltage_time(pu_reg, PU_SOC_VOLTAGE_NORMAL,
-                                                 PU_SOC_VOLTAGE_HIGH);
-                if (ret > 0)
-                        transition_latency += ret * 1000;
-                ret = regulator_set_voltage_time(soc_reg, PU_SOC_VOLTAGE_NORMAL,
-                                                 PU_SOC_VOLTAGE_HIGH);
-                if (ret > 0)
-                        transition_latency += ret * 1000;
-        }
-
         ret = cpufreq_register_driver(&imx6q_cpufreq_driver);
         if (ret) {
                 dev_err(cpu_dev, "failed register driver: %d\n", ret);
diff --git a/drivers/cpufreq/integrator-cpufreq.c b/drivers/cpufreq/integrator-cpufreq.c
index 7d8ab000d317..0e27844e8c2d 100644
--- a/drivers/cpufreq/integrator-cpufreq.c
+++ b/drivers/cpufreq/integrator-cpufreq.c
@@ -190,6 +190,7 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver integrator_driver = {
+        .flags          = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = integrator_verify_policy,
         .target         = integrator_set_target,
         .get            = integrator_get,
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index d51f17ed691e..7e257b233602 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -35,6 +35,7 @@
 #define SAMPLE_COUNT            3
 
 #define BYT_RATIOS      0x66a
+#define BYT_VIDS        0x66b
 
 #define FRAC_BITS 8
 #define int_tofp(X) ((int64_t)(X) << FRAC_BITS)
@@ -50,6 +51,8 @@ static inline int32_t div_fp(int32_t x, int32_t y)
         return div_s64((int64_t)x << FRAC_BITS, (int64_t)y);
 }
 
+static u64 energy_divisor;
+
 struct sample {
         int32_t core_pct_busy;
         u64 aperf;
@@ -64,6 +67,12 @@ struct pstate_data {
         int     turbo_pstate;
 };
 
+struct vid_data {
+        int32_t min;
+        int32_t max;
+        int32_t ratio;
+};
+
 struct _pid {
         int setpoint;
         int32_t integral;
@@ -82,10 +91,9 @@ struct cpudata {
         struct timer_list timer;
 
         struct pstate_data pstate;
+        struct vid_data vid;
         struct _pid pid;
 
-        int min_pstate_count;
-
         u64     prev_aperf;
         u64     prev_mperf;
         int     sample_ptr;
@@ -106,7 +114,8 @@ struct pstate_funcs {
         int (*get_max)(void);
         int (*get_min)(void);
         int (*get_turbo)(void);
-        void (*set)(int pstate);
+        void (*set)(struct cpudata*, int pstate);
+        void (*get_vid)(struct cpudata *);
 };
 
 struct cpu_defaults {
@@ -358,6 +367,42 @@ static int byt_get_max_pstate(void)
         return (value >> 16) & 0xFF;
 }
 
+static void byt_set_pstate(struct cpudata *cpudata, int pstate)
+{
+        u64 val;
+        int32_t vid_fp;
+        u32 vid;
+
+        val = pstate << 8;
+        if (limits.no_turbo)
+                val |= (u64)1 << 32;
+
+        vid_fp = cpudata->vid.min + mul_fp(
+                int_tofp(pstate - cpudata->pstate.min_pstate),
+                cpudata->vid.ratio);
+
+        vid_fp = clamp_t(int32_t, vid_fp, cpudata->vid.min, cpudata->vid.max);
+        vid = fp_toint(vid_fp);
+
+        val |= vid;
+
+        wrmsrl(MSR_IA32_PERF_CTL, val);
+}
+
+static void byt_get_vid(struct cpudata *cpudata)
+{
+        u64 value;
+
+        rdmsrl(BYT_VIDS, value);
+        cpudata->vid.min = int_tofp((value >> 8) & 0x7f);
+        cpudata->vid.max = int_tofp((value >> 16) & 0x7f);
+        cpudata->vid.ratio = div_fp(
+                cpudata->vid.max - cpudata->vid.min,
+                int_tofp(cpudata->pstate.max_pstate -
+                        cpudata->pstate.min_pstate));
+}
+
+
 static int core_get_min_pstate(void)
 {
         u64 value;
@@ -384,7 +429,7 @@ static int core_get_turbo_pstate(void)
         return ret;
 }
 
-static void core_set_pstate(int pstate)
+static void core_set_pstate(struct cpudata *cpudata, int pstate)
 {
         u64 val;
 
@@ -425,7 +470,8 @@ static struct cpu_defaults byt_params = {
                 .get_max = byt_get_max_pstate,
                 .get_min = byt_get_min_pstate,
                 .get_turbo = byt_get_max_pstate,
-                .set = core_set_pstate,
+                .set = byt_set_pstate,
+                .get_vid = byt_get_vid,
         },
 };
 
@@ -462,7 +508,7 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
 
         cpu->pstate.current_pstate = pstate;
 
-        pstate_funcs.set(pstate);
+        pstate_funcs.set(cpu, pstate);
 }
 
 static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
@@ -488,6 +534,9 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
         cpu->pstate.max_pstate = pstate_funcs.get_max();
         cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
 
+        if (pstate_funcs.get_vid)
+                pstate_funcs.get_vid(cpu);
+
         /*
          * goto max pstate so we don't slow up boot if we are built-in if we are
          * a module we will take care of it during normal operation
@@ -512,6 +561,7 @@ static inline void intel_pstate_sample(struct cpudata *cpu)
 
         rdmsrl(MSR_IA32_APERF, aperf);
         rdmsrl(MSR_IA32_MPERF, mperf);
+
         cpu->sample_ptr = (cpu->sample_ptr + 1) % SAMPLE_COUNT;
         cpu->samples[cpu->sample_ptr].aperf = aperf;
         cpu->samples[cpu->sample_ptr].mperf = mperf;
@@ -556,6 +606,7 @@ static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu)
         ctl = pid_calc(pid, busy_scaled);
 
         steps = abs(ctl);
+
         if (ctl < 0)
                 intel_pstate_pstate_increase(cpu, steps);
         else
@@ -565,17 +616,23 @@ static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu)
 static void intel_pstate_timer_func(unsigned long __data)
 {
         struct cpudata *cpu = (struct cpudata *) __data;
+        struct sample *sample;
+        u64 energy;
 
         intel_pstate_sample(cpu);
+
+        sample = &cpu->samples[cpu->sample_ptr];
+        rdmsrl(MSR_PKG_ENERGY_STATUS, energy);
+
         intel_pstate_adjust_busy_pstate(cpu);
 
-        if (cpu->pstate.current_pstate == cpu->pstate.min_pstate) {
-                cpu->min_pstate_count++;
-                if (!(cpu->min_pstate_count % 5)) {
-                        intel_pstate_set_pstate(cpu, cpu->pstate.max_pstate);
-                }
-        } else
-                cpu->min_pstate_count = 0;
+        trace_pstate_sample(fp_toint(sample->core_pct_busy),
+                        fp_toint(intel_pstate_get_scaled_busy(cpu)),
+                        cpu->pstate.current_pstate,
+                        sample->mperf,
+                        sample->aperf,
+                        div64_u64(energy, energy_divisor),
+                        sample->freq);
 
         intel_pstate_set_sample_time(cpu);
 }
@@ -782,6 +839,7 @@ static void copy_cpu_funcs(struct pstate_funcs *funcs)
         pstate_funcs.get_min   = funcs->get_min;
         pstate_funcs.get_turbo = funcs->get_turbo;
         pstate_funcs.set       = funcs->set;
+        pstate_funcs.get_vid   = funcs->get_vid;
 }
 
 #if IS_ENABLED(CONFIG_ACPI)
@@ -855,6 +913,7 @@ static int __init intel_pstate_init(void)
         int cpu, rc = 0;
         const struct x86_cpu_id *id;
         struct cpu_defaults *cpu_info;
+        u64 units;
 
         if (no_load)
                 return -ENODEV;
@@ -888,8 +947,12 @@ static int __init intel_pstate_init(void)
         if (rc)
                 goto out;
 
+        rdmsrl(MSR_RAPL_POWER_UNIT, units);
+        energy_divisor = 1 << ((units >> 8) & 0x1f); /* bits{12:8} */
+
         intel_pstate_debug_expose_params();
         intel_pstate_sysfs_expose_params();
+
         return rc;
 out:
         get_online_cpus();
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 0767a4e29dfe..eb7abe345b50 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -97,6 +97,7 @@ static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver kirkwood_cpufreq_driver = {
+        .flags  = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .get    = kirkwood_cpufreq_get_cpu_frequency,
         .verify = cpufreq_generic_frequency_table_verify,
         .target_index = kirkwood_cpufreq_target,
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index a43609218105..b6581abc9207 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -24,8 +24,6 @@
 
 static uint nowait;
 
-static struct clk *cpuclk;
-
 static void (*saved_cpu_wait) (void);
 
 static int loongson2_cpu_freq_notifier(struct notifier_block *nb,
@@ -44,11 +42,6 @@ static int loongson2_cpu_freq_notifier(struct notifier_block *nb,
         return 0;
 }
 
-static unsigned int loongson2_cpufreq_get(unsigned int cpu)
-{
-        return clk_get_rate(cpuclk);
-}
-
 /*
  * Here we notify other drivers of the proposed change and the final change.
  */
@@ -69,13 +62,14 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
         set_cpus_allowed_ptr(current, &cpus_allowed);
 
         /* setting the cpu frequency */
-        clk_set_rate(cpuclk, freq);
+        clk_set_rate(policy->clk, freq);
 
         return 0;
 }
 
 static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
+        static struct clk *cpuclk;
         int i;
         unsigned long rate;
         int ret;
@@ -104,13 +98,14 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 return ret;
         }
 
+        policy->clk = cpuclk;
         return cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0);
 }
 
 static int loongson2_cpufreq_exit(struct cpufreq_policy *policy)
 {
         cpufreq_frequency_table_put_attr(policy->cpu);
-        clk_put(cpuclk);
+        clk_put(policy->clk);
         return 0;
 }
 
@@ -119,7 +114,7 @@ static struct cpufreq_driver loongson2_cpufreq_driver = {
         .init = loongson2_cpufreq_cpu_init,
         .verify = cpufreq_generic_frequency_table_verify,
         .target_index = loongson2_cpufreq_target,
-        .get = loongson2_cpufreq_get,
+        .get = cpufreq_generic_get,
         .exit = loongson2_cpufreq_exit,
         .attr = cpufreq_generic_attr,
 };
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index a0acd0bfba40..590f5b66d181 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -36,21 +36,9 @@
 
 static struct cpufreq_frequency_table *freq_table;
 static atomic_t freq_table_users = ATOMIC_INIT(0);
-static struct clk *mpu_clk;
 static struct device *mpu_dev;
 static struct regulator *mpu_reg;
 
-static unsigned int omap_getspeed(unsigned int cpu)
-{
-        unsigned long rate;
-
-        if (cpu >= NR_CPUS)
-                return 0;
-
-        rate = clk_get_rate(mpu_clk) / 1000;
-        return rate;
-}
-
 static int omap_target(struct cpufreq_policy *policy, unsigned int index)
 {
         int r, ret;
@@ -58,11 +46,11 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
         unsigned long freq, volt = 0, volt_old = 0, tol = 0;
         unsigned int old_freq, new_freq;
 
-        old_freq = omap_getspeed(policy->cpu);
+        old_freq = policy->cur;
         new_freq = freq_table[index].frequency;
 
         freq = new_freq * 1000;
-        ret = clk_round_rate(mpu_clk, freq);
+        ret = clk_round_rate(policy->clk, freq);
         if (IS_ERR_VALUE(ret)) {
                 dev_warn(mpu_dev,
                          "CPUfreq: Cannot find matching frequency for %lu\n",
@@ -100,7 +88,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
                 }
         }
 
-        ret = clk_set_rate(mpu_clk, new_freq * 1000);
+        ret = clk_set_rate(policy->clk, new_freq * 1000);
 
         /* scaling down?  scale voltage after frequency */
         if (mpu_reg && (new_freq < old_freq)) {
@@ -108,7 +96,7 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)
                 if (r < 0) {
                         dev_warn(mpu_dev, "%s: unable to scale voltage down.\n",
                                  __func__);
-                        clk_set_rate(mpu_clk, old_freq * 1000);
+                        clk_set_rate(policy->clk, old_freq * 1000);
                         return r;
                 }
         }
@@ -126,9 +114,9 @@ static int omap_cpu_init(struct cpufreq_policy *policy)
 {
         int result;
 
-        mpu_clk = clk_get(NULL, "cpufreq_ck");
-        if (IS_ERR(mpu_clk))
-                return PTR_ERR(mpu_clk);
+        policy->clk = clk_get(NULL, "cpufreq_ck");
+        if (IS_ERR(policy->clk))
+                return PTR_ERR(policy->clk);
 
         if (!freq_table) {
                 result = dev_pm_opp_init_cpufreq_table(mpu_dev, &freq_table);
@@ -149,7 +137,7 @@ static int omap_cpu_init(struct cpufreq_policy *policy)
 
         freq_table_free();
 fail:
-        clk_put(mpu_clk);
+        clk_put(policy->clk);
         return result;
 }
 
@@ -157,15 +145,15 @@ static int omap_cpu_exit(struct cpufreq_policy *policy)
 {
         cpufreq_frequency_table_put_attr(policy->cpu);
         freq_table_free();
-        clk_put(mpu_clk);
+        clk_put(policy->clk);
         return 0;
 }
 
 static struct cpufreq_driver omap_driver = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = omap_target,
-        .get            = omap_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = omap_cpu_init,
         .exit           = omap_cpu_exit,
         .name           = "omap",
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index e2b4f40ff69a..1c0f1067af73 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -213,6 +213,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
                 cpu, target_freq,
                 (pcch_virt_addr + pcc_cpu_data->input_offset));
 
+        freqs.old = policy->cur;
         freqs.new = target_freq;
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
@@ -228,25 +229,20 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
         memset_io((pcch_virt_addr + pcc_cpu_data->input_offset), 0, BUF_SZ);
 
         status = ioread16(&pcch_hdr->status);
+        iowrite16(0, &pcch_hdr->status);
+
+        cpufreq_notify_post_transition(policy, &freqs, status != CMD_COMPLETE);
+        spin_unlock(&pcc_lock);
+
         if (status != CMD_COMPLETE) {
                 pr_debug("target: FAILED for cpu %d, with status: 0x%x\n",
                         cpu, status);
-                goto cmd_incomplete;
+                return -EINVAL;
         }
-        iowrite16(0, &pcch_hdr->status);
 
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         pr_debug("target: was SUCCESSFUL for cpu %d\n", cpu);
-        spin_unlock(&pcc_lock);
 
         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;
 }
 
 static int pcc_get_offset(int cpu)
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index 643e7952cad3..b9a444e358b5 100644
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -26,41 +26,108 @@
 static unsigned int                     busfreq;   /* FSB, in 10 kHz */
 static unsigned int                     max_multiplier;
 
+static unsigned int                     param_busfreq = 0;
+static unsigned int                     param_max_multiplier = 0;
+
+module_param_named(max_multiplier, param_max_multiplier, uint, S_IRUGO);
+MODULE_PARM_DESC(max_multiplier, "Maximum multiplier (allowed values: 20 30 35 40 45 50 55 60)");
+
+module_param_named(bus_frequency, param_busfreq, uint, S_IRUGO);
+MODULE_PARM_DESC(bus_frequency, "Bus frequency in kHz");
 
 /* Clock ratio multiplied by 10 - see table 27 in AMD#23446 */
 static struct cpufreq_frequency_table clock_ratio[] = {
-        {45,  /* 000 -> 4.5x */ 0},
+        {60,  /* 110 -> 6.0x */ 0},
+        {55,  /* 011 -> 5.5x */ 0},
         {50,  /* 001 -> 5.0x */ 0},
+        {45,  /* 000 -> 4.5x */ 0},
         {40,  /* 010 -> 4.0x */ 0},
-        {55,  /* 011 -> 5.5x */ 0},
-        {20,  /* 100 -> 2.0x */ 0},
-        {30,  /* 101 -> 3.0x */ 0},
-        {60,  /* 110 -> 6.0x */ 0},
         {35,  /* 111 -> 3.5x */ 0},
+        {30,  /* 101 -> 3.0x */ 0},
+        {20,  /* 100 -> 2.0x */ 0},
         {0, CPUFREQ_TABLE_END}
 };
 
+static const u8 index_to_register[8] = { 6, 3, 1, 0, 2, 7, 5, 4 };
+static const u8 register_to_index[8] = { 3, 2, 4, 1, 7, 6, 0, 5 };
+
+static const struct {
+        unsigned freq;
+        unsigned mult;
+} usual_frequency_table[] = {
+        { 400000, 40 }, // 100   * 4
+        { 450000, 45 }, // 100   * 4.5
+        { 475000, 50 }, //  95   * 5
+        { 500000, 50 }, // 100   * 5
+        { 506250, 45 }, // 112.5 * 4.5
+        { 533500, 55 }, //  97   * 5.5
+        { 550000, 55 }, // 100   * 5.5
+        { 562500, 50 }, // 112.5 * 5
+        { 570000, 60 }, //  95   * 6
+        { 600000, 60 }, // 100   * 6
+        { 618750, 55 }, // 112.5 * 5.5
+        { 660000, 55 }, // 120   * 5.5
+        { 675000, 60 }, // 112.5 * 6
+        { 720000, 60 }, // 120   * 6
+};
+
+#define FREQ_RANGE              3000
 
 /**
  * powernow_k6_get_cpu_multiplier - returns the current FSB multiplier
  *
- *   Returns the current setting of the frequency multiplier. Core clock
+ * Returns the current setting of the frequency multiplier. Core clock
  * speed is frequency of the Front-Side Bus multiplied with this value.
  */
 static int powernow_k6_get_cpu_multiplier(void)
 {
-        u64 invalue = 0;
+        unsigned long invalue = 0;
         u32 msrval;
 
+        local_irq_disable();
+
         msrval = POWERNOW_IOPORT + 0x1;
         wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
         invalue = inl(POWERNOW_IOPORT + 0x8);
         msrval = POWERNOW_IOPORT + 0x0;
         wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
 
-        return clock_ratio[(invalue >> 5)&7].driver_data;
+        local_irq_enable();
+
+        return clock_ratio[register_to_index[(invalue >> 5)&7]].driver_data;
 }
 
+static void powernow_k6_set_cpu_multiplier(unsigned int best_i)
+{
+        unsigned long outvalue, invalue;
+        unsigned long msrval;
+        unsigned long cr0;
+
+        /* we now need to transform best_i to the BVC format, see AMD#23446 */
+
+        /*
+         * The processor doesn't respond to inquiry cycles while changing the
+         * frequency, so we must disable cache.
+         */
+        local_irq_disable();
+        cr0 = read_cr0();
+        write_cr0(cr0 | X86_CR0_CD);
+        wbinvd();
+
+        outvalue = (1<<12) | (1<<10) | (1<<9) | (index_to_register[best_i]<<5);
+
+        msrval = POWERNOW_IOPORT + 0x1;
+        wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
+        invalue = inl(POWERNOW_IOPORT + 0x8);
+        invalue = invalue & 0x1f;
+        outvalue = outvalue | invalue;
+        outl(outvalue, (POWERNOW_IOPORT + 0x8));
+        msrval = POWERNOW_IOPORT + 0x0;
+        wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
+
+        write_cr0(cr0);
+        local_irq_enable();
+}
 
 /**
  * powernow_k6_target - set the PowerNow! multiplier
@@ -71,8 +138,6 @@ static int powernow_k6_get_cpu_multiplier(void)
 static int powernow_k6_target(struct cpufreq_policy *policy,
                 unsigned int best_i)
 {
-        unsigned long outvalue = 0, invalue = 0;
-        unsigned long msrval;
         struct cpufreq_freqs freqs;
 
         if (clock_ratio[best_i].driver_data > max_multiplier) {
@@ -85,35 +150,63 @@ static int powernow_k6_target(struct cpufreq_policy *policy,
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
-        /* we now need to transform best_i to the BVC format, see AMD#23446 */
-
-        outvalue = (1<<12) | (1<<10) | (1<<9) | (best_i<<5);
-
-        msrval = POWERNOW_IOPORT + 0x1;
-        wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
-        invalue = inl(POWERNOW_IOPORT + 0x8);
-        invalue = invalue & 0xf;
-        outvalue = outvalue | invalue;
-        outl(outvalue , (POWERNOW_IOPORT + 0x8));
-        msrval = POWERNOW_IOPORT + 0x0;
-        wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
+        powernow_k6_set_cpu_multiplier(best_i);
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return 0;
 }
 
-
 static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
 {
         unsigned int i, f;
+        unsigned khz;
 
         if (policy->cpu != 0)
                 return -ENODEV;
 
-        /* get frequencies */
-        max_multiplier = powernow_k6_get_cpu_multiplier();
-        busfreq = cpu_khz / max_multiplier;
+        max_multiplier = 0;
+        khz = cpu_khz;
+        for (i = 0; i < ARRAY_SIZE(usual_frequency_table); i++) {
+                if (khz >= usual_frequency_table[i].freq - FREQ_RANGE &&
+                    khz <= usual_frequency_table[i].freq + FREQ_RANGE) {
+                        khz = usual_frequency_table[i].freq;
+                        max_multiplier = usual_frequency_table[i].mult;
+                        break;
+                }
+        }
+        if (param_max_multiplier) {
+                for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
+                        if (clock_ratio[i].driver_data == param_max_multiplier) {
+                                max_multiplier = param_max_multiplier;
+                                goto have_max_multiplier;
+                        }
+                }
+                printk(KERN_ERR "powernow-k6: invalid max_multiplier parameter, valid parameters 20, 30, 35, 40, 45, 50, 55, 60\n");
+                return -EINVAL;
+        }
+
+        if (!max_multiplier) {
+                printk(KERN_WARNING "powernow-k6: unknown frequency %u, cannot determine current multiplier\n", khz);
+                printk(KERN_WARNING "powernow-k6: use module parameters max_multiplier and bus_frequency\n");
+                return -EOPNOTSUPP;
+        }
+
+have_max_multiplier:
+        param_max_multiplier = max_multiplier;
+
+        if (param_busfreq) {
+                if (param_busfreq >= 50000 && param_busfreq <= 150000) {
+                        busfreq = param_busfreq / 10;
+                        goto have_busfreq;
+                }
+                printk(KERN_ERR "powernow-k6: invalid bus_frequency parameter, allowed range 50000 - 150000 kHz\n");
+                return -EINVAL;
+        }
+
+        busfreq = khz / max_multiplier;
+have_busfreq:
+        param_busfreq = busfreq * 10;
 
         /* table init */
         for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
@@ -125,7 +218,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
         }
 
         /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = 200000;
+        policy->cpuinfo.transition_latency = 500000;
 
         return cpufreq_table_validate_and_show(policy, clock_ratio);
 }
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 0023c7d40a51..e10b646634d7 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -964,14 +964,9 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
         cpufreq_cpu_put(policy);
 
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
-
         res = transition_fid_vid(data, fid, vid);
-        if (res)
-                freqs.new = freqs.old;
-        else
-                freqs.new = find_khz_freq_from_fid(data->currfid);
+        cpufreq_notify_post_transition(policy, &freqs, res);
 
-        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
index 3f7be46d2b27..051000f44ca2 100644
--- a/drivers/cpufreq/ppc-corenet-cpufreq.c
+++ b/drivers/cpufreq/ppc-corenet-cpufreq.c
@@ -24,12 +24,10 @@
 
 /**
  * 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;
 };
@@ -81,13 +79,6 @@ static inline const struct cpumask *cpu_core_mask(int cpu)
 }
 #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)
@@ -158,8 +149,8 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 goto err_np;
         }
 
-        data->clk = of_clk_get(np, 0);
-        if (IS_ERR(data->clk)) {
+        policy->clk = of_clk_get(np, 0);
+        if (IS_ERR(policy->clk)) {
                 pr_err("%s: no clock information\n", __func__);
                 goto err_nomem2;
         }
@@ -255,7 +246,7 @@ static int corenet_cpufreq_target(struct cpufreq_policy *policy,
         struct cpu_data *data = per_cpu(cpu_data, policy->cpu);
 
         parent = of_clk_get(data->parent, data->table[index].driver_data);
-        return clk_set_parent(data->clk, parent);
+        return clk_set_parent(policy->clk, parent);
 }
 
 static struct cpufreq_driver ppc_corenet_cpufreq_driver = {
@@ -265,7 +256,7 @@ static struct cpufreq_driver ppc_corenet_cpufreq_driver = {
         .exit           = __exit_p(corenet_cpufreq_cpu_exit),
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = corenet_cpufreq_target,
-        .get            = corenet_cpufreq_get_speed,
+        .get            = cpufreq_generic_get,
         .attr           = cpufreq_generic_attr,
 };
 
diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c
index 0a0f4369636a..a9195a86b069 100644
--- a/drivers/cpufreq/pxa2xx-cpufreq.c
+++ b/drivers/cpufreq/pxa2xx-cpufreq.c
@@ -423,6 +423,7 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver pxa_cpufreq_driver = {
+        .flags  = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify = cpufreq_generic_frequency_table_verify,
         .target_index = pxa_set_target,
         .init   = pxa_cpufreq_init,
diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c
index 93840048dd11..3785687e9d70 100644
--- a/drivers/cpufreq/pxa3xx-cpufreq.c
+++ b/drivers/cpufreq/pxa3xx-cpufreq.c
@@ -201,6 +201,7 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver pxa3xx_cpufreq_driver = {
+        .flags          = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = pxa3xx_cpufreq_set,
         .init           = pxa3xx_cpufreq_init,
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 8d904a00027b..826b8be23099 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -481,7 +481,7 @@ err_hclk:
 }
 
 static struct cpufreq_driver s3c2416_cpufreq_driver = {
-        .flags          = 0,
+        .flags          = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = s3c2416_cpufreq_set_target,
         .get            = s3c2416_cpufreq_get_speed,
diff --git a/drivers/cpufreq/s3c2440-cpufreq.c b/drivers/cpufreq/s3c2440-cpufreq.c
index 72b2cc8a5a85..f84ed10755b5 100644
--- a/drivers/cpufreq/s3c2440-cpufreq.c
+++ b/drivers/cpufreq/s3c2440-cpufreq.c
@@ -22,8 +22,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
-
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
@@ -55,7 +53,7 @@ static inline int within_khz(unsigned long a, unsigned long b)
  * specified in @cfg. The values are stored in @cfg for later use
  * by the relevant set routine if the request settings can be reached.
  */
-int s3c2440_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
+static int s3c2440_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
 {
         unsigned int hdiv, pdiv;
         unsigned long hclk, fclk, armclk;
@@ -242,7 +240,7 @@ static int s3c2440_cpufreq_calctable(struct s3c_cpufreq_config *cfg,
         return ret;
 }
 
-struct s3c_cpufreq_info s3c2440_cpufreq_info = {
+static struct s3c_cpufreq_info s3c2440_cpufreq_info = {
         .max            = {
                 .fclk   = 400000000,
                 .hclk   = 133333333,
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c
index 485088253358..25069741b507 100644
--- a/drivers/cpufreq/s3c24xx-cpufreq.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq.c
@@ -355,11 +355,6 @@ static int s3c_cpufreq_target(struct cpufreq_policy *policy,
         return -EINVAL;
 }
 
-static unsigned int s3c_cpufreq_get(unsigned int cpu)
-{
-        return clk_get_rate(clk_arm) / 1000;
-}
-
 struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)
 {
         struct clk *clk;
@@ -373,6 +368,7 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)
 
 static int s3c_cpufreq_init(struct cpufreq_policy *policy)
 {
+        policy->clk = clk_arm;
         return cpufreq_generic_init(policy, ftab, cpu_cur.info->latency);
 }
 
@@ -408,7 +404,7 @@ static int s3c_cpufreq_suspend(struct cpufreq_policy *policy)
 {
         suspend_pll.frequency = clk_get_rate(_clk_mpll);
         suspend_pll.driver_data = __raw_readl(S3C2410_MPLLCON);
-        suspend_freq = s3c_cpufreq_get(0) * 1000;
+        suspend_freq = clk_get_rate(clk_arm);
 
         return 0;
 }
@@ -448,9 +444,9 @@ static int s3c_cpufreq_resume(struct cpufreq_policy *policy)
 #endif
 
 static struct cpufreq_driver s3c24xx_driver = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .target         = s3c_cpufreq_target,
-        .get            = s3c_cpufreq_get,
+        .get            = cpufreq_generic_get,
         .init           = s3c_cpufreq_init,
         .suspend        = s3c_cpufreq_suspend,
         .resume         = s3c_cpufreq_resume,
@@ -509,7 +505,7 @@ int __init s3c_cpufreq_setboard(struct s3c_cpufreq_board *board)
         return 0;
 }
 
-int __init s3c_cpufreq_auto_io(void)
+static int __init s3c_cpufreq_auto_io(void)
 {
         int ret;
 
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index 67e302eeefec..c4226de079ab 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -19,7 +19,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 
-static struct clk *armclk;
 static struct regulator *vddarm;
 static unsigned long regulator_latency;
 
@@ -54,14 +53,6 @@ static struct cpufreq_frequency_table s3c64xx_freq_table[] = {
 };
 #endif
 
-static unsigned int s3c64xx_cpufreq_get_speed(unsigned int cpu)
-{
-        if (cpu != 0)
-                return 0;
-
-        return clk_get_rate(armclk) / 1000;
-}
-
 static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
                                       unsigned int index)
 {
@@ -69,7 +60,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
         unsigned int old_freq, new_freq;
         int ret;
 
-        old_freq = clk_get_rate(armclk) / 1000;
+        old_freq = clk_get_rate(policy->clk) / 1000;
         new_freq = s3c64xx_freq_table[index].frequency;
         dvfs = &s3c64xx_dvfs_table[s3c64xx_freq_table[index].driver_data];
 
@@ -86,7 +77,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
         }
 #endif
 
-        ret = clk_set_rate(armclk, new_freq * 1000);
+        ret = clk_set_rate(policy->clk, new_freq * 1000);
         if (ret < 0) {
                 pr_err("Failed to set rate %dkHz: %d\n",
                        new_freq, ret);
@@ -101,7 +92,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
                 if (ret != 0) {
                         pr_err("Failed to set VDDARM for %dkHz: %d\n",
                                new_freq, ret);
-                        if (clk_set_rate(armclk, old_freq * 1000) < 0)
+                        if (clk_set_rate(policy->clk, old_freq * 1000) < 0)
                                 pr_err("Failed to restore original clock rate\n");
 
                         return ret;
@@ -110,7 +101,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
 #endif
 
         pr_debug("Set actual frequency %lukHz\n",
-                 clk_get_rate(armclk) / 1000);
+                 clk_get_rate(policy->clk) / 1000);
 
         return 0;
 }
@@ -169,11 +160,11 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
                 return -ENODEV;
         }
 
-        armclk = clk_get(NULL, "armclk");
-        if (IS_ERR(armclk)) {
+        policy->clk = clk_get(NULL, "armclk");
+        if (IS_ERR(policy->clk)) {
                 pr_err("Unable to obtain ARMCLK: %ld\n",
-                       PTR_ERR(armclk));
-                return PTR_ERR(armclk);
+                       PTR_ERR(policy->clk));
+                return PTR_ERR(policy->clk);
         }
 
 #ifdef CONFIG_REGULATOR
@@ -193,7 +184,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
                 unsigned long r;
 
                 /* Check for frequencies we can generate */
-                r = clk_round_rate(armclk, freq->frequency * 1000);
+                r = clk_round_rate(policy->clk, freq->frequency * 1000);
                 r /= 1000;
                 if (r != freq->frequency) {
                         pr_debug("%dkHz unsupported by clock\n",
@@ -203,7 +194,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
 
                 /* If we have no regulator then assume startup
                  * frequency is the maximum we can support. */
-                if (!vddarm && freq->frequency > s3c64xx_cpufreq_get_speed(0))
+                if (!vddarm && freq->frequency > clk_get_rate(policy->clk) / 1000)
                         freq->frequency = CPUFREQ_ENTRY_INVALID;
 
                 freq++;
@@ -219,17 +210,17 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
                 pr_err("Failed to configure frequency table: %d\n",
                        ret);
                 regulator_put(vddarm);
-                clk_put(armclk);
+                clk_put(policy->clk);
         }
 
         return ret;
 }
 
 static struct cpufreq_driver s3c64xx_cpufreq_driver = {
-        .flags          = 0,
+        .flags          = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = s3c64xx_cpufreq_set_target,
-        .get            = s3c64xx_cpufreq_get_speed,
+        .get            = cpufreq_generic_get,
         .init           = s3c64xx_cpufreq_driver_init,
         .name           = "s3c",
 };
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index e3973dae28a7..55a8e9fa9435 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -23,7 +23,6 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 
-static struct clk *cpu_clk;
 static struct clk *dmc0_clk;
 static struct clk *dmc1_clk;
 static DEFINE_MUTEX(set_freq_lock);
@@ -164,14 +163,6 @@ static void s5pv210_set_refresh(enum s5pv210_dmc_port ch, unsigned long freq)
         __raw_writel(tmp1, reg);
 }
 
-static unsigned int s5pv210_getspeed(unsigned int cpu)
-{
-        if (cpu)
-                return 0;
-
-        return clk_get_rate(cpu_clk) / 1000;
-}
-
 static int s5pv210_target(struct cpufreq_policy *policy, unsigned int index)
 {
         unsigned long reg;
@@ -193,7 +184,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, unsigned int index)
                 goto exit;
         }
 
-        old_freq = s5pv210_getspeed(0);
+        old_freq = policy->cur;
         new_freq = s5pv210_freq_table[index].frequency;
 
         /* Finding current running level index */
@@ -471,9 +462,9 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
         unsigned long mem_type;
         int ret;
 
-        cpu_clk = clk_get(NULL, "armclk");
-        if (IS_ERR(cpu_clk))
-                return PTR_ERR(cpu_clk);
+        policy->clk = clk_get(NULL, "armclk");
+        if (IS_ERR(policy->clk))
+                return PTR_ERR(policy->clk);
 
         dmc0_clk = clk_get(NULL, "sclk_dmc0");
         if (IS_ERR(dmc0_clk)) {
@@ -516,7 +507,7 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
 out_dmc1:
         clk_put(dmc0_clk);
 out_dmc0:
-        clk_put(cpu_clk);
+        clk_put(policy->clk);
         return ret;
 }
 
@@ -560,10 +551,10 @@ static int s5pv210_cpufreq_reboot_notifier_event(struct notifier_block *this,
 }
 
 static struct cpufreq_driver s5pv210_driver = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = s5pv210_target,
-        .get            = s5pv210_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = s5pv210_cpu_init,
         .name           = "s5pv210",
 #ifdef CONFIG_PM
diff --git a/drivers/cpufreq/sa1100-cpufreq.c b/drivers/cpufreq/sa1100-cpufreq.c
index 623da742f8e7..728eab77e8e0 100644
--- a/drivers/cpufreq/sa1100-cpufreq.c
+++ b/drivers/cpufreq/sa1100-cpufreq.c
@@ -201,7 +201,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver sa1100_driver __refdata = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = sa1100_target,
         .get            = sa11x0_getspeed,
diff --git a/drivers/cpufreq/sa1110-cpufreq.c b/drivers/cpufreq/sa1110-cpufreq.c
index 2c2b2e601d13..546376719d8f 100644
--- a/drivers/cpufreq/sa1110-cpufreq.c
+++ b/drivers/cpufreq/sa1110-cpufreq.c
@@ -312,7 +312,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
 /* sa1110_driver needs __refdata because it must remain after init registers
  * it with cpufreq_register_driver() */
 static struct cpufreq_driver sa1110_driver __refdata = {
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = sa1110_target,
         .get            = sa11x0_getspeed,
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index d02ccd19c9c4..5c86e3fa5593 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -30,11 +30,6 @@ static struct {
         u32 cnt;
 } spear_cpufreq;
 
-static unsigned int spear_cpufreq_get(unsigned int cpu)
-{
-        return clk_get_rate(spear_cpufreq.clk) / 1000;
-}
-
 static struct clk *spear1340_cpu_get_possible_parent(unsigned long newfreq)
 {
         struct clk *sys_pclk;
@@ -138,7 +133,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
         }
 
         newfreq = clk_round_rate(srcclk, newfreq * mult);
-        if (newfreq < 0) {
+        if (newfreq <= 0) {
                 pr_err("clk_round_rate failed for cpu src clock\n");
                 return newfreq;
         }
@@ -156,16 +151,17 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
 
 static int spear_cpufreq_init(struct cpufreq_policy *policy)
 {
+        policy->clk = spear_cpufreq.clk;
         return cpufreq_generic_init(policy, spear_cpufreq.freq_tbl,
                         spear_cpufreq.transition_latency);
 }
 
 static struct cpufreq_driver spear_cpufreq_driver = {
         .name           = "cpufreq-spear",
-        .flags          = CPUFREQ_STICKY,
+        .flags          = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = spear_cpufreq_target,
-        .get            = spear_cpufreq_get,
+        .get            = cpufreq_generic_get,
         .init           = spear_cpufreq_init,
         .exit           = cpufreq_generic_exit,
         .attr           = cpufreq_generic_attr,
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index 0f5326d6f79f..998c17b42200 100644
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -141,38 +141,6 @@ static int speedstep_smi_get_freqs(unsigned int *low, unsigned int *high)
 }
 
 /**
- * speedstep_get_state - set the SpeedStep state
- * @state: processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
- *
- */
-static int speedstep_get_state(void)
-{
-        u32 function = GET_SPEEDSTEP_STATE;
-        u32 result, state, edi, command, dummy;
-
-        command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
-
-        pr_debug("trying to determine current setting with command %x "
-                "at port %x\n", command, smi_port);
-
-        __asm__ __volatile__(
-                "push %%ebp\n"
-                "out %%al, (%%dx)\n"
-                "pop %%ebp\n"
-                : "=a" (result),
-                  "=b" (state), "=D" (edi),
-                  "=c" (dummy), "=d" (dummy), "=S" (dummy)
-                : "a" (command), "b" (function), "c" (0),
-                  "d" (smi_port), "S" (0), "D" (0)
-        );
-
-        pr_debug("state is %x, result is %x\n", state, result);
-
-        return state & 1;
-}
-
-
-/**
  * speedstep_set_state - set the SpeedStep state
  * @state: new processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
  *
diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c
index b7309c37033d..e652c1bd8d0f 100644
--- a/drivers/cpufreq/tegra-cpufreq.c
+++ b/drivers/cpufreq/tegra-cpufreq.c
@@ -47,21 +47,9 @@ static struct clk *pll_x_clk;
 static struct clk *pll_p_clk;
 static struct clk *emc_clk;
 
-static unsigned long target_cpu_speed[NUM_CPUS];
 static DEFINE_MUTEX(tegra_cpu_lock);
 static bool is_suspended;
 
-static unsigned int tegra_getspeed(unsigned int cpu)
-{
-        unsigned long rate;
-
-        if (cpu >= NUM_CPUS)
-                return 0;
-
-        rate = clk_get_rate(cpu_clk) / 1000;
-        return rate;
-}
-
 static int tegra_cpu_clk_set_rate(unsigned long rate)
 {
         int ret;
@@ -103,9 +91,6 @@ static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
 {
         int ret = 0;
 
-        if (tegra_getspeed(0) == rate)
-                return ret;
-
         /*
          * Vote on memory bus frequency based on cpu frequency
          * This sets the minimum frequency, display or avp may request higher
@@ -125,33 +110,16 @@ static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
         return ret;
 }
 
-static unsigned long tegra_cpu_highest_speed(void)
-{
-        unsigned long rate = 0;
-        int i;
-
-        for_each_online_cpu(i)
-                rate = max(rate, target_cpu_speed[i]);
-        return rate;
-}
-
 static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
 {
-        unsigned int freq;
-        int ret = 0;
+        int ret = -EBUSY;
 
         mutex_lock(&tegra_cpu_lock);
 
-        if (is_suspended)
-                goto out;
-
-        freq = freq_table[index].frequency;
+        if (!is_suspended)
+                ret = tegra_update_cpu_speed(policy,
+                                freq_table[index].frequency);
 
-        target_cpu_speed[policy->cpu] = freq;
-
-        ret = tegra_update_cpu_speed(policy, tegra_cpu_highest_speed());
-
-out:
         mutex_unlock(&tegra_cpu_lock);
         return ret;
 }
@@ -165,7 +133,8 @@ static int tegra_pm_notify(struct notifier_block *nb, unsigned long event,
                 is_suspended = true;
                 pr_info("Tegra cpufreq suspend: setting frequency to %d kHz\n",
                         freq_table[0].frequency);
-                tegra_update_cpu_speed(policy, freq_table[0].frequency);
+                if (clk_get_rate(cpu_clk) / 1000 != freq_table[0].frequency)
+                        tegra_update_cpu_speed(policy, freq_table[0].frequency);
                 cpufreq_cpu_put(policy);
         } else if (event == PM_POST_SUSPEND) {
                 is_suspended = false;
@@ -189,8 +158,6 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)
         clk_prepare_enable(emc_clk);
         clk_prepare_enable(cpu_clk);
 
-        target_cpu_speed[policy->cpu] = tegra_getspeed(policy->cpu);
-
         /* FIXME: what's the actual transition time? */
         ret = cpufreq_generic_init(policy, freq_table, 300 * 1000);
         if (ret) {
@@ -202,6 +169,7 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)
         if (policy->cpu == 0)
                 register_pm_notifier(&tegra_cpu_pm_notifier);
 
+        policy->clk = cpu_clk;
         return 0;
 }
 
@@ -214,9 +182,10 @@ static int tegra_cpu_exit(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver tegra_cpufreq_driver = {
+        .flags          = CPUFREQ_NEED_INITIAL_FREQ_CHECK,
         .verify         = cpufreq_generic_frequency_table_verify,
         .target_index   = tegra_target,
-        .get            = tegra_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = tegra_cpu_init,
         .exit           = tegra_cpu_exit,
         .name           = "tegra",
diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c
index 653ae2955b55..36cc330b8747 100644
--- a/drivers/cpufreq/unicore2-cpufreq.c
+++ b/drivers/cpufreq/unicore2-cpufreq.c
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -33,42 +34,34 @@ static int ucv2_verify_speed(struct cpufreq_policy *policy)
         return 0;
 }
 
-static unsigned int ucv2_getspeed(unsigned int cpu)
-{
-        struct clk *mclk = clk_get(NULL, "MAIN_CLK");
-
-        if (cpu)
-                return 0;
-        return clk_get_rate(mclk)/1000;
-}
-
 static int ucv2_target(struct cpufreq_policy *policy,
                          unsigned int target_freq,
                          unsigned int relation)
 {
-        unsigned int cur = ucv2_getspeed(0);
         struct cpufreq_freqs freqs;
-        struct clk *mclk = clk_get(NULL, "MAIN_CLK");
+        int ret;
 
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+        freqs.old = policy->cur;
+        freqs.new = target_freq;
 
-        if (!clk_set_rate(mclk, target_freq * 1000)) {
-                freqs.old = cur;
-                freqs.new = target_freq;
-        }
-
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+        ret = clk_set_rate(policy->mclk, target_freq * 1000);
+        cpufreq_notify_post_transition(policy, &freqs, ret);
 
-        return 0;
+        return ret;
 }
 
 static int __init ucv2_cpu_init(struct cpufreq_policy *policy)
 {
         if (policy->cpu != 0)
                 return -EINVAL;
+
         policy->min = policy->cpuinfo.min_freq = 250000;
         policy->max = policy->cpuinfo.max_freq = 1000000;
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        policy->clk = clk_get(NULL, "MAIN_CLK");
+        if (IS_ERR(policy->clk))
+                return PTR_ERR(policy->clk);
         return 0;
 }
 
@@ -76,7 +69,7 @@ static struct cpufreq_driver ucv2_driver = {
         .flags          = CPUFREQ_STICKY,
         .verify         = ucv2_verify_speed,
         .target         = ucv2_target,
-        .get            = ucv2_getspeed,
+        .get            = cpufreq_generic_get,
         .init           = ucv2_cpu_init,
         .name           = "UniCore-II",
 };
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 5a29fac951ec..41983883cef4 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -113,7 +113,7 @@ config DMI_SCAN_MACHINE_NON_EFI_FALLBACK
 
 config ISCSI_IBFT_FIND
         bool "iSCSI Boot Firmware Table Attributes"
-        depends on X86
+        depends on X86 && ACPI
         default n
         help
           This option enables the kernel to find the region of memory
diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c
index ad0d6de938f3..13ec6283bf59 100644
--- a/drivers/gpu/drm/gma500/opregion.c
+++ b/drivers/gpu/drm/gma500/opregion.c
@@ -22,7 +22,6 @@
  *
  */
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include "psb_drv.h"
 #include "psb_intel_reg.h"
 
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 41838eaa799c..d4ae48b04cf2 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
           intel_ringbuffer.o \
           intel_overlay.o \
           intel_sprite.o \
-          intel_opregion.o \
           intel_sideband.o \
           intel_uncore.o \
           dvo_ch7xxx.o \
@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
 
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 
-i915-$(CONFIG_ACPI)     += intel_acpi.o
+i915-$(CONFIG_ACPI)     += intel_acpi.o intel_opregion.o
 
 i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 90fcccba17b0..1caa5e34fbe3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2339,8 +2339,8 @@ extern void intel_i2c_reset(struct drm_device *dev);
 
 /* intel_opregion.c */
 struct intel_encoder;
-extern int intel_opregion_setup(struct drm_device *dev);
 #ifdef CONFIG_ACPI
+extern int intel_opregion_setup(struct drm_device *dev);
 extern void intel_opregion_init(struct drm_device *dev);
 extern void intel_opregion_fini(struct drm_device *dev);
 extern void intel_opregion_asle_intr(struct drm_device *dev);
@@ -2349,6 +2349,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
 extern int intel_opregion_notify_adapter(struct drm_device *dev,
                                          pci_power_t state);
 #else
+static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
 static inline void intel_opregion_init(struct drm_device *dev) { return; }
 static inline void intel_opregion_fini(struct drm_device *dev) { return; }
 static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index dfff0907f70e..d96eee1ae9c5 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -6,14 +6,10 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/vga_switcheroo.h>
-#include <acpi/acpi_drivers.h>
-
 #include <drm/drmP.h>
 #include "i915_drv.h"
 
 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */
-
-#define INTEL_DSM_FN_SUPPORTED_FUNCTIONS 0 /* No args */
 #define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */
 
 static struct intel_dsm_priv {
@@ -28,61 +24,6 @@ static const u8 intel_dsm_guid[] = {
         0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c
 };
 
-static int intel_dsm(acpi_handle handle, int func)
-{
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
-        union acpi_object *obj;
-        u32 result;
-        int ret = 0;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(intel_dsm_guid);
-        params[0].buffer.pointer = (char *)intel_dsm_guid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = INTEL_DSM_REVISION_ID;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        ret = acpi_evaluate_object(handle, "_DSM", &input, &output);
-        if (ret) {
-                DRM_DEBUG_DRIVER("failed to evaluate _DSM: %d\n", ret);
-                return ret;
-        }
-
-        obj = (union acpi_object *)output.pointer;
-
-        result = 0;
-        switch (obj->type) {
-        case ACPI_TYPE_INTEGER:
-                result = obj->integer.value;
-                break;
-
-        case ACPI_TYPE_BUFFER:
-                if (obj->buffer.length == 4) {
-                        result = (obj->buffer.pointer[0] |
-                                (obj->buffer.pointer[1] <<  8) |
-                                (obj->buffer.pointer[2] << 16) |
-                                (obj->buffer.pointer[3] << 24));
-                        break;
-                }
-        default:
-                ret = -EINVAL;
-                break;
-        }
-        if (result == 0x80000002)
-                ret = -ENODEV;
-
-        kfree(output.pointer);
-        return ret;
-}
-
 static char *intel_dsm_port_name(u8 id)
 {
         switch (id) {
@@ -137,83 +78,56 @@ static char *intel_dsm_mux_type(u8 type)
 
 static void intel_dsm_platform_mux_info(void)
 {
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
-        union acpi_object *pkg;
-        int i, ret;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(intel_dsm_guid);
-        params[0].buffer.pointer = (char *)intel_dsm_guid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = INTEL_DSM_REVISION_ID;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = INTEL_DSM_FN_PLATFORM_MUX_INFO;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        ret = acpi_evaluate_object(intel_dsm_priv.dhandle, "_DSM", &input,
-                                   &output);
-        if (ret) {
-                DRM_DEBUG_DRIVER("failed to evaluate _DSM: %d\n", ret);
-                goto out;
+        int i;
+        union acpi_object *pkg, *connector_count;
+
+        pkg = acpi_evaluate_dsm_typed(intel_dsm_priv.dhandle, intel_dsm_guid,
+                        INTEL_DSM_REVISION_ID, INTEL_DSM_FN_PLATFORM_MUX_INFO,
+                        NULL, ACPI_TYPE_PACKAGE);
+        if (!pkg) {
+                DRM_DEBUG_DRIVER("failed to evaluate _DSM\n");
+                return;
         }
 
-        pkg = (union acpi_object *)output.pointer;
-
-        if (pkg->type == ACPI_TYPE_PACKAGE) {
-                union acpi_object *connector_count = &pkg->package.elements[0];
-                DRM_DEBUG_DRIVER("MUX info connectors: %lld\n",
-                          (unsigned long long)connector_count->integer.value);
-                for (i = 1; i < pkg->package.count; i++) {
-                        union acpi_object *obj = &pkg->package.elements[i];
-                        union acpi_object *connector_id =
-                                &obj->package.elements[0];
-                        union acpi_object *info = &obj->package.elements[1];
-                        DRM_DEBUG_DRIVER("Connector id: 0x%016llx\n",
-                                  (unsigned long long)connector_id->integer.value);
-                        DRM_DEBUG_DRIVER("  port id: %s\n",
-                               intel_dsm_port_name(info->buffer.pointer[0]));
-                        DRM_DEBUG_DRIVER("  display mux info: %s\n",
-                               intel_dsm_mux_type(info->buffer.pointer[1]));
-                        DRM_DEBUG_DRIVER("  aux/dc mux info: %s\n",
-                               intel_dsm_mux_type(info->buffer.pointer[2]));
-                        DRM_DEBUG_DRIVER("  hpd mux info: %s\n",
-                               intel_dsm_mux_type(info->buffer.pointer[3]));
-                }
+        connector_count = &pkg->package.elements[0];
+        DRM_DEBUG_DRIVER("MUX info connectors: %lld\n",
+                  (unsigned long long)connector_count->integer.value);
+        for (i = 1; i < pkg->package.count; i++) {
+                union acpi_object *obj = &pkg->package.elements[i];
+                union acpi_object *connector_id = &obj->package.elements[0];
+                union acpi_object *info = &obj->package.elements[1];
+                DRM_DEBUG_DRIVER("Connector id: 0x%016llx\n",
+                          (unsigned long long)connector_id->integer.value);
+                DRM_DEBUG_DRIVER("  port id: %s\n",
+                       intel_dsm_port_name(info->buffer.pointer[0]));
+                DRM_DEBUG_DRIVER("  display mux info: %s\n",
+                       intel_dsm_mux_type(info->buffer.pointer[1]));
+                DRM_DEBUG_DRIVER("  aux/dc mux info: %s\n",
+                       intel_dsm_mux_type(info->buffer.pointer[2]));
+                DRM_DEBUG_DRIVER("  hpd mux info: %s\n",
+                       intel_dsm_mux_type(info->buffer.pointer[3]));
         }
 
-out:
-        kfree(output.pointer);
+        ACPI_FREE(pkg);
 }
 
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 {
         acpi_handle dhandle;
-        int ret;
 
         dhandle = ACPI_HANDLE(&pdev->dev);
         if (!dhandle)
                 return false;
 
-        if (!acpi_has_method(dhandle, "_DSM")) {
+        if (!acpi_check_dsm(dhandle, intel_dsm_guid, INTEL_DSM_REVISION_ID,
+                            1 << INTEL_DSM_FN_PLATFORM_MUX_INFO)) {
                 DRM_DEBUG_KMS("no _DSM method for intel device\n");
                 return false;
         }
 
-        ret = intel_dsm(dhandle, INTEL_DSM_FN_SUPPORTED_FUNCTIONS);
-        if (ret < 0) {
-                DRM_DEBUG_KMS("failed to get supported _DSM functions\n");
-                return false;
-        }
-
         intel_dsm_priv.dhandle = dhandle;
-
         intel_dsm_platform_mux_info();
+
         return true;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 6d69a9bad865..9a8804bee5cd 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -28,7 +28,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <acpi/video.h>
 
 #include <drm/drmP.h>
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c b/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c
index 129120473f6c..13c5af88a601 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c
@@ -87,55 +87,39 @@ mxm_shadow_dsm(struct nouveau_mxm *mxm, u8 version)
                 0xB8, 0x9C, 0x79, 0xB6, 0x2F, 0xD5, 0x56, 0x65
         };
         u32 mxms_args[] = { 0x00000000 };
-        union acpi_object args[4] = {
-                /* _DSM MUID */
-                { .buffer.type = 3,
-                  .buffer.length = sizeof(muid),
-                  .buffer.pointer = muid,
-                },
-                /* spec says this can be zero to mean "highest revision", but
-                 * of course there's at least one bios out there which fails
-                 * unless you pass in exactly the version it supports..
-                 */
-                { .integer.type = ACPI_TYPE_INTEGER,
-                  .integer.value = (version & 0xf0) << 4 | (version & 0x0f),
-                },
-                /* MXMS function */
-                { .integer.type = ACPI_TYPE_INTEGER,
-                  .integer.value = 0x00000010,
-                },
-                /* Pointer to MXMS arguments */
-                { .buffer.type = ACPI_TYPE_BUFFER,
-                  .buffer.length = sizeof(mxms_args),
-                  .buffer.pointer = (char *)mxms_args,
-                },
+        union acpi_object argv4 = {
+                .buffer.type = ACPI_TYPE_BUFFER,
+                .buffer.length = sizeof(mxms_args),
+                .buffer.pointer = (char *)mxms_args,
         };
-        struct acpi_object_list list = { ARRAY_SIZE(args), args };
-        struct acpi_buffer retn = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *obj;
         acpi_handle handle;
-        int ret;
+        int rev;
 
         handle = ACPI_HANDLE(&device->pdev->dev);
         if (!handle)
                 return false;
 
-        ret = acpi_evaluate_object(handle, "_DSM", &list, &retn);
-        if (ret) {
-                nv_debug(mxm, "DSM MXMS failed: %d\n", ret);
+        /*
+         * spec says this can be zero to mean "highest revision", but
+         * of course there's at least one bios out there which fails
+         * unless you pass in exactly the version it supports..
+         */
+        rev = (version & 0xf0) << 4 | (version & 0x0f);
+        obj = acpi_evaluate_dsm(handle, muid, rev, 0x00000010, &argv4);
+        if (!obj) {
+                nv_debug(mxm, "DSM MXMS failed\n");
                 return false;
         }
 
-        obj = retn.pointer;
         if (obj->type == ACPI_TYPE_BUFFER) {
                 mxm->mxms = kmemdup(obj->buffer.pointer,
                                          obj->buffer.length, GFP_KERNEL);
-        } else
-        if (obj->type == ACPI_TYPE_INTEGER) {
+        } else if (obj->type == ACPI_TYPE_INTEGER) {
                 nv_debug(mxm, "DSM MXMS returned 0x%llx\n", obj->integer.value);
         }
 
-        kfree(obj);
+        ACPI_FREE(obj);
         return mxm->mxms != NULL;
 }
 #endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index ba0183fb84f3..3c149617cfcb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -1,15 +1,10 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/video.h>
-#include <acpi/acpi.h>
 #include <linux/mxm-wmi.h>
-
 #include <linux/vga_switcheroo.h>
-
 #include <drm/drm_edid.h>
+#include <acpi/video.h>
 
 #include "nouveau_drm.h"
 #include "nouveau_acpi.h"
@@ -78,124 +73,66 @@ static const char nouveau_op_dsm_muid[] = {
 
 static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
 {
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
+        int i;
         union acpi_object *obj;
-        int i, err;
         char args_buff[4];
+        union acpi_object argv4 = {
+                .buffer.type = ACPI_TYPE_BUFFER,
+                .buffer.length = 4,
+                .buffer.pointer = args_buff
+        };
 
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(nouveau_op_dsm_muid);
-        params[0].buffer.pointer = (char *)nouveau_op_dsm_muid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 0x00000100;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_BUFFER;
-        params[3].buffer.length = 4;
         /* ACPI is little endian, AABBCCDD becomes {DD,CC,BB,AA} */
         for (i = 0; i < 4; i++)
                 args_buff[i] = (arg >> i * 8) & 0xFF;
-        params[3].buffer.pointer = args_buff;
-
-        err = acpi_evaluate_object(handle, "_DSM", &input, &output);
-        if (err) {
-                printk(KERN_INFO "failed to evaluate _DSM: %d\n", err);
-                return err;
-        }
-
-        obj = (union acpi_object *)output.pointer;
 
-        if (obj->type == ACPI_TYPE_INTEGER)
-                if (obj->integer.value == 0x80000002) {
-                        return -ENODEV;
-                }
-
-        if (obj->type == ACPI_TYPE_BUFFER) {
-                if (obj->buffer.length == 4 && result) {
-                        *result = 0;
+        *result = 0;
+        obj = acpi_evaluate_dsm_typed(handle, nouveau_op_dsm_muid, 0x00000100,
+                                      func, &argv4, ACPI_TYPE_BUFFER);
+        if (!obj) {
+                acpi_handle_info(handle, "failed to evaluate _DSM\n");
+                return AE_ERROR;
+        } else {
+                if (obj->buffer.length == 4) {
                         *result |= obj->buffer.pointer[0];
                         *result |= (obj->buffer.pointer[1] << 8);
                         *result |= (obj->buffer.pointer[2] << 16);
                         *result |= (obj->buffer.pointer[3] << 24);
                 }
+                ACPI_FREE(obj);
         }
 
-        kfree(output.pointer);
         return 0;
 }
 
-static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
+static int nouveau_dsm(acpi_handle handle, int func, int arg)
 {
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
+        int ret = 0;
         union acpi_object *obj;
-        int err;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(nouveau_dsm_muid);
-        params[0].buffer.pointer = (char *)nouveau_dsm_muid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 0x00000102;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_INTEGER;
-        params[3].integer.value = arg;
-
-        err = acpi_evaluate_object(handle, "_DSM", &input, &output);
-        if (err) {
-                printk(KERN_INFO "failed to evaluate _DSM: %d\n", err);
-                return err;
-        }
-
-        obj = (union acpi_object *)output.pointer;
-
-        if (obj->type == ACPI_TYPE_INTEGER)
+        union acpi_object argv4 = {
+                .integer.type = ACPI_TYPE_INTEGER,
+                .integer.value = arg,
+        };
+
+        obj = acpi_evaluate_dsm_typed(handle, nouveau_dsm_muid, 0x00000102,
+                                      func, &argv4, ACPI_TYPE_INTEGER);
+        if (!obj) {
+                acpi_handle_info(handle, "failed to evaluate _DSM\n");
+                return AE_ERROR;
+        } else {
                 if (obj->integer.value == 0x80000002)
-                        return -ENODEV;
-
-        if (obj->type == ACPI_TYPE_BUFFER) {
-                if (obj->buffer.length == 4 && result) {
-                        *result = 0;
-                        *result |= obj->buffer.pointer[0];
-                        *result |= (obj->buffer.pointer[1] << 8);
-                        *result |= (obj->buffer.pointer[2] << 16);
-                        *result |= (obj->buffer.pointer[3] << 24);
-                }
+                        ret = -ENODEV;
+                ACPI_FREE(obj);
         }
 
-        kfree(output.pointer);
-        return 0;
-}
-
-/* Returns 1 if a DSM function is usable and 0 otherwise */
-static int nouveau_test_dsm(acpi_handle test_handle,
-        int (*dsm_func)(acpi_handle, int, int, uint32_t *),
-        int sfnc)
-{
-        u32 result = 0;
-
-        /* Function 0 returns a Buffer containing available functions. The args
-         * parameter is ignored for function 0, so just put 0 in it */
-        if (dsm_func(test_handle, 0, 0, &result))
-                return 0;
-
-        /* ACPI Spec v4 9.14.1: if bit 0 is zero, no function is supported. If
-         * the n-th bit is enabled, function n is supported */
-        return result & 1 && result & (1 << sfnc);
+        return ret;
 }
 
 static int nouveau_dsm_switch_mux(acpi_handle handle, int mux_id)
 {
         mxm_wmi_call_mxmx(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
         mxm_wmi_call_mxds(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
-        return nouveau_dsm(handle, NOUVEAU_DSM_LED, mux_id, NULL);
+        return nouveau_dsm(handle, NOUVEAU_DSM_LED, mux_id);
 }
 
 static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switcheroo_state state)
@@ -205,7 +142,7 @@ static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switchero
                 arg = NOUVEAU_DSM_POWER_SPEED;
         else
                 arg = NOUVEAU_DSM_POWER_STAMINA;
-        nouveau_dsm(handle, NOUVEAU_DSM_POWER, arg, NULL);
+        nouveau_dsm(handle, NOUVEAU_DSM_POWER, arg);
         return 0;
 }
 
@@ -265,11 +202,12 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
                 nouveau_dsm_priv.other_handle = dhandle;
                 return false;
         }
-        if (nouveau_test_dsm(dhandle, nouveau_dsm, NOUVEAU_DSM_POWER))
+        if (acpi_check_dsm(dhandle, nouveau_dsm_muid, 0x00000102,
+                           1 << NOUVEAU_DSM_POWER))
                 retval |= NOUVEAU_DSM_HAS_MUX;
 
-        if (nouveau_test_dsm(dhandle, nouveau_optimus_dsm,
-                NOUVEAU_DSM_OPTIMUS_CAPS))
+        if (acpi_check_dsm(dhandle, nouveau_op_dsm_muid, 0x00000100,
+                           1 << NOUVEAU_DSM_OPTIMUS_CAPS))
                 retval |= NOUVEAU_DSM_HAS_OPT;
 
         if (retval & NOUVEAU_DSM_HAS_OPT) {
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
index 98a9074b306b..77e9d07c55b6 100644
--- a/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -25,18 +25,14 @@
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/power_supply.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
+#include <linux/vga_switcheroo.h>
 #include <acpi/video.h>
-
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include "radeon.h"
 #include "radeon_acpi.h"
 #include "atom.h"
 
-#include <linux/vga_switcheroo.h>
-
 #define ACPI_AC_CLASS           "ac_adapter"
 
 extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev);
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index e914f2755491..d1f81f52481a 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -850,37 +850,23 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client,
                 0xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45,
                 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE,
         };
-        union acpi_object params[4];
-        struct acpi_object_list input;
+        union acpi_object *obj;
         struct acpi_device *adev;
-        unsigned long long value;
         acpi_handle handle;
 
         handle = ACPI_HANDLE(&client->dev);
         if (!handle || acpi_bus_get_device(handle, &adev))
                 return -ENODEV;
 
-        input.count = ARRAY_SIZE(params);
-        input.pointer = params;
-
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(i2c_hid_guid);
-        params[0].buffer.pointer = i2c_hid_guid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 1;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = 1; /* HID function */
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        if (ACPI_FAILURE(acpi_evaluate_integer(handle, "_DSM", &input,
-                                                                &value))) {
+        obj = acpi_evaluate_dsm_typed(handle, i2c_hid_guid, 1, 1, NULL,
+                                      ACPI_TYPE_INTEGER);
+        if (!obj) {
                 dev_err(&client->dev, "device _DSM execution failed\n");
                 return -ENODEV;
         }
 
-        pdata->hid_descriptor_address = value;
+        pdata->hid_descriptor_address = obj->integer.value;
+        ACPI_FREE(obj);
 
         return 0;
 }
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 48aad4faea06..077bb1bdac34 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -30,7 +30,6 @@
 #include <linux/sysctl.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/completion.h>
 #include <linux/hyperv.h>
 #include <linux/kernel_stat.h>
@@ -39,7 +38,6 @@
 #include <asm/mshyperv.h>
 #include "hyperv_vmbus.h"
 
-
 static struct acpi_device  *hv_acpi_dev;
 
 static struct tasklet_struct msg_dpc;
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 6a34f7f48eb9..579bdf93be43 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -30,8 +30,7 @@
 #include <linux/sched.h>
 #include <linux/time.h>
 #include <linux/err.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 
 #define ACPI_POWER_METER_NAME           "power_meter"
 ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index dafc63c6932d..ae208f612198 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -16,11 +16,7 @@
 #include <linux/dmi.h>
 #include <linux/jiffies.h>
 #include <linux/err.h>
-
-#include <acpi/acpi.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
-
+#include <linux/acpi.h>
 
 #define ATK_HID "ATK0110"
 
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index d74c0b34248e..c4c5588ec0fb 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -104,6 +104,11 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
 static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct i2c_client       *client = to_i2c_client(dev);
+        int rc;
+
+        rc = acpi_device_uevent_modalias(dev, env);
+        if (rc != -ENODEV)
+                return rc;
 
         if (add_uevent_var(env, "MODALIAS=%s%s",
                            I2C_MODULE_PREFIX, client->name))
@@ -409,6 +414,12 @@ static ssize_t
 show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
+        int len;
+
+        len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
+        if (len != -ENODEV)
+                return len;
+
         return sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);
 }
 
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index d9e1f7ccfe6f..b6940992a6ff 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <acpi/acpi.h>
 #include <linux/ide.h>
 #include <linux/pci.h>
 #include <linux/dmi.h>
@@ -98,6 +97,17 @@ bool ide_port_acpi(ide_hwif_t *hwif)
         return ide_noacpi == 0 && hwif->acpidata;
 }
 
+static acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
+{
+        struct acpi_device *adev;
+
+        if (!handle || acpi_bus_get_device(handle, &adev))
+                return NULL;
+
+        adev = acpi_find_child_device(adev, addr, false);
+        return adev ? adev->handle : NULL;
+}
+
 /**
  * ide_get_dev_handle - finds acpi_handle and PCI device.function
  * @dev: device to locate
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 6c0e0452dd9b..8e1939f564f4 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -635,39 +635,10 @@ static int __init intel_idle_cpuidle_driver_init(void)
  */
 static int intel_idle_cpu_init(int cpu)
 {
-        int cstate;
         struct cpuidle_device *dev;
 
         dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);
 
-        dev->state_count = 1;
-
-        for (cstate = 0; cstate < CPUIDLE_STATE_MAX; ++cstate) {
-                int num_substates, mwait_hint, mwait_cstate, mwait_substate;
-
-                if (cpuidle_state_table[cstate].enter == NULL)
-                        break;
-
-                if (cstate + 1 > max_cstate) {
-                        printk(PREFIX "max_cstate %d reached\n", max_cstate);
-                        break;
-                }
-
-                mwait_hint = flg2MWAIT(cpuidle_state_table[cstate].flags);
-                mwait_cstate = MWAIT_HINT2CSTATE(mwait_hint);
-                mwait_substate = MWAIT_HINT2SUBSTATE(mwait_hint);
-
-                /* does the state exist in CPUID.MWAIT? */
-                num_substates = (mwait_substates >> ((mwait_cstate + 1) * 4))
-                                        & MWAIT_SUBSTATE_MASK;
-
-                /* if sub-state in table is not enumerated by CPUID */
-                if ((mwait_substate + 1) > num_substates)
-                        continue;
-
-                dev->state_count += 1;
-        }
-
         dev->cpu = cpu;
 
         if (cpuidle_register_device(dev)) {
@@ -679,6 +650,9 @@ static int intel_idle_cpu_init(int cpu)
         if (icpu->auto_demotion_disable_flags)
                 smp_call_function_single(cpu, auto_demotion_disable, NULL, 1);
 
+        if (icpu->disable_promotion_to_c1e)
+                smp_call_function_single(cpu, c1e_promotion_disable, NULL, 1);
+
         return 0;
 }
 
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index 5d4402365a52..d781b5e52065 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -28,8 +28,8 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/types.h>
+#include <linux/acpi.h>
 #include <asm/uaccess.h>
-#include <acpi/acpi_drivers.h>
 
 #define ACPI_ATLAS_NAME         "Atlas ACPI"
 #define ACPI_ATLAS_CLASS        "Atlas"
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 8f798be6e398..28b4bea7c109 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -26,7 +26,6 @@
 #include <linux/msi.h>
 #include <linux/amd-iommu.h>
 #include <linux/export.h>
-#include <acpi/acpi.h>
 #include <asm/pci-direct.h>
 #include <asm/iommu.h>
 #include <asm/gart.h>
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index bab10b1002fb..0cb7528b30a1 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -6,11 +6,11 @@
 #include <linux/hpet.h>
 #include <linux/pci.h>
 #include <linux/irq.h>
+#include <linux/intel-iommu.h>
+#include <linux/acpi.h>
 #include <asm/io_apic.h>
 #include <asm/smp.h>
 #include <asm/cpu.h>
-#include <linux/intel-iommu.h>
-#include <acpi/acpi.h>
 #include <asm/irq_remapping.h>
 #include <asm/pci-direct.h>
 #include <asm/msidef.h>
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 157b570ba343..92d1ba8e8153 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -308,7 +308,7 @@ static void sdio_acpi_set_handle(struct sdio_func *func)
         struct mmc_host *host = func->card->host;
         u64 addr = (host->slotno << 16) | func->num;
 
-        acpi_preset_companion(&func->dev, ACPI_HANDLE(host->parent), addr);
+        acpi_preset_companion(&func->dev, ACPI_COMPANION(host->parent), addr);
 }
 #else
 static inline void sdio_acpi_set_handle(struct sdio_func *func) {}
diff --git a/drivers/of/device.c b/drivers/of/device.c
index f685e55e0717..dafb9736ab9b 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -85,6 +85,9 @@ ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
         int cplen, i;
         ssize_t tsize, csize, repend;
 
+        if ((!dev) || (!dev->of_node))
+                return -ENODEV;
+
         /* Name & Type */
         csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
                          dev->of_node->type);
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index ee26bac2d378..cd929aed3613 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -494,7 +494,7 @@ static void acpiphp_bus_add(acpi_handle handle)
 
         acpi_bus_scan(handle);
         acpi_bus_get_device(handle, &adev);
-        if (adev)
+        if (acpi_device_enumerated(adev))
                 acpi_device_set_power(adev, ACPI_STATE_D0);
 }
 
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index ecfac7e72d91..8dcccffd6e21 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -31,12 +31,11 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <acpi/acpi_bus.h>
 #include <linux/sysfs.h>
 #include <linux/kobject.h>
-#include <asm/uaccess.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <asm/uaccess.h>
 
 #include "acpiphp.h"
 #include "../pci.h"
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index ccb0925bcd7b..88b37cad4b35 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -162,8 +162,6 @@ static inline const char *slot_name(struct slot *slot)
 }
 
 #ifdef CONFIG_ACPI
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/pci-acpi.h>
 
 void __init pciehp_acpi_slot_detection_init(void);
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 2c2930ea06ad..6b2b7dddbbdb 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
 
 struct ioapic {
         acpi_handle     handle;
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 2bdbc0080204..f49abef88485 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -12,9 +12,6 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/pci-aspm.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-
 #include <linux/pci-acpi.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_qos.h>
@@ -306,10 +303,10 @@ void acpi_pci_remove_bus(struct pci_bus *bus)
 }
 
 /* ACPI bus type */
-static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
+static struct acpi_device *acpi_pci_find_companion(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        bool is_bridge;
+        bool check_children;
         u64 addr;
 
         /*
@@ -317,14 +314,12 @@ static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
          * is set only after acpi_pci_find_device() has been called for the
          * given device.
          */
-        is_bridge = pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE
+        check_children = pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE
                         || pci_dev->hdr_type == PCI_HEADER_TYPE_CARDBUS;
         /* Please ref to ACPI spec for the syntax of _ADR */
         addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn);
-        *handle = acpi_find_child(ACPI_HANDLE(dev->parent), addr, is_bridge);
-        if (!*handle)
-                return -ENODEV;
-        return 0;
+        return acpi_find_child_device(ACPI_COMPANION(dev->parent), addr,
+                                      check_children);
 }
 
 static void pci_acpi_setup(struct device *dev)
@@ -367,7 +362,7 @@ static bool pci_acpi_bus_match(struct device *dev)
 static struct acpi_bus_type acpi_pci_bus = {
         .name = "PCI",
         .match = pci_acpi_bus_match,
-        .find_device = acpi_pci_find_device,
+        .find_companion = acpi_pci_find_companion,
         .setup = pci_acpi_setup,
         .cleanup = pci_acpi_cleanup,
 };
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 6f5d343d251c..45113daaa778 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -29,7 +29,6 @@
 #include <linux/nls.h>
 #include <linux/acpi.h>
 #include <linux/pci-acpi.h>
-#include <acpi/acpi_bus.h>
 #include "pci.h"
 
 #define DEVICE_LABEL_DSM        0x07
@@ -162,7 +161,6 @@ static const char device_label_dsm_uuid[] = {
 };
 
 enum acpi_attr_enum {
-        ACPI_ATTR_NONE = 0,
         ACPI_ATTR_LABEL_SHOW,
         ACPI_ATTR_INDEX_SHOW,
 };
@@ -170,84 +168,61 @@ enum acpi_attr_enum {
 static void dsm_label_utf16s_to_utf8s(union acpi_object *obj, char *buf)
 {
         int len;
-        len = utf16s_to_utf8s((const wchar_t *)obj->
-                              package.elements[1].string.pointer,
-                              obj->package.elements[1].string.length,
+        len = utf16s_to_utf8s((const wchar_t *)obj->string.pointer,
+                              obj->string.length,
                               UTF16_LITTLE_ENDIAN,
                               buf, PAGE_SIZE);
         buf[len] = '\n';
 }
 
 static int
-dsm_get_label(acpi_handle handle, int func,
-              struct acpi_buffer *output,
-              char *buf, enum acpi_attr_enum attribute)
+dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr)
 {
-        struct acpi_object_list input;
-        union acpi_object params[4];
-        union acpi_object *obj;
-        int len = 0;
-
-        int err;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(device_label_dsm_uuid);
-        params[0].buffer.pointer = (char *)device_label_dsm_uuid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 0x02;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        err = acpi_evaluate_object(handle, "_DSM", &input, output);
-        if (err)
+        acpi_handle handle;
+        union acpi_object *obj, *tmp;
+        int len = -1;
+
+        handle = ACPI_HANDLE(dev);
+        if (!handle)
                 return -1;
 
-        obj = (union acpi_object *)output->pointer;
-
-        switch (obj->type) {
-        case ACPI_TYPE_PACKAGE:
-                if (obj->package.count != 2)
-                        break;
-                len = obj->package.elements[0].integer.value;
-                if (buf) {
-                        if (attribute == ACPI_ATTR_INDEX_SHOW)
-                                scnprintf(buf, PAGE_SIZE, "%llu\n",
-                                obj->package.elements[0].integer.value);
-                        else if (attribute == ACPI_ATTR_LABEL_SHOW)
-                                dsm_label_utf16s_to_utf8s(obj, buf);
-                        kfree(output->pointer);
-                        return strlen(buf);
-                }
-                kfree(output->pointer);
-                return len;
-        break;
-        default:
-                kfree(output->pointer);
+        obj = acpi_evaluate_dsm(handle, device_label_dsm_uuid, 0x2,
+                                DEVICE_LABEL_DSM, NULL);
+        if (!obj)
+                return -1;
+
+        tmp = obj->package.elements;
+        if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 2 &&
+            tmp[0].type == ACPI_TYPE_INTEGER &&
+            tmp[1].type == ACPI_TYPE_STRING) {
+                /*
+                 * The second string element is optional even when
+                 * this _DSM is implemented; when not implemented,
+                 * this entry must return a null string.
+                 */
+                if (attr == ACPI_ATTR_INDEX_SHOW)
+                        scnprintf(buf, PAGE_SIZE, "%llu\n", tmp->integer.value);
+                else if (attr == ACPI_ATTR_LABEL_SHOW)
+                        dsm_label_utf16s_to_utf8s(tmp + 1, buf);
+                len = strlen(buf) > 0 ? strlen(buf) : -1;
         }
-        return -1;
+
+        ACPI_FREE(obj);
+
+        return len;
 }
 
 static bool
 device_has_dsm(struct device *dev)
 {
         acpi_handle handle;
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
 
         handle = ACPI_HANDLE(dev);
-
         if (!handle)
-                return FALSE;
+                return false;
 
-        if (dsm_get_label(handle, DEVICE_LABEL_DSM, &output, NULL,
-                          ACPI_ATTR_NONE) > 0)
-                return TRUE;
-
-        return FALSE;
+        return !!acpi_check_dsm(handle, device_label_dsm_uuid, 0x2,
+                                1 << DEVICE_LABEL_DSM);
 }
 
 static umode_t
@@ -266,44 +241,13 @@ acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n)
 static ssize_t
 acpilabel_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        acpi_handle handle;
-        int length;
-
-        handle = ACPI_HANDLE(dev);
-
-        if (!handle)
-                return -1;
-
-        length = dsm_get_label(handle, DEVICE_LABEL_DSM,
-                               &output, buf, ACPI_ATTR_LABEL_SHOW);
-
-        if (length < 1)
-                return -1;
-
-        return length;
+        return dsm_get_label(dev, buf, ACPI_ATTR_LABEL_SHOW);
 }
 
 static ssize_t
 acpiindex_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        acpi_handle handle;
-        int length;
-
-        handle = ACPI_HANDLE(dev);
-
-        if (!handle)
-                return -1;
-
-        length = dsm_get_label(handle, DEVICE_LABEL_DSM,
-                               &output, buf, ACPI_ATTR_INDEX_SHOW);
-
-        if (length < 0)
-                return -1;
-
-        return length;
-
+        return dsm_get_label(dev, buf, ACPI_ATTR_INDEX_SHOW);
 }
 
 static struct device_attribute acpi_attr_label = {
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index c9076bdaf2c1..c91f69b39db4 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -41,8 +41,6 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
-
-#include <acpi/acpi_drivers.h>
 #include <acpi/video.h>
 
 MODULE_AUTHOR("Carlos Corbacho");
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 594323a926cf..7f4dc6f51f8a 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -53,8 +53,7 @@
 #include <linux/rfkill.h>
 #include <linux/slab.h>
 #include <linux/dmi.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 
 #define ASUS_LAPTOP_VERSION     "0.42"
 
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 6fe268f6af91..109f6383040c 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -45,8 +45,7 @@
 #include <linux/seq_file.h>
 #include <linux/platform_device.h>
 #include <linux/thermal.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <acpi/video.h>
 
 #include "asus-wmi.h"
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 6dfa8d3b4eec..70d355a9ae2c 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -21,14 +21,13 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/backlight.h>
 #include <linux/input.h>
 #include <linux/rfkill.h>
 
 MODULE_LICENSE("GPL");
 
-
 struct cmpc_accel {
         int sensitivity;
         int g_select;
diff --git a/drivers/platform/x86/dell-wmi-aio.c b/drivers/platform/x86/dell-wmi-aio.c
index bcf8cc6b5537..dbc97a33bbc8 100644
--- a/drivers/platform/x86/dell-wmi-aio.c
+++ b/drivers/platform/x86/dell-wmi-aio.c
@@ -24,7 +24,6 @@
 #include <linux/types.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/acpi.h>
 #include <linux/string.h>
 
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 60e0900bc117..390e8e33d5e3 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -32,7 +32,6 @@
 #include <linux/types.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/acpi.h>
 #include <linux/string.h>
 #include <linux/dmi.h>
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 7029cba7025b..ed69ec5f36f7 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -28,8 +28,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/slab.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 #include <linux/uaccess.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index af67e6e56ebb..6112933f6278 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -33,7 +33,7 @@
 #include <linux/input/sparse-keymap.h>
 #include <linux/dmi.h>
 #include <linux/fb.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 
 #include "asus-wmi.h"
 
diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
index a8e43cf70fac..aff4d0670edf 100644
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -36,7 +36,7 @@
 #include <linux/uaccess.h>
 #include <linux/leds.h>
 #include <linux/atomic.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include "../../misc/lis3lv02d/lis3lv02d.h"
 
 #define DRIVER_NAME     "hp_accel"
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 19ec95147f69..6dd060a0bb65 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -26,8 +26,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/rfkill.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel-rst.c
index a2083a9e5662..d45bca34bf1b 100644
--- a/drivers/platform/x86/intel-rst.c
+++ b/drivers/platform/x86/intel-rst.c
@@ -20,7 +20,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c
index 1838400dc036..04cf5dffdfd9 100644
--- a/drivers/platform/x86/intel-smartconnect.c
+++ b/drivers/platform/x86/intel-smartconnect.c
@@ -19,7 +19,7 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index 11244f8703c4..e8b46d2c468c 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
@@ -36,10 +36,8 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
-
 #include <linux/thermal.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 MODULE_AUTHOR("Thomas Sujith");
 MODULE_AUTHOR("Zhang Rui");
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
index f6f18cde0f11..4bc960416785 100644
--- a/drivers/platform/x86/intel_oaktrail.c
+++ b/drivers/platform/x86/intel_oaktrail.c
@@ -50,9 +50,6 @@
 #include <linux/platform_device.h>
 #include <linux/dmi.h>
 #include <linux/rfkill.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-
 
 #define DRIVER_NAME     "intel_oaktrail"
 #define DRIVER_VERSION  "0.4ac1"
diff --git a/drivers/platform/x86/mxm-wmi.c b/drivers/platform/x86/mxm-wmi.c
index 0aea63b3729a..3c59c0a3ee0f 100644
--- a/drivers/platform/x86/mxm-wmi.c
+++ b/drivers/platform/x86/mxm-wmi.c
@@ -20,8 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 MODULE_AUTHOR("Dave Airlie");
 MODULE_DESCRIPTION("MXM WMI Driver");
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 3008fd20572e..609d38779b26 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -125,12 +125,10 @@
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
 
-
 #ifndef ACPI_HOTKEY_COMPONENT
 #define ACPI_HOTKEY_COMPONENT   0x10000000
 #endif
diff --git a/drivers/platform/x86/pvpanic.c b/drivers/platform/x86/pvpanic.c
index 47ae0c47d4b5..c9f6e511daa6 100644
--- a/drivers/platform/x86/pvpanic.c
+++ b/drivers/platform/x86/pvpanic.c
@@ -24,8 +24,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>");
 MODULE_DESCRIPTION("pvpanic device driver");
diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
index cae7098e9b0d..5413f62d2e61 100644
--- a/drivers/platform/x86/samsung-q10.c
+++ b/drivers/platform/x86/samsung-q10.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/backlight.h>
 #include <linux/dmi.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #define SAMSUNGQ10_BL_MAX_INTENSITY 7
 
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index fb233ae7bb0e..563e4f595f83 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -61,9 +61,6 @@
 #include <linux/workqueue.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
-#include <asm/uaccess.h>
 #include <linux/sonypi.h>
 #include <linux/sony-laptop.h>
 #include <linux/rfkill.h>
@@ -71,6 +68,7 @@
 #include <linux/poll.h>
 #include <linux/miscdevice.h>
 #endif
+#include <asm/uaccess.h>
 
 #define dprintk(fmt, ...)                       \
 do {                                            \
diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
index 9b93fdb61ed7..6a6ea28a7e51 100644
--- a/drivers/platform/x86/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
@@ -32,9 +32,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/platform_device.h>
 
 #define GUID "C364AC71-36DB-495A-8494-B439D472A505"
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 58b0274d24cc..defb6afc1409 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -61,7 +61,6 @@
 #include <linux/freezer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-
 #include <linux/nvram.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -74,21 +73,16 @@
 #include <linux/input.h>
 #include <linux/leds.h>
 #include <linux/rfkill.h>
-#include <asm/uaccess.h>
-
 #include <linux/dmi.h>
 #include <linux/jiffies.h>
 #include <linux/workqueue.h>
-
+#include <linux/acpi.h>
+#include <linux/pci_ids.h>
+#include <linux/thinkpad_acpi.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/initval.h>
-
-#include <acpi/acpi_drivers.h>
-
-#include <linux/pci_ids.h>
-
-#include <linux/thinkpad_acpi.h>
+#include <asm/uaccess.h>
 
 /* ThinkPad CMOS commands */
 #define TP_CMOS_VOLUME_DOWN     0
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 7fce391818d3..7ad1ed091f92 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -54,11 +54,9 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/i8042.h>
-
+#include <linux/acpi.h>
 #include <asm/uaccess.h>
 
-#include <acpi/acpi_drivers.h>
-
 MODULE_AUTHOR("John Belmonte");
 MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 74dd01ae343b..2cb1ea62b4a7 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -23,14 +23,12 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@gmail.com>");
 MODULE_DESCRIPTION("Toshiba Laptop ACPI Bluetooth Enable Driver");
 MODULE_LICENSE("GPL");
 
-
 static int toshiba_bt_rfkill_add(struct acpi_device *device);
 static int toshiba_bt_rfkill_remove(struct acpi_device *device);
 static void toshiba_bt_rfkill_notify(struct acpi_device *device, u32 event);
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index c2e7b2657aeb..43d13295e63d 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -37,8 +37,6 @@
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 
 ACPI_MODULE_NAME("wmi");
 MODULE_AUTHOR("Carlos Corbacho");
diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c
index 4b1377bd5944..49cbccec6e2d 100644
--- a/drivers/platform/x86/xo15-ebook.c
+++ b/drivers/platform/x86/xo15-ebook.c
@@ -18,8 +18,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/input.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 
 #define MODULE_NAME "xo15-ebook"
 
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index bc00693d0c79..874c236ac1a7 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -239,6 +239,7 @@ int pnp_add_card(struct pnp_card *card)
         error = device_register(&card->dev);
         if (error) {
                 dev_err(&card->dev, "could not register (err=%d)\n", error);
+                put_device(&card->dev);
                 return error;
         }
 
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 14655a0f0431..9f611cbbc294 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -24,7 +24,6 @@
 #include <linux/pnp.h>
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
-#include <acpi/acpi_bus.h>
 
 #include "../base.h"
 #include "pnpacpi.h"
@@ -242,6 +241,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         struct pnp_dev *dev;
         char *pnpid;
         struct acpi_hardware_id *id;
+        int error;
 
         /* Skip devices that are already bound */
         if (device->physical_node_count)
@@ -300,10 +300,16 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         /* clear out the damaged flags */
         if (!dev->active)
                 pnp_init_resources(dev);
-        pnp_add_device(dev);
+
+        error = pnp_add_device(dev);
+        if (error) {
+                put_device(&dev->dev);
+                return error;
+        }
+
         num++;
 
-        return AE_OK;
+        return 0;
 }
 
 static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
@@ -329,20 +335,15 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)
             && compare_pnp_id(pnp->id, acpi_device_hid(acpi));
 }
 
-static int __init acpi_pnp_find_device(struct device *dev, acpi_handle * handle)
+static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev)
 {
-        struct device *adev;
-        struct acpi_device *acpi;
-
-        adev = bus_find_device(&acpi_bus_type, NULL,
-                               to_pnp_dev(dev), acpi_pnp_match);
-        if (!adev)
-                return -ENODEV;
+        dev = bus_find_device(&acpi_bus_type, NULL, to_pnp_dev(dev),
+                              acpi_pnp_match);
+        if (!dev)
+                return NULL;
 
-        acpi = to_acpi_device(adev);
-        *handle = acpi->handle;
-        put_device(adev);
-        return 0;
+        put_device(dev);
+        return to_acpi_device(dev);
 }
 
 /* complete initialization of a PNPACPI device includes having
@@ -356,7 +357,7 @@ static bool acpi_pnp_bus_match(struct device *dev)
 static struct acpi_bus_type __initdata acpi_pnp_bus = {
         .name        = "PNP",
         .match       = acpi_pnp_bus_match,
-        .find_device = acpi_pnp_find_device,
+        .find_companion = acpi_pnp_find_companion,
 };
 
 int pnpacpi_disabled __initdata;
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h
index 3e60225b0227..051ef9699777 100644
--- a/drivers/pnp/pnpacpi/pnpacpi.h
+++ b/drivers/pnp/pnpacpi/pnpacpi.h
@@ -1,7 +1,6 @@
 #ifndef ACPI_PNP_H
 #define ACPI_PNP_H
 
-#include <acpi/acpi_bus.h>
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 9b86a01af631..074569e77d22 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -312,18 +312,19 @@ static int __init insert_device(struct pnp_bios_node *node)
         struct list_head *pos;
         struct pnp_dev *dev;
         char id[8];
+        int error;
 
         /* check if the device is already added */
         list_for_each(pos, &pnpbios_protocol.devices) {
                 dev = list_entry(pos, struct pnp_dev, protocol_list);
                 if (dev->number == node->handle)
-                        return -1;
+                        return -EEXIST;
         }
 
         pnp_eisa_id_to_string(node->eisa_id & PNP_EISA_ID_MASK, id);
         dev = pnp_alloc_dev(&pnpbios_protocol, node->handle, id);
         if (!dev)
-                return -1;
+                return -ENOMEM;
 
         pnpbios_parse_data_stream(dev, node);
         dev->active = pnp_is_active(dev);
@@ -342,7 +343,12 @@ static int __init insert_device(struct pnp_bios_node *node)
         if (!dev->active)
                 pnp_init_resources(dev);
 
-        pnp_add_device(dev);
+        error = pnp_add_device(dev);
+        if (error) {
+                put_device(&dev->dev);
+                return error;
+        }
+
         pnpbios_interface_attach_device(node);
 
         return 0;
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index d95e101ffb43..bacddd102ae9 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -31,7 +31,7 @@ static int pnp_reserve_mem[16] = {[0 ... 15] = -1 };	/* reserve (don't use) some
  * option registration
  */
 
-struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long type,
+static struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long type,
                                     unsigned int option_flags)
 {
         struct pnp_option *option;
diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
index f5b4ca581541..d277b36eb389 100644
--- a/drivers/sfi/sfi_acpi.c
+++ b/drivers/sfi/sfi_acpi.c
@@ -60,9 +60,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>
-
-#include <linux/sfi.h>
+#include <linux/sfi_acpi.h>
 #include "sfi_core.h"
 
 /*
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 349ebba4b199..827ff49d3d4f 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -58,6 +58,11 @@ static ssize_t
 modalias_show(struct device *dev, struct device_attribute *a, char *buf)
 {
         const struct spi_device *spi = to_spi_device(dev);
+        int len;
+
+        len = acpi_device_modalias(dev, buf, PAGE_SIZE - 1);
+        if (len != -ENODEV)
+                return len;
 
         return sprintf(buf, "%s%s\n", SPI_MODULE_PREFIX, spi->modalias);
 }
@@ -114,6 +119,11 @@ static int spi_match_device(struct device *dev, struct device_driver *drv)
 static int spi_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         const struct spi_device         *spi = to_spi_device(dev);
+        int rc;
+
+        rc = acpi_device_uevent_modalias(dev, env);
+        if (rc != -ENODEV)
+                return rc;
 
         add_uevent_var(env, "MODALIAS=%s%s", SPI_MODULE_PREFIX, spi->modalias);
         return 0;
diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c
index 9f6ebdb23740..a85c3d68c462 100644
--- a/drivers/staging/quickstart/quickstart.c
+++ b/drivers/staging/quickstart/quickstart.c
@@ -31,7 +31,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
 
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 073c292baa53..476b768c633e 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -131,8 +131,8 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
 
 #define EXYNOS4412_TMU_DATA \
         .threshold_falling = 10, \
-        .trigger_levels[0] = 85, \
-        .trigger_levels[1] = 103, \
+        .trigger_levels[0] = 70, \
+        .trigger_levels[1] = 95, \
         .trigger_levels[2] = 110, \
         .trigger_levels[3] = 120, \
         .trigger_enable[0] = true, \
@@ -155,12 +155,12 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
         .second_point_trim = 85, \
         .default_temp_offset = 50, \
         .freq_tab[0] = { \
-                .freq_clip_max = 800 * 1000, \
-                .temp_level = 85, \
+                .freq_clip_max = 1400 * 1000, \
+                .temp_level = 70, \
         }, \
         .freq_tab[1] = { \
-                .freq_clip_max = 200 * 1000, \
-                .temp_level = 103, \
+                .freq_clip_max = 400 * 1000, \
+                .temp_level = 95, \
         }, \
         .freq_tab_count = 2, \
         .registers = &exynos4412_tmu_registers, \
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index d7cb822d6eab..5ca4070b1f38 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -16,7 +16,6 @@
 #include <linux/acpi.h>
 #include <linux/pci.h>
 #include <linux/usb/hcd.h>
-#include <acpi/acpi_bus.h>
 
 #include "usb.h"
 
@@ -127,7 +126,7 @@ out:
         return ret;
 }
 
-static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
+static struct acpi_device *usb_acpi_find_companion(struct device *dev)
 {
         struct usb_device *udev;
         acpi_handle *parent_handle;
@@ -169,16 +168,15 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
                                 break;
                         }
 
-                        return -ENODEV;
+                        return NULL;
                 }
 
                 /* root hub's parent is the usb hcd. */
-                parent_handle = ACPI_HANDLE(dev->parent);
-                *handle = acpi_get_child(parent_handle, udev->portnum);
-                if (!*handle)
-                        return -ENODEV;
-                return 0;
+                return acpi_find_child_device(ACPI_COMPANION(dev->parent),
+                                              udev->portnum, false);
         } else if (is_usb_port(dev)) {
+                struct acpi_device *adev = NULL;
+
                 sscanf(dev_name(dev), "port%d", &port_num);
                 /* Get the struct usb_device point of port's hub */
                 udev = to_usb_device(dev->parent->parent);
@@ -194,26 +192,27 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
 
                         raw_port_num = usb_hcd_find_raw_port_number(hcd,
                                 port_num);
-                        *handle = acpi_get_child(ACPI_HANDLE(&udev->dev),
-                                raw_port_num);
-                        if (!*handle)
-                                return -ENODEV;
+                        adev = acpi_find_child_device(ACPI_COMPANION(&udev->dev),
+                                                      raw_port_num, false);
+                        if (!adev)
+                                return NULL;
                 } else {
                         parent_handle =
                                 usb_get_hub_port_acpi_handle(udev->parent,
                                 udev->portnum);
                         if (!parent_handle)
-                                return -ENODEV;
+                                return NULL;
 
-                        *handle = acpi_get_child(parent_handle, port_num);
-                        if (!*handle)
-                                return -ENODEV;
+                        acpi_bus_get_device(parent_handle, &adev);
+                        adev = acpi_find_child_device(adev, port_num, false);
+                        if (!adev)
+                                return NULL;
                 }
-                usb_acpi_check_port_connect_type(udev, *handle, port_num);
-        } else
-                return -ENODEV;
+                usb_acpi_check_port_connect_type(udev, adev->handle, port_num);
+                return adev;
+        }
 
-        return 0;
+        return NULL;
 }
 
 static bool usb_acpi_bus_match(struct device *dev)
@@ -224,7 +223,7 @@ static bool usb_acpi_bus_match(struct device *dev)
 static struct acpi_bus_type usb_acpi_bus = {
         .name = "USB",
         .match = usb_acpi_bus_match,
-        .find_device = usb_acpi_find_device,
+        .find_companion = usb_acpi_find_companion,
 };
 
 int usb_acpi_register(void)
diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c
index 8dae6c13063a..80875fb770ed 100644
--- a/drivers/xen/xen-acpi-cpuhotplug.c
+++ b/drivers/xen/xen-acpi-cpuhotplug.c
@@ -24,10 +24,7 @@
 #include <linux/cpu.h>
 #include <linux/acpi.h>
 #include <linux/uaccess.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
-
 #include <xen/acpi.h>
 #include <xen/interface/platform.h>
 #include <asm/xen/hypercall.h>
@@ -269,7 +266,8 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
                 if (!is_processor_present(handle))
                         break;
 
-                if (!acpi_bus_get_device(handle, &device))
+                acpi_bus_get_device(handle, &device);
+                if (acpi_device_enumerated(device))
                         break;
 
                 result = acpi_bus_scan(handle);
@@ -277,8 +275,9 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
                         pr_err(PREFIX "Unable to add the device\n");
                         break;
                 }
-                result = acpi_bus_get_device(handle, &device);
-                if (result) {
+                device = NULL;
+                acpi_bus_get_device(handle, &device);
+                if (!acpi_device_enumerated(device)) {
                         pr_err(PREFIX "Missing device object\n");
                         break;
                 }
diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c
index 9083f1e474f8..f8d18626969a 100644
--- a/drivers/xen/xen-acpi-memhotplug.c
+++ b/drivers/xen/xen-acpi-memhotplug.c
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <xen/acpi.h>
 #include <xen/interface/platform.h>
 #include <asm/xen/hypercall.h>
@@ -169,7 +168,7 @@ static int acpi_memory_get_device(acpi_handle handle,
         acpi_scan_lock_acquire();
 
         acpi_bus_get_device(handle, &device);
-        if (device)
+        if (acpi_device_enumerated(device))
                 goto end;
 
         /*
@@ -182,8 +181,9 @@ static int acpi_memory_get_device(acpi_handle handle,
                 result = -EINVAL;
                 goto out;
         }
-        result = acpi_bus_get_device(handle, &device);
-        if (result) {
+        device = NULL;
+        acpi_bus_get_device(handle, &device);
+        if (!acpi_device_enumerated(device)) {
                 pr_warn(PREFIX "Missing device object\n");
                 result = -EINVAL;
                 goto out;
diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c
index 59708fdd068b..40c4bc06b5fa 100644
--- a/drivers/xen/xen-acpi-pad.c
+++ b/drivers/xen/xen-acpi-pad.c
@@ -18,11 +18,10 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#include <asm/xen/hypercall.h>
+#include <linux/acpi.h>
 #include <xen/interface/version.h>
 #include <xen/xen-ops.h>
+#include <asm/xen/hypercall.h>
 
 #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 13bc6c31c060..7231859119f1 100644
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -28,10 +28,8 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/syscore_ops.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <acpi/processor.h>
-
 #include <xen/xen.h>
 #include <xen/interface/platform.h>
 #include <asm/xen/hypercall.h>
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index ddabed1f51c2..8256eb4ad057 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -28,8 +28,6 @@
 
 #include <linux/device.h>
 
-#include <acpi/acpi.h>
-
 /* TBD: Make dynamic */
 #define ACPI_MAX_HANDLES        10
 struct acpi_handle_list {
@@ -66,6 +64,32 @@ bool acpi_ata_match(acpi_handle handle);
 bool acpi_bay_match(acpi_handle handle);
 bool acpi_dock_match(acpi_handle handle);
 
+bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs);
+union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
+                        int rev, int func, union acpi_object *argv4);
+
+static inline union acpi_object *
+acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, int rev, int func,
+                        union acpi_object *argv4, acpi_object_type type)
+{
+        union acpi_object *obj;
+
+        obj = acpi_evaluate_dsm(handle, uuid, rev, func, argv4);
+        if (obj && obj->type != type) {
+                ACPI_FREE(obj);
+                obj = NULL;
+        }
+
+        return obj;
+}
+
+#define ACPI_INIT_DSM_ARGV4(cnt, eles)                  \
+        {                                               \
+          .package.type = ACPI_TYPE_PACKAGE,            \
+          .package.count = (cnt),                       \
+          .package.elements = (eles)                    \
+        }
+
 #ifdef CONFIG_ACPI
 
 #include <linux/proc_fs.h>
@@ -91,17 +115,11 @@ struct acpi_device;
  * -----------------
  */
 
-enum acpi_hotplug_mode {
-        AHM_GENERIC = 0,
-        AHM_CONTAINER,
-        AHM_COUNT
-};
-
 struct acpi_hotplug_profile {
         struct kobject kobj;
+        int (*scan_dependent)(struct acpi_device *adev);
         bool enabled:1;
-        bool ignore:1;
-        enum acpi_hotplug_mode mode;
+        bool demand_offline:1;
 };
 
 static inline struct acpi_hotplug_profile *to_acpi_hotplug_profile(
@@ -169,8 +187,10 @@ struct acpi_device_flags {
         u32 ejectable:1;
         u32 power_manageable:1;
         u32 match_driver:1;
+        u32 initialized:1;
+        u32 visited:1;
         u32 no_hotplug:1;
-        u32 reserved:26;
+        u32 reserved:24;
 };
 
 /* File System */
@@ -300,6 +320,7 @@ struct acpi_device {
         struct list_head children;
         struct list_head node;
         struct list_head wakeup_list;
+        struct list_head del_list;
         struct acpi_device_status status;
         struct acpi_device_flags flags;
         struct acpi_device_pnp pnp;
@@ -325,6 +346,11 @@ static inline void *acpi_driver_data(struct acpi_device *d)
 #define to_acpi_device(d)       container_of(d, struct acpi_device, dev)
 #define to_acpi_driver(d)       container_of(d, struct acpi_driver, drv)
 
+static inline void acpi_set_device_status(struct acpi_device *adev, u32 sta)
+{
+        *((u32 *)&adev->status) = sta;
+}
+
 /* acpi_device.dev.bus == &acpi_bus_type */
 extern struct bus_type acpi_bus_type;
 
@@ -387,6 +413,11 @@ int acpi_match_device_ids(struct acpi_device *device,
 int acpi_create_dir(struct acpi_device *);
 void acpi_remove_dir(struct acpi_device *);
 
+static inline bool acpi_device_enumerated(struct acpi_device *adev)
+{
+        return adev && adev->flags.initialized && adev->flags.visited;
+}
+
 typedef void (*acpi_hp_callback)(void *data, u32 src);
 
 acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src);
@@ -410,7 +441,7 @@ struct acpi_bus_type {
         struct list_head list;
         const char *name;
         bool (*match)(struct device *dev);
-        int (*find_device) (struct device *, acpi_handle *);
+        struct acpi_device * (*find_companion)(struct device *);
         void (*setup)(struct device *);
         void (*cleanup)(struct device *);
 };
@@ -429,12 +460,9 @@ struct acpi_pci_root {
 };
 
 /* helper */
-acpi_handle acpi_find_child(acpi_handle, u64, bool);
-static inline acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
-{
-        return acpi_find_child(handle, addr, false);
-}
-void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr);
+
+struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
+                                           u64 address, bool check_children);
 int acpi_is_root_bridge(acpi_handle);
 struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
 
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 1cedfcb1bd88..b124fdb26046 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -26,9 +26,6 @@
 #ifndef __ACPI_DRIVERS_H__
 #define __ACPI_DRIVERS_H__
 
-#include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-
 #define ACPI_MAX_STRING                 80
 
 /*
diff --git a/include/linux/acpi_io.h b/include/acpi/acpi_io.h
index b0ffa219993e..2be858018c7f 100644
--- a/include/linux/acpi_io.h
+++ b/include/acpi/acpi_io.h
@@ -2,7 +2,6 @@
 #define _ACPI_IO_H_
 
 #include <linux/io.h>
-#include <acpi/acpi.h>
 
 static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
                                             acpi_size size)
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 4278aba96503..d2f16f14b419 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20131115
+#define ACPI_CA_VERSION                 0x20131218
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
@@ -54,7 +54,6 @@
 #include <acpi/acbuffer.h>
 
 extern u8 acpi_gbl_permanent_mmap;
-extern u32 acpi_rsdt_forced;
 
 /*
  * Globals that are publically available
@@ -72,17 +71,19 @@ extern u32 acpi_dbg_layer;
 
 /* ACPICA runtime options */
 
-extern u8 acpi_gbl_enable_interpreter_slack;
 extern u8 acpi_gbl_all_methods_serialized;
-extern u8 acpi_gbl_create_osi_method;
-extern u8 acpi_gbl_use_default_register_widths;
-extern acpi_name acpi_gbl_trace_method_name;
-extern u32 acpi_gbl_trace_flags;
-extern bool acpi_gbl_enable_aml_debug_object;
 extern u8 acpi_gbl_copy_dsdt_locally;
-extern u8 acpi_gbl_truncate_io_addresses;
+extern u8 acpi_gbl_create_osi_method;
 extern u8 acpi_gbl_disable_auto_repair;
 extern u8 acpi_gbl_disable_ssdt_table_load;
+extern u8 acpi_gbl_do_not_use_xsdt;
+extern bool acpi_gbl_enable_aml_debug_object;
+extern u8 acpi_gbl_enable_interpreter_slack;
+extern u32 acpi_gbl_trace_flags;
+extern acpi_name acpi_gbl_trace_method_name;
+extern u8 acpi_gbl_truncate_io_addresses;
+extern u8 acpi_gbl_use32_bit_fadt_addresses;
+extern u8 acpi_gbl_use_default_register_widths;
 
 /*
  * Hardware-reduced prototypes. All interfaces that use these macros will
@@ -130,10 +131,9 @@ acpi_status __init acpi_terminate(void);
  * Miscellaneous global interfaces
  */
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable(void))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable(void))
 #ifdef ACPI_FUTURE_USAGE
- acpi_status acpi_subsystem_status(void);
+acpi_status acpi_subsystem_status(void);
 #endif
 
 #ifdef ACPI_FUTURE_USAGE
@@ -278,16 +278,13 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                 acpi_install_sci_handler(acpi_sci_handler
                                                          address,
                                                          void *context))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_remove_sci_handler(acpi_sci_handler
                                                          address))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_install_global_event_handler
                                  (acpi_gbl_event_handler handler,
                                   void *context))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_install_fixed_event_handler(u32
                                                                   acpi_event,
@@ -295,12 +292,10 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                                                   handler,
                                                                   void
                                                                   *context))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_remove_fixed_event_handler(u32 acpi_event,
                                                                  acpi_event_handler
                                                                  handler))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_install_gpe_handler(acpi_handle
                                                           gpe_device,
@@ -309,15 +304,14 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                                           acpi_gpe_handler
                                                           address,
                                                           void *context))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_remove_gpe_handler(acpi_handle gpe_device,
                                                          u32 gpe_number,
                                                          acpi_gpe_handler
                                                          address))
 acpi_status acpi_install_notify_handler(acpi_handle device, u32 handler_type,
-                                        acpi_notify_handler handler,
-                                        void *context);
+                                         acpi_notify_handler handler,
+                                         void *context);
 
 acpi_status
 acpi_remove_notify_handler(acpi_handle device,
@@ -366,7 +360,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                 acpi_disable_event(u32 event, u32 flags))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_clear_event(u32 event))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
@@ -404,20 +397,16 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                                         parent_device,
                                                         acpi_handle gpe_device,
                                                         u32 gpe_number))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_set_gpe_wake_mask(acpi_handle gpe_device,
                                                         u32 gpe_number,
                                                         u8 action))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_get_gpe_status(acpi_handle gpe_device,
                                                      u32 gpe_number,
                                                      acpi_event_status
                                                      *event_status))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
@@ -431,7 +420,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                                        *gpe_block_address,
                                                        u32 register_count,
                                                        u32 interrupt_number))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                  acpi_remove_gpe_block(acpi_handle gpe_device))
 
@@ -532,7 +520,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
 #ifdef ACPI_FUTURE_USAGE
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                 acpi_get_timer_resolution(u32 *resolution))
-
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_get_timer(u32 *ticks))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 94970880126f..325aeae1fa99 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -182,6 +182,9 @@ struct acpi_table_xsdt {
         u64 table_offset_entry[1];      /* Array of pointers to ACPI tables */
 };
 
+#define ACPI_RSDT_ENTRY_SIZE        (sizeof (u32))
+#define ACPI_XSDT_ENTRY_SIZE        (sizeof (u64))
+
 /*******************************************************************************
  *
  * FACS - Firmware ACPI Control Structure (FACS)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 40f7ed115452..094a906a0e98 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -327,6 +327,11 @@ struct acpi_table_dbg2 {
         u32 info_count;
 };
 
+struct acpi_dbg2_header {
+        u32 info_offset;
+        u32 info_count;
+};
+
 /* Debug Device Information Subtable */
 
 struct acpi_dbg2_device {
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index e2c0931a3d67..01c2a9013e40 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -374,16 +374,22 @@ struct acpi_mpst_shared {
 struct acpi_table_pcct {
         struct acpi_table_header header;        /* Common ACPI table header */
         u32 flags;
-        u32 latency;
-        u32 reserved;
+        u64 reserved;
 };
 
 /* Values for Flags field above */
 
 #define ACPI_PCCT_DOORBELL              1
 
+/* Values for subtable type in struct acpi_subtable_header */
+
+enum acpi_pcct_type {
+        ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0,
+        ACPI_PCCT_TYPE_RESERVED = 1     /* 1 and greater are reserved */
+};
+
 /*
- * PCCT subtables
+ * PCCT Subtables, correspond to Type in struct acpi_subtable_header
  */
 
 /* 0: Generic Communications Subspace */
@@ -396,6 +402,9 @@ struct acpi_pcct_subspace {
         struct acpi_generic_address doorbell_register;
         u64 preserve_mask;
         u64 write_mask;
+        u32 latency;
+        u32 max_access_rate;
+        u16 min_turnaround_time;
 };
 
 /*
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 809b1a0fee7f..68a3ada689c9 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -928,8 +928,8 @@ struct acpi_object_list {
  * Miscellaneous common Data Structures used by the interfaces
  */
 #define ACPI_NO_BUFFER              0
-#define ACPI_ALLOCATE_BUFFER        (acpi_size) (-1)
-#define ACPI_ALLOCATE_LOCAL_BUFFER  (acpi_size) (-2)
+#define ACPI_ALLOCATE_BUFFER        (acpi_size) (-1)    /* Let ACPICA allocate buffer */
+#define ACPI_ALLOCATE_LOCAL_BUFFER  (acpi_size) (-2)    /* For internal use only (enables tracking) */
 
 struct acpi_buffer {
         acpi_size length;       /* Length in bytes of the buffer */
@@ -937,14 +937,6 @@ struct acpi_buffer {
 };
 
 /*
- * Free a buffer created in an struct acpi_buffer via ACPI_ALLOCATE_BUFFER.
- * Note: We use acpi_os_free here because acpi_os_allocate was used to allocate
- * the buffer. This purposefully bypasses the internal allocation tracking
- * mechanism (if it is enabled).
- */
-#define ACPI_FREE_BUFFER(b)         acpi_os_free((b).pointer)
-
-/*
  * name_type for acpi_get_name
  */
 #define ACPI_FULL_PATHNAME              0
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 974d3ef7c141..b402eb67af83 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -96,13 +96,14 @@
 #endif
 
 /*
- * acpi_bin/acpi_dump/acpi_src/acpi_xtract configuration. All single
+ * acpi_bin/acpi_dump/acpi_src/acpi_xtract/Example configuration. All single
  * threaded, with no debug output.
  */
-#if (defined ACPI_BIN_APP)   || \
-        (defined ACPI_DUMP_APP)  || \
-        (defined ACPI_SRC_APP)   || \
-        (defined ACPI_XTRACT_APP)
+#if (defined ACPI_BIN_APP)      || \
+        (defined ACPI_DUMP_APP)     || \
+        (defined ACPI_SRC_APP)      || \
+        (defined ACPI_XTRACT_APP)   || \
+        (defined ACPI_EXAMPLE_APP)
 #define ACPI_APPLICATION
 #define ACPI_SINGLE_THREADED
 #endif
@@ -394,4 +395,13 @@ typedef char *va_list;
 
 #endif                          /* ACPI_USE_SYSTEM_CLIBRARY */
 
+#ifndef ACPI_FILE
+#ifdef ACPI_APPLICATION
+#include <stdio.h>
+#define ACPI_FILE              FILE *
+#else
+#define ACPI_FILE              void *
+#endif                          /* ACPI_APPLICATION */
+#endif                          /* ACPI_FILE */
+
 #endif                          /* __ACENV_H__ */
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 28f4f4dba0b6..008aa287c7a9 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -239,10 +239,6 @@ void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
  */
 void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
 
-void acpi_os_gpe_count(u32 gpe_number);
-
-void acpi_os_fixed_event_count(u32 fixed_event_number);
-
 #endif                          /* __KERNEL__ */
 
 #endif                          /* __ACLINUX_H__ */
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d9099b15b472..1151a1dcfe41 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -42,6 +42,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_numa.h>
+#include <acpi/acpi_io.h>
 #include <asm/acpi.h>
 
 static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
@@ -53,6 +54,12 @@ static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
 #define ACPI_COMPANION_SET(dev, adev)   ACPI_COMPANION(dev) = (adev)
 #define ACPI_HANDLE(dev)                acpi_device_handle(ACPI_COMPANION(dev))
 
+static inline void acpi_preset_companion(struct device *dev,
+                                         struct acpi_device *parent, u64 addr)
+{
+        ACPI_COMPANION_SET(dev, acpi_find_child_device(parent, addr, NULL));
+}
+
 static inline const char *acpi_dev_name(struct acpi_device *adev)
 {
         return dev_name(&adev->dev);
@@ -409,6 +416,9 @@ static inline bool acpi_driver_match_device(struct device *dev,
         return !!acpi_match_device(drv->acpi_match_table, dev);
 }
 
+int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
+int acpi_device_modalias(struct device *, char *, int);
+
 #define ACPI_PTR(_ptr)  (_ptr)
 
 #else   /* !CONFIG_ACPI */
@@ -460,7 +470,7 @@ struct acpi_table_header;
 static inline int acpi_table_parse(char *id,
                                 int (*handler)(struct acpi_table_header *))
 {
-        return -1;
+        return -ENODEV;
 }
 
 static inline int acpi_nvs_register(__u64 start, __u64 size)
@@ -488,6 +498,18 @@ static inline bool acpi_driver_match_device(struct device *dev,
         return false;
 }
 
+static inline int acpi_device_uevent_modalias(struct device *dev,
+                                struct kobj_uevent_env *env)
+{
+        return -ENODEV;
+}
+
+static inline int acpi_device_modalias(struct device *dev,
+                                char *buf, int size)
+{
+        return -ENODEV;
+}
+
 #define ACPI_PTR(_ptr)  (NULL)
 
 #endif  /* !CONFIG_ACPI */
diff --git a/include/linux/container.h b/include/linux/container.h
new file mode 100644
index 000000000000..3c03e6fd2035
--- /dev/null
+++ b/include/linux/container.h
@@ -0,0 +1,25 @@
+/*
+ * Definitions for container bus type.
+ *
+ * Copyright (C) 2013, Intel Corporation
+ * Author: 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/device.h>
+
+/* drivers/base/power/container.c */
+extern struct bus_type container_subsys;
+
+struct container_dev {
+        struct device dev;
+        int (*offline)(struct container_dev *cdev);
+};
+
+static inline struct container_dev *to_container_dev(struct device *dev)
+{
+        return container_of(dev, struct container_dev, dev);
+}
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index dc196bbcf227..4d89e0e6f9cc 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -11,6 +11,7 @@
 #ifndef _LINUX_CPUFREQ_H
 #define _LINUX_CPUFREQ_H
 
+#include <linux/clk.h>
 #include <linux/cpumask.h>
 #include <linux/completion.h>
 #include <linux/kobject.h>
@@ -66,6 +67,7 @@ struct cpufreq_policy {
         unsigned int            cpu;    /* cpu nr of CPU managing this policy */
         unsigned int            last_cpu; /* cpu nr of previous CPU that managed
                                            * this policy */
+        struct clk              *clk;
         struct cpufreq_cpuinfo  cpuinfo;/* see above */
 
         unsigned int            min;    /* in kHz */
@@ -225,6 +227,11 @@ struct cpufreq_driver {
         int     (*suspend)      (struct cpufreq_policy *policy);
         int     (*resume)       (struct cpufreq_policy *policy);
         struct freq_attr        **attr;
+
+        /* platform specific boost support code */
+        bool                    boost_supported;
+        bool                    boost_enabled;
+        int     (*set_boost)    (int state);
 };
 
 /* flags */
@@ -252,6 +259,15 @@ struct cpufreq_driver {
  */
 #define CPUFREQ_ASYNC_NOTIFICATION  (1 << 4)
 
+/*
+ * Set by drivers which want cpufreq core to check if CPU is running at a
+ * frequency present in freq-table exposed by the driver. For these drivers if
+ * CPU is found running at an out of table freq, we will try to set it to a freq
+ * from the table. And if that fails, we will stop further boot process by
+ * issuing a BUG_ON().
+ */
+#define CPUFREQ_NEED_INITIAL_FREQ_CHECK (1 << 5)
+
 int cpufreq_register_driver(struct cpufreq_driver *driver_data);
 int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);
 
@@ -299,6 +315,8 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy)
 #define CPUFREQ_NOTIFY                  (2)
 #define CPUFREQ_START                   (3)
 #define CPUFREQ_UPDATE_POLICY_CPU       (4)
+#define CPUFREQ_CREATE_POLICY           (5)
+#define CPUFREQ_REMOVE_POLICY           (6)
 
 #ifdef CONFIG_CPU_FREQ
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
@@ -306,6 +324,8 @@ int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
 
 void cpufreq_notify_transition(struct cpufreq_policy *policy,
                 struct cpufreq_freqs *freqs, unsigned int state);
+void cpufreq_notify_post_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, int transition_failed);
 
 #else /* CONFIG_CPU_FREQ */
 static inline int cpufreq_register_notifier(struct notifier_block *nb,
@@ -420,6 +440,7 @@ extern struct cpufreq_governor cpufreq_gov_conservative;
 
 #define CPUFREQ_ENTRY_INVALID ~0
 #define CPUFREQ_TABLE_END     ~1
+#define CPUFREQ_BOOST_FREQ    ~2
 
 struct cpufreq_frequency_table {
         unsigned int    driver_data; /* driver specific data, not used by core */
@@ -439,10 +460,30 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                                    unsigned int target_freq,
                                    unsigned int relation,
                                    unsigned int *index);
+int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
+                unsigned int freq);
 
 void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy);
 ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf);
 
+#ifdef CONFIG_CPU_FREQ
+int cpufreq_boost_trigger_state(int state);
+int cpufreq_boost_supported(void);
+int cpufreq_boost_enabled(void);
+#else
+static inline int cpufreq_boost_trigger_state(int state)
+{
+        return 0;
+}
+static inline int cpufreq_boost_supported(void)
+{
+        return 0;
+}
+static inline int cpufreq_boost_enabled(void)
+{
+        return 0;
+}
+#endif
 /* the following funtion is for cpufreq core use only */
 struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu);
 
@@ -455,6 +496,7 @@ void cpufreq_frequency_table_put_attr(unsigned int cpu);
 int cpufreq_table_validate_and_show(struct cpufreq_policy *policy,
                                       struct cpufreq_frequency_table *table);
 
+unsigned int cpufreq_generic_get(unsigned int cpu);
 int cpufreq_generic_init(struct cpufreq_policy *policy,
                 struct cpufreq_frequency_table *table,
                 unsigned int transition_latency);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 46a14229a162..93b5ca754b5b 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -18,14 +18,10 @@
 #include <linux/completion.h>
 #include <linux/pm.h>
 #include <linux/mutex.h>
-#ifdef CONFIG_BLK_DEV_IDEACPI
-#include <acpi/acpi.h>
-#endif
-#include <asm/byteorder.h>
-#include <asm/io.h>
-
 /* for request_sense */
 #include <linux/cdrom.h>
+#include <asm/byteorder.h>
+#include <asm/io.h>
 
 #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)
 # define SUPPORT_VLB_SYNC 0
diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h
index 8ba7e5b9d62c..605cc5c333d9 100644
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
@@ -21,7 +21,7 @@
 #ifndef ISCSI_IBFT_H
 #define ISCSI_IBFT_H
 
-#include <acpi/acpi.h>
+#include <linux/acpi.h>
 
 /*
  * Logical location of iSCSI Boot Format Table.
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 82ce324fdce7..8d7dd6768cb7 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -64,6 +64,12 @@ static inline int of_driver_match_device(struct device *dev,
 static inline void of_device_uevent(struct device *dev,
                         struct kobj_uevent_env *env) { }
 
+static inline int of_device_get_modalias(struct device *dev,
+                                   char *str, ssize_t len)
+{
+        return -ENODEV;
+}
+
 static inline int of_device_uevent_modalias(struct device *dev,
                                    struct kobj_uevent_env *env)
 {
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index a2e2f1d17e16..5f2e559af6b0 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -175,8 +175,7 @@ struct hotplug_params {
 };
 
 #ifdef CONFIG_ACPI
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);
 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
 int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
diff --git a/include/linux/pm.h b/include/linux/pm.h
index a224c7f5c377..8c6583a53a06 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -311,6 +311,18 @@ struct dev_pm_ops {
 #define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn)
 #endif
 
+#ifdef CONFIG_PM_SLEEP
+#define SET_LATE_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
+        .suspend_late = suspend_fn, \
+        .resume_early = resume_fn, \
+        .freeze_late = suspend_fn, \
+        .thaw_early = resume_fn, \
+        .poweroff_late = suspend_fn, \
+        .restore_early = resume_fn,
+#else
+#define SET_LATE_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn)
+#endif
+
 #ifdef CONFIG_PM_RUNTIME
 #define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \
         .runtime_suspend = suspend_fn, \
@@ -320,6 +332,15 @@ struct dev_pm_ops {
 #define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn)
 #endif
 
+#ifdef CONFIG_PM
+#define SET_PM_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \
+        .runtime_suspend = suspend_fn, \
+        .runtime_resume = resume_fn, \
+        .runtime_idle = idle_fn,
+#else
+#define SET_PM_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn)
+#endif
+
 /*
  * Use this if you want to use the same suspend and resume callbacks for suspend
  * to RAM and hibernation.
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 6fa7cea25da9..16c9a62fa1c0 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -23,6 +23,14 @@
                                             usage_count */
 #define RPM_AUTO                0x08    /* Use autosuspend_delay */
 
+#ifdef CONFIG_PM
+extern int pm_generic_runtime_suspend(struct device *dev);
+extern int pm_generic_runtime_resume(struct device *dev);
+#else
+static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
+static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
+#endif
+
 #ifdef CONFIG_PM_RUNTIME
 
 extern struct workqueue_struct *pm_wq;
@@ -37,8 +45,6 @@ extern void pm_runtime_enable(struct device *dev);
 extern void __pm_runtime_disable(struct device *dev, bool check_resume);
 extern void pm_runtime_allow(struct device *dev);
 extern void pm_runtime_forbid(struct device *dev);
-extern int pm_generic_runtime_suspend(struct device *dev);
-extern int pm_generic_runtime_resume(struct device *dev);
 extern void pm_runtime_no_callbacks(struct device *dev);
 extern void pm_runtime_irq_safe(struct device *dev);
 extern void __pm_runtime_use_autosuspend(struct device *dev, bool use);
@@ -142,8 +148,6 @@ static inline bool pm_runtime_active(struct device *dev) { return true; }
 static inline bool pm_runtime_status_suspended(struct device *dev) { return false; }
 static inline bool pm_runtime_enabled(struct device *dev) { return false; }
 
-static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
-static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
 static inline void pm_runtime_no_callbacks(struct device *dev) {}
 static inline void pm_runtime_irq_safe(struct device *dev) {}
 
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
index 631af63af42d..4723bbfa1c26 100644
--- a/include/linux/sfi_acpi.h
+++ b/include/linux/sfi_acpi.h
@@ -59,8 +59,11 @@
 #ifndef _LINUX_SFI_ACPI_H
 #define _LINUX_SFI_ACPI_H
 
+#include <linux/acpi.h>
+#include <linux/sfi.h>
+
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>          /* struct acpi_table_header */
+#include <acpi/acpi.h>  /* FIXME: inclusion should be removed */
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
                                 char *oem_table_id,
diff --git a/include/linux/tboot.h b/include/linux/tboot.h
index c75128bed5fa..9a54b331f938 100644
--- a/include/linux/tboot.h
+++ b/include/linux/tboot.h
@@ -34,7 +34,7 @@ enum {
 };
 
 #ifdef CONFIG_INTEL_TXT
-#include <acpi/acpi.h>
+#include <linux/acpi.h>
 /* used to communicate between tboot and the launched kernel */
 
 #define TB_KEY_SIZE             64   /* 512 bits */
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index cda100d6762d..9e9475c85de5 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -35,6 +35,59 @@ DEFINE_EVENT(cpu, cpu_idle,
         TP_ARGS(state, cpu_id)
 );
 
+TRACE_EVENT(pstate_sample,
+
+        TP_PROTO(u32 core_busy,
+                u32 scaled_busy,
+                u32 state,
+                u64 mperf,
+                u64 aperf,
+                u32 energy,
+                u32 freq
+                ),
+
+        TP_ARGS(core_busy,
+                scaled_busy,
+                state,
+                mperf,
+                aperf,
+                energy,
+                freq
+                ),
+
+        TP_STRUCT__entry(
+                __field(u32, core_busy)
+                __field(u32, scaled_busy)
+                __field(u32, state)
+                __field(u64, mperf)
+                __field(u64, aperf)
+                __field(u32, energy)
+                __field(u32, freq)
+
+        ),
+
+        TP_fast_assign(
+                __entry->core_busy = core_busy;
+                __entry->scaled_busy = scaled_busy;
+                __entry->state = state;
+                __entry->mperf = mperf;
+                __entry->aperf = aperf;
+                __entry->energy = energy;
+                __entry->freq = freq;
+                ),
+
+        TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu energy=%lu freq=%lu ",
+                (unsigned long)__entry->core_busy,
+                (unsigned long)__entry->scaled_busy,
+                (unsigned long)__entry->state,
+                (unsigned long long)__entry->mperf,
+                (unsigned long long)__entry->aperf,
+                (unsigned long)__entry->energy,
+                (unsigned long)__entry->freq
+                )
+
+);
+
 /* This file can get included multiple times, TRACE_HEADER_MULTI_READ at top */
 #ifndef _PWR_EVENT_AVOID_DOUBLE_DEFINING
 #define _PWR_EVENT_AVOID_DOUBLE_DEFINING
diff --git a/include/uapi/linux/apm_bios.h b/include/uapi/linux/apm_bios.h
index 724f409adae0..df79bca1b898 100644
--- a/include/uapi/linux/apm_bios.h
+++ b/include/uapi/linux/apm_bios.h
@@ -67,6 +67,8 @@ struct apm_bios_info {
 #define APM_USER_SUSPEND        0x000a
 #define APM_STANDBY_RESUME      0x000b
 #define APM_CAPABILITY_CHANGE   0x000c
+#define APM_USER_HIBERNATION    0x000d
+#define APM_HIBERNATION_RESUME  0x000e
 
 /*
  * Error codes
diff --git a/init/main.c b/init/main.c
index f333385d9a4f..3f1f4e4b61f7 100644
--- a/init/main.c
+++ b/init/main.c
@@ -563,6 +563,7 @@ asmlinkage void __init start_kernel(void)
         init_timers();
         hrtimers_init();
         softirq_init();
+        acpi_early_init();
         timekeeping_init();
         time_init();
         sched_clock_postinit();
@@ -640,7 +641,6 @@ asmlinkage void __init start_kernel(void)
 
         check_bugs();
 
-        acpi_early_init(); /* before LAPIC and SMP init */
         sfi_init_late();
 
         if (efi_enabled(EFI_RUNTIME_SERVICES)) {
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 0121dab83f43..37170d4dd9a6 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -82,6 +82,7 @@ void hibernation_set_ops(const struct platform_hibernation_ops *ops)
 
         unlock_system_sleep();
 }
+EXPORT_SYMBOL_GPL(hibernation_set_ops);
 
 static bool entering_platform_hibernation;
 
@@ -293,10 +294,10 @@ static int create_image(int platform_mode)
                         error);
         /* Restore control flow magically appears here */
         restore_processor_state();
-        if (!in_suspend) {
+        if (!in_suspend)
                 events_check_enabled = false;
-                platform_leave(platform_mode);
-        }
+
+        platform_leave(platform_mode);
 
  Power_up:
         syscore_resume();
diff --git a/scripts/analyze_suspend.py b/scripts/analyze_suspend.py
new file mode 100755
index 000000000000..4f2cc12dc7c7
--- /dev/null
+++ b/scripts/analyze_suspend.py
@@ -0,0 +1,1446 @@
+#!/usr/bin/python
+#
+# Tool for analyzing suspend/resume timing
+# Copyright (c) 2013, Intel Corporation.
+#
+# 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Authors:
+#        Todd Brandt <todd.e.brandt@linux.intel.com>
+#
+# Description:
+#        This tool is designed to assist kernel and OS developers in optimizing
+#        their linux stack's suspend/resume time. Using a kernel image built
+#        with a few extra options enabled, the tool will execute a suspend and
+#        will capture dmesg and ftrace data until resume is complete. This data
+#        is transformed into a device timeline and a callgraph to give a quick
+#        and detailed view of which devices and callbacks are taking the most
+#        time in suspend/resume. The output is a single html file which can be
+#        viewed in firefox or chrome.
+#
+#        The following kernel build options are required:
+#                CONFIG_PM_DEBUG=y
+#                CONFIG_PM_SLEEP_DEBUG=y
+#                CONFIG_FTRACE=y
+#                CONFIG_FUNCTION_TRACER=y
+#                CONFIG_FUNCTION_GRAPH_TRACER=y
+#
+#        The following additional kernel parameters are required:
+#                (e.g. in file /etc/default/grub)
+#                GRUB_CMDLINE_LINUX_DEFAULT="... initcall_debug log_buf_len=16M ..."
+#
+
+import sys
+import time
+import os
+import string
+import re
+import array
+import platform
+import datetime
+import struct
+
+# -- classes --
+
+class SystemValues:
+        testdir = "."
+        tpath = "/sys/kernel/debug/tracing/"
+        mempath = "/dev/mem"
+        powerfile = "/sys/power/state"
+        suspendmode = "mem"
+        prefix = "test"
+        teststamp = ""
+        dmesgfile = ""
+        ftracefile = ""
+        htmlfile = ""
+        rtcwake = False
+        def setOutputFile(self):
+                if((self.htmlfile == "") and (self.dmesgfile != "")):
+                        m = re.match(r"(?P<name>.*)_dmesg\.txt$", self.dmesgfile)
+                        if(m):
+                                self.htmlfile = m.group("name")+".html"
+                if((self.htmlfile == "") and (self.ftracefile != "")):
+                        m = re.match(r"(?P<name>.*)_ftrace\.txt$", self.ftracefile)
+                        if(m):
+                                self.htmlfile = m.group("name")+".html"
+                if(self.htmlfile == ""):
+                        self.htmlfile = "output.html"
+        def initTestOutput(self):
+                hostname = platform.node()
+                if(hostname != ""):
+                        self.prefix = hostname
+                v = os.popen("cat /proc/version").read().strip()
+                kver = string.split(v)[2]
+                self.testdir = os.popen("date \"+suspend-%m%d%y-%H%M%S\"").read().strip()
+                self.teststamp = "# "+self.testdir+" "+self.prefix+" "+self.suspendmode+" "+kver
+                self.dmesgfile = self.testdir+"/"+self.prefix+"_"+self.suspendmode+"_dmesg.txt"
+                self.ftracefile = self.testdir+"/"+self.prefix+"_"+self.suspendmode+"_ftrace.txt"
+                self.htmlfile = self.testdir+"/"+self.prefix+"_"+self.suspendmode+".html"
+                os.mkdir(self.testdir)
+
+class Data:
+        altdevname = dict()
+        usedmesg = False
+        useftrace = False
+        notestrun = False
+        verbose = False
+        phases = []
+        dmesg = {} # root data structure
+        start = 0.0
+        end = 0.0
+        stamp = {'time': "", 'host': "", 'mode': ""}
+        id = 0
+        tSuspended = 0.0
+        fwValid = False
+        fwSuspend = 0
+        fwResume = 0
+        def initialize(self):
+                self.dmesg = { # dmesg log data
+                        'suspend_general': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "#CCFFCC", 'order': 0},
+                          'suspend_early': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "green", 'order': 1},
+                          'suspend_noirq': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "#00FFFF", 'order': 2},
+                                'suspend_cpu': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "blue", 'order': 3},
+                                 'resume_cpu': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "red", 'order': 4},
+                           'resume_noirq': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "orange", 'order': 5},
+                           'resume_early': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "yellow", 'order': 6},
+                         'resume_general': {'list': dict(), 'start': -1.0, 'end': -1.0,
+                                                                'row': 0, 'color': "#FFFFCC", 'order': 7}
+                }
+                self.phases = self.sortedPhases()
+        def normalizeTime(self):
+                tSus = tRes = self.tSuspended
+                if self.fwValid:
+                        tSus -= -self.fwSuspend / 1000000000.0
+                        tRes -= self.fwResume / 1000000000.0
+                self.tSuspended = 0.0
+                self.start -= tSus
+                self.end -= tRes
+                for phase in self.phases:
+                        zero = tRes
+                        if "suspend" in phase:
+                                zero = tSus
+                        p = self.dmesg[phase]
+                        p['start'] -= zero
+                        p['end'] -= zero
+                        list = p['list']
+                        for name in list:
+                                d = list[name]
+                                d['start'] -= zero
+                                d['end'] -= zero
+                                if('ftrace' in d):
+                                        cg = d['ftrace']
+                                        cg.start -= zero
+                                        cg.end -= zero
+                                        for line in cg.list:
+                                                line.time -= zero
+                if self.fwValid:
+                        fws = -self.fwSuspend / 1000000000.0
+                        fwr = self.fwResume / 1000000000.0
+                        list = dict()
+                        self.id += 1
+                        devid = "dc%d" % self.id
+                        list["firmware-suspend"] = \
+                                {'start': fws, 'end': 0, 'pid': 0, 'par': "",
+                                'length': -fws, 'row': 0, 'id': devid };
+                        self.id += 1
+                        devid = "dc%d" % self.id
+                        list["firmware-resume"] = \
+                                {'start': 0, 'end': fwr, 'pid': 0, 'par': "",
+                                'length': fwr, 'row': 0, 'id': devid };
+                        self.dmesg['BIOS'] = \
+                                {'list': list, 'start': fws, 'end': fwr,
+                                'row': 0, 'color': "purple", 'order': 4}
+                        self.dmesg['resume_cpu']['order'] += 1
+                        self.dmesg['resume_noirq']['order'] += 1
+                        self.dmesg['resume_early']['order'] += 1
+                        self.dmesg['resume_general']['order'] += 1
+                        self.phases = self.sortedPhases()
+        def vprint(self, msg):
+                if(self.verbose):
+                        print(msg)
+        def dmesgSortVal(self, phase):
+                return self.dmesg[phase]['order']
+        def sortedPhases(self):
+                return sorted(self.dmesg, key=self.dmesgSortVal)
+        def sortedDevices(self, phase):
+                list = self.dmesg[phase]['list']
+                slist = []
+                tmp = dict()
+                for devname in list:
+                        dev = list[devname]
+                        tmp[dev['start']] = devname
+                for t in sorted(tmp):
+                        slist.append(tmp[t])
+                return slist
+        def fixupInitcalls(self, phase, end):
+                # if any calls never returned, clip them at system resume end
+                phaselist = self.dmesg[phase]['list']
+                for devname in phaselist:
+                        dev = phaselist[devname]
+                        if(dev['end'] < 0):
+                                dev['end'] = end
+                                self.vprint("%s (%s): callback didn't return" % (devname, phase))
+        def fixupInitcallsThatDidntReturn(self):
+                # if any calls never returned, clip them at system resume end
+                for phase in self.phases:
+                        self.fixupInitcalls(phase, self.dmesg['resume_general']['end'])
+                        if(phase == "resume_general"):
+                                break
+        def newAction(self, phase, name, pid, parent, start, end):
+                self.id += 1
+                devid = "dc%d" % self.id
+                list = self.dmesg[phase]['list']
+                length = -1.0
+                if(start >= 0 and end >= 0):
+                        length = end - start
+                list[name] = {'start': start, 'end': end, 'pid': pid, 'par': parent,
+                                          'length': length, 'row': 0, 'id': devid }
+        def deviceIDs(self, devlist, phase):
+                idlist = []
+                for p in self.phases:
+                        if(p[0] != phase[0]):
+                                continue
+                        list = data.dmesg[p]['list']
+                        for devname in list:
+                                if devname in devlist:
+                                        idlist.append(list[devname]['id'])
+                return idlist
+        def deviceParentID(self, devname, phase):
+                pdev = ""
+                pdevid = ""
+                for p in self.phases:
+                        if(p[0] != phase[0]):
+                                continue
+                        list = data.dmesg[p]['list']
+                        if devname in list:
+                                pdev = list[devname]['par']
+                for p in self.phases:
+                        if(p[0] != phase[0]):
+                                continue
+                        list = data.dmesg[p]['list']
+                        if pdev in list:
+                                return list[pdev]['id']
+                return pdev
+        def deviceChildrenIDs(self, devname, phase):
+                devlist = []
+                for p in self.phases:
+                        if(p[0] != phase[0]):
+                                continue
+                        list = data.dmesg[p]['list']
+                        for child in list:
+                                if(list[child]['par'] == devname):
+                                        devlist.append(child)
+                return self.deviceIDs(devlist, phase)
+
+class FTraceLine:
+        time = 0.0
+        length = 0.0
+        fcall = False
+        freturn = False
+        fevent = False
+        depth = 0
+        name = ""
+        def __init__(self, t, m, d):
+                self.time = float(t)
+                # check to see if this is a trace event
+                em = re.match(r"^ *\/\* *(?P<msg>.*) \*\/ *$", m)
+                if(em):
+                        self.name = em.group("msg")
+                        self.fevent = True
+                        return
+                # convert the duration to seconds
+                if(d):
+                        self.length = float(d)/1000000
+                # the indentation determines the depth
+                match = re.match(r"^(?P<d> *)(?P<o>.*)$", m)
+                if(not match):
+                        return
+                self.depth = self.getDepth(match.group('d'))
+                m = match.group('o')
+                # function return
+                if(m[0] == '}'):
+                        self.freturn = True
+                        if(len(m) > 1):
+                                # includes comment with function name
+                                match = re.match(r"^} *\/\* *(?P<n>.*) *\*\/$", m)
+                                if(match):
+                                        self.name = match.group('n')
+                # function call
+                else:
+                        self.fcall = True
+                        # function call with children
+                        if(m[-1] == '{'):
+                                match = re.match(r"^(?P<n>.*) *\(.*", m)
+                                if(match):
+                                        self.name = match.group('n')
+                        # function call with no children (leaf)
+                        elif(m[-1] == ';'):
+                                self.freturn = True
+                                match = re.match(r"^(?P<n>.*) *\(.*", m)
+                                if(match):
+                                        self.name = match.group('n')
+                        # something else (possibly a trace marker)
+                        else:
+                                self.name = m
+        def getDepth(self, str):
+                return len(str)/2
+
+class FTraceCallGraph:
+        start = -1.0
+        end = -1.0
+        list = []
+        invalid = False
+        depth = 0
+        def __init__(self):
+                self.start = -1.0
+                self.end = -1.0
+                self.list = []
+                self.depth = 0
+        def setDepth(self, line):
+                if(line.fcall and not line.freturn):
+                        line.depth = self.depth
+                        self.depth += 1
+                elif(line.freturn and not line.fcall):
+                        self.depth -= 1
+                        line.depth = self.depth
+                else:
+                        line.depth = self.depth
+        def addLine(self, line, match):
+                if(not self.invalid):
+                        self.setDepth(line)
+                if(line.depth == 0 and line.freturn):
+                        self.end = line.time
+                        self.list.append(line)
+                        return True
+                if(self.invalid):
+                        return False
+                if(len(self.list) >= 1000000 or self.depth < 0):
+                   first = self.list[0]
+                   self.list = []
+                   self.list.append(first)
+                   self.invalid = True
+                   id = "task %s cpu %s" % (match.group("pid"), match.group("cpu"))
+                   window = "(%f - %f)" % (self.start, line.time)
+                   data.vprint("Too much data for "+id+" "+window+", ignoring this callback")
+                   return False
+                self.list.append(line)
+                if(self.start < 0):
+                        self.start = line.time
+                return False
+        def sanityCheck(self):
+                stack = dict()
+                cnt = 0
+                for l in self.list:
+                        if(l.fcall and not l.freturn):
+                                stack[l.depth] = l
+                                cnt += 1
+                        elif(l.freturn and not l.fcall):
+                                if(not stack[l.depth]):
+                                        return False
+                                stack[l.depth].length = l.length
+                                stack[l.depth] = 0
+                                l.length = 0
+                                cnt -= 1
+                if(cnt == 0):
+                        return True
+                return False
+        def debugPrint(self, filename):
+                if(filename == "stdout"):
+                        print("[%f - %f]") % (self.start, self.end)
+                        for l in self.list:
+                                if(l.freturn and l.fcall):
+                                        print("%f (%02d): %s(); (%.3f us)" % (l.time, l.depth, l.name, l.length*1000000))
+                                elif(l.freturn):
+                                        print("%f (%02d): %s} (%.3f us)" % (l.time, l.depth, l.name, l.length*1000000))
+                                else:
+                                        print("%f (%02d): %s() { (%.3f us)" % (l.time, l.depth, l.name, l.length*1000000))
+                        print(" ")
+                else:
+                        fp = open(filename, 'w')
+                        print(filename)
+                        for l in self.list:
+                                if(l.freturn and l.fcall):
+                                        fp.write("%f (%02d): %s(); (%.3f us)\n" % (l.time, l.depth, l.name, l.length*1000000))
+                                elif(l.freturn):
+                                        fp.write("%f (%02d): %s} (%.3f us)\n" % (l.time, l.depth, l.name, l.length*1000000))
+                                else:
+                                        fp.write("%f (%02d): %s() { (%.3f us)\n" % (l.time, l.depth, l.name, l.length*1000000))
+                        fp.close()
+
+class Timeline:
+        html = {}
+        scaleH = 0.0 # height of the timescale row as a percent of the timeline height
+        rowH = 0.0 # height of each row in percent of the timeline height
+        row_height_pixels = 30
+        maxrows = 0
+        height = 0
+        def __init__(self):
+                self.html = {
+                        'timeline': "",
+                        'legend': "",
+                        'scale': ""
+                }
+        def setRows(self, rows):
+                self.maxrows = int(rows)
+                self.scaleH = 100.0/float(self.maxrows)
+                self.height = self.maxrows*self.row_height_pixels
+                r = float(self.maxrows - 1)
+                if(r < 1.0):
+                        r = 1.0
+                self.rowH = (100.0 - self.scaleH)/r
+
+# -- global objects --
+
+sysvals = SystemValues()
+data = Data()
+
+# -- functions --
+
+# Function: initFtrace
+# Description:
+#        Configure ftrace to capture a function trace during suspend/resume
+def initFtrace():
+        global sysvals
+
+        print("INITIALIZING FTRACE...")
+        # turn trace off
+        os.system("echo 0 > "+sysvals.tpath+"tracing_on")
+        # set the trace clock to global
+        os.system("echo global > "+sysvals.tpath+"trace_clock")
+        # set trace buffer to a huge value
+        os.system("echo nop > "+sysvals.tpath+"current_tracer")
+        os.system("echo 100000 > "+sysvals.tpath+"buffer_size_kb")
+        # clear the trace buffer
+        os.system("echo \"\" > "+sysvals.tpath+"trace")
+        # set trace type
+        os.system("echo function_graph > "+sysvals.tpath+"current_tracer")
+        os.system("echo \"\" > "+sysvals.tpath+"set_ftrace_filter")
+        # set trace format options
+        os.system("echo funcgraph-abstime > "+sysvals.tpath+"trace_options")
+        os.system("echo funcgraph-proc > "+sysvals.tpath+"trace_options")
+        # focus only on device suspend and resume
+        os.system("cat "+sysvals.tpath+"available_filter_functions | grep dpm_run_callback > "+sysvals.tpath+"set_graph_function")
+
+# Function: verifyFtrace
+# Description:
+#        Check that ftrace is working on the system
+def verifyFtrace():
+        global sysvals
+        files = ["available_filter_functions", "buffer_size_kb",
+                         "current_tracer", "set_ftrace_filter",
+                         "trace", "trace_marker"]
+        for f in files:
+                if(os.path.exists(sysvals.tpath+f) == False):
+                        return False
+        return True
+
+def parseStamp(line):
+        global data, sysvals
+        stampfmt = r"# suspend-(?P<m>[0-9]{2})(?P<d>[0-9]{2})(?P<y>[0-9]{2})-"+\
+                                "(?P<H>[0-9]{2})(?P<M>[0-9]{2})(?P<S>[0-9]{2})"+\
+                                " (?P<host>.*) (?P<mode>.*) (?P<kernel>.*)$"
+        m = re.match(stampfmt, line)
+        if(m):
+                dt = datetime.datetime(int(m.group("y"))+2000, int(m.group("m")),
+                        int(m.group("d")), int(m.group("H")), int(m.group("M")),
+                        int(m.group("S")))
+                data.stamp['time'] = dt.strftime("%B %d %Y, %I:%M:%S %p")
+                data.stamp['host'] = m.group("host")
+                data.stamp['mode'] = m.group("mode")
+                data.stamp['kernel'] = m.group("kernel")
+                sysvals.suspendmode = data.stamp['mode']
+
+# Function: analyzeTraceLog
+# Description:
+#        Analyse an ftrace log output file generated from this app during
+#        the execution phase. Create an "ftrace" structure in memory for
+#        subsequent formatting in the html output file
+def analyzeTraceLog():
+        global sysvals, data
+
+        # the ftrace data is tied to the dmesg data
+        if(not data.usedmesg):
+                return
+
+        # read through the ftrace and parse the data
+        data.vprint("Analyzing the ftrace data...")
+        ftrace_line_fmt = r"^ *(?P<time>[0-9\.]*) *\| *(?P<cpu>[0-9]*)\)"+\
+                                           " *(?P<proc>.*)-(?P<pid>[0-9]*) *\|"+\
+                                           "[ +!]*(?P<dur>[0-9\.]*) .*\|  (?P<msg>.*)"
+        ftemp = dict()
+        inthepipe = False
+        tf = open(sysvals.ftracefile, 'r')
+        count = 0
+        for line in tf:
+                count = count + 1
+                # grab the time stamp if it's valid
+                if(count == 1):
+                        parseStamp(line)
+                        continue
+                # parse only valid lines
+                m = re.match(ftrace_line_fmt, line)
+                if(not m):
+                        continue
+                m_time = m.group("time")
+                m_pid = m.group("pid")
+                m_msg = m.group("msg")
+                m_dur = m.group("dur")
+                if(m_time and m_pid and m_msg):
+                        t = FTraceLine(m_time, m_msg, m_dur)
+                        pid = int(m_pid)
+                else:
+                        continue
+                # the line should be a call, return, or event
+                if(not t.fcall and not t.freturn and not t.fevent):
+                        continue
+                # only parse the ftrace data during suspend/resume
+                if(not inthepipe):
+                        # look for the suspend start marker
+                        if(t.fevent):
+                                if(t.name == "SUSPEND START"):
+                                        data.vprint("SUSPEND START %f %s:%d" % (t.time, sysvals.ftracefile, count))
+                                        inthepipe = True
+                                continue
+                else:
+                        # look for the resume end marker
+                        if(t.fevent):
+                                if(t.name == "RESUME COMPLETE"):
+                                        data.vprint("RESUME COMPLETE %f %s:%d" % (t.time, sysvals.ftracefile, count))
+                                        inthepipe = False
+                                        break
+                                continue
+                        # create a callgraph object for the data
+                        if(pid not in ftemp):
+                                ftemp[pid] = FTraceCallGraph()
+                        # when the call is finished, see which device matches it
+                        if(ftemp[pid].addLine(t, m)):
+                                if(not ftemp[pid].sanityCheck()):
+                                        id = "task %s cpu %s" % (pid, m.group("cpu"))
+                                        data.vprint("Sanity check failed for "+id+", ignoring this callback")
+                                        continue
+                                callstart = ftemp[pid].start
+                                callend = ftemp[pid].end
+                                for p in data.phases:
+                                        if(data.dmesg[p]['start'] <= callstart and callstart <= data.dmesg[p]['end']):
+                                                list = data.dmesg[p]['list']
+                                                for devname in list:
+                                                        dev = list[devname]
+                                                        if(pid == dev['pid'] and callstart <= dev['start'] and callend >= dev['end']):
+                                                                data.vprint("%15s [%f - %f] %s(%d)" % (p, callstart, callend, devname, pid))
+                                                                dev['ftrace'] = ftemp[pid]
+                                                break
+                                ftemp[pid] = FTraceCallGraph()
+        tf.close()
+
+# Function: sortKernelLog
+# Description:
+#        The dmesg output log sometimes comes with with lines that have
+#        timestamps out of order. This could cause issues since a call
+#        could accidentally end up in the wrong phase
+def sortKernelLog():
+        global sysvals, data
+        lf = open(sysvals.dmesgfile, 'r')
+        dmesglist = []
+        count = 0
+        for line in lf:
+                line = line.replace("\r\n", "")
+                if(count == 0):
+                        parseStamp(line)
+                elif(count == 1):
+                        m = re.match(r"# fwsuspend (?P<s>[0-9]*) fwresume (?P<r>[0-9]*)$", line)
+                        if(m):
+                                data.fwSuspend = int(m.group("s"))
+                                data.fwResume = int(m.group("r"))
+                                if(data.fwSuspend > 0 or data.fwResume > 0):
+                                        data.fwValid = True
+                if(re.match(r".*(\[ *)(?P<ktime>[0-9\.]*)(\]) (?P<msg>.*)", line)):
+                        dmesglist.append(line)
+                count += 1
+        lf.close()
+        last = ""
+
+        # fix lines with the same time stamp and function with the call and return swapped
+        for line in dmesglist:
+                mc = re.match(r".*(\[ *)(?P<t>[0-9\.]*)(\]) calling  (?P<f>.*)\+ @ .*, parent: .*", line)
+                mr = re.match(r".*(\[ *)(?P<t>[0-9\.]*)(\]) call (?P<f>.*)\+ returned .* after (?P<dt>.*) usecs", last)
+                if(mc and mr and (mc.group("t") == mr.group("t")) and (mc.group("f") == mr.group("f"))):
+                        i = dmesglist.index(last)
+                        j = dmesglist.index(line)
+                        dmesglist[i] = line
+                        dmesglist[j] = last
+                last = line
+        return dmesglist
+
+# Function: analyzeKernelLog
+# Description:
+#        Analyse a dmesg log output file generated from this app during
+#        the execution phase. Create a set of device structures in memory
+#        for subsequent formatting in the html output file
+def analyzeKernelLog():
+        global sysvals, data
+
+        print("PROCESSING DATA")
+        data.vprint("Analyzing the dmesg data...")
+        if(os.path.exists(sysvals.dmesgfile) == False):
+                print("ERROR: %s doesn't exist") % sysvals.dmesgfile
+                return False
+
+        lf = sortKernelLog()
+        phase = "suspend_runtime"
+
+        dm = {
+                'suspend_general': r"PM: Syncing filesystems.*",
+                  'suspend_early': r"PM: suspend of devices complete after.*",
+                  'suspend_noirq': r"PM: late suspend of devices complete after.*",
+                    'suspend_cpu': r"PM: noirq suspend of devices complete after.*",
+                     'resume_cpu': r"ACPI: Low-level resume complete.*",
+                   'resume_noirq': r"ACPI: Waking up from system sleep state.*",
+                   'resume_early': r"PM: noirq resume of devices complete after.*",
+                 'resume_general': r"PM: early resume of devices complete after.*",
+                'resume_complete': r".*Restarting tasks \.\.\..*",
+        }
+        if(sysvals.suspendmode == "standby"):
+                dm['resume_cpu'] = r"PM: Restoring platform NVS memory"
+        elif(sysvals.suspendmode == "disk"):
+                dm['suspend_early'] = r"PM: freeze of devices complete after.*"
+                dm['suspend_noirq'] = r"PM: late freeze of devices complete after.*"
+                dm['suspend_cpu'] = r"PM: noirq freeze of devices complete after.*"
+                dm['resume_cpu'] = r"PM: Restoring platform NVS memory"
+                dm['resume_early'] = r"PM: noirq restore of devices complete after.*"
+                dm['resume_general'] = r"PM: early restore of devices complete after.*"
+
+        action_start = 0.0
+        for line in lf:
+                # -- preprocessing --
+                # parse each dmesg line into the time and message
+                m = re.match(r".*(\[ *)(?P<ktime>[0-9\.]*)(\]) (?P<msg>.*)", line)
+                if(m):
+                        ktime = float(m.group("ktime"))
+                        msg = m.group("msg")
+                else:
+                        print line
+                        continue
+
+                # -- phase changes --
+                # suspend_general start
+                if(re.match(dm['suspend_general'], msg)):
+                        phase = "suspend_general"
+                        data.dmesg[phase]['start'] = ktime
+                        data.start = ktime
+                        # action start: syncing filesystems
+                        action_start = ktime
+                # suspend_early start
+                elif(re.match(dm['suspend_early'], msg)):
+                        data.dmesg["suspend_general"]['end'] = ktime
+                        phase = "suspend_early"
+                        data.dmesg[phase]['start'] = ktime
+                # suspend_noirq start
+                elif(re.match(dm['suspend_noirq'], msg)):
+                        data.dmesg["suspend_early"]['end'] = ktime
+                        phase = "suspend_noirq"
+                        data.dmesg[phase]['start'] = ktime
+                # suspend_cpu start
+                elif(re.match(dm['suspend_cpu'], msg)):
+                        data.dmesg["suspend_noirq"]['end'] = ktime
+                        phase = "suspend_cpu"
+                        data.dmesg[phase]['start'] = ktime
+                # resume_cpu start
+                elif(re.match(dm['resume_cpu'], msg)):
+                        data.tSuspended = ktime
+                        data.dmesg["suspend_cpu"]['end'] = ktime
+                        phase = "resume_cpu"
+                        data.dmesg[phase]['start'] = ktime
+                # resume_noirq start
+                elif(re.match(dm['resume_noirq'], msg)):
+                        data.dmesg["resume_cpu"]['end'] = ktime
+                        phase = "resume_noirq"
+                        data.dmesg[phase]['start'] = ktime
+                        # action end: ACPI resume
+                        data.newAction("resume_cpu", "ACPI", -1, "", action_start, ktime)
+                # resume_early start
+                elif(re.match(dm['resume_early'], msg)):
+                        data.dmesg["resume_noirq"]['end'] = ktime
+                        phase = "resume_early"
+                        data.dmesg[phase]['start'] = ktime
+                # resume_general start
+                elif(re.match(dm['resume_general'], msg)):
+                        data.dmesg["resume_early"]['end'] = ktime
+                        phase = "resume_general"
+                        data.dmesg[phase]['start'] = ktime
+                # resume complete start
+                elif(re.match(dm['resume_complete'], msg)):
+                        data.dmesg["resume_general"]['end'] = ktime
+                        data.end = ktime
+                        phase = "resume_runtime"
+                        break
+
+                # -- device callbacks --
+                if(phase in data.phases):
+                        # device init call
+                        if(re.match(r"calling  (?P<f>.*)\+ @ .*, parent: .*", msg)):
+                                sm = re.match(r"calling  (?P<f>.*)\+ @ (?P<n>.*), parent: (?P<p>.*)", msg);
+                                f = sm.group("f")
+                                n = sm.group("n")
+                                p = sm.group("p")
+                                if(f and n and p):
+                                        data.newAction(phase, f, int(n), p, ktime, -1)
+                        # device init return
+                        elif(re.match(r"call (?P<f>.*)\+ returned .* after (?P<t>.*) usecs", msg)):
+                                sm = re.match(r"call (?P<f>.*)\+ returned .* after (?P<t>.*) usecs(?P<a>.*)", msg);
+                                f = sm.group("f")
+                                t = sm.group("t")
+                                list = data.dmesg[phase]['list']
+                                if(f in list):
+                                        dev = list[f]
+                                        dev['length'] = int(t)
+                                        dev['end'] = ktime
+                                        data.vprint("%15s [%f - %f] %s(%d) %s" %
+                                                (phase, dev['start'], dev['end'], f, dev['pid'], dev['par']))
+
+                # -- phase specific actions --
+                if(phase == "suspend_general"):
+                        if(re.match(r"PM: Preparing system for mem sleep.*", msg)):
+                                data.newAction(phase, "filesystem-sync", -1, "", action_start, ktime)
+                        elif(re.match(r"Freezing user space processes .*", msg)):
+                                action_start = ktime
+                        elif(re.match(r"Freezing remaining freezable tasks.*", msg)):
+                                data.newAction(phase, "freeze-user-processes", -1, "", action_start, ktime)
+                                action_start = ktime
+                        elif(re.match(r"PM: Entering (?P<mode>[a-z,A-Z]*) sleep.*", msg)):
+                                data.newAction(phase, "freeze-tasks", -1, "", action_start, ktime)
+                elif(phase == "suspend_cpu"):
+                        m = re.match(r"smpboot: CPU (?P<cpu>[0-9]*) is now offline", msg)
+                        if(m):
+                                cpu = "CPU"+m.group("cpu")
+                                data.newAction(phase, cpu, -1, "", action_start, ktime)
+                                action_start = ktime
+                        elif(re.match(r"ACPI: Preparing to enter system sleep state.*", msg)):
+                                action_start = ktime
+                        elif(re.match(r"Disabling non-boot CPUs .*", msg)):
+                                data.newAction(phase, "ACPI", -1, "", action_start, ktime)
+                                action_start = ktime
+                elif(phase == "resume_cpu"):
+                        m = re.match(r"CPU(?P<cpu>[0-9]*) is up", msg)
+                        if(m):
+                                cpu = "CPU"+m.group("cpu")
+                                data.newAction(phase, cpu, -1, "", action_start, ktime)
+                                action_start = ktime
+                        elif(re.match(r"Enabling non-boot CPUs .*", msg)):
+                                action_start = ktime
+
+        # fill in any missing phases
+        lp = "suspend_general"
+        for p in data.phases:
+                if(p == "suspend_general"):
+                        continue
+                if(data.dmesg[p]['start'] < 0):
+                        data.dmesg[p]['start'] = data.dmesg[lp]['end']
+                        if(p == "resume_cpu"):
+                                data.tSuspended = data.dmesg[lp]['end']
+                if(data.dmesg[p]['end'] < 0):
+                        data.dmesg[p]['end'] = data.dmesg[p]['start']
+                lp = p
+
+        data.fixupInitcallsThatDidntReturn()
+        return True
+
+# Function: setTimelineRows
+# Description:
+#        Organize the device or thread lists into the smallest
+#        number of rows possible, with no entry overlapping
+# Arguments:
+#        list: the list to sort (dmesg or ftrace)
+#        sortedkeys: sorted key list to use
+def setTimelineRows(list, sortedkeys):
+        global data
+
+        # clear all rows and set them to undefined
+        remaining = len(list)
+        rowdata = dict()
+        row = 0
+        for item in list:
+                list[item]['row'] = -1
+
+        # try to pack each row with as many ranges as possible
+        while(remaining > 0):
+                if(row not in rowdata):
+                        rowdata[row] = []
+                for item in sortedkeys:
+                        if(list[item]['row'] < 0):
+                                s = list[item]['start']
+                                e = list[item]['end']
+                                valid = True
+                                for ritem in rowdata[row]:
+                                        rs = ritem['start']
+                                        re = ritem['end']
+                                        if(not (((s <= rs) and (e <= rs)) or ((s >= re) and (e >= re)))):
+                                                valid = False
+                                                break
+                                if(valid):
+                                        rowdata[row].append(list[item])
+                                        list[item]['row'] = row
+                                        remaining -= 1
+                row += 1
+        return row
+
+# Function: createTimeScale
+# Description:
+#        Create timescale lines for the dmesg and ftrace timelines
+# Arguments:
+#        t0: start time (suspend begin)
+#        tMax: end time (resume end)
+#        tSuspend: time when suspend occurs
+def createTimeScale(t0, tMax, tSuspended):
+        global data
+        timescale = "<div class=\"t\" style=\"right:{0}%\">{1}</div>\n"
+        output = '<div id="timescale">\n'
+
+        # set scale for timeline
+        tTotal = tMax - t0
+        tS = 0.1
+        if(tTotal <= 0):
+                return output
+        if(tTotal > 4):
+                tS = 1
+        if(tSuspended < 0):
+                for i in range(int(tTotal/tS)+1):
+                        pos = "%0.3f" % (100 - ((float(i)*tS*100)/tTotal))
+                        if(i > 0):
+                                val = "%0.f" % (float(i)*tS*1000)
+                        else:
+                                val = ""
+                        output += timescale.format(pos, val)
+        else:
+                tSuspend = tSuspended - t0
+                divTotal = int(tTotal/tS) + 1
+                divSuspend = int(tSuspend/tS)
+                s0 = (tSuspend - tS*divSuspend)*100/tTotal
+                for i in range(divTotal):
+                        pos = "%0.3f" % (100 - ((float(i)*tS*100)/tTotal) - s0)
+                        if((i == 0) and (s0 < 3)):
+                                val = ""
+                        elif(i == divSuspend):
+                                val = "S/R"
+                        else:
+                                val = "%0.f" % (float(i-divSuspend)*tS*1000)
+                        output += timescale.format(pos, val)
+        output += '</div>\n'
+        return output
+
+# Function: createHTML
+# Description:
+#        Create the output html file.
+def createHTML():
+        global sysvals, data
+
+        data.normalizeTime()
+
+        # html function templates
+        headline_stamp = '<div class="stamp">{0} {1} {2} {3}</div>\n'
+        html_zoombox = '<center><button id="zoomin">ZOOM IN</button><button id="zoomout">ZOOM OUT</button><button id="zoomdef">ZOOM 1:1</button></center>\n<div id="dmesgzoombox" class="zoombox">\n'
+        html_timeline = '<div id="{0}" class="timeline" style="height:{1}px">\n'
+        html_device = '<div id="{0}" title="{1}" class="thread" style="left:{2}%;top:{3}%;height:{4}%;width:{5}%;">{6}</div>\n'
+        html_phase = '<div class="phase" style="left:{0}%;width:{1}%;top:{2}%;height:{3}%;background-color:{4}">{5}</div>\n'
+        html_legend = '<div class="square" style="left:{0}%;background-color:{1}">&nbsp;{2}</div>\n'
+        html_timetotal = '<table class="time1">\n<tr>'\
+                '<td class="gray">{2} Suspend Time: <b>{0} ms</b></td>'\
+                '<td class="gray">{2} Resume Time: <b>{1} ms</b></td>'\
+                '</tr>\n</table>\n'
+        html_timegroups = '<table class="time2">\n<tr>'\
+                '<td class="green">Kernel Suspend: {0} ms</td>'\
+                '<td class="purple">Firmware Suspend: {1} ms</td>'\
+                '<td class="purple">Firmware Resume: {2} ms</td>'\
+                '<td class="yellow">Kernel Resume: {3} ms</td>'\
+                '</tr>\n</table>\n'
+
+        # device timeline (dmesg)
+        if(data.usedmesg):
+                data.vprint("Creating Device Timeline...")
+                devtl = Timeline()
+
+                # Generate the header for this timeline
+                t0 = data.start
+                tMax = data.end
+                tTotal = tMax - t0
+                if(tTotal == 0):
+                        print("ERROR: No timeline data")
+                        sys.exit()
+                suspend_time = "%.0f"%(-data.start*1000)
+                resume_time = "%.0f"%(data.end*1000)
+                if data.fwValid:
+                        devtl.html['timeline'] = html_timetotal.format(suspend_time, resume_time, "Total")
+                        sktime = "%.3f"%((data.dmesg['suspend_cpu']['end'] - data.dmesg['suspend_general']['start'])*1000)
+                        sftime = "%.3f"%(data.fwSuspend / 1000000.0)
+                        rftime = "%.3f"%(data.fwResume / 1000000.0)
+                        rktime = "%.3f"%((data.dmesg['resume_general']['end'] - data.dmesg['resume_cpu']['start'])*1000)
+                        devtl.html['timeline'] += html_timegroups.format(sktime, sftime, rftime, rktime)
+                else:
+                        devtl.html['timeline'] = html_timetotal.format(suspend_time, resume_time, "Kernel")
+
+                # determine the maximum number of rows we need to draw
+                timelinerows = 0
+                for phase in data.dmesg:
+                        list = data.dmesg[phase]['list']
+                        rows = setTimelineRows(list, list)
+                        data.dmesg[phase]['row'] = rows
+                        if(rows > timelinerows):
+                                timelinerows = rows
+
+                # calculate the timeline height and create its bounding box
+                devtl.setRows(timelinerows + 1)
+                devtl.html['timeline'] += html_zoombox;
+                devtl.html['timeline'] += html_timeline.format("dmesg", devtl.height);
+
+                # draw the colored boxes for each of the phases
+                for b in data.dmesg:
+                        phase = data.dmesg[b]
+                        left = "%.3f" % (((phase['start']-data.start)*100)/tTotal)
+                        width = "%.3f" % (((phase['end']-phase['start'])*100)/tTotal)
+                        devtl.html['timeline'] += html_phase.format(left, width, "%.3f"%devtl.scaleH, "%.3f"%(100-devtl.scaleH), data.dmesg[b]['color'], "")
+
+                # draw the time scale, try to make the number of labels readable
+                devtl.html['scale'] = createTimeScale(t0, tMax, data.tSuspended)
+                devtl.html['timeline'] += devtl.html['scale']
+                for b in data.dmesg:
+                        phaselist = data.dmesg[b]['list']
+                        for d in phaselist:
+                                name = d
+                                if(d in data.altdevname):
+                                        name = data.altdevname[d]
+                                dev = phaselist[d]
+                                height = (100.0 - devtl.scaleH)/data.dmesg[b]['row']
+                                top = "%.3f" % ((dev['row']*height) + devtl.scaleH)
+                                left = "%.3f" % (((dev['start']-data.start)*100)/tTotal)
+                                width = "%.3f" % (((dev['end']-dev['start'])*100)/tTotal)
+                                len = " (%0.3f ms) " % ((dev['end']-dev['start'])*1000)
+                                color = "rgba(204,204,204,0.5)"
+                                devtl.html['timeline'] += html_device.format(dev['id'], name+len+b, left, top, "%.3f"%height, width, name)
+
+                # timeline is finished
+                devtl.html['timeline'] += "</div>\n</div>\n"
+
+                # draw a legend which describes the phases by color
+                devtl.html['legend'] = "<div class=\"legend\">\n"
+                pdelta = 100.0/data.phases.__len__()
+                pmargin = pdelta / 4.0
+                for phase in data.phases:
+                        order = "%.2f" % ((data.dmesg[phase]['order'] * pdelta) + pmargin)
+                        name = string.replace(phase, "_", " &nbsp;")
+                        devtl.html['legend'] += html_legend.format(order, data.dmesg[phase]['color'], name)
+                devtl.html['legend'] += "</div>\n"
+
+        hf = open(sysvals.htmlfile, 'w')
+        thread_height = 0
+
+        # write the html header first (html head, css code, everything up to the start of body)
+        html_header = "<!DOCTYPE html>\n<html>\n<head>\n\
+        <meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n\
+        <title>AnalyzeSuspend</title>\n\
+        <style type='text/css'>\n\
+                body {overflow-y: scroll;}\n\
+                .stamp {width: 100%;text-align:center;background-color:gray;line-height:30px;color:white;font: 25px Arial;}\n\
+                .callgraph {margin-top: 30px;box-shadow: 5px 5px 20px black;}\n\
+                .callgraph article * {padding-left: 28px;}\n\
+                h1 {color:black;font: bold 30px Times;}\n\
+                table {width:100%;}\n\
+                .gray {background-color:rgba(80,80,80,0.1);}\n\
+                .green {background-color:rgba(204,255,204,0.4);}\n\
+                .purple {background-color:rgba(128,0,128,0.2);}\n\
+                .yellow {background-color:rgba(255,255,204,0.4);}\n\
+                .time1 {font: 22px Arial;border:1px solid;}\n\
+                .time2 {font: 15px Arial;border-bottom:1px solid;border-left:1px solid;border-right:1px solid;}\n\
+                td {text-align: center;}\n\
+                .tdhl {color: red;}\n\
+                .hide {display: none;}\n\
+                .pf {display: none;}\n\
+                .pf:checked + label {background: url(\'data:image/svg+xml;utf,<?xml version=\"1.0\" standalone=\"no\"?><svg xmlns=\"http://www.w3.org/2000/svg\" height=\"18\" width=\"18\" version=\"1.1\"><circle cx=\"9\" cy=\"9\" r=\"8\" stroke=\"black\" stroke-width=\"1\" fill=\"white\"/><rect x=\"4\" y=\"8\" width=\"10\" height=\"2\" style=\"fill:black;stroke-width:0\"/><rect x=\"8\" y=\"4\" width=\"2\" height=\"10\" style=\"fill:black;stroke-width:0\"/></svg>\') no-repeat left center;}\n\
+                .pf:not(:checked) ~ label {background: url(\'data:image/svg+xml;utf,<?xml version=\"1.0\" standalone=\"no\"?><svg xmlns=\"http://www.w3.org/2000/svg\" height=\"18\" width=\"18\" version=\"1.1\"><circle cx=\"9\" cy=\"9\" r=\"8\" stroke=\"black\" stroke-width=\"1\" fill=\"white\"/><rect x=\"4\" y=\"8\" width=\"10\" height=\"2\" style=\"fill:black;stroke-width:0\"/></svg>\') no-repeat left center;}\n\
+                .pf:checked ~ *:not(:nth-child(2)) {display: none;}\n\
+                .zoombox {position: relative; width: 100%; overflow-x: scroll;}\n\
+                .timeline {position: relative; font-size: 14px;cursor: pointer;width: 100%; overflow: hidden; background-color:#dddddd;}\n\
+                .thread {position: absolute; height: "+"%.3f"%thread_height+"%; overflow: hidden; line-height: 30px; border:1px solid;text-align:center;white-space:nowrap;background-color:rgba(204,204,204,0.5);}\n\
+                .thread:hover {background-color:white;border:1px solid red;z-index:10;}\n\
+                .phase {position: absolute;overflow: hidden;border:0px;text-align:center;}\n\
+                .t {position: absolute; top: 0%; height: 100%; border-right:1px solid black;}\n\
+                .legend {position: relative; width: 100%; height: 40px; text-align: center;margin-bottom:20px}\n\
+                .legend .square {position:absolute;top:10px; width: 0px;height: 20px;border:1px solid;padding-left:20px;}\n\
+                button {height:40px;width:200px;margin-bottom:20px;margin-top:20px;font-size:24px;}\n\
+        </style>\n</head>\n<body>\n"
+        hf.write(html_header)
+
+        # write the test title and general info header
+        if(data.stamp['time'] != ""):
+                hf.write(headline_stamp.format(data.stamp['host'],
+                        data.stamp['kernel'], data.stamp['mode'], data.stamp['time']))
+
+        # write the dmesg data (device timeline)
+        if(data.usedmesg):
+                hf.write(devtl.html['timeline'])
+                hf.write(devtl.html['legend'])
+                hf.write('<div id="devicedetail"></div>\n')
+                hf.write('<div id="devicetree"></div>\n')
+
+        # write the ftrace data (callgraph)
+        if(data.useftrace):
+                hf.write('<section id="callgraphs" class="callgraph">\n')
+                # write out the ftrace data converted to html
+                html_func_top = '<article id="{0}" class="atop" style="background-color:{1}">\n<input type="checkbox" class="pf" id="f{2}" checked/><label for="f{2}">{3} {4}</label>\n'
+                html_func_start = '<article>\n<input type="checkbox" class="pf" id="f{0}" checked/><label for="f{0}">{1} {2}</label>\n'
+                html_func_end = '</article>\n'
+                html_func_leaf = '<article>{0} {1}</article>\n'
+                num = 0
+                for p in data.phases:
+                        list = data.dmesg[p]['list']
+                        for devname in data.sortedDevices(p):
+                                if('ftrace' not in list[devname]):
+                                        continue
+                                name = devname
+                                if(devname in data.altdevname):
+                                        name = data.altdevname[devname]
+                                devid = list[devname]['id']
+                                cg = list[devname]['ftrace']
+                                flen = "(%.3f ms)" % ((cg.end - cg.start)*1000)
+                                hf.write(html_func_top.format(devid, data.dmesg[p]['color'], num, name+" "+p, flen))
+                                num += 1
+                                for line in cg.list:
+                                        if(line.length < 0.000000001):
+                                                flen = ""
+                                        else:
+                                                flen = "(%.3f ms)" % (line.length*1000)
+                                        if(line.freturn and line.fcall):
+                                                hf.write(html_func_leaf.format(line.name, flen))
+                                        elif(line.freturn):
+                                                hf.write(html_func_end)
+                                        else:
+                                                hf.write(html_func_start.format(num, line.name, flen))
+                                                num += 1
+                                hf.write(html_func_end)
+                hf.write("\n\n    </section>\n")
+        # write the footer and close
+        addScriptCode(hf)
+        hf.write("</body>\n</html>\n")
+        hf.close()
+        return True
+
+def addScriptCode(hf):
+        global data
+
+        t0 = (data.start - data.tSuspended) * 1000
+        tMax = (data.end - data.tSuspended) * 1000
+        # create an array in javascript memory with the device details
+        detail = '      var bounds = [%f,%f];\n' % (t0, tMax)
+        detail += '     var d = [];\n'
+        dfmt = '        d["%s"] = { n:"%s", p:"%s", c:[%s] };\n';
+        for p in data.dmesg:
+                list = data.dmesg[p]['list']
+                for d in list:
+                        parent = data.deviceParentID(d, p)
+                        idlist = data.deviceChildrenIDs(d, p)
+                        idstr = ""
+                        for i in idlist:
+                                if(idstr == ""):
+                                        idstr += '"'+i+'"'
+                                else:
+                                        idstr += ', '+'"'+i+'"'
+                        detail += dfmt % (list[d]['id'], d, parent, idstr)
+
+        # add the code which will manipulate the data in the browser
+        script_code = \
+        '<script type="text/javascript">\n'+detail+\
+        '       var filter = [];\n'\
+        '       var table = [];\n'\
+        '       function deviceParent(devid) {\n'\
+        '               var devlist = [];\n'\
+        '               if(filter.indexOf(devid) < 0) filter[filter.length] = devid;\n'\
+        '               if(d[devid].p in d)\n'\
+        '                       devlist = deviceParent(d[devid].p);\n'\
+        '               else if(d[devid].p != "")\n'\
+        '                       devlist = [d[devid].p];\n'\
+        '               devlist[devlist.length] = d[devid].n;\n'\
+        '               return devlist;\n'\
+        '       }\n'\
+        '       function deviceChildren(devid, column, row) {\n'\
+        '               if(!(devid in d)) return;\n'\
+        '               if(filter.indexOf(devid) < 0) filter[filter.length] = devid;\n'\
+        '               var cell = {name: d[devid].n, span: 1};\n'\
+        '               var span = 0;\n'\
+        '               if(column >= table.length) table[column] = [];\n'\
+        '               table[column][row] = cell;\n'\
+        '               for(var i = 0; i < d[devid].c.length; i++) {\n'\
+        '                       var cid = d[devid].c[i];\n'\
+        '                       span += deviceChildren(cid, column+1, row+span);\n'\
+        '               }\n'\
+        '               if(span == 0) span = 1;\n'\
+        '               table[column][row].span = span;\n'\
+        '               return span;\n'\
+        '       }\n'\
+        '       function deviceTree(devid, resume) {\n'\
+        '               var html = "<table border=1>";\n'\
+        '               filter = [];\n'\
+        '               table = [];\n'\
+        '               plist = deviceParent(devid);\n'\
+        '               var devidx = plist.length - 1;\n'\
+        '               for(var i = 0; i < devidx; i++)\n'\
+        '                       table[i] = [{name: plist[i], span: 1}];\n'\
+        '               deviceChildren(devid, devidx, 0);\n'\
+        '               for(var i = 0; i < devidx; i++)\n'\
+        '                       table[i][0].span = table[devidx][0].span;\n'\
+        '               for(var row = 0; row < table[0][0].span; row++) {\n'\
+        '                       html += "<tr>";\n'\
+        '                       for(var col = 0; col < table.length; col++)\n'\
+        '                               if(row in table[col]) {\n'\
+        '                                       var cell = table[col][row];\n'\
+        '                                       var args = "";\n'\
+        '                                       if(cell.span > 1)\n'\
+        '                                               args += " rowspan="+cell.span;\n'\
+        '                                       if((col == devidx) && (row == 0))\n'\
+        '                                               args += " class=tdhl";\n'\
+        '                                       if(resume)\n'\
+        '                                               html += "<td"+args+">"+cell.name+" &rarr;</td>";\n'\
+        '                                       else\n'\
+        '                                               html += "<td"+args+">&larr; "+cell.name+"</td>";\n'\
+        '                               }\n'\
+        '                       html += "</tr>";\n'\
+        '               }\n'\
+        '               html += "</table>";\n'\
+        '               return html;\n'\
+        '       }\n'\
+        '       function zoomTimeline() {\n'\
+        '               var timescale = document.getElementById("timescale");\n'\
+        '               var dmesg = document.getElementById("dmesg");\n'\
+        '               var zoombox = document.getElementById("dmesgzoombox");\n'\
+        '               var val = parseFloat(dmesg.style.width);\n'\
+        '               var newval = 100;\n'\
+        '               var sh = window.outerWidth / 2;\n'\
+        '               if(this.id == "zoomin") {\n'\
+        '                       newval = val * 1.2;\n'\
+        '                       if(newval > 40000) newval = 40000;\n'\
+        '                       dmesg.style.width = newval+"%";\n'\
+        '                       zoombox.scrollLeft = ((zoombox.scrollLeft + sh) * newval / val) - sh;\n'\
+        '               } else if (this.id == "zoomout") {\n'\
+        '                       newval = val / 1.2;\n'\
+        '                       if(newval < 100) newval = 100;\n'\
+        '                       dmesg.style.width = newval+"%";\n'\
+        '                       zoombox.scrollLeft = ((zoombox.scrollLeft + sh) * newval / val) - sh;\n'\
+        '               } else {\n'\
+        '                       zoombox.scrollLeft = 0;\n'\
+        '                       dmesg.style.width = "100%";\n'\
+        '               }\n'\
+        '               var html = "";\n'\
+        '               var t0 = bounds[0];\n'\
+        '               var tMax = bounds[1];\n'\
+        '               var tTotal = tMax - t0;\n'\
+        '               var wTotal = tTotal * 100.0 / newval;\n'\
+        '               for(var tS = 1000; (wTotal / tS) < 3; tS /= 10);\n'\
+        '               if(tS < 1) tS = 1;\n'\
+        '               for(var s = ((t0 / tS)|0) * tS; s < tMax; s += tS) {\n'\
+        '                       var pos = (tMax - s) * 100.0 / tTotal;\n'\
+        '                       var name = (s == 0)?"S/R":(s+"ms");\n'\
+        '                       html += \"<div class=\\\"t\\\" style=\\\"right:\"+pos+\"%\\\">\"+name+\"</div>\";\n'\
+        '               }\n'\
+        '               timescale.innerHTML = html;\n'\
+        '       }\n'\
+        '       function deviceDetail() {\n'\
+        '               var devtitle = document.getElementById("devicedetail");\n'\
+        '               devtitle.innerHTML = "<h1>"+this.title+"</h1>";\n'\
+        '               var devtree = document.getElementById("devicetree");\n'\
+        '               devtree.innerHTML = deviceTree(this.id, (this.title.indexOf("resume") >= 0));\n'\
+        '               var cglist = document.getElementById("callgraphs");\n'\
+        '               if(!cglist) return;\n'\
+        '               var cg = cglist.getElementsByClassName("atop");\n'\
+        '               for (var i = 0; i < cg.length; i++) {\n'\
+        '                       if(filter.indexOf(cg[i].id) >= 0) {\n'\
+        '                               cg[i].style.display = "block";\n'\
+        '                       } else {\n'\
+        '                               cg[i].style.display = "none";\n'\
+        '                       }\n'\
+        '               }\n'\
+        '       }\n'\
+        '       window.addEventListener("load", function () {\n'\
+        '               var dmesg = document.getElementById("dmesg");\n'\
+        '               dmesg.style.width = "100%"\n'\
+        '               document.getElementById("zoomin").onclick = zoomTimeline;\n'\
+        '               document.getElementById("zoomout").onclick = zoomTimeline;\n'\
+        '               document.getElementById("zoomdef").onclick = zoomTimeline;\n'\
+        '               var dev = dmesg.getElementsByClassName("thread");\n'\
+        '               for (var i = 0; i < dev.length; i++) {\n'\
+        '                       dev[i].onclick = deviceDetail;\n'\
+        '               }\n'\
+        '               zoomTimeline();\n'\
+        '       });\n'\
+        '</script>\n'
+        hf.write(script_code);
+
+# Function: executeSuspend
+# Description:
+#        Execute system suspend through the sysfs interface
+def executeSuspend():
+        global sysvals, data
+
+        detectUSB()
+        pf = open(sysvals.powerfile, 'w')
+        # clear the kernel ring buffer just as we start
+        os.system("dmesg -C")
+        # start ftrace
+        if(data.useftrace):
+                print("START TRACING")
+                os.system("echo 1 > "+sysvals.tpath+"tracing_on")
+                os.system("echo SUSPEND START > "+sysvals.tpath+"trace_marker")
+        # initiate suspend
+        if(sysvals.rtcwake):
+                print("SUSPEND START")
+                os.system("rtcwake -s 10 -m "+sysvals.suspendmode)
+        else:
+                print("SUSPEND START (press a key to resume)")
+                pf.write(sysvals.suspendmode)
+        # execution will pause here
+        pf.close()
+        # return from suspend
+        print("RESUME COMPLETE")
+        # stop ftrace
+        if(data.useftrace):
+                os.system("echo RESUME COMPLETE > "+sysvals.tpath+"trace_marker")
+                os.system("echo 0 > "+sysvals.tpath+"tracing_on")
+                print("CAPTURING FTRACE")
+                os.system("echo \""+sysvals.teststamp+"\" > "+sysvals.ftracefile)
+                os.system("cat "+sysvals.tpath+"trace >> "+sysvals.ftracefile)
+        # grab a copy of the dmesg output
+        print("CAPTURING DMESG")
+        os.system("echo \""+sysvals.teststamp+"\" > "+sysvals.dmesgfile)
+        os.system("dmesg -c >> "+sysvals.dmesgfile)
+
+# Function: detectUSB
+# Description:
+#        Detect all the USB hosts and devices currently connected
+def detectUSB():
+        global sysvals, data
+
+        for dirname, dirnames, filenames in os.walk("/sys/devices"):
+                if(re.match(r".*/usb[0-9]*.*", dirname) and
+                        "idVendor" in filenames and "idProduct" in filenames):
+                        vid = os.popen("cat %s/idVendor 2>/dev/null" % dirname).read().replace('\n', '')
+                        pid = os.popen("cat %s/idProduct 2>/dev/null" % dirname).read().replace('\n', '')
+                        product = os.popen("cat %s/product 2>/dev/null" % dirname).read().replace('\n', '')
+                        name = dirname.split('/')[-1]
+                        if(len(product) > 0):
+                                data.altdevname[name] = "%s [%s]" % (product, name)
+                        else:
+                                data.altdevname[name] = "%s:%s [%s]" % (vid, pid, name)
+
+def getModes():
+        global sysvals
+        modes = ""
+        if(os.path.exists(sysvals.powerfile)):
+                fp = open(sysvals.powerfile, 'r')
+                modes = string.split(fp.read())
+                fp.close()
+        return modes
+
+# Function: statusCheck
+# Description:
+#        Verify that the requested command and options will work
+def statusCheck(dryrun):
+        global sysvals, data
+        res = dict()
+
+        if(data.notestrun):
+                print("SUCCESS: The command should run!")
+                return
+
+        # check we have root access
+        check = "YES"
+        if(os.environ['USER'] != "root"):
+                if(not dryrun):
+                        doError("root access is required", False)
+                check = "NO"
+        res["    have root access:     "] = check
+
+        # check sysfs is mounted
+        check = "YES"
+        if(not os.path.exists(sysvals.powerfile)):
+                if(not dryrun):
+                        doError("sysfs must be mounted", False)
+                check = "NO"
+        res["    is sysfs mounted:     "] = check
+
+        # check target mode is a valid mode
+        check = "YES"
+        modes = getModes()
+        if(sysvals.suspendmode not in modes):
+                if(not dryrun):
+                        doError("%s is not a value power mode" % sysvals.suspendmode, False)
+                check = "NO"
+        res["    is "+sysvals.suspendmode+" a power mode: "] = check
+
+        # check if ftrace is available
+        if(data.useftrace):
+                check = "YES"
+                if(not verifyFtrace()):
+                        if(not dryrun):
+                                doError("ftrace is not configured", False)
+                        check = "NO"
+                res["    is ftrace usable:     "] = check
+
+        # check if rtcwake
+        if(sysvals.rtcwake):
+                check = "YES"
+                version = os.popen("rtcwake -V 2>/dev/null").read()
+                if(not version.startswith("rtcwake")):
+                        if(not dryrun):
+                                doError("rtcwake is not installed", False)
+                        check = "NO"
+                res["    is rtcwake usable:    "] = check
+
+        if(dryrun):
+                status = True
+                print("Checking if system can run the current command:")
+                for r in res:
+                        print("%s\t%s" % (r, res[r]))
+                        if(res[r] != "YES"):
+                                status = False
+                if(status):
+                        print("SUCCESS: The command should run!")
+                else:
+                        print("FAILURE: The command won't run!")
+
+def printHelp():
+        global sysvals
+        modes = getModes()
+
+        print("")
+        print("AnalyzeSuspend")
+        print("Usage: sudo analyze_suspend.py <options>")
+        print("")
+        print("Description:")
+        print("  Initiates a system suspend/resume while capturing dmesg")
+        print("  and (optionally) ftrace data to analyze device timing")
+        print("")
+        print("  Generates output files in subdirectory: suspend-mmddyy-HHMMSS")
+        print("   HTML output:                    <hostname>_<mode>.html")
+        print("   raw dmesg output:               <hostname>_<mode>_dmesg.txt")
+        print("   raw ftrace output (with -f):    <hostname>_<mode>_ftrace.txt")
+        print("")
+        print("Options:")
+        print("  [general]")
+        print("    -h        Print this help text")
+        print("    -verbose  Print extra information during execution and analysis")
+        print("    -status   Test to see if the system is enabled to run this tool")
+        print("    -modes    List available suspend modes")
+        print("    -m mode   Mode to initiate for suspend %s (default: %s)") % (modes, sysvals.suspendmode)
+        print("    -rtcwake  Use rtcwake to autoresume after 10 seconds (default: disabled)")
+        print("    -f        Use ftrace to create device callgraphs (default: disabled)")
+        print("  [re-analyze data from previous runs]")
+        print("    -dmesg dmesgfile      Create HTML timeline from dmesg file")
+        print("    -ftrace ftracefile    Create HTML callgraph from ftrace file")
+        print("")
+        return True
+
+def doError(msg, help):
+        print("ERROR: %s") % msg
+        if(help == True):
+                printHelp()
+        sys.exit()
+
+# -- script main --
+# loop through the command line arguments
+cmd = ""
+args = iter(sys.argv[1:])
+for arg in args:
+        if(arg == "-m"):
+                try:
+                        val = args.next()
+                except:
+                        doError("No mode supplied", True)
+                sysvals.suspendmode = val
+        elif(arg == "-f"):
+                data.useftrace = True
+        elif(arg == "-modes"):
+                cmd = "modes"
+        elif(arg == "-status"):
+                cmd = "status"
+        elif(arg == "-verbose"):
+                data.verbose = True
+        elif(arg == "-rtcwake"):
+                sysvals.rtcwake = True
+        elif(arg == "-dmesg"):
+                try:
+                        val = args.next()
+                except:
+                        doError("No dmesg file supplied", True)
+                data.notestrun = True
+                data.usedmesg = True
+                sysvals.dmesgfile = val
+        elif(arg == "-ftrace"):
+                try:
+                        val = args.next()
+                except:
+                        doError("No ftrace file supplied", True)
+                data.notestrun = True
+                data.useftrace = True
+                sysvals.ftracefile = val
+        elif(arg == "-h"):
+                printHelp()
+                sys.exit()
+        else:
+                doError("Invalid argument: "+arg, True)
+
+# just run a utility command and exit
+if(cmd != ""):
+        if(cmd == "status"):
+                statusCheck(True)
+        elif(cmd == "modes"):
+                modes = getModes()
+                print modes
+        sys.exit()
+
+data.initialize()
+
+# if instructed, re-analyze existing data files
+if(data.notestrun):
+        sysvals.setOutputFile()
+        data.vprint("Output file: %s" % sysvals.htmlfile)
+        if(sysvals.dmesgfile != ""):
+                analyzeKernelLog()
+        if(sysvals.ftracefile != ""):
+                analyzeTraceLog()
+        createHTML()
+        sys.exit()
+
+# verify that we can run a test
+data.usedmesg = True
+statusCheck(False)
+
+# prepare for the test
+if(data.useftrace):
+        initFtrace()
+sysvals.initTestOutput()
+
+data.vprint("Output files:\n    %s" % sysvals.dmesgfile)
+if(data.useftrace):
+        data.vprint("    %s" % sysvals.ftracefile)
+data.vprint("    %s" % sysvals.htmlfile)
+
+# execute the test
+executeSuspend()
+analyzeKernelLog()
+if(data.useftrace):
+        analyzeTraceLog()
+createHTML()
diff --git a/tools/Makefile b/tools/Makefile
index 927cd46d36dc..feec3ad5fd09 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,6 +3,7 @@ include scripts/Makefile.include
 help:
         @echo 'Possible targets:'
         @echo ''
+        @echo '  acpi       - ACPI tools'
         @echo '  cgroup     - cgroup tools'
         @echo '  cpupower   - a tool for all things x86 CPU power'
         @echo '  firewire   - the userspace part of nosy, an IEEE-1394 traffic sniffer'
@@ -33,6 +34,9 @@ help:
         @echo '    the respective build directory.'
         @echo '  clean: a summary clean target to clean _all_ folders'
 
+acpi: FORCE
+        $(call descend,power/$@)
+
 cpupower: FORCE
         $(call descend,power/$@)
 
@@ -54,6 +58,9 @@ turbostat x86_energy_perf_policy: FORCE
 tmon: FORCE
         $(call descend,thermal/$@)
 
+acpi_install:
+        $(call descend,power/$(@:_install=),install)
+
 cpupower_install:
         $(call descend,power/$(@:_install=),install)
 
@@ -69,11 +76,14 @@ turbostat_install x86_energy_perf_policy_install:
 tmon_install:
         $(call descend,thermal/$(@:_install=),install)
 
-install: cgroup_install cpupower_install firewire_install lguest_install \
+install: acpi_install cgroup_install cpupower_install firewire_install lguest_install \
                 perf_install selftests_install turbostat_install usb_install \
                 virtio_install vm_install net_install x86_energy_perf_policy_install \
         tmon
 
+acpi_clean:
+        $(call descend,power/acpi,clean)
+
 cpupower_clean:
         $(call descend,power/cpupower,clean)
 
@@ -95,8 +105,8 @@ turbostat_clean x86_energy_perf_policy_clean:
 tmon_clean:
         $(call descend,thermal/tmon,clean)
 
-clean: cgroup_clean cpupower_clean firewire_clean lguest_clean perf_clean \
-                selftests_clean turbostat_clean usb_clean virtio_clean \
+clean: acpi_clean cgroup_clean cpupower_clean firewire_clean lguest_clean \
+                perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
                 vm_clean net_clean x86_energy_perf_policy_clean tmon_clean
 
 .PHONY: FORCE
diff --git a/tools/power/acpi/Makefile b/tools/power/acpi/Makefile
index bafeb8d662a3..d9186a2fdf06 100644
--- a/tools/power/acpi/Makefile
+++ b/tools/power/acpi/Makefile
@@ -1,18 +1,143 @@
-PROG= acpidump
-SRCS=   acpidump.c
+# tools/power/acpi/Makefile - ACPI tool Makefile
+#
+# Copyright (c) 2013, Intel Corporation
+#   Author: Lv Zheng <lv.zheng@intel.com>
+#
+# 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; version 2
+# of the License.
+
+OUTPUT=./
+ifeq ("$(origin O)", "command line")
+        OUTPUT := $(O)/
+endif
+
+ifneq ($(OUTPUT),)
+# check that the output directory actually exists
+OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
+$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
+endif
+
+# --- CONFIGURATION BEGIN ---
+
+# Set the following to `true' to make a unstripped, unoptimized
+# binary. Leave this set to `false' for production use.
+DEBUG ?=        true
+
+# make the build silent. Set this to something else to make it noisy again.
+V ?=            false
+
+# Prefix to the directories we're installing to
+DESTDIR ?=
+
+# --- CONFIGURATION END ---
+
+# Directory definitions. These are default and most probably
+# do not need to be changed. Please note that DESTDIR is
+# added in front of any of them
+
+bindir ?=       /usr/bin
+sbindir ?=      /usr/sbin
+mandir ?=       /usr/man
+
+# Toolchain: what tools do we use, and what options do they need:
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA  = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+
+# If you are running a cross compiler, you may want to set this
+# to something more interesting, like "arm-linux-".  If you want
+# to compile vs uClibc, that can be done here as well.
+CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
+CC = $(CROSS)gcc
+LD = $(CROSS)gcc
+STRIP = $(CROSS)strip
+HOSTCC = gcc
+
+# check if compiler option is supported
+cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
+
+# use '-Os' optimization if available, else use -O2
+OPTIMIZATION := $(call cc-supports,-Os,-O2)
+
+WARNINGS := -Wall
+WARNINGS += $(call cc-supports,-Wstrict-prototypes)
+WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
+
 KERNEL_INCLUDE := ../../../include
-CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE) 
+CFLAGS += -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
+CFLAGS += $(WARNINGS)
+
+ifeq ($(strip $(V)),false)
+        QUIET=@
+        ECHO=@echo
+else
+        QUIET=
+        ECHO=@\#
+endif
+export QUIET ECHO
+
+# if DEBUG is enabled, then we do not strip or optimize
+ifeq ($(strip $(DEBUG)),true)
+        CFLAGS += -O1 -g -DDEBUG
+        STRIPCMD = /bin/true -Since_we_are_debugging
+else
+        CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+        STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+endif
+
+# if DEBUG is enabled, then we do not strip or optimize
+ifeq ($(strip $(DEBUG)),true)
+        CFLAGS += -O1 -g -DDEBUG
+        STRIPCMD = /bin/true -Since_we_are_debugging
+else
+        CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+        STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+endif
+
+# --- ACPIDUMP BEGIN ---
+
+vpath %.c \
+        tools/acpidump
+
+DUMP_OBJS = \
+        acpidump.o
+
+DUMP_OBJS := $(addprefix $(OUTPUT)tools/acpidump/,$(DUMP_OBJS))
+
+$(OUTPUT)acpidump: $(DUMP_OBJS)
+        $(ECHO) "  LD      " $@
+        $(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(DUMP_OBJS) -L$(OUTPUT) -o $@
+        $(QUIET) $(STRIPCMD) $@
+
+$(OUTPUT)tools/acpidump/%.o: %.c
+        $(ECHO) "  CC      " $@
+        $(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
+
+# --- ACPIDUMP END ---
+
+all: $(OUTPUT)acpidump
+        echo $(OUTPUT)
+
+clean:
+        -find $(OUTPUT) \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
+         | xargs rm -f
+        -rm -f $(OUTPUT)acpidump
 
-all: acpidump
-$(PROG) : $(SRCS)
-        $(CC) $(CFLAGS) $(SRCS) -o $(PROG)
+install-tools:
+        $(INSTALL) -d $(DESTDIR)${bindir}
+        $(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}
 
-CLEANFILES= $(PROG)
+install-man:
+        $(INSTALL_DATA) -D man/acpidump.8 $(DESTDIR)${mandir}/man8/acpidump.8
 
-clean : 
-        rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS)) *~
+install: all install-tools install-man
 
-install :
-        install acpidump /usr/sbin/acpidump
-        install acpidump.8 /usr/share/man/man8
+uninstall:
+        - rm -f $(DESTDIR)${sbindir}/acpidump
+        - rm -f $(DESTDIR)${mandir}/man8/acpidump.8
 
+.PHONY: all utils install-tools install-man install uninstall clean
diff --git a/tools/power/acpi/acpidump.8 b/tools/power/acpi/man/acpidump.8
index adfa99166e5e..adfa99166e5e 100644
--- a/tools/power/acpi/acpidump.8
+++ b/tools/power/acpi/man/acpidump.8
diff --git a/tools/power/acpi/acpidump.c b/tools/power/acpi/tools/acpidump/acpidump.c
index a84553a0e0df..a84553a0e0df 100644
--- a/tools/power/acpi/acpidump.c
+++ b/tools/power/acpi/tools/acpidump/acpidump.c
diff --git a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
index 66cace601e57..0f10b81e3322 100644
--- a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
+++ b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
@@ -25,12 +25,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-
+#include <linux/acpi.h>
 #include <asm/io.h>
 
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-
 static int pm_tmr_ioport = 0;
 
 /*helper function to safely read acpi pm timesource*/
diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c
index dd1539eb8c63..a416de80c55e 100644
--- a/tools/power/cpupower/utils/cpufreq-set.c
+++ b/tools/power/cpupower/utils/cpufreq-set.c
@@ -257,7 +257,7 @@ int cmd_freq_set(int argc, char **argv)
                                 print_unknown_arg();
                                 return -EINVAL;
                         }
-                        if ((sscanf(optarg, "%s", gov)) != 1) {
+                        if ((sscanf(optarg, "%19s", gov)) != 1) {
                                 print_unknown_arg();
                                 return -EINVAL;
                         }