188 files changed, 9413 insertions, 3763 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index d5a0d33c571f..acb9bfc89b48 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -128,7 +128,7 @@ Description:	Discover cpuidle policy and mechanism
 
 What:           /sys/devices/system/cpu/cpu#/cpufreq/*
 Date:           pre-git history
-Contact:        cpufreq@vger.kernel.org
+Contact:        linux-pm@vger.kernel.org
 Description:    Discover and change clock speed of CPUs
 
                 Clock scaling allows you to change the clock speed of the
@@ -146,7 +146,7 @@ Description:	Discover and change clock speed of CPUs
 
 What:           /sys/devices/system/cpu/cpu#/cpufreq/freqdomain_cpus
 Date:           June 2013
-Contact:        cpufreq@vger.kernel.org
+Contact:        linux-pm@vger.kernel.org
 Description:    Discover CPUs in the same CPU frequency coordination domain
 
                 freqdomain_cpus is the list of CPUs (online+offline) that share
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power
index 64c9276e9421..f4551816329e 100644
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
@@ -7,19 +7,30 @@ Description:
                 subsystem.
 
 What:           /sys/power/state
-Date:           August 2006
+Date:           May 2014
 Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
-                The /sys/power/state file controls the system power state.
-                Reading from this file returns what states are supported,
-                which is hard-coded to 'freeze' (Low-Power Idle), 'standby'
-                (Power-On Suspend), 'mem' (Suspend-to-RAM), and 'disk'
-                (Suspend-to-Disk).
+                The /sys/power/state file controls system sleep states.
+                Reading from this file returns the available sleep state
+                labels, which may be "mem", "standby", "freeze" and "disk"
+                (hibernation).  The meanings of the first three labels depend on
+                the relative_sleep_states command line argument as follows:
+                 1) relative_sleep_states = 1
+                    "mem", "standby", "freeze" represent non-hibernation sleep
+                    states from the deepest ("mem", always present) to the
+                    shallowest ("freeze").  "standby" and "freeze" may or may
+                    not be present depending on the capabilities of the
+                    platform.  "freeze" can only be present if "standby" is
+                    present.
+                 2) relative_sleep_states = 0 (default)
+                    "mem" - "suspend-to-RAM", present if supported.
+                    "standby" - "power-on suspend", present if supported.
+                    "freeze" - "suspend-to-idle", always present.
 
                 Writing to this file one of these strings causes the system to
-                transition into that state. Please see the file
-                Documentation/power/states.txt for a description of each of
-                these states.
+                transition into the corresponding state, if available.  See
+                Documentation/power/states.txt for a description of what
+                "suspend-to-RAM", "power-on suspend" and "suspend-to-idle" mean.
 
 What:           /sys/power/disk
 Date:           September 2006
diff --git a/Documentation/cpu-freq/core.txt b/Documentation/cpu-freq/core.txt
index 0060d76b445f..70933eadc308 100644
--- a/Documentation/cpu-freq/core.txt
+++ b/Documentation/cpu-freq/core.txt
@@ -20,6 +20,7 @@ Contents:
 ---------
 1.  CPUFreq core and interfaces
 2.  CPUFreq notifiers
+3.  CPUFreq Table Generation with Operating Performance Point (OPP)
 
 1. General Information
 =======================
@@ -92,3 +93,31 @@ values:
 cpu     - number of the affected CPU
 old     - old frequency
 new     - new frequency
+
+3. CPUFreq Table Generation with Operating Performance Point (OPP)
+==================================================================
+For details about OPP, see Documentation/power/opp.txt
+
+dev_pm_opp_init_cpufreq_table - cpufreq framework typically is initialized with
+        cpufreq_frequency_table_cpuinfo which is provided with the list of
+        frequencies that are available for operation. This function provides
+        a ready to use conversion routine to translate the OPP layer's internal
+        information about the available frequencies into a format readily
+        providable to cpufreq.
+
+        WARNING: Do not use this function in interrupt context.
+
+        Example:
+         soc_pm_init()
+         {
+                /* Do things */
+                r = dev_pm_opp_init_cpufreq_table(dev, &freq_table);
+                if (!r)
+                        cpufreq_frequency_table_cpuinfo(policy, freq_table);
+                /* Do other things */
+         }
+
+        NOTE: This function is available only if CONFIG_CPU_FREQ is enabled in
+        addition to CONFIG_PM_OPP.
+
+dev_pm_opp_free_cpufreq_table - Free up the table allocated by dev_pm_opp_init_cpufreq_table
diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt
index 48da5fdcb9f1..b045fe54986a 100644
--- a/Documentation/cpu-freq/cpu-drivers.txt
+++ b/Documentation/cpu-freq/cpu-drivers.txt
@@ -228,3 +228,22 @@ is the corresponding frequency table helper for the ->target
 stage. Just pass the values to this function, and the unsigned int
 index returns the number of the frequency table entry which contains
 the frequency the CPU shall be set to.
+
+The following macros can be used as iterators over cpufreq_frequency_table:
+
+cpufreq_for_each_entry(pos, table) - iterates over all entries of frequency
+table.
+
+cpufreq-for_each_valid_entry(pos, table) - iterates over all entries,
+excluding CPUFREQ_ENTRY_INVALID frequencies.
+Use arguments "pos" - a cpufreq_frequency_table * as a loop cursor and
+"table" - the cpufreq_frequency_table * you want to iterate over.
+
+For example:
+
+        struct cpufreq_frequency_table *pos, *driver_freq_table;
+
+        cpufreq_for_each_entry(pos, driver_freq_table) {
+                /* Do something with pos */
+                pos->frequency = ...
+        }
diff --git a/Documentation/cpu-freq/index.txt b/Documentation/cpu-freq/index.txt
index 3d0b915035b9..dc024ab4054f 100644
--- a/Documentation/cpu-freq/index.txt
+++ b/Documentation/cpu-freq/index.txt
@@ -35,8 +35,8 @@ Mailing List
 ------------
 There is a CPU frequency changing CVS commit and general list where
 you can report bugs, problems or submit patches. To post a message,
-send an email to cpufreq@vger.kernel.org, to subscribe go to
-http://vger.kernel.org/vger-lists.html#cpufreq and follow the
+send an email to linux-pm@vger.kernel.org, to subscribe go to
+http://vger.kernel.org/vger-lists.html#linux-pm and follow the
 instructions there.
 
 Links
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4ddcbf949699..af55e13ace8f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -214,6 +214,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         unusable.  The "log_buf_len" parameter may be useful
                         if you need to capture more output.
 
+        acpi_force_table_verification   [HW,ACPI]
+                        Enable table checksum verification during early stage.
+                        By default, this is disabled due to x86 early mapping
+                        size limitation.
+
         acpi_irq_balance [HW,ACPI]
                         ACPI will balance active IRQs
                         default in APIC mode
@@ -237,7 +242,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         This feature is enabled by default.
                         This option allows to turn off the feature.
 
-        acpi_no_auto_ssdt       [HW,ACPI] Disable automatic loading of SSDT
+        acpi_no_static_ssdt     [HW,ACPI]
+                        Disable installation of static SSDTs at early boot time
+                        By default, SSDTs contained in the RSDT/XSDT will be
+                        installed automatically and they will appear under
+                        /sys/firmware/acpi/tables.
+                        This option turns off this feature.
+                        Note that specifying this option does not affect
+                        dynamic table installation which will install SSDT
+                        tables to /sys/firmware/acpi/tables/dynamic.
 
         acpica_no_return_repair [HW, ACPI]
                         Disable AML predefined validation mechanism
@@ -2898,6 +2911,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         [KNL, SMP] Set scheduler's default relax_domain_level.
                         See Documentation/cgroups/cpusets.txt.
 
+        relative_sleep_states=
+                        [SUSPEND] Use sleep state labeling where the deepest
+                        state available other than hibernation is always "mem".
+                        Format: { "0" | "1" }
+                        0 -- Traditional sleep state labels.
+                        1 -- Relative sleep state labels.
+
         reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
 
         reservetop=     [X86-32]
@@ -3470,7 +3490,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         the allocated input device; If set to 0, video driver
                         will only send out the event without touching backlight
                         brightness level.
-                        default: 1
+                        default: 0
 
         virtio_mmio.device=
                         [VMMIO] Memory mapped virtio (platform) device.
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index 47d46dff70f7..d172bce0fd49 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -2,6 +2,7 @@ Device Power Management
 
 Copyright (c) 2010-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
 Copyright (c) 2010 Alan Stern <stern@rowland.harvard.edu>
+Copyright (c) 2014 Intel Corp., Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 
 
 Most of the code in Linux is device drivers, so most of the Linux power
@@ -326,6 +327,20 @@ the phases are:
         driver in some way for the upcoming system power transition, but it
         should not put the device into a low-power state.
 
+        For devices supporting runtime power management, the return value of the
+        prepare callback can be used to indicate to the PM core that it may
+        safely leave the device in runtime suspend (if runtime-suspended
+        already), provided that all of the device's descendants are also left in
+        runtime suspend.  Namely, if the prepare callback returns a positive
+        number and that happens for all of the descendants of the device too,
+        and all of them (including the device itself) are runtime-suspended, the
+        PM core will skip the suspend, suspend_late and suspend_noirq suspend
+        phases as well as the resume_noirq, resume_early and resume phases of
+        the following system resume for all of these devices.   In that case,
+        the complete callback will be called directly after the prepare callback
+        and is entirely responsible for bringing the device back to the
+        functional state as appropriate.
+
     2.  The suspend methods should quiesce the device to stop it from performing
         I/O.  They also may save the device registers and put it into the
         appropriate low-power state, depending on the bus type the device is on,
@@ -400,12 +415,23 @@ When resuming from freeze, standby or memory sleep, the phases are:
         the resume callbacks occur; it's not necessary to wait until the
         complete phase.
 
+        Moreover, if the preceding prepare callback returned a positive number,
+        the device may have been left in runtime suspend throughout the whole
+        system suspend and resume (the suspend, suspend_late, suspend_noirq
+        phases of system suspend and the resume_noirq, resume_early, resume
+        phases of system resume may have been skipped for it).  In that case,
+        the complete callback is entirely responsible for bringing the device
+        back to the functional state after system suspend if necessary.  [For
+        example, it may need to queue up a runtime resume request for the device
+        for this purpose.]  To check if that is the case, the complete callback
+        can consult the device's power.direct_complete flag.  Namely, if that
+        flag is set when the complete callback is being run, it has been called
+        directly after the preceding prepare and special action may be required
+        to make the device work correctly afterward.
+
 At the end of these phases, drivers should be as functional as they were before
 suspending: I/O can be performed using DMA and IRQs, and the relevant clocks are
-gated on.  Even if the device was in a low-power state before the system sleep
-because of runtime power management, afterwards it should be back in its
-full-power state.  There are multiple reasons why it's best to do this; they are
-discussed in more detail in Documentation/power/runtime_pm.txt.
+gated on.
 
 However, the details here may again be platform-specific.  For example,
 some systems support multiple "run" states, and the mode in effect at
diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt
index b8a907dc0169..a9adad828cdc 100644
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
@@ -10,8 +10,7 @@ Contents
 3. OPP Search Functions
 4. OPP Availability Control Functions
 5. OPP Data Retrieval Functions
-6. Cpufreq Table Generation
-7. Data Structures
+6. Data Structures
 
 1. Introduction
 ===============
@@ -72,7 +71,6 @@ operations until that OPP could be re-enabled if possible.
 OPP library facilitates this concept in it's implementation. The following
 operational functions operate only on available opps:
 opp_find_freq_{ceil, floor}, dev_pm_opp_get_voltage, dev_pm_opp_get_freq, dev_pm_opp_get_opp_count
-and dev_pm_opp_init_cpufreq_table
 
 dev_pm_opp_find_freq_exact is meant to be used to find the opp pointer which can then
 be used for dev_pm_opp_enable/disable functions to make an opp available as required.
@@ -96,10 +94,9 @@ using RCU read locks. The opp_find_freq_{exact,ceil,floor},
 opp_get_{voltage, freq, opp_count} fall into this category.
 
 opp_{add,enable,disable} are updaters which use mutex and implement it's own
-RCU locking mechanisms. dev_pm_opp_init_cpufreq_table acts as an updater and uses
-mutex to implment RCU updater strategy. These functions should *NOT* be called
-under RCU locks and other contexts that prevent blocking functions in RCU or
-mutex operations from working.
+RCU locking mechanisms. These functions should *NOT* be called under RCU locks
+and other contexts that prevent blocking functions in RCU or mutex operations
+from working.
 
 2. Initial OPP List Registration
 ================================
@@ -311,34 +308,7 @@ dev_pm_opp_get_opp_count - Retrieve the number of available opps for a device
                 /* Do other things */
          }
 
-6. Cpufreq Table Generation
-===========================
-dev_pm_opp_init_cpufreq_table - cpufreq framework typically is initialized with
-        cpufreq_frequency_table_cpuinfo which is provided with the list of
-        frequencies that are available for operation. This function provides
-        a ready to use conversion routine to translate the OPP layer's internal
-        information about the available frequencies into a format readily
-        providable to cpufreq.
-
-        WARNING: Do not use this function in interrupt context.
-
-        Example:
-         soc_pm_init()
-         {
-                /* Do things */
-                r = dev_pm_opp_init_cpufreq_table(dev, &freq_table);
-                if (!r)
-                        cpufreq_frequency_table_cpuinfo(policy, freq_table);
-                /* Do other things */
-         }
-
-        NOTE: This function is available only if CONFIG_CPU_FREQ is enabled in
-        addition to CONFIG_PM as power management feature is required to
-        dynamically scale voltage and frequency in a system.
-
-dev_pm_opp_free_cpufreq_table - Free up the table allocated by dev_pm_opp_init_cpufreq_table
-
-7. Data Structures
+6. Data Structures
 ==================
 Typically an SoC contains multiple voltage domains which are variable. Each
 domain is represented by a device pointer. The relationship to OPP can be
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt
index 5f96daf8566a..f32ce5419573 100644
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
@@ -2,6 +2,7 @@ Runtime Power Management Framework for I/O Devices
 
 (C) 2009-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
 (C) 2010 Alan Stern <stern@rowland.harvard.edu>
+(C) 2014 Intel Corp., Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 
 1. Introduction
 
@@ -444,6 +445,10 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:
   bool pm_runtime_status_suspended(struct device *dev);
     - return true if the device's runtime PM status is 'suspended'
 
+  bool pm_runtime_suspended_if_enabled(struct device *dev);
+    - return true if the device's runtime PM status is 'suspended' and its
+      'power.disable_depth' field is equal to 1
+
   void pm_runtime_allow(struct device *dev);
     - set the power.runtime_auto flag for the device and decrease its usage
       counter (used by the /sys/devices/.../power/control interface to
@@ -644,19 +649,33 @@ place (in particular, if the system is not waking up from hibernation), it may
 be more efficient to leave the devices that had been suspended before the system
 suspend began in the suspended state.
 
+To this end, the PM core provides a mechanism allowing some coordination between
+different levels of device hierarchy.  Namely, if a system suspend .prepare()
+callback returns a positive number for a device, that indicates to the PM core
+that the device appears to be runtime-suspended and its state is fine, so it
+may be left in runtime suspend provided that all of its descendants are also
+left in runtime suspend.  If that happens, the PM core will not execute any
+system suspend and resume callbacks for all of those devices, except for the
+complete callback, which is then entirely responsible for handling the device
+as appropriate.  This only applies to system suspend transitions that are not
+related to hibernation (see Documentation/power/devices.txt for more
+information).
+
 The PM core does its best to reduce the probability of race conditions between
 the runtime PM and system suspend/resume (and hibernation) callbacks by carrying
 out the following operations:
 
-  * During system suspend it calls pm_runtime_get_noresume() and
-    pm_runtime_barrier() for every device right before executing the
-    subsystem-level .suspend() callback for it.  In addition to that it calls
-    __pm_runtime_disable() with 'false' as the second argument for every device
-    right before executing the subsystem-level .suspend_late() callback for it.
-
-  * During system resume it calls pm_runtime_enable() and pm_runtime_put()
-    for every device right after executing the subsystem-level .resume_early()
-    callback and right after executing the subsystem-level .resume() callback
+  * During system suspend pm_runtime_get_noresume() is called for every device
+    right before executing the subsystem-level .prepare() callback for it and
+    pm_runtime_barrier() is called for every device right before executing the
+    subsystem-level .suspend() callback for it.  In addition to that the PM core
+    calls  __pm_runtime_disable() with 'false' as the second argument for every
+    device right before executing the subsystem-level .suspend_late() callback
+    for it.
+
+  * During system resume pm_runtime_enable() and pm_runtime_put() are called for
+    every device right after executing the subsystem-level .resume_early()
+    callback and right after executing the subsystem-level .complete() callback
     for it, respectively.
 
 7. Generic subsystem callbacks
diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt
index 442d43df9b25..50f3ef9177c1 100644
--- a/Documentation/power/states.txt
+++ b/Documentation/power/states.txt
@@ -1,62 +1,87 @@
+System Power Management Sleep States
 
-System Power Management States
+(C) 2014 Intel Corp., Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 
+The kernel supports up to four system sleep states generically, although three
+of them depend on the platform support code to implement the low-level details
+for each state.
 
-The kernel supports four power management states generically, though
-one is generic and the other three are dependent on platform support
-code to implement the low-level details for each state.
-This file describes each state, what they are
-commonly called, what ACPI state they map to, and what string to write
-to /sys/power/state to enter that state
+The states are represented by strings that can be read or written to the
+/sys/power/state file.  Those strings may be "mem", "standby", "freeze" and
+"disk", where the last one always represents hibernation (Suspend-To-Disk) and
+the meaning of the remaining ones depends on the relative_sleep_states command
+line argument.
 
-state:          Freeze / Low-Power Idle
+For relative_sleep_states=1, the strings "mem", "standby" and "freeze" label the
+available non-hibernation sleep states from the deepest to the shallowest,
+respectively.  In that case, "mem" is always present in /sys/power/state,
+because there is at least one non-hibernation sleep state in every system.  If
+the given system supports two non-hibernation sleep states, "standby" is present
+in /sys/power/state in addition to "mem".  If the system supports three
+non-hibernation sleep states, "freeze" will be present in /sys/power/state in
+addition to "mem" and "standby".
+
+For relative_sleep_states=0, which is the default, the following descriptions
+apply.
+
+state:          Suspend-To-Idle
 ACPI state:     S0
-String:         "freeze"
+Label:          "freeze"
 
-This state is a generic, pure software, light-weight, low-power state.
-It allows more energy to be saved relative to idle by freezing user
+This state is a generic, pure software, light-weight, system sleep state.
+It allows more energy to be saved relative to runtime idle by freezing user
 space and putting all I/O devices into low-power states (possibly
 lower-power than available at run time), such that the processors can
 spend more time in their idle states.
-This state can be used for platforms without Standby/Suspend-to-RAM
+
+This state can be used for platforms without Power-On Suspend/Suspend-to-RAM
 support, or it can be used in addition to Suspend-to-RAM (memory sleep)
-to provide reduced resume latency.
+to provide reduced resume latency.  It is always supported.
 
 
 State:          Standby / Power-On Suspend
 ACPI State:     S1
-String:         "standby"
+Label:          "standby"
 
-This state offers minimal, though real, power savings, while providing
-a very low-latency transition back to a working system. No operating
-state is lost (the CPU retains power), so the system easily starts up
+This state, if supported, offers moderate, though real, power savings, while
+providing a relatively low-latency transition back to a working system.  No
+operating state is lost (the CPU retains power), so the system easily starts up
 again where it left off. 
 
-We try to put devices in a low-power state equivalent to D1, which
-also offers low power savings, but low resume latency. Not all devices
-support D1, and those that don't are left on. 
+In addition to freezing user space and putting all I/O devices into low-power
+states, which is done for Suspend-To-Idle too, nonboot CPUs are taken offline
+and all low-level system functions are suspended during transitions into this
+state.  For this reason, it should allow more energy to be saved relative to
+Suspend-To-Idle, but the resume latency will generally be greater than for that
+state.
 
 
 State:          Suspend-to-RAM
 ACPI State:     S3
-String:         "mem"
+Label:          "mem"
 
-This state offers significant power savings as everything in the
-system is put into a low-power state, except for memory, which is
-placed in self-refresh mode to retain its contents. 
+This state, if supported, offers significant power savings as everything in the
+system is put into a low-power state, except for memory, which should be placed
+into the self-refresh mode to retain its contents.  All of the steps carried out
+when entering Power-On Suspend are also carried out during transitions to STR.
+Additional operations may take place depending on the platform capabilities.  In
+particular, on ACPI systems the kernel passes control to the BIOS (platform
+firmware) as the last step during STR transitions and that usually results in
+powering down some more low-level components that aren't directly controlled by
+the kernel.
 
-System and device state is saved and kept in memory. All devices are
-suspended and put into D3. In many cases, all peripheral buses lose
-power when entering STR, so devices must be able to handle the
-transition back to the On state. 
+System and device state is saved and kept in memory.  All devices are suspended
+and put into low-power states.  In many cases, all peripheral buses lose power
+when entering STR, so devices must be able to handle the transition back to the
+"on" state.
 
-For at least ACPI, STR requires some minimal boot-strapping code to
-resume the system from STR. This may be true on other platforms. 
+For at least ACPI, STR requires some minimal boot-strapping code to resume the
+system from it.  This may be the case on other platforms too.
 
 
 State:          Suspend-to-disk
 ACPI State:     S4
-String:         "disk"
+Label:          "disk"
 
 This state offers the greatest power savings, and can be used even in
 the absence of low-level platform support for power management. This
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index 079160e22bcc..f732a8321e8a 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -220,7 +220,10 @@ Q: After resuming, system is paging heavily, leading to very bad interactivity.
 
 A: Try running
 
-cat `cat /proc/[0-9]*/maps | grep / | sed 's:.* /:/:' | sort -u` > /dev/null
+cat /proc/[0-9]*/maps | grep / | sed 's:.* /:/:' | sort -u | while read file
+do
+  test -f "$file" && cat "$file" > /dev/null
+done
 
 after resume. swapoff -a; swapon -a may also be useful.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 53feaaf1cf15..b1bf92d9c440 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2405,7 +2405,6 @@ F:	drivers/net/ethernet/ti/cpmac.c
 CPU FREQUENCY DRIVERS
 M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Viresh Kumar <viresh.kumar@linaro.org>
-L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
@@ -2416,7 +2415,6 @@ F:	include/linux/cpufreq.h
 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 M:      Viresh Kumar <viresh.kumar@linaro.org>
 M:      Sudeep Holla <sudeep.holla@arm.com>
-L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 W:      http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 S:      Maintained
@@ -6947,7 +6945,6 @@ F:	drivers/power/
 
 PNP SUPPORT
 M:      Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-M:      Bjorn Helgaas <bhelgaas@google.com>
 S:      Maintained
 F:      drivers/pnp/
 
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 85399c98f84a..45ce065e7170 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1092,20 +1092,21 @@ int da850_register_cpufreq(char *async_clk)
 
 static int da850_round_armrate(struct clk *clk, unsigned long rate)
 {
-        int i, ret = 0, diff;
+        int ret = 0, diff;
         unsigned int best = (unsigned int) -1;
         struct cpufreq_frequency_table *table = cpufreq_info.freq_table;
+        struct cpufreq_frequency_table *pos;
 
         rate /= 1000; /* convert to kHz */
 
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                diff = table[i].frequency - rate;
+        cpufreq_for_each_entry(pos, table) {
+                diff = pos->frequency - rate;
                 if (diff < 0)
                         diff = -diff;
 
                 if (diff < best) {
                         best = diff;
-                        ret = table[i].frequency;
+                        ret = pos->frequency;
                 }
         }
 
diff --git a/arch/ia64/include/asm/acenv.h b/arch/ia64/include/asm/acenv.h
new file mode 100644
index 000000000000..3f9eaeec9873
--- /dev/null
+++ b/arch/ia64/include/asm/acenv.h
@@ -0,0 +1,56 @@
+/*
+ * IA64 specific ACPICA environments and implementation
+ *
+ * Copyright (C) 2014, 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASM_IA64_ACENV_H
+#define _ASM_IA64_ACENV_H
+
+#include <asm/intrinsics.h>
+
+#define COMPILER_DEPENDENT_INT64        long
+#define COMPILER_DEPENDENT_UINT64       unsigned long
+
+/* Asm macros */
+
+#ifdef CONFIG_ACPI
+
+static inline int
+ia64_acpi_acquire_global_lock(unsigned int *lock)
+{
+        unsigned int old, new, val;
+        do {
+                old = *lock;
+                new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
+                val = ia64_cmpxchg4_acq(lock, new, old);
+        } while (unlikely (val != old));
+        return (new < 3) ? -1 : 0;
+}
+
+static inline int
+ia64_acpi_release_global_lock(unsigned int *lock)
+{
+        unsigned int old, new, val;
+        do {
+                old = *lock;
+                new = old & ~0x3;
+                val = ia64_cmpxchg4_acq(lock, new, old);
+        } while (unlikely (val != old));
+        return old & 0x1;
+}
+
+#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq)                             \
+        ((Acq) = ia64_acpi_acquire_global_lock(&facs->global_lock))
+
+#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)                             \
+        ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
+
+#endif
+
+#endif /* _ASM_IA64_ACENV_H */
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index d651102a4d45..75dc59a793d6 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -34,57 +34,8 @@
 #include <linux/numa.h>
 #include <asm/numa.h>
 
-#define COMPILER_DEPENDENT_INT64        long
-#define COMPILER_DEPENDENT_UINT64       unsigned long
-
-/*
- * Calling conventions:
- *
- * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
- * ACPI_EXTERNAL_XFACE      - External ACPI interfaces
- * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
- * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
- */
-#define ACPI_SYSTEM_XFACE
-#define ACPI_EXTERNAL_XFACE
-#define ACPI_INTERNAL_XFACE
-#define ACPI_INTERNAL_VAR_XFACE
-
-/* Asm macros */
-
-#define ACPI_FLUSH_CPU_CACHE()
-
-static inline int
-ia64_acpi_acquire_global_lock (unsigned int *lock)
-{
-        unsigned int old, new, val;
-        do {
-                old = *lock;
-                new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
-                val = ia64_cmpxchg4_acq(lock, new, old);
-        } while (unlikely (val != old));
-        return (new < 3) ? -1 : 0;
-}
-
-static inline int
-ia64_acpi_release_global_lock (unsigned int *lock)
-{
-        unsigned int old, new, val;
-        do {
-                old = *lock;
-                new = old & ~0x3;
-                val = ia64_cmpxchg4_acq(lock, new, old);
-        } while (unlikely (val != old));
-        return old & 0x1;
-}
-
-#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq)                             \
-        ((Acq) = ia64_acpi_acquire_global_lock(&facs->global_lock))
-
-#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)                             \
-        ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
-
 #ifdef  CONFIG_ACPI
+extern int acpi_lapic;
 #define acpi_disabled 0 /* ACPI always enabled on IA64 */
 #define acpi_noirq 0    /* ACPI always enabled on IA64 */
 #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
@@ -92,7 +43,6 @@ ia64_acpi_release_global_lock (unsigned int *lock)
 #endif
 #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
 static inline void disable_acpi(void) { }
-static inline void pci_acpi_crs_quirks(void) { }
 
 #ifdef CONFIG_IA64_GENERIC
 const char *acpi_get_sysname (void);
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 0d407b300762..615ef81def49 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -56,6 +56,7 @@
 
 #define PREFIX                  "ACPI: "
 
+int acpi_lapic;
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
@@ -676,6 +677,8 @@ int __init early_acpi_boot_init(void)
         if (ret < 1)
                 printk(KERN_ERR PREFIX
                        "Error parsing MADT - no LAPIC entries\n");
+        else
+                acpi_lapic = 1;
 
 #ifdef CONFIG_SMP
         if (available_cpus == 0) {
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c
index 67dd94ef28e6..1eed38e28b1e 100644
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -91,10 +91,9 @@ EXPORT_SYMBOL(clk_put);
 
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
-        unsigned int rate_khz = rate / 1000;
+        struct cpufreq_frequency_table *pos;
         int ret = 0;
         int regval;
-        int i;
 
         if (likely(clk->ops && clk->ops->set_rate)) {
                 unsigned long flags;
@@ -107,22 +106,16 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
         if (unlikely(clk->flags & CLK_RATE_PROPAGATES))
                 propagate_rate(clk);
 
-        for (i = 0; loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END;
-             i++) {
-                if (loongson2_clockmod_table[i].frequency ==
-                    CPUFREQ_ENTRY_INVALID)
-                        continue;
-                if (rate_khz == loongson2_clockmod_table[i].frequency)
+        cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table)
+                if (rate == pos->frequency)
                         break;
-        }
-        if (rate_khz != loongson2_clockmod_table[i].frequency)
+        if (rate != pos->frequency)
                 return -ENOTSUPP;
 
         clk->rate = rate;
 
         regval = LOONGSON_CHIPCFG0;
-        regval = (regval & ~0x7) |
-                (loongson2_clockmod_table[i].driver_data - 1);
+        regval = (regval & ~0x7) | (pos->driver_data - 1);
         LOONGSON_CHIPCFG0 = regval;
 
         return ret;
diff --git a/arch/x86/include/asm/acenv.h b/arch/x86/include/asm/acenv.h
new file mode 100644
index 000000000000..66873297e9f5
--- /dev/null
+++ b/arch/x86/include/asm/acenv.h
@@ -0,0 +1,49 @@
+/*
+ * X86 specific ACPICA environments and implementation
+ *
+ * Copyright (C) 2014, 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASM_X86_ACENV_H
+#define _ASM_X86_ACENV_H
+
+#include <asm/special_insns.h>
+
+/* Asm macros */
+
+#define ACPI_FLUSH_CPU_CACHE()  wbinvd()
+
+#ifdef CONFIG_ACPI
+
+int __acpi_acquire_global_lock(unsigned int *lock);
+int __acpi_release_global_lock(unsigned int *lock);
+
+#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \
+        ((Acq) = __acpi_acquire_global_lock(&facs->global_lock))
+
+#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
+        ((Acq) = __acpi_release_global_lock(&facs->global_lock))
+
+/*
+ * Math helper asm macros
+ */
+#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
+        asm("divl %2;"                               \
+            : "=a"(q32), "=d"(r32)                   \
+            : "r"(d32),                              \
+             "0"(n_lo), "1"(n_hi))
+
+#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
+        asm("shrl   $1,%2       ;"      \
+            "rcrl   $1,%3;"             \
+            : "=r"(n_hi), "=r"(n_lo)    \
+            : "0"(n_hi), "1"(n_lo))
+
+#endif
+
+#endif /* _ASM_X86_ACENV_H */
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index c8c1e700c26e..e06225eda635 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -32,51 +32,6 @@
 #include <asm/mpspec.h>
 #include <asm/realmode.h>
 
-#define COMPILER_DEPENDENT_INT64   long long
-#define COMPILER_DEPENDENT_UINT64  unsigned long long
-
-/*
- * Calling conventions:
- *
- * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
- * ACPI_EXTERNAL_XFACE      - External ACPI interfaces
- * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
- * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
- */
-#define ACPI_SYSTEM_XFACE
-#define ACPI_EXTERNAL_XFACE
-#define ACPI_INTERNAL_XFACE
-#define ACPI_INTERNAL_VAR_XFACE
-
-/* Asm macros */
-
-#define ACPI_FLUSH_CPU_CACHE()  wbinvd()
-
-int __acpi_acquire_global_lock(unsigned int *lock);
-int __acpi_release_global_lock(unsigned int *lock);
-
-#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \
-        ((Acq) = __acpi_acquire_global_lock(&facs->global_lock))
-
-#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
-        ((Acq) = __acpi_release_global_lock(&facs->global_lock))
-
-/*
- * Math helper asm macros
- */
-#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
-        asm("divl %2;"                               \
-            : "=a"(q32), "=d"(r32)                   \
-            : "r"(d32),                              \
-             "0"(n_lo), "1"(n_hi))
-
-
-#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
-        asm("shrl   $1,%2       ;"      \
-            "rcrl   $1,%3;"             \
-            : "=r"(n_hi), "=r"(n_lo)    \
-            : "0"(n_hi), "1"(n_lo))
-
 #ifdef CONFIG_ACPI
 extern int acpi_lapic;
 extern int acpi_ioapic;
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index bce34afadcd0..ea55e0179f81 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -39,8 +39,9 @@ acpi-y				+= processor_core.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
 acpi-y                          += pci_root.o pci_link.o pci_irq.o
-acpi-$(CONFIG_X86_INTEL_LPSS)   += acpi_lpss.o
+acpi-y                          += acpi_lpss.o
 acpi-y                          += acpi_platform.o
+acpi-y                          += acpi_pnp.o
 acpi-y                          += power.o
 acpi-y                          += event.o
 acpi-y                          += sysfs.o
@@ -63,9 +64,9 @@ obj-$(CONFIG_ACPI_FAN)		+= fan.o
 obj-$(CONFIG_ACPI_VIDEO)        += video.o
 obj-$(CONFIG_ACPI_PCI_SLOT)     += pci_slot.o
 obj-$(CONFIG_ACPI_PROCESSOR)    += processor.o
-obj-$(CONFIG_ACPI_CONTAINER)    += container.o
+obj-y                           += container.o
 obj-$(CONFIG_ACPI_THERMAL)      += thermal.o
-obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
+obj-y                           += acpi_memhotplug.o
 obj-$(CONFIG_ACPI_BATTERY)      += battery.o
 obj-$(CONFIG_ACPI_SBS)          += sbshc.o
 obj-$(CONFIG_ACPI_SBS)          += sbs.o
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 961b45d18a5d..2da8660262e5 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -68,7 +68,7 @@ static int acpi_install_cmos_rtc_space_handler(struct acpi_device *adev,
                 return -ENODEV;
         }
 
-        return 0;
+        return 1;
 }
 
 static void acpi_remove_cmos_rtc_space_handler(struct acpi_device *adev)
diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c
index c4a5d87ede7e..185334114d71 100644
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
@@ -220,13 +220,13 @@ static int __init extlog_init(void)
                 goto err;
         }
 
-        extlog_l1_hdr = acpi_os_map_memory(l1_dirbase, l1_hdr_size);
+        extlog_l1_hdr = acpi_os_map_iomem(l1_dirbase, l1_hdr_size);
         l1_head = (struct extlog_l1_head *)extlog_l1_hdr;
         l1_size = l1_head->total_len;
         l1_percpu_entry = l1_head->entries;
         elog_base = l1_head->elog_base;
         elog_size = l1_head->elog_len;
-        acpi_os_unmap_memory(extlog_l1_hdr, l1_hdr_size);
+        acpi_os_unmap_iomem(extlog_l1_hdr, l1_hdr_size);
         release_mem_region(l1_dirbase, l1_hdr_size);
 
         /* remap L1 header again based on completed information */
@@ -237,7 +237,7 @@ static int __init extlog_init(void)
                         (unsigned long long)l1_dirbase + l1_size);
                 goto err;
         }
-        extlog_l1_addr = acpi_os_map_memory(l1_dirbase, l1_size);
+        extlog_l1_addr = acpi_os_map_iomem(l1_dirbase, l1_size);
         l1_entry_base = (u64 *)((u8 *)extlog_l1_addr + l1_hdr_size);
 
         /* remap elog table */
@@ -248,7 +248,7 @@ static int __init extlog_init(void)
                         (unsigned long long)elog_base + elog_size);
                 goto err_release_l1_dir;
         }
-        elog_addr = acpi_os_map_memory(elog_base, elog_size);
+        elog_addr = acpi_os_map_iomem(elog_base, elog_size);
 
         rc = -ENOMEM;
         /* allocate buffer to save elog record */
@@ -270,11 +270,11 @@ static int __init extlog_init(void)
 
 err_release_elog:
         if (elog_addr)
-                acpi_os_unmap_memory(elog_addr, elog_size);
+                acpi_os_unmap_iomem(elog_addr, elog_size);
         release_mem_region(elog_base, elog_size);
 err_release_l1_dir:
         if (extlog_l1_addr)
-                acpi_os_unmap_memory(extlog_l1_addr, l1_size);
+                acpi_os_unmap_iomem(extlog_l1_addr, l1_size);
         release_mem_region(l1_dirbase, l1_size);
 err:
         pr_warn(FW_BUG "Extended error log disabled because of problems parsing f/w tables\n");
@@ -287,9 +287,9 @@ static void __exit extlog_exit(void)
         mce_unregister_decode_chain(&extlog_mce_dec);
         ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN;
         if (extlog_l1_addr)
-                acpi_os_unmap_memory(extlog_l1_addr, l1_size);
+                acpi_os_unmap_iomem(extlog_l1_addr, l1_size);
         if (elog_addr)
-                acpi_os_unmap_memory(elog_addr, elog_size);
+                acpi_os_unmap_iomem(elog_addr, elog_size);
         release_mem_region(elog_base, elog_size);
         release_mem_region(l1_dirbase, l1_size);
         kfree(elog_buf);
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index d79c6d7f598e..63407d264885 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -19,15 +19,21 @@
 #include <linux/platform_device.h>
 #include <linux/platform_data/clk-lpss.h>
 #include <linux/pm_runtime.h>
+#include <linux/delay.h>
 
 #include "internal.h"
 
 ACPI_MODULE_NAME("acpi_lpss");
 
+#ifdef CONFIG_X86_INTEL_LPSS
+
+#define LPSS_ADDR(desc) ((unsigned long)&desc)
+
 #define LPSS_CLK_SIZE   0x04
 #define LPSS_LTR_SIZE   0x18
 
 /* Offsets relative to LPSS_PRIVATE_OFFSET */
+#define LPSS_CLK_DIVIDER_DEF_MASK       (BIT(1) | BIT(16))
 #define LPSS_GENERAL                    0x08
 #define LPSS_GENERAL_LTR_MODE_SW        BIT(2)
 #define LPSS_GENERAL_UART_RTS_OVRD      BIT(3)
@@ -43,6 +49,8 @@ ACPI_MODULE_NAME("acpi_lpss");
 #define LPSS_TX_INT                     0x20
 #define LPSS_TX_INT_MASK                BIT(1)
 
+#define LPSS_PRV_REG_COUNT              9
+
 struct lpss_shared_clock {
         const char *name;
         unsigned long rate;
@@ -57,7 +65,9 @@ struct lpss_device_desc {
         bool ltr_required;
         unsigned int prv_offset;
         size_t prv_size_override;
+        bool clk_divider;
         bool clk_gate;
+        bool save_ctx;
         struct lpss_shared_clock *shared_clock;
         void (*setup)(struct lpss_private_data *pdata);
 };
@@ -72,6 +82,7 @@ struct lpss_private_data {
         resource_size_t mmio_size;
         struct clk *clk;
         const struct lpss_device_desc *dev_desc;
+        u32 prv_reg_ctx[LPSS_PRV_REG_COUNT];
 };
 
 static void lpss_uart_setup(struct lpss_private_data *pdata)
@@ -92,6 +103,14 @@ static struct lpss_device_desc lpt_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x800,
         .ltr_required = true,
+        .clk_divider = true,
+        .clk_gate = true,
+};
+
+static struct lpss_device_desc lpt_i2c_dev_desc = {
+        .clk_required = true,
+        .prv_offset = 0x800,
+        .ltr_required = true,
         .clk_gate = true,
 };
 
@@ -99,6 +118,7 @@ static struct lpss_device_desc lpt_uart_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x800,
         .ltr_required = true,
+        .clk_divider = true,
         .clk_gate = true,
         .setup = lpss_uart_setup,
 };
@@ -116,32 +136,25 @@ static struct lpss_shared_clock pwm_clock = {
 
 static struct lpss_device_desc byt_pwm_dev_desc = {
         .clk_required = true,
+        .save_ctx = true,
         .shared_clock = &pwm_clock,
 };
 
-static struct lpss_shared_clock uart_clock = {
-        .name = "uart_clk",
-        .rate = 44236800,
-};
-
 static struct lpss_device_desc byt_uart_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x800,
+        .clk_divider = true,
         .clk_gate = true,
-        .shared_clock = &uart_clock,
+        .save_ctx = true,
         .setup = lpss_uart_setup,
 };
 
-static struct lpss_shared_clock spi_clock = {
-        .name = "spi_clk",
-        .rate = 50000000,
-};
-
 static struct lpss_device_desc byt_spi_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x400,
+        .clk_divider = true,
         .clk_gate = true,
-        .shared_clock = &spi_clock,
+        .save_ctx = true,
 };
 
 static struct lpss_device_desc byt_sdio_dev_desc = {
@@ -156,44 +169,53 @@ static struct lpss_shared_clock i2c_clock = {
 static struct lpss_device_desc byt_i2c_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x800,
+        .save_ctx = true,
         .shared_clock = &i2c_clock,
 };
 
+#else
+
+#define LPSS_ADDR(desc) (0UL)
+
+#endif /* CONFIG_X86_INTEL_LPSS */
+
 static const struct acpi_device_id acpi_lpss_device_ids[] = {
         /* Generic LPSS devices */
-        { "INTL9C60", (unsigned long)&lpss_dma_desc },
+        { "INTL9C60", LPSS_ADDR(lpss_dma_desc) },
 
         /* Lynxpoint LPSS devices */
-        { "INT33C0", (unsigned long)&lpt_dev_desc },
-        { "INT33C1", (unsigned long)&lpt_dev_desc },
-        { "INT33C2", (unsigned long)&lpt_dev_desc },
-        { "INT33C3", (unsigned long)&lpt_dev_desc },
-        { "INT33C4", (unsigned long)&lpt_uart_dev_desc },
-        { "INT33C5", (unsigned long)&lpt_uart_dev_desc },
-        { "INT33C6", (unsigned long)&lpt_sdio_dev_desc },
+        { "INT33C0", LPSS_ADDR(lpt_dev_desc) },
+        { "INT33C1", LPSS_ADDR(lpt_dev_desc) },
+        { "INT33C2", LPSS_ADDR(lpt_i2c_dev_desc) },
+        { "INT33C3", LPSS_ADDR(lpt_i2c_dev_desc) },
+        { "INT33C4", LPSS_ADDR(lpt_uart_dev_desc) },
+        { "INT33C5", LPSS_ADDR(lpt_uart_dev_desc) },
+        { "INT33C6", LPSS_ADDR(lpt_sdio_dev_desc) },
         { "INT33C7", },
 
         /* BayTrail LPSS devices */
-        { "80860F09", (unsigned long)&byt_pwm_dev_desc },
-        { "80860F0A", (unsigned long)&byt_uart_dev_desc },
-        { "80860F0E", (unsigned long)&byt_spi_dev_desc },
-        { "80860F14", (unsigned long)&byt_sdio_dev_desc },
-        { "80860F41", (unsigned long)&byt_i2c_dev_desc },
+        { "80860F09", LPSS_ADDR(byt_pwm_dev_desc) },
+        { "80860F0A", LPSS_ADDR(byt_uart_dev_desc) },
+        { "80860F0E", LPSS_ADDR(byt_spi_dev_desc) },
+        { "80860F14", LPSS_ADDR(byt_sdio_dev_desc) },
+        { "80860F41", LPSS_ADDR(byt_i2c_dev_desc) },
         { "INT33B2", },
         { "INT33FC", },
 
-        { "INT3430", (unsigned long)&lpt_dev_desc },
-        { "INT3431", (unsigned long)&lpt_dev_desc },
-        { "INT3432", (unsigned long)&lpt_dev_desc },
-        { "INT3433", (unsigned long)&lpt_dev_desc },
-        { "INT3434", (unsigned long)&lpt_uart_dev_desc },
-        { "INT3435", (unsigned long)&lpt_uart_dev_desc },
-        { "INT3436", (unsigned long)&lpt_sdio_dev_desc },
+        { "INT3430", LPSS_ADDR(lpt_dev_desc) },
+        { "INT3431", LPSS_ADDR(lpt_dev_desc) },
+        { "INT3432", LPSS_ADDR(lpt_i2c_dev_desc) },
+        { "INT3433", LPSS_ADDR(lpt_i2c_dev_desc) },
+        { "INT3434", LPSS_ADDR(lpt_uart_dev_desc) },
+        { "INT3435", LPSS_ADDR(lpt_uart_dev_desc) },
+        { "INT3436", LPSS_ADDR(lpt_sdio_dev_desc) },
         { "INT3437", },
 
         { }
 };
 
+#ifdef CONFIG_X86_INTEL_LPSS
+
 static int is_memory(struct acpi_resource *res, void *not_used)
 {
         struct resource r;
@@ -213,9 +235,11 @@ static int register_device_clock(struct acpi_device *adev,
 {
         const struct lpss_device_desc *dev_desc = pdata->dev_desc;
         struct lpss_shared_clock *shared_clock = dev_desc->shared_clock;
+        const char *devname = dev_name(&adev->dev);
         struct clk *clk = ERR_PTR(-ENODEV);
         struct lpss_clk_data *clk_data;
-        const char *parent;
+        const char *parent, *clk_name;
+        void __iomem *prv_base;
 
         if (!lpss_clk_dev)
                 lpt_register_clock_device();
@@ -226,7 +250,7 @@ static int register_device_clock(struct acpi_device *adev,
 
         if (dev_desc->clkdev_name) {
                 clk_register_clkdev(clk_data->clk, dev_desc->clkdev_name,
-                                    dev_name(&adev->dev));
+                                    devname);
                 return 0;
         }
 
@@ -235,6 +259,7 @@ static int register_device_clock(struct acpi_device *adev,
                 return -ENODATA;
 
         parent = clk_data->name;
+        prv_base = pdata->mmio_base + dev_desc->prv_offset;
 
         if (shared_clock) {
                 clk = shared_clock->clk;
@@ -248,16 +273,41 @@ static int register_device_clock(struct acpi_device *adev,
         }
 
         if (dev_desc->clk_gate) {
-                clk = clk_register_gate(NULL, dev_name(&adev->dev), parent, 0,
-                                        pdata->mmio_base + dev_desc->prv_offset,
-                                        0, 0, NULL);
-                pdata->clk = clk;
+                clk = clk_register_gate(NULL, devname, parent, 0,
+                                        prv_base, 0, 0, NULL);
+                parent = devname;
+        }
+
+        if (dev_desc->clk_divider) {
+                /* Prevent division by zero */
+                if (!readl(prv_base))
+                        writel(LPSS_CLK_DIVIDER_DEF_MASK, prv_base);
+
+                clk_name = kasprintf(GFP_KERNEL, "%s-div", devname);
+                if (!clk_name)
+                        return -ENOMEM;
+                clk = clk_register_fractional_divider(NULL, clk_name, parent,
+                                                      0, prv_base,
+                                                      1, 15, 16, 15, 0, NULL);
+                parent = clk_name;
+
+                clk_name = kasprintf(GFP_KERNEL, "%s-update", devname);
+                if (!clk_name) {
+                        kfree(parent);
+                        return -ENOMEM;
+                }
+                clk = clk_register_gate(NULL, clk_name, parent,
+                                        CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,
+                                        prv_base, 31, 0, NULL);
+                kfree(parent);
+                kfree(clk_name);
         }
 
         if (IS_ERR(clk))
                 return PTR_ERR(clk);
 
-        clk_register_clkdev(clk, NULL, dev_name(&adev->dev));
+        pdata->clk = clk;
+        clk_register_clkdev(clk, NULL, devname);
         return 0;
 }
 
@@ -268,12 +318,14 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
         struct lpss_private_data *pdata;
         struct resource_list_entry *rentry;
         struct list_head resource_list;
+        struct platform_device *pdev;
         int ret;
 
         dev_desc = (struct lpss_device_desc *)id->driver_data;
-        if (!dev_desc)
-                return acpi_create_platform_device(adev, id);
-
+        if (!dev_desc) {
+                pdev = acpi_create_platform_device(adev);
+                return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
+        }
         pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
@@ -323,10 +375,13 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
                 dev_desc->setup(pdata);
 
         adev->driver_data = pdata;
-        ret = acpi_create_platform_device(adev, id);
-        if (ret > 0)
-                return ret;
+        pdev = acpi_create_platform_device(adev);
+        if (!IS_ERR_OR_NULL(pdev)) {
+                device_enable_async_suspend(&pdev->dev);
+                return 1;
+        }
 
+        ret = PTR_ERR(pdev);
         adev->driver_data = NULL;
 
  err_out:
@@ -450,6 +505,126 @@ static void acpi_lpss_set_ltr(struct device *dev, s32 val)
         }
 }
 
+#ifdef CONFIG_PM
+/**
+ * acpi_lpss_save_ctx() - Save the private registers of LPSS device
+ * @dev: LPSS device
+ *
+ * Most LPSS devices have private registers which may loose their context when
+ * the device is powered down. acpi_lpss_save_ctx() saves those registers into
+ * prv_reg_ctx array.
+ */
+static void acpi_lpss_save_ctx(struct device *dev)
+{
+        struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
+        unsigned int i;
+
+        for (i = 0; i < LPSS_PRV_REG_COUNT; i++) {
+                unsigned long offset = i * sizeof(u32);
+
+                pdata->prv_reg_ctx[i] = __lpss_reg_read(pdata, offset);
+                dev_dbg(dev, "saving 0x%08x from LPSS reg at offset 0x%02lx\n",
+                        pdata->prv_reg_ctx[i], offset);
+        }
+}
+
+/**
+ * acpi_lpss_restore_ctx() - Restore the private registers of LPSS device
+ * @dev: LPSS device
+ *
+ * Restores the registers that were previously stored with acpi_lpss_save_ctx().
+ */
+static void acpi_lpss_restore_ctx(struct device *dev)
+{
+        struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
+        unsigned int i;
+
+        /*
+         * The following delay is needed or the subsequent write operations may
+         * fail. The LPSS devices are actually PCI devices and the PCI spec
+         * expects 10ms delay before the device can be accessed after D3 to D0
+         * transition.
+         */
+        msleep(10);
+
+        for (i = 0; i < LPSS_PRV_REG_COUNT; i++) {
+                unsigned long offset = i * sizeof(u32);
+
+                __lpss_reg_write(pdata->prv_reg_ctx[i], pdata, offset);
+                dev_dbg(dev, "restoring 0x%08x to LPSS reg at offset 0x%02lx\n",
+                        pdata->prv_reg_ctx[i], offset);
+        }
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int acpi_lpss_suspend_late(struct device *dev)
+{
+        int ret = pm_generic_suspend_late(dev);
+
+        if (ret)
+                return ret;
+
+        acpi_lpss_save_ctx(dev);
+        return acpi_dev_suspend_late(dev);
+}
+
+static int acpi_lpss_restore_early(struct device *dev)
+{
+        int ret = acpi_dev_resume_early(dev);
+
+        if (ret)
+                return ret;
+
+        acpi_lpss_restore_ctx(dev);
+        return pm_generic_resume_early(dev);
+}
+#endif /* CONFIG_PM_SLEEP */
+
+#ifdef CONFIG_PM_RUNTIME
+static int acpi_lpss_runtime_suspend(struct device *dev)
+{
+        int ret = pm_generic_runtime_suspend(dev);
+
+        if (ret)
+                return ret;
+
+        acpi_lpss_save_ctx(dev);
+        return acpi_dev_runtime_suspend(dev);
+}
+
+static int acpi_lpss_runtime_resume(struct device *dev)
+{
+        int ret = acpi_dev_runtime_resume(dev);
+
+        if (ret)
+                return ret;
+
+        acpi_lpss_restore_ctx(dev);
+        return pm_generic_runtime_resume(dev);
+}
+#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
+
+static struct dev_pm_domain acpi_lpss_pm_domain = {
+        .ops = {
+#ifdef CONFIG_PM_SLEEP
+                .suspend_late = acpi_lpss_suspend_late,
+                .restore_early = acpi_lpss_restore_early,
+                .prepare = acpi_subsys_prepare,
+                .complete = acpi_subsys_complete,
+                .suspend = acpi_subsys_suspend,
+                .resume_early = acpi_subsys_resume_early,
+                .freeze = acpi_subsys_freeze,
+                .poweroff = acpi_subsys_suspend,
+                .poweroff_late = acpi_subsys_suspend_late,
+#endif
+#ifdef CONFIG_PM_RUNTIME
+                .runtime_suspend = acpi_lpss_runtime_suspend,
+                .runtime_resume = acpi_lpss_runtime_resume,
+#endif
+        },
+};
+
 static int acpi_lpss_platform_notify(struct notifier_block *nb,
                                      unsigned long action, void *data)
 {
@@ -457,7 +632,6 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
         struct lpss_private_data *pdata;
         struct acpi_device *adev;
         const struct acpi_device_id *id;
-        int ret = 0;
 
         id = acpi_match_device(acpi_lpss_device_ids, &pdev->dev);
         if (!id || !id->driver_data)
@@ -467,7 +641,7 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
                 return 0;
 
         pdata = acpi_driver_data(adev);
-        if (!pdata || !pdata->mmio_base || !pdata->dev_desc->ltr_required)
+        if (!pdata || !pdata->mmio_base)
                 return 0;
 
         if (pdata->mmio_size < pdata->dev_desc->prv_offset + LPSS_LTR_SIZE) {
@@ -475,12 +649,27 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
                 return 0;
         }
 
-        if (action == BUS_NOTIFY_ADD_DEVICE)
-                ret = sysfs_create_group(&pdev->dev.kobj, &lpss_attr_group);
-        else if (action == BUS_NOTIFY_DEL_DEVICE)
-                sysfs_remove_group(&pdev->dev.kobj, &lpss_attr_group);
+        switch (action) {
+        case BUS_NOTIFY_BOUND_DRIVER:
+                if (pdata->dev_desc->save_ctx)
+                        pdev->dev.pm_domain = &acpi_lpss_pm_domain;
+                break;
+        case BUS_NOTIFY_UNBOUND_DRIVER:
+                if (pdata->dev_desc->save_ctx)
+                        pdev->dev.pm_domain = NULL;
+                break;
+        case BUS_NOTIFY_ADD_DEVICE:
+                if (pdata->dev_desc->ltr_required)
+                        return sysfs_create_group(&pdev->dev.kobj,
+                                                  &lpss_attr_group);
+        case BUS_NOTIFY_DEL_DEVICE:
+                if (pdata->dev_desc->ltr_required)
+                        sysfs_remove_group(&pdev->dev.kobj, &lpss_attr_group);
+        default:
+                break;
+        }
 
-        return ret;
+        return 0;
 }
 
 static struct notifier_block acpi_lpss_nb = {
@@ -519,3 +708,16 @@ void __init acpi_lpss_init(void)
                 acpi_scan_add_handler(&lpss_handler);
         }
 }
+
+#else
+
+static struct acpi_scan_handler lpss_handler = {
+        .ids = acpi_lpss_device_ids,
+};
+
+void __init acpi_lpss_init(void)
+{
+        acpi_scan_add_handler(&lpss_handler);
+}
+
+#endif /* CONFIG_X86_INTEL_LPSS */
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index b67be85ff0fc..23e2319ead41 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -44,6 +44,13 @@
 
 ACPI_MODULE_NAME("acpi_memhotplug");
 
+static const struct acpi_device_id memory_device_ids[] = {
+        {ACPI_MEMORY_DEVICE_HID, 0},
+        {"", 0},
+};
+
+#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
+
 /* Memory Device States */
 #define MEMORY_INVALID_STATE    0
 #define MEMORY_POWER_ON_STATE   1
@@ -53,11 +60,6 @@ static int acpi_memory_device_add(struct acpi_device *device,
                                   const struct acpi_device_id *not_used);
 static void acpi_memory_device_remove(struct acpi_device *device);
 
-static const struct acpi_device_id memory_device_ids[] = {
-        {ACPI_MEMORY_DEVICE_HID, 0},
-        {"", 0},
-};
-
 static struct acpi_scan_handler memory_device_handler = {
         .ids = memory_device_ids,
         .attach = acpi_memory_device_add,
@@ -364,9 +366,11 @@ static bool __initdata acpi_no_memhotplug;
 
 void __init acpi_memory_hotplug_init(void)
 {
-        if (acpi_no_memhotplug)
+        if (acpi_no_memhotplug) {
+                memory_device_handler.attach = NULL;
+                acpi_scan_add_handler(&memory_device_handler);
                 return;
-
+        }
         acpi_scan_add_handler_with_hotplug(&memory_device_handler, "memory");
 }
 
@@ -376,3 +380,16 @@ static int __init disable_acpi_memory_hotplug(char *str)
         return 1;
 }
 __setup("acpi_no_memhotplug", disable_acpi_memory_hotplug);
+
+#else
+
+static struct acpi_scan_handler memory_device_handler = {
+        .ids = memory_device_ids,
+};
+
+void __init acpi_memory_hotplug_init(void)
+{
+        acpi_scan_add_handler(&memory_device_handler);
+}
+
+#endif /* CONFIG_ACPI_HOTPLUG_MEMORY */
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 37d73024b82e..f148a0580e04 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -156,12 +156,13 @@ static int power_saving_thread(void *data)
 
         while (!kthread_should_stop()) {
                 int cpu;
-                u64 expire_time;
+                unsigned long expire_time;
 
                 try_to_freeze();
 
                 /* round robin to cpus */
-                if (last_jiffies + round_robin_time * HZ < jiffies) {
+                expire_time = last_jiffies + round_robin_time * HZ;
+                if (time_before(expire_time, jiffies)) {
                         last_jiffies = jiffies;
                         round_robin_cpu(tsk_index);
                 }
@@ -200,7 +201,7 @@ static int power_saving_thread(void *data)
                                         CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
                         local_irq_enable();
 
-                        if (jiffies > expire_time) {
+                        if (time_before(expire_time, jiffies)) {
                                 do_sleep = 1;
                                 break;
                         }
@@ -215,8 +216,15 @@ static int power_saving_thread(void *data)
                  * borrow CPU time from this CPU and cause RT task use > 95%
                  * CPU time. To make 'avoid starvation' work, takes a nap here.
                  */
-                if (do_sleep)
+                if (unlikely(do_sleep))
                         schedule_timeout_killable(HZ * idle_pct / 100);
+
+                /* If an external event has set the need_resched flag, then
+                 * we need to deal with it, or this loop will continue to
+                 * spin without calling __mwait().
+                 */
+                if (unlikely(need_resched()))
+                        schedule();
         }
 
         exit_round_robin(tsk_index);
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 1d4950388fa1..2bf9082f7523 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -22,27 +22,16 @@
 
 ACPI_MODULE_NAME("platform");
 
-/*
- * The following ACPI IDs are known to be suitable for representing as
- * platform devices.
- */
-static const struct acpi_device_id acpi_platform_device_ids[] = {
-
-        { "PNP0D40" },
-        { "VPC2004" },
-        { "BCM4752" },
-
-        /* Intel Smart Sound Technology */
-        { "INT33C8" },
-        { "80860F28" },
-
-        { }
+static const struct acpi_device_id forbidden_id_list[] = {
+        {"PNP0000", 0}, /* PIC */
+        {"PNP0100", 0}, /* Timer */
+        {"PNP0200", 0}, /* AT DMA Controller */
+        {"", 0},
 };
 
 /**
  * acpi_create_platform_device - Create platform device for ACPI device node
  * @adev: ACPI device node to create a platform device for.
- * @id: ACPI device ID used to match @adev.
  *
  * Check if the given @adev can be represented as a platform device and, if
  * that's the case, create and register a platform device, populate its common
@@ -50,8 +39,7 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
  *
  * Name of the platform device will be the same as @adev's.
  */
-int acpi_create_platform_device(struct acpi_device *adev,
-                                const struct acpi_device_id *id)
+struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
 {
         struct platform_device *pdev = NULL;
         struct acpi_device *acpi_parent;
@@ -63,19 +51,22 @@ int acpi_create_platform_device(struct acpi_device *adev,
 
         /* If the ACPI node already has a physical device attached, skip it. */
         if (adev->physical_node_count)
-                return 0;
+                return NULL;
+
+        if (!acpi_match_device_ids(adev, forbidden_id_list))
+                return ERR_PTR(-EINVAL);
 
         INIT_LIST_HEAD(&resource_list);
         count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
         if (count < 0) {
-                return 0;
+                return NULL;
         } else if (count > 0) {
                 resources = kmalloc(count * sizeof(struct resource),
                                     GFP_KERNEL);
                 if (!resources) {
                         dev_err(&adev->dev, "No memory for resources\n");
                         acpi_dev_free_resource_list(&resource_list);
-                        return -ENOMEM;
+                        return ERR_PTR(-ENOMEM);
                 }
                 count = 0;
                 list_for_each_entry(rentry, &resource_list, node)
@@ -112,25 +103,13 @@ int acpi_create_platform_device(struct acpi_device *adev,
         pdevinfo.num_res = count;
         pdevinfo.acpi_node.companion = adev;
         pdev = platform_device_register_full(&pdevinfo);
-        if (IS_ERR(pdev)) {
+        if (IS_ERR(pdev))
                 dev_err(&adev->dev, "platform device creation failed: %ld\n",
                         PTR_ERR(pdev));
-                pdev = NULL;
-        } else {
+        else
                 dev_dbg(&adev->dev, "created platform device %s\n",
                         dev_name(&pdev->dev));
-        }
 
         kfree(resources);
-        return 1;
-}
-
-static struct acpi_scan_handler platform_handler = {
-        .ids = acpi_platform_device_ids,
-        .attach = acpi_create_platform_device,
-};
-
-void __init acpi_platform_init(void)
-{
-        acpi_scan_add_handler(&platform_handler);
+        return pdev;
 }
diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
new file mode 100644
index 000000000000..6703c1fd993a
--- /dev/null
+++ b/drivers/acpi/acpi_pnp.c
@@ -0,0 +1,395 @@
+/*
+ * ACPI support for PNP bus type
+ *
+ * Copyright (C) 2014, Intel Corporation
+ * Authors: Zhang Rui <rui.zhang@intel.com>
+ *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/module.h>
+
+static const struct acpi_device_id acpi_pnp_device_ids[] = {
+        /* pata_isapnp */
+        {"PNP0600"},            /* Generic ESDI/IDE/ATA compatible hard disk controller */
+        /* floppy */
+        {"PNP0700"},
+        /* ipmi_si */
+        {"IPI0001"},
+        /* tpm_inf_pnp */
+        {"IFX0101"},            /* Infineon TPMs */
+        {"IFX0102"},            /* Infineon TPMs */
+        /*tpm_tis */
+        {"PNP0C31"},            /* TPM */
+        {"ATM1200"},            /* Atmel */
+        {"IFX0102"},            /* Infineon */
+        {"BCM0101"},            /* Broadcom */
+        {"BCM0102"},            /* Broadcom */
+        {"NSC1200"},            /* National */
+        {"ICO0102"},            /* Intel */
+        /* ide   */
+        {"PNP0600"},            /* Generic ESDI/IDE/ATA compatible hard disk controller */
+        /* ns558 */
+        {"ASB16fd"},            /* AdLib NSC16 */
+        {"AZT3001"},            /* AZT1008 */
+        {"CDC0001"},            /* Opl3-SAx */
+        {"CSC0001"},            /* CS4232 */
+        {"CSC000f"},            /* CS4236 */
+        {"CSC0101"},            /* CS4327 */
+        {"CTL7001"},            /* SB16 */
+        {"CTL7002"},            /* AWE64 */
+        {"CTL7005"},            /* Vibra16 */
+        {"ENS2020"},            /* SoundscapeVIVO */
+        {"ESS0001"},            /* ES1869 */
+        {"ESS0005"},            /* ES1878 */
+        {"ESS6880"},            /* ES688 */
+        {"IBM0012"},            /* CS4232 */
+        {"OPT0001"},            /* OPTi Audio16 */
+        {"YMH0006"},            /* Opl3-SA */
+        {"YMH0022"},            /* Opl3-SAx */
+        {"PNPb02f"},            /* Generic */
+        /* i8042 kbd */
+        {"PNP0300"},
+        {"PNP0301"},
+        {"PNP0302"},
+        {"PNP0303"},
+        {"PNP0304"},
+        {"PNP0305"},
+        {"PNP0306"},
+        {"PNP0309"},
+        {"PNP030a"},
+        {"PNP030b"},
+        {"PNP0320"},
+        {"PNP0343"},
+        {"PNP0344"},
+        {"PNP0345"},
+        {"CPQA0D7"},
+        /* i8042 aux */
+        {"AUI0200"},
+        {"FJC6000"},
+        {"FJC6001"},
+        {"PNP0f03"},
+        {"PNP0f0b"},
+        {"PNP0f0e"},
+        {"PNP0f12"},
+        {"PNP0f13"},
+        {"PNP0f19"},
+        {"PNP0f1c"},
+        {"SYN0801"},
+        /* fcpnp */
+        {"AVM0900"},
+        /* radio-cadet */
+        {"MSM0c24"},            /* ADS Cadet AM/FM Radio Card */
+        /* radio-gemtek */
+        {"ADS7183"},            /* AOpen FX-3D/Pro Radio */
+        /* radio-sf16fmr2 */
+        {"MFRad13"},            /* tuner subdevice of SF16-FMD2 */
+        /* ene_ir */
+        {"ENE0100"},
+        {"ENE0200"},
+        {"ENE0201"},
+        {"ENE0202"},
+        /* fintek-cir */
+        {"FIT0002"},            /* CIR */
+        /* ite-cir */
+        {"ITE8704"},            /* Default model */
+        {"ITE8713"},            /* CIR found in EEEBox 1501U */
+        {"ITE8708"},            /* Bridged IT8512 */
+        {"ITE8709"},            /* SRAM-Bridged IT8512 */
+        /* nuvoton-cir */
+        {"WEC0530"},            /* CIR */
+        {"NTN0530"},            /* CIR for new chip's pnp id */
+        /* Winbond CIR */
+        {"WEC1022"},
+        /* wbsd */
+        {"WEC0517"},
+        {"WEC0518"},
+        /* Winbond CIR */
+        {"TCM5090"},            /* 3Com Etherlink III (TP) */
+        {"TCM5091"},            /* 3Com Etherlink III */
+        {"TCM5094"},            /* 3Com Etherlink III (combo) */
+        {"TCM5095"},            /* 3Com Etherlink III (TPO) */
+        {"TCM5098"},            /* 3Com Etherlink III (TPC) */
+        {"PNP80f7"},            /* 3Com Etherlink III compatible */
+        {"PNP80f8"},            /* 3Com Etherlink III compatible */
+        /* nsc-ircc */
+        {"NSC6001"},
+        {"HWPC224"},
+        {"IBM0071"},
+        /* smsc-ircc2 */
+        {"SMCf010"},
+        /* sb1000 */
+        {"GIC1000"},
+        /* parport_pc */
+        {"PNP0400"},            /* Standard LPT Printer Port */
+        {"PNP0401"},            /* ECP Printer Port */
+        /* apple-gmux */
+        {"APP000B"},
+        /* fujitsu-laptop.c */
+        {"FUJ02bf"},
+        {"FUJ02B1"},
+        {"FUJ02E3"},
+        /* system */
+        {"PNP0c02"},            /* General ID for reserving resources */
+        {"PNP0c01"},            /* memory controller */
+        /* rtc_cmos */
+        {"PNP0b00"},
+        {"PNP0b01"},
+        {"PNP0b02"},
+        /* c6xdigio */
+        {"PNP0400"},            /* Standard LPT Printer Port */
+        {"PNP0401"},            /* ECP Printer Port */
+        /* ni_atmio.c */
+        {"NIC1900"},
+        {"NIC2400"},
+        {"NIC2500"},
+        {"NIC2600"},
+        {"NIC2700"},
+        /* serial */
+        {"AAC000F"},            /* Archtek America Corp. Archtek SmartLink Modem 3334BT Plug & Play */
+        {"ADC0001"},            /* Anchor Datacomm BV. SXPro 144 External Data Fax Modem Plug & Play */
+        {"ADC0002"},            /* SXPro 288 External Data Fax Modem Plug & Play */
+        {"AEI0250"},            /* PROLiNK 1456VH ISA PnP K56flex Fax Modem */
+        {"AEI1240"},            /* Actiontec ISA PNP 56K X2 Fax Modem */
+        {"AKY1021"},            /* Rockwell 56K ACF II Fax+Data+Voice Modem */
+        {"AZT4001"},            /* AZT3005 PnP SOUND DEVICE */
+        {"BDP3336"},            /* Best Data Products Inc. Smart One 336F PnP Modem */
+        {"BRI0A49"},            /* Boca Complete Ofc Communicator 14.4 Data-FAX */
+        {"BRI1400"},            /* Boca Research 33,600 ACF Modem */
+        {"BRI3400"},            /* Boca 33.6 Kbps Internal FD34FSVD */
+        {"BRI0A49"},            /* Boca 33.6 Kbps Internal FD34FSVD */
+        {"BDP3336"},            /* Best Data Products Inc. Smart One 336F PnP Modem */
+        {"CPI4050"},            /* Computer Peripherals Inc. EuroViVa CommCenter-33.6 SP PnP */
+        {"CTL3001"},            /* Creative Labs Phone Blaster 28.8 DSVD PnP Voice */
+        {"CTL3011"},            /* Creative Labs Modem Blaster 28.8 DSVD PnP Voice */
+        {"DAV0336"},            /* Davicom ISA 33.6K Modem */
+        {"DMB1032"},            /* Creative Modem Blaster Flash56 DI5601-1 */
+        {"DMB2001"},            /* Creative Modem Blaster V.90 DI5660 */
+        {"ETT0002"},            /* E-Tech CyberBULLET PC56RVP */
+        {"FUJ0202"},            /* Fujitsu 33600 PnP-I2 R Plug & Play */
+        {"FUJ0205"},            /* Fujitsu FMV-FX431 Plug & Play */
+        {"FUJ0206"},            /* Fujitsu 33600 PnP-I4 R Plug & Play */
+        {"FUJ0209"},            /* Fujitsu Fax Voice 33600 PNP-I5 R Plug & Play */
+        {"GVC000F"},            /* Archtek SmartLink Modem 3334BT Plug & Play */
+        {"GVC0303"},            /* Archtek SmartLink Modem 3334BRV 33.6K Data Fax Voice */
+        {"HAY0001"},            /* Hayes Optima 288 V.34-V.FC + FAX + Voice Plug & Play */
+        {"HAY000C"},            /* Hayes Optima 336 V.34 + FAX + Voice PnP */
+        {"HAY000D"},            /* Hayes Optima 336B V.34 + FAX + Voice PnP */
+        {"HAY5670"},            /* Hayes Accura 56K Ext Fax Modem PnP */
+        {"HAY5674"},            /* Hayes Accura 56K Ext Fax Modem PnP */
+        {"HAY5675"},            /* Hayes Accura 56K Fax Modem PnP */
+        {"HAYF000"},            /* Hayes 288, V.34 + FAX */
+        {"HAYF001"},            /* Hayes Optima 288 V.34 + FAX + Voice, Plug & Play */
+        {"IBM0033"},            /* IBM Thinkpad 701 Internal Modem Voice */
+        {"PNP4972"},            /* Intermec CV60 touchscreen port */
+        {"IXDC801"},            /* Intertex 28k8 33k6 Voice EXT PnP */
+        {"IXDC901"},            /* Intertex 33k6 56k Voice EXT PnP */
+        {"IXDD801"},            /* Intertex 28k8 33k6 Voice SP EXT PnP */
+        {"IXDD901"},            /* Intertex 33k6 56k Voice SP EXT PnP */
+        {"IXDF401"},            /* Intertex 28k8 33k6 Voice SP INT PnP */
+        {"IXDF801"},            /* Intertex 28k8 33k6 Voice SP EXT PnP */
+        {"IXDF901"},            /* Intertex 33k6 56k Voice SP EXT PnP */
+        {"KOR4522"},            /* KORTEX 28800 Externe PnP */
+        {"KORF661"},            /* KXPro 33.6 Vocal ASVD PnP */
+        {"LAS4040"},            /* LASAT Internet 33600 PnP */
+        {"LAS4540"},            /* Lasat Safire 560 PnP */
+        {"LAS5440"},            /* Lasat Safire 336  PnP */
+        {"MNP0281"},            /* Microcom TravelPorte FAST V.34 Plug & Play */
+        {"MNP0336"},            /* Microcom DeskPorte V.34 FAST or FAST+ Plug & Play */
+        {"MNP0339"},            /* Microcom DeskPorte FAST EP 28.8 Plug & Play */
+        {"MNP0342"},            /* Microcom DeskPorte 28.8P Plug & Play */
+        {"MNP0500"},            /* Microcom DeskPorte FAST ES 28.8 Plug & Play */
+        {"MNP0501"},            /* Microcom DeskPorte FAST ES 28.8 Plug & Play */
+        {"MNP0502"},            /* Microcom DeskPorte 28.8S Internal Plug & Play */
+        {"MOT1105"},            /* Motorola BitSURFR Plug & Play */
+        {"MOT1111"},            /* Motorola TA210 Plug & Play */
+        {"MOT1114"},            /* Motorola HMTA 200 (ISDN) Plug & Play */
+        {"MOT1115"},            /* Motorola BitSURFR Plug & Play */
+        {"MOT1190"},            /* Motorola Lifestyle 28.8 Internal */
+        {"MOT1501"},            /* Motorola V.3400 Plug & Play */
+        {"MOT1502"},            /* Motorola Lifestyle 28.8 V.34 Plug & Play */
+        {"MOT1505"},            /* Motorola Power 28.8 V.34 Plug & Play */
+        {"MOT1509"},            /* Motorola ModemSURFR External 28.8 Plug & Play */
+        {"MOT150A"},            /* Motorola Premier 33.6 Desktop Plug & Play */
+        {"MOT150F"},            /* Motorola VoiceSURFR 56K External PnP */
+        {"MOT1510"},            /* Motorola ModemSURFR 56K External PnP */
+        {"MOT1550"},            /* Motorola ModemSURFR 56K Internal PnP */
+        {"MOT1560"},            /* Motorola ModemSURFR Internal 28.8 Plug & Play */
+        {"MOT1580"},            /* Motorola Premier 33.6 Internal Plug & Play */
+        {"MOT15B0"},            /* Motorola OnlineSURFR 28.8 Internal Plug & Play */
+        {"MOT15F0"},            /* Motorola VoiceSURFR 56K Internal PnP */
+        {"MVX00A1"},            /*  Deskline K56 Phone System PnP */
+        {"MVX00F2"},            /* PC Rider K56 Phone System PnP */
+        {"nEC8241"},            /* NEC 98NOTE SPEAKER PHONE FAX MODEM(33600bps) */
+        {"PMC2430"},            /* Pace 56 Voice Internal Plug & Play Modem */
+        {"PNP0500"},            /* Generic standard PC COM port     */
+        {"PNP0501"},            /* Generic 16550A-compatible COM port */
+        {"PNPC000"},            /* Compaq 14400 Modem */
+        {"PNPC001"},            /* Compaq 2400/9600 Modem */
+        {"PNPC031"},            /* Dial-Up Networking Serial Cable between 2 PCs */
+        {"PNPC032"},            /* Dial-Up Networking Parallel Cable between 2 PCs */
+        {"PNPC100"},            /* Standard 9600 bps Modem */
+        {"PNPC101"},            /* Standard 14400 bps Modem */
+        {"PNPC102"},            /*  Standard 28800 bps Modem */
+        {"PNPC103"},            /*  Standard Modem */
+        {"PNPC104"},            /*  Standard 9600 bps Modem */
+        {"PNPC105"},            /*  Standard 14400 bps Modem */
+        {"PNPC106"},            /*  Standard 28800 bps Modem */
+        {"PNPC107"},            /*  Standard Modem */
+        {"PNPC108"},            /* Standard 9600 bps Modem */
+        {"PNPC109"},            /* Standard 14400 bps Modem */
+        {"PNPC10A"},            /* Standard 28800 bps Modem */
+        {"PNPC10B"},            /* Standard Modem */
+        {"PNPC10C"},            /* Standard 9600 bps Modem */
+        {"PNPC10D"},            /* Standard 14400 bps Modem */
+        {"PNPC10E"},            /* Standard 28800 bps Modem */
+        {"PNPC10F"},            /* Standard Modem */
+        {"PNP2000"},            /* Standard PCMCIA Card Modem */
+        {"ROK0030"},            /* Rockwell 33.6 DPF Internal PnP, Modular Technology 33.6 Internal PnP */
+        {"ROK0100"},            /* KORTEX 14400 Externe PnP */
+        {"ROK4120"},            /* Rockwell 28.8 */
+        {"ROK4920"},            /* Viking 28.8 INTERNAL Fax+Data+Voice PnP */
+        {"RSS00A0"},            /* Rockwell 33.6 DPF External PnP, BT Prologue 33.6 External PnP, Modular Technology 33.6 External PnP */
+        {"RSS0262"},            /* Viking 56K FAX INT */
+        {"RSS0250"},            /* K56 par,VV,Voice,Speakphone,AudioSpan,PnP */
+        {"SUP1310"},            /* SupraExpress 28.8 Data/Fax PnP modem */
+        {"SUP1381"},            /* SupraExpress 336i PnP Voice Modem */
+        {"SUP1421"},            /* SupraExpress 33.6 Data/Fax PnP modem */
+        {"SUP1590"},            /* SupraExpress 33.6 Data/Fax PnP modem */
+        {"SUP1620"},            /* SupraExpress 336i Sp ASVD */
+        {"SUP1760"},            /* SupraExpress 33.6 Data/Fax PnP modem */
+        {"SUP2171"},            /* SupraExpress 56i Sp Intl */
+        {"TEX0011"},            /* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */
+        {"UAC000F"},            /* Archtek SmartLink Modem 3334BT Plug & Play */
+        {"USR0000"},            /* 3Com Corp. Gateway Telepath IIvi 33.6 */
+        {"USR0002"},            /* U.S. Robotics Sporster 33.6K Fax INT PnP */
+        {"USR0004"},            /*  Sportster Vi 14.4 PnP FAX Voicemail */
+        {"USR0006"},            /* U.S. Robotics 33.6K Voice INT PnP */
+        {"USR0007"},            /* U.S. Robotics 33.6K Voice EXT PnP */
+        {"USR0009"},            /* U.S. Robotics Courier V.Everything INT PnP */
+        {"USR2002"},            /* U.S. Robotics 33.6K Voice INT PnP */
+        {"USR2070"},            /* U.S. Robotics 56K Voice INT PnP */
+        {"USR2080"},            /* U.S. Robotics 56K Voice EXT PnP */
+        {"USR3031"},            /* U.S. Robotics 56K FAX INT */
+        {"USR3050"},            /* U.S. Robotics 56K FAX INT */
+        {"USR3070"},            /* U.S. Robotics 56K Voice INT PnP */
+        {"USR3080"},            /* U.S. Robotics 56K Voice EXT PnP */
+        {"USR3090"},            /* U.S. Robotics 56K Voice INT PnP */
+        {"USR9100"},            /* U.S. Robotics 56K Message  */
+        {"USR9160"},            /* U.S. Robotics 56K FAX EXT PnP */
+        {"USR9170"},            /* U.S. Robotics 56K FAX INT PnP */
+        {"USR9180"},            /* U.S. Robotics 56K Voice EXT PnP */
+        {"USR9190"},            /* U.S. Robotics 56K Voice INT PnP */
+        {"WACFXXX"},            /* Wacom tablets */
+        {"FPI2002"},            /* Compaq touchscreen */
+        {"FUJ02B2"},            /* Fujitsu Stylistic touchscreens */
+        {"FUJ02B3"},
+        {"FUJ02B4"},            /* Fujitsu Stylistic LT touchscreens */
+        {"FUJ02B6"},            /* Passive Fujitsu Stylistic touchscreens */
+        {"FUJ02B7"},
+        {"FUJ02B8"},
+        {"FUJ02B9"},
+        {"FUJ02BC"},
+        {"FUJ02E5"},            /* Fujitsu Wacom Tablet PC device */
+        {"FUJ02E6"},            /* Fujitsu P-series tablet PC device */
+        {"FUJ02E7"},            /* Fujitsu Wacom 2FGT Tablet PC device */
+        {"FUJ02E9"},            /* Fujitsu Wacom 1FGT Tablet PC device */
+        {"LTS0001"},            /* LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in disguise) */
+        {"WCI0003"},            /* Rockwell's (PORALiNK) 33600 INT PNP */
+        {"WEC1022"},            /* Winbond CIR port, should not be probed. We should keep track of it to prevent the legacy serial driver from probing it */
+        /* scl200wdt */
+        {"NSC0800"},            /* National Semiconductor PC87307/PC97307 watchdog component */
+        /* mpu401 */
+        {"PNPb006"},
+        /* cs423x-pnpbios */
+        {"CSC0100"},
+        {"CSC0000"},
+        {"GIM0100"},            /* Guillemot Turtlebeach something appears to be cs4232 compatible */
+        /* es18xx-pnpbios */
+        {"ESS1869"},
+        {"ESS1879"},
+        /* snd-opl3sa2-pnpbios */
+        {"YMH0021"},
+        {"NMX2210"},            /* Gateway Solo 2500 */
+        {""},
+};
+
+static bool is_hex_digit(char c)
+{
+        return (c >= 0 && c <= '9') || (c >= 'A' && c <= 'F');
+}
+
+static bool matching_id(char *idstr, char *list_id)
+{
+        int i;
+
+        if (memcmp(idstr, list_id, 3))
+                return false;
+
+        for (i = 3; i < 7; i++) {
+                char c = toupper(idstr[i]);
+
+                if (!is_hex_digit(c)
+                    || (list_id[i] != 'X' && c != toupper(list_id[i])))
+                        return false;
+        }
+        return true;
+}
+
+static bool acpi_pnp_match(char *idstr, const struct acpi_device_id **matchid)
+{
+        const struct acpi_device_id *devid;
+
+        for (devid = acpi_pnp_device_ids; devid->id[0]; devid++)
+                if (matching_id(idstr, (char *)devid->id)) {
+                        if (matchid)
+                                *matchid = devid;
+
+                        return true;
+                }
+
+        return false;
+}
+
+static int acpi_pnp_attach(struct acpi_device *adev,
+                           const struct acpi_device_id *id)
+{
+        return 1;
+}
+
+static struct acpi_scan_handler acpi_pnp_handler = {
+        .ids = acpi_pnp_device_ids,
+        .match = acpi_pnp_match,
+        .attach = acpi_pnp_attach,
+};
+
+/*
+ * For CMOS RTC devices, the PNP ACPI scan handler does not work, because
+ * there is a CMOS RTC ACPI scan handler installed already, so we need to
+ * check those devices and enumerate them to the PNP bus directly.
+ */
+static int is_cmos_rtc_device(struct acpi_device *adev)
+{
+        struct acpi_device_id ids[] = {
+                { "PNP0B00" },
+                { "PNP0B01" },
+                { "PNP0B02" },
+                {""},
+        };
+        return !acpi_match_device_ids(adev, ids);
+}
+
+bool acpi_is_pnp_device(struct acpi_device *adev)
+{
+        return adev->handler == &acpi_pnp_handler || is_cmos_rtc_device(adev);
+}
+EXPORT_SYMBOL_GPL(acpi_is_pnp_device);
+
+void __init acpi_pnp_init(void)
+{
+        acpi_scan_add_handler(&acpi_pnp_handler);
+}
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 52c81c49cc7d..1c085742644f 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -268,7 +268,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
         pr->apic_id = apic_id;
 
         cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id);
-        if (!cpu0_initialized) {
+        if (!cpu0_initialized && !acpi_lapic) {
                 cpu0_initialized = 1;
                 /* Handle UP system running SMP kernel, with no LAPIC in MADT */
                 if ((cpu_index == -1) && (num_online_cpus() == 1))
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index b7ed86a20427..8bb43f06e11f 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -135,6 +135,7 @@ acpi-y +=		\
         rsxface.o
 
 acpi-y +=               \
+        tbdata.o        \
         tbfadt.o        \
         tbfind.o        \
         tbinstal.o      \
diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h
new file mode 100644
index 000000000000..8698ffba6f39
--- /dev/null
+++ b/drivers/acpi/acpica/acapps.h
@@ -0,0 +1,170 @@
+/******************************************************************************
+ *
+ * Module Name: acapps - common include for ACPI applications/tools
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _ACAPPS
+#define _ACAPPS
+
+/* Common info for tool signons */
+
+#define ACPICA_NAME                 "Intel ACPI Component Architecture"
+#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2014 Intel Corporation"
+
+#if ACPI_MACHINE_WIDTH == 64
+#define ACPI_WIDTH          "-64"
+
+#elif ACPI_MACHINE_WIDTH == 32
+#define ACPI_WIDTH          "-32"
+
+#else
+#error unknown ACPI_MACHINE_WIDTH
+#define ACPI_WIDTH          "-??"
+
+#endif
+
+/* Macros for signons and file headers */
+
+#define ACPI_COMMON_SIGNON(utility_name) \
+        "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \
+        ACPICA_NAME, \
+        utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+        ACPICA_COPYRIGHT
+
+#define ACPI_COMMON_HEADER(utility_name, prefix) \
+        "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \
+        prefix, ACPICA_NAME, \
+        prefix, utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+        prefix, ACPICA_COPYRIGHT, \
+        prefix
+
+/* Macros for usage messages */
+
+#define ACPI_USAGE_HEADER(usage) \
+        printf ("Usage: %s\nOptions:\n", usage);
+
+#define ACPI_OPTION(name, description) \
+        printf ("  %-18s%s\n", name, description);
+
+#define FILE_SUFFIX_DISASSEMBLY     "dsl"
+#define ACPI_TABLE_FILE_SUFFIX      ".dat"
+
+/*
+ * getopt
+ */
+int acpi_getopt(int argc, char **argv, char *opts);
+
+int acpi_getopt_argument(int argc, char **argv);
+
+extern int acpi_gbl_optind;
+extern int acpi_gbl_opterr;
+extern int acpi_gbl_sub_opt_char;
+extern char *acpi_gbl_optarg;
+
+/*
+ * cmfsize - Common get file size function
+ */
+u32 cm_get_file_size(FILE * file);
+
+#ifndef ACPI_DUMP_APP
+/*
+ * adisasm
+ */
+acpi_status
+ad_aml_disassemble(u8 out_to_file,
+                   char *filename, char *prefix, char **out_filename);
+
+void ad_print_statistics(void);
+
+acpi_status ad_find_dsdt(u8 **dsdt_ptr, u32 *dsdt_length);
+
+void ad_dump_tables(void);
+
+acpi_status ad_get_local_tables(void);
+
+acpi_status
+ad_parse_table(struct acpi_table_header *table,
+               acpi_owner_id * owner_id, u8 load_table, u8 external);
+
+acpi_status ad_display_tables(char *filename, struct acpi_table_header *table);
+
+acpi_status ad_display_statistics(void);
+
+/*
+ * adwalk
+ */
+void
+acpi_dm_cross_reference_namespace(union acpi_parse_object *parse_tree_root,
+                                  struct acpi_namespace_node *namespace_root,
+                                  acpi_owner_id owner_id);
+
+void acpi_dm_dump_tree(union acpi_parse_object *origin);
+
+void acpi_dm_find_orphan_methods(union acpi_parse_object *origin);
+
+void
+acpi_dm_finish_namespace_load(union acpi_parse_object *parse_tree_root,
+                              struct acpi_namespace_node *namespace_root,
+                              acpi_owner_id owner_id);
+
+void
+acpi_dm_convert_resource_indexes(union acpi_parse_object *parse_tree_root,
+                                 struct acpi_namespace_node *namespace_root);
+
+/*
+ * adfile
+ */
+acpi_status ad_initialize(void);
+
+char *fl_generate_filename(char *input_filename, char *suffix);
+
+acpi_status
+fl_split_input_pathname(char *input_path,
+                        char **out_directory_path, char **out_filename);
+
+char *ad_generate_filename(char *prefix, char *table_id);
+
+void
+ad_write_table(struct acpi_table_header *table,
+               u32 length, char *table_name, char *oem_table_id);
+#endif
+
+#endif                          /* _ACAPPS */
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 68ec61fff188..7a7811a9fc26 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -104,9 +104,10 @@ acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info *gpe_event_info);
  */
 acpi_status
 acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
-                         struct acpi_generic_address *gpe_block_address,
+                         u64 address,
+                         u8 space_id,
                          u32 register_count,
-                         u8 gpe_block_base_number,
+                         u16 gpe_block_base_number,
                          u32 interrupt_number,
                          struct acpi_gpe_block_info **return_gpe_block);
 
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index a08a448068dd..115eedcade1e 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -44,144 +44,14 @@
 #ifndef __ACGLOBAL_H__
 #define __ACGLOBAL_H__
 
-/*
- * Ensure that the globals are actually defined and initialized only once.
- *
- * The use of these macros allows a single list of globals (here) in order
- * to simplify maintenance of the code.
- */
-#ifdef DEFINE_ACPI_GLOBALS
-#define ACPI_GLOBAL(type,name) \
-        extern type name; \
-        type name
-
-#define ACPI_INIT_GLOBAL(type,name,value) \
-        type name=value
-
-#else
-#define ACPI_GLOBAL(type,name) \
-        extern type name
-
-#define ACPI_INIT_GLOBAL(type,name,value) \
-        extern type name
-#endif
-
-#ifdef DEFINE_ACPI_GLOBALS
-
-/* Public globals, available from outside ACPICA subsystem */
-
 /*****************************************************************************
  *
- * Runtime configuration (static defaults that can be overriden at runtime)
+ * Globals related to the ACPI tables
  *
  ****************************************************************************/
 
-/*
- * Enable "slack" in the AML interpreter?  Default is FALSE, and the
- * interpreter strictly follows the ACPI specification. Setting to TRUE
- * allows the interpreter to ignore certain errors and/or bad AML constructs.
- *
- * Currently, these features are enabled by this flag:
- *
- * 1) Allow "implicit return" of last value in a control method
- * 2) Allow access beyond the end of an operation region
- * 3) Allow access to uninitialized locals/args (auto-init to integer 0)
- * 4) Allow ANY object type to be a source operand for the Store() operator
- * 5) Allow unresolved references (invalid target name) in package objects
- * 6) Enable warning messages for behavior that is not ACPI spec compliant
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_interpreter_slack, FALSE);
+/* Master list of all ACPI tables that were found in the RSDT/XSDT */
 
-/*
- * Automatically serialize all methods that create named objects? Default
- * is TRUE, meaning that all non_serialized methods are scanned once at
- * table load time to determine those that create named objects. Methods
- * that create named objects are marked Serialized in order to prevent
- * possible run-time problems if they are entered by more than one thread.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_auto_serialize_methods, TRUE);
-
-/*
- * Create the predefined _OSI method in the namespace? Default is TRUE
- * because ACPI CA is fully compatible with other ACPI implementations.
- * Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_create_osi_method, TRUE);
-
-/*
- * Optionally use default values for the ACPI register widths. Set this to
- * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_use_default_register_widths, TRUE);
-
-/*
- * Optionally enable output from the AML Debug Object.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_aml_debug_object, FALSE);
-
-/*
- * Optionally copy the entire DSDT to local memory (instead of simply
- * mapping it.) There are some BIOSs that corrupt or replace the original
- * DSDT, creating the need for this option. Default is FALSE, do not copy
- * the DSDT.
- */
-ACPI_INIT_GLOBAL(u8, 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.
- */
-ACPI_INIT_GLOBAL(u8, 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 TRUE, favor the 32-bit addresses.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, TRUE);
-
-/*
- * 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
- * requested by the BIOS.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_truncate_io_addresses, FALSE);
-
-/*
- * Disable runtime checking and repair of values returned by control methods.
- * Use only if the repair is causing a problem on a particular machine.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_auto_repair, FALSE);
-
-/*
- * Optionally do not load any SSDTs from the RSDT/XSDT during initialization.
- * This can be useful for debugging ACPI problems on some machines.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_ssdt_table_load, FALSE);
-
-/*
- * We keep track of the latest version of Windows that has been requested by
- * the BIOS.
- */
-ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0);
-
-#endif                          /* DEFINE_ACPI_GLOBALS */
-
-/*****************************************************************************
- *
- * ACPI Table globals
- *
- ****************************************************************************/
-
-/*
- * Master list of all ACPI tables that were found in the RSDT/XSDT.
- */
 ACPI_GLOBAL(struct acpi_table_list, acpi_gbl_root_table_list);
 
 /* DSDT information. Used to check for DSDT corruption */
@@ -279,7 +149,6 @@ ACPI_GLOBAL(acpi_exception_handler, acpi_gbl_exception_handler);
 ACPI_GLOBAL(acpi_init_handler, acpi_gbl_init_handler);
 ACPI_GLOBAL(acpi_table_handler, acpi_gbl_table_handler);
 ACPI_GLOBAL(void *, acpi_gbl_table_handler_context);
-ACPI_GLOBAL(struct acpi_walk_state *, acpi_gbl_breakpoint_walk);
 ACPI_GLOBAL(acpi_interface_handler, acpi_gbl_interface_handler);
 ACPI_GLOBAL(struct acpi_sci_handler_info *, acpi_gbl_sci_handler_list);
 
@@ -296,7 +165,6 @@ ACPI_GLOBAL(u8, acpi_gbl_reg_methods_executed);
 /* Misc */
 
 ACPI_GLOBAL(u32, acpi_gbl_original_mode);
-ACPI_GLOBAL(u32, acpi_gbl_rsdp_original_location);
 ACPI_GLOBAL(u32, acpi_gbl_ns_lookup_count);
 ACPI_GLOBAL(u32, acpi_gbl_ps_find_count);
 ACPI_GLOBAL(u16, acpi_gbl_pm1_enable_register_save);
@@ -483,11 +351,6 @@ ACPI_GLOBAL(u16, acpi_gbl_node_type_count_misc);
 ACPI_GLOBAL(u32, acpi_gbl_num_nodes);
 ACPI_GLOBAL(u32, acpi_gbl_num_objects);
 
-ACPI_GLOBAL(u32, acpi_gbl_size_of_parse_tree);
-ACPI_GLOBAL(u32, acpi_gbl_size_of_method_trees);
-ACPI_GLOBAL(u32, acpi_gbl_size_of_node_entries);
-ACPI_GLOBAL(u32, acpi_gbl_size_of_acpi_objects);
-
 #endif                          /* ACPI_DEBUGGER */
 
 /*****************************************************************************
@@ -509,5 +372,6 @@ ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);
  ****************************************************************************/
 
 extern const struct ah_predefined_name asl_predefined_info[];
+extern const struct ah_device_id asl_device_ids[];
 
 #endif                          /* __ACGLOBAL_H__ */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 52a21dafb540..91f801a2e689 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -450,9 +450,9 @@ struct acpi_gpe_event_info {
 struct acpi_gpe_register_info {
         struct acpi_generic_address status_address;     /* Address of status reg */
         struct acpi_generic_address enable_address;     /* Address of enable reg */
+        u16 base_gpe_number;    /* Base GPE number for this register */
         u8 enable_for_wake;     /* GPEs to keep enabled when sleeping */
         u8 enable_for_run;      /* GPEs to keep enabled when running */
-        u8 base_gpe_number;     /* Base GPE number for this register */
 };
 
 /*
@@ -466,11 +466,12 @@ struct acpi_gpe_block_info {
         struct acpi_gpe_xrupt_info *xrupt_block;        /* Backpointer to interrupt block */
         struct acpi_gpe_register_info *register_info;   /* One per GPE register pair */
         struct acpi_gpe_event_info *event_info; /* One for each GPE */
-        struct acpi_generic_address block_address;      /* Base address of the block */
+        u64 address;            /* Base address of the block */
         u32 register_count;     /* Number of register pairs in block */
         u16 gpe_count;          /* Number of individual GPEs in block */
-        u8 block_base_number;   /* Base GPE number for this block */
-        u8 initialized;         /* TRUE if this block is initialized */
+        u16 block_base_number;  /* Base GPE number for this block */
+        u8 space_id;
+        u8 initialized;         /* TRUE if this block is initialized */
 };
 
 /* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */
@@ -733,7 +734,8 @@ union acpi_parse_value {
 #define ACPI_DASM_MATCHOP               0x06    /* Parent opcode is a Match() operator */
 #define ACPI_DASM_LNOT_PREFIX           0x07    /* Start of a Lnot_equal (etc.) pair of opcodes */
 #define ACPI_DASM_LNOT_SUFFIX           0x08    /* End  of a Lnot_equal (etc.) pair of opcodes */
-#define ACPI_DASM_IGNORE                0x09    /* Not used at this time */
+#define ACPI_DASM_HID_STRING            0x09    /* String is a _HID or _CID */
+#define ACPI_DASM_IGNORE                0x0A    /* Not used at this time */
 
 /*
  * Generic operation (for example:  If, While, Store)
@@ -1147,4 +1149,9 @@ struct ah_predefined_name {
 #endif
 };
 
+struct ah_device_id {
+        char *name;
+        char *description;
+};
+
 #endif                          /* __ACLOCAL_H__ */
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index a48d713e9599..bd08817cafd8 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -586,6 +586,10 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
         {{"_LID", METHOD_0ARGS,
           METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
 
+        {{"_LPD", METHOD_0ARGS,
+          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(rev), n Pkg (2 Int) */
+        PACKAGE_INFO(ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),
+
         {{"_MAT", METHOD_0ARGS,
           METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
 
@@ -698,12 +702,6 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
           METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
         PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
 
-        {{"_PRP", METHOD_0ARGS,
-          METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each: 1 Str, 1 Int/Str/Pkg */
-        PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_STRING, 1,
-                     ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING |
-                     ACPI_RTYPE_PACKAGE | ACPI_RTYPE_REFERENCE, 1, 0),
-
         {{"_PRS", METHOD_0ARGS,
           METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
 
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 5fa4b2027697..f14882788eee 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -54,6 +54,31 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
 u8 *acpi_tb_scan_memory_for_rsdp(u8 *start_address, u32 length);
 
 /*
+ * tbdata - table data structure management
+ */
+acpi_status acpi_tb_get_next_root_index(u32 *table_index);
+
+void
+acpi_tb_init_table_descriptor(struct acpi_table_desc *table_desc,
+                              acpi_physical_address address,
+                              u8 flags, struct acpi_table_header *table);
+
+acpi_status
+acpi_tb_acquire_temp_table(struct acpi_table_desc *table_desc,
+                           acpi_physical_address address, u8 flags);
+
+void acpi_tb_release_temp_table(struct acpi_table_desc *table_desc);
+
+acpi_status acpi_tb_validate_temp_table(struct acpi_table_desc *table_desc);
+
+acpi_status
+acpi_tb_verify_temp_table(struct acpi_table_desc *table_desc, char *signature);
+
+u8 acpi_tb_is_table_loaded(u32 table_index);
+
+void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded);
+
+/*
  * tbfadt - FADT parse/convert/validate
  */
 void acpi_tb_parse_fadt(u32 table_index);
@@ -72,22 +97,32 @@ acpi_tb_find_table(char *signature,
  */
 acpi_status acpi_tb_resize_root_table_list(void);
 
-acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc);
+acpi_status acpi_tb_validate_table(struct acpi_table_desc *table_desc);
+
+void acpi_tb_invalidate_table(struct acpi_table_desc *table_desc);
+
+void acpi_tb_override_table(struct acpi_table_desc *old_table_desc);
 
-struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
-                                                 *table_header,
-                                                 struct acpi_table_desc
-                                                 *table_desc);
+acpi_status
+acpi_tb_acquire_table(struct acpi_table_desc *table_desc,
+                      struct acpi_table_header **table_ptr,
+                      u32 *table_length, u8 *table_flags);
+
+void
+acpi_tb_release_table(struct acpi_table_header *table,
+                      u32 table_length, u8 table_flags);
 
 acpi_status
-acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index);
+acpi_tb_install_standard_table(acpi_physical_address address,
+                               u8 flags,
+                               u8 reload, u8 override, u32 *table_index);
 
 acpi_status
 acpi_tb_store_table(acpi_physical_address address,
                     struct acpi_table_header *table,
                     u32 length, u8 flags, u32 *table_index);
 
-void acpi_tb_delete_table(struct acpi_table_desc *table_desc);
+void acpi_tb_uninstall_table(struct acpi_table_desc *table_desc);
 
 void acpi_tb_terminate(void);
 
@@ -99,10 +134,6 @@ acpi_status acpi_tb_release_owner_id(u32 table_index);
 
 acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id);
 
-u8 acpi_tb_is_table_loaded(u32 table_index);
-
-void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded);
-
 /*
  * tbutils - table manager utilities
  */
@@ -124,8 +155,13 @@ void acpi_tb_check_dsdt_header(void);
 struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index);
 
 void
-acpi_tb_install_table(acpi_physical_address address,
-                      char *signature, u32 table_index);
+acpi_tb_install_table_with_override(u32 table_index,
+                                    struct acpi_table_desc *new_table_desc,
+                                    u8 override);
+
+acpi_status
+acpi_tb_install_fixed_table(acpi_physical_address address,
+                            char *signature, u32 table_index);
 
 acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);
 
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index ceeec0b7ccb1..1e256c5bda20 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -176,8 +176,7 @@ acpi_status acpi_ut_init_globals(void);
 
 char *acpi_ut_get_mutex_name(u32 mutex_id);
 
-const char *acpi_ut_get_notify_name(u32 notify_value);
-
+const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type);
 #endif
 
 char *acpi_ut_get_type_name(acpi_object_type type);
@@ -737,4 +736,11 @@ acpi_ut_method_error(const char *module_name,
                      struct acpi_namespace_node *node,
                      const char *path, acpi_status lookup_status);
 
+/*
+ * Utility functions for ACPI names and IDs
+ */
+const struct ah_predefined_name *acpi_ah_match_predefined_name(char *nameseg);
+
+const struct ah_device_id *acpi_ah_match_hardware_id(char *hid);
+
 #endif                          /* _ACUTILS_H */
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 955f83da68a5..48f70013b488 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -383,7 +383,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         if (!(gpe_register_info->enable_for_run |
                               gpe_register_info->enable_for_wake)) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
-                                                  "Ignore disabled registers for GPE%02X-GPE%02X: "
+                                                  "Ignore disabled registers for GPE %02X-%02X: "
                                                   "RunEnable=%02X, WakeEnable=%02X\n",
                                                   gpe_register_info->
                                                   base_gpe_number,
@@ -416,7 +416,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         }
 
                         ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
-                                          "Read registers for GPE%02X-GPE%02X: Status=%02X, Enable=%02X, "
+                                          "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, "
                                           "RunEnable=%02X, WakeEnable=%02X\n",
                                           gpe_register_info->base_gpe_number,
                                           gpe_register_info->base_gpe_number +
@@ -706,7 +706,8 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE%02X", gpe_number));
+                                        "Unable to clear GPE %02X",
+                                        gpe_number));
                         return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
         }
@@ -723,7 +724,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
         status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
-                                "Unable to disable GPE%02X", gpe_number));
+                                "Unable to disable GPE %02X", gpe_number));
                 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
         }
 
@@ -764,7 +765,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                                          gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to queue handler for GPE%02X - event disabled",
+                                        "Unable to queue handler for GPE %02X - event disabled",
                                         gpe_number));
                 }
                 break;
@@ -776,7 +777,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
                  * a GPE to be enabled if it has no handler or method.
                  */
                 ACPI_ERROR((AE_INFO,
-                            "No handler or method for GPE%02X, disabling event",
+                            "No handler or method for GPE %02X, disabling event",
                             gpe_number));
 
                 break;
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index caaed3c673fd..d86699eea33c 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -252,21 +252,17 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
 
                 /* Init the register_info for this GPE register (8 GPEs) */
 
-                this_register->base_gpe_number =
-                    (u8) (gpe_block->block_base_number +
-                          (i * ACPI_GPE_REGISTER_WIDTH));
+                this_register->base_gpe_number = (u16)
+                    (gpe_block->block_base_number +
+                     (i * ACPI_GPE_REGISTER_WIDTH));
 
-                this_register->status_address.address =
-                    gpe_block->block_address.address + i;
+                this_register->status_address.address = gpe_block->address + i;
 
                 this_register->enable_address.address =
-                    gpe_block->block_address.address + i +
-                    gpe_block->register_count;
+                    gpe_block->address + i + gpe_block->register_count;
 
-                this_register->status_address.space_id =
-                    gpe_block->block_address.space_id;
-                this_register->enable_address.space_id =
-                    gpe_block->block_address.space_id;
+                this_register->status_address.space_id = gpe_block->space_id;
+                this_register->enable_address.space_id = gpe_block->space_id;
                 this_register->status_address.bit_width =
                     ACPI_GPE_REGISTER_WIDTH;
                 this_register->enable_address.bit_width =
@@ -334,9 +330,10 @@ error_exit:
 
 acpi_status
 acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
-                         struct acpi_generic_address *gpe_block_address,
+                         u64 address,
+                         u8 space_id,
                          u32 register_count,
-                         u8 gpe_block_base_number,
+                         u16 gpe_block_base_number,
                          u32 interrupt_number,
                          struct acpi_gpe_block_info **return_gpe_block)
 {
@@ -359,15 +356,14 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 
         /* Initialize the new GPE block */
 
+        gpe_block->address = address;
+        gpe_block->space_id = space_id;
         gpe_block->node = gpe_device;
         gpe_block->gpe_count = (u16)(register_count * ACPI_GPE_REGISTER_WIDTH);
         gpe_block->initialized = FALSE;
         gpe_block->register_count = register_count;
         gpe_block->block_base_number = gpe_block_base_number;
 
-        ACPI_MEMCPY(&gpe_block->block_address, gpe_block_address,
-                    sizeof(struct acpi_generic_address));
-
         /*
          * Create the register_info and event_info sub-structures
          * Note: disables and clears all GPEs in the block
@@ -408,12 +404,14 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                              "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X\n",
+                              "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
                               (u32)gpe_block->block_base_number,
                               (u32)(gpe_block->block_base_number +
                                     (gpe_block->gpe_count - 1)),
                               gpe_device->name.ascii, gpe_block->register_count,
-                              interrupt_number));
+                              interrupt_number,
+                              interrupt_number ==
+                              acpi_gbl_FADT.sci_interrupt ? " (SCI)" : ""));
 
         /* Update global count of currently available GPEs */
 
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index ae779c1e871d..49fc7effd961 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -131,8 +131,10 @@ acpi_status acpi_ev_gpe_initialize(void)
                 /* Install GPE Block 0 */
 
                 status = acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
-                                                  &acpi_gbl_FADT.xgpe0_block,
-                                                  register_count0, 0,
+                                                  acpi_gbl_FADT.xgpe0_block.
+                                                  address,
+                                                  acpi_gbl_FADT.xgpe0_block.
+                                                  space_id, register_count0, 0,
                                                   acpi_gbl_FADT.sci_interrupt,
                                                   &acpi_gbl_gpe_fadt_blocks[0]);
 
@@ -169,8 +171,10 @@ acpi_status acpi_ev_gpe_initialize(void)
 
                         status =
                             acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
-                                                     &acpi_gbl_FADT.xgpe1_block,
-                                                     register_count1,
+                                                     acpi_gbl_FADT.xgpe1_block.
+                                                     address,
+                                                     acpi_gbl_FADT.xgpe1_block.
+                                                     space_id, register_count1,
                                                      acpi_gbl_FADT.gpe1_base,
                                                      acpi_gbl_FADT.
                                                      sci_interrupt,
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 5d594eb2e5ec..24ea3424981b 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -167,7 +167,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                           "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
                           acpi_ut_get_node_name(node),
                           acpi_ut_get_type_name(node->type), notify_value,
-                          acpi_ut_get_notify_name(notify_value), node));
+                          acpi_ut_get_notify_name(notify_value, ACPI_TYPE_ANY),
+                          node));
 
         status = acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
                                  info);
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index 4d8a709c1fc4..29630e303829 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -117,7 +117,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
         ACPI_FUNCTION_TRACE(ev_sci_xrupt_handler);
 
         /*
-         * We are guaranteed by the ACPI CA initialization/shutdown code that
+         * We are guaranteed by the ACPICA initialization/shutdown code that
          * if this interrupt handler is installed, ACPI is enabled.
          */
 
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index a734b27da061..11e5803b8b41 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -239,7 +239,7 @@ acpi_remove_notify_handler(acpi_handle device,
         union acpi_operand_object *obj_desc;
         union acpi_operand_object *handler_obj;
         union acpi_operand_object *previous_handler_obj;
-        acpi_status status;
+        acpi_status status = AE_OK;
         u32 i;
 
         ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);
@@ -251,20 +251,17 @@ acpi_remove_notify_handler(acpi_handle device,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Make sure all deferred notify tasks are completed */
-
-        acpi_os_wait_events_complete();
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
         /* Root Object. Global handlers are removed here */
 
         if (device == ACPI_ROOT_OBJECT) {
                 for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
                         if (handler_type & (i + 1)) {
+                                status =
+                                    acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+
                                 if (!acpi_gbl_global_notify[i].handler ||
                                     (acpi_gbl_global_notify[i].handler !=
                                      handler)) {
@@ -277,31 +274,40 @@ acpi_remove_notify_handler(acpi_handle device,
 
                                 acpi_gbl_global_notify[i].handler = NULL;
                                 acpi_gbl_global_notify[i].context = NULL;
+
+                                (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+
+                                /* Make sure all deferred notify tasks are completed */
+
+                                acpi_os_wait_events_complete();
                         }
                 }
 
-                goto unlock_and_exit;
+                return_ACPI_STATUS(AE_OK);
         }
 
         /* All other objects: Are Notifies allowed on this object? */
 
         if (!acpi_ev_is_notify_object(node)) {
-                status = AE_TYPE;
-                goto unlock_and_exit;
+                return_ACPI_STATUS(AE_TYPE);
         }
 
         /* Must have an existing internal object */
 
         obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
-                status = AE_NOT_EXIST;
-                goto unlock_and_exit;
+                return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
         /* Internal object exists. Find the handler and remove it */
 
         for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
                 if (handler_type & (i + 1)) {
+                        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
+
                         handler_obj = obj_desc->common_notify.notify_list[i];
                         previous_handler_obj = NULL;
 
@@ -329,10 +335,17 @@ acpi_remove_notify_handler(acpi_handle device,
                                     handler_obj->notify.next[i];
                         }
 
+                        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+
+                        /* Make sure all deferred notify tasks are completed */
+
+                        acpi_os_wait_events_complete();
                         acpi_ut_remove_reference(handler_obj);
                 }
         }
 
+        return_ACPI_STATUS(status);
+
 unlock_and_exit:
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_ACPI_STATUS(status);
@@ -457,6 +470,8 @@ exit:
         return_ACPI_STATUS(status);
 }
 
+ACPI_EXPORT_SYMBOL(acpi_install_sci_handler)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_remove_sci_handler
@@ -468,7 +483,6 @@ exit:
  * DESCRIPTION: Remove a handler for a System Control Interrupt.
  *
  ******************************************************************************/
-
 acpi_status acpi_remove_sci_handler(acpi_sci_handler address)
 {
         struct acpi_sci_handler_info *prev_sci_handler;
@@ -522,6 +536,8 @@ unlock_and_exit:
         return_ACPI_STATUS(status);
 }
 
+ACPI_EXPORT_SYMBOL(acpi_remove_sci_handler)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_global_event_handler
@@ -537,7 +553,6 @@ unlock_and_exit:
  *              Can be used to update event counters, etc.
  *
  ******************************************************************************/
-
 acpi_status
 acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context)
 {
@@ -840,10 +855,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Make sure all deferred GPE tasks are completed */
-
-        acpi_os_wait_events_complete();
-
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -895,9 +906,17 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
                 (void)acpi_ev_add_gpe_reference(gpe_event_info);
         }
 
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        /* Make sure all deferred GPE tasks are completed */
+
+        acpi_os_wait_events_complete();
+
         /* Now we can free the handler object */
 
         ACPI_FREE(handler);
+        return_ACPI_STATUS(status);
 
 unlock_and_exit:
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 20a1392ffe06..cb534faf5369 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -599,9 +599,10 @@ acpi_install_gpe_block(acpi_handle gpe_device,
          * For user-installed GPE Block Devices, the gpe_block_base_number
          * is always zero
          */
-        status =
-            acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0,
-                                     interrupt_number, &gpe_block);
+        status = acpi_ev_create_gpe_block(node, gpe_block_address->address,
+                                          gpe_block_address->space_id,
+                                          register_count, 0, interrupt_number,
+                                          &gpe_block);
         if (ACPI_FAILURE(status)) {
                 goto unlock_and_exit;
         }
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 8ba1464efd11..7d2949420db7 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -343,16 +343,14 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                 struct acpi_walk_state *walk_state)
 {
         union acpi_operand_object *ddb_handle;
+        struct acpi_table_header *table_header;
         struct acpi_table_header *table;
-        struct acpi_table_desc table_desc;
         u32 table_index;
         acpi_status status;
         u32 length;
 
         ACPI_FUNCTION_TRACE(ex_load_op);
 
-        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
-
         /* Source Object can be either an op_region or a Buffer/Field */
 
         switch (obj_desc->common.type) {
@@ -380,17 +378,17 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
                 /* Get the table header first so we can get the table length */
 
-                table = ACPI_ALLOCATE(sizeof(struct acpi_table_header));
-                if (!table) {
+                table_header = ACPI_ALLOCATE(sizeof(struct acpi_table_header));
+                if (!table_header) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 status =
                     acpi_ex_region_read(obj_desc,
                                         sizeof(struct acpi_table_header),
-                                        ACPI_CAST_PTR(u8, table));
-                length = table->length;
-                ACPI_FREE(table);
+                                        ACPI_CAST_PTR(u8, table_header));
+                length = table_header->length;
+                ACPI_FREE(table_header);
 
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
@@ -420,22 +418,19 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
                 /* Allocate a buffer for the table */
 
-                table_desc.pointer = ACPI_ALLOCATE(length);
-                if (!table_desc.pointer) {
+                table = ACPI_ALLOCATE(length);
+                if (!table) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 /* Read the entire table */
 
                 status = acpi_ex_region_read(obj_desc, length,
-                                             ACPI_CAST_PTR(u8,
-                                                           table_desc.pointer));
+                                             ACPI_CAST_PTR(u8, table));
                 if (ACPI_FAILURE(status)) {
-                        ACPI_FREE(table_desc.pointer);
+                        ACPI_FREE(table);
                         return_ACPI_STATUS(status);
                 }
-
-                table_desc.address = obj_desc->region.address;
                 break;
 
         case ACPI_TYPE_BUFFER:  /* Buffer or resolved region_field */
@@ -452,10 +447,10 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
                 /* Get the actual table length from the table header */
 
-                table =
+                table_header =
                     ACPI_CAST_PTR(struct acpi_table_header,
                                   obj_desc->buffer.pointer);
-                length = table->length;
+                length = table_header->length;
 
                 /* Table cannot extend beyond the buffer */
 
@@ -470,13 +465,12 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                  * Copy the table from the buffer because the buffer could be modified
                  * or even deleted in the future
                  */
-                table_desc.pointer = ACPI_ALLOCATE(length);
-                if (!table_desc.pointer) {
+                table = ACPI_ALLOCATE(length);
+                if (!table) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
-                ACPI_MEMCPY(table_desc.pointer, table, length);
-                table_desc.address = ACPI_TO_INTEGER(table_desc.pointer);
+                ACPI_MEMCPY(table, table_header, length);
                 break;
 
         default:
@@ -484,27 +478,32 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
-        /* Validate table checksum (will not get validated in tb_add_table) */
-
-        status = acpi_tb_verify_checksum(table_desc.pointer, length);
-        if (ACPI_FAILURE(status)) {
-                ACPI_FREE(table_desc.pointer);
-                return_ACPI_STATUS(status);
-        }
-
-        /* Complete the table descriptor */
+        /* Install the new table into the local data structures */
 
-        table_desc.length = length;
-        table_desc.flags = ACPI_TABLE_ORIGIN_ALLOCATED;
+        ACPI_INFO((AE_INFO, "Dynamic OEM Table Load:"));
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
 
-        /* Install the new table into the local data structures */
+        status = acpi_tb_install_standard_table(ACPI_PTR_TO_PHYSADDR(table),
+                                                ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
+                                                TRUE, TRUE, &table_index);
 
-        status = acpi_tb_add_table(&table_desc, &table_index);
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
         if (ACPI_FAILURE(status)) {
 
                 /* Delete allocated table buffer */
 
-                acpi_tb_delete_table(&table_desc);
+                ACPI_FREE(table);
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Note: Now table is "INSTALLED", it must be validated before
+         * loading.
+         */
+        status =
+            acpi_tb_validate_table(&acpi_gbl_root_table_list.
+                                   tables[table_index]);
+        if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
@@ -536,9 +535,6 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(status);
         }
 
-        ACPI_INFO((AE_INFO, "Dynamic OEM Table Load:"));
-        acpi_tb_print_table_header(0, table_desc.pointer);
-
         /* Remove the reference by added by acpi_ex_store above */
 
         acpi_ut_remove_reference(ddb_handle);
@@ -546,8 +542,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
         /* Invoke table handler if present */
 
         if (acpi_gbl_table_handler) {
-                (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD,
-                                             table_desc.pointer,
+                (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD, table,
                                              acpi_gbl_table_handler_context);
         }
 
@@ -576,6 +571,13 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
         ACPI_FUNCTION_TRACE(ex_unload_table);
 
         /*
+         * Temporarily emit a warning so that the ASL for the machine can be
+         * hopefully obtained. This is to say that the Unload() operator is
+         * extremely rare if not completely unused.
+         */
+        ACPI_WARNING((AE_INFO, "Received request to unload an ACPI table"));
+
+        /*
          * Validate the handle
          * Although the handle is partially validated in acpi_ex_reconfiguration()
          * when it calls acpi_ex_resolve_operands(), the handle is more completely
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 973fdae00f94..925202acc3e4 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -134,9 +134,11 @@ static struct acpi_exdump_info acpi_ex_dump_method[9] = {
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.aml_start), "Aml Start"}
 };
 
-static struct acpi_exdump_info acpi_ex_dump_mutex[5] = {
+static struct acpi_exdump_info acpi_ex_dump_mutex[6] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_mutex), NULL},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(mutex.sync_level), "Sync Level"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(mutex.original_sync_level),
+         "Original Sync Level"},
         {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread), "Owner Thread"},
         {ACPI_EXD_UINT16, ACPI_EXD_OFFSET(mutex.acquisition_depth),
          "Acquire Depth"},
diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c
index e701d8c33dbf..6aade8e1d2a1 100644
--- a/drivers/acpi/acpica/hwpci.c
+++ b/drivers/acpi/acpica/hwpci.c
@@ -140,11 +140,12 @@ acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
                 /* Walk the list, updating the PCI device/function/bus numbers */
 
                 status = acpi_hw_process_pci_list(pci_id, list_head);
-        }
 
-        /* Always delete the list */
+                /* Delete the list */
+
+                acpi_hw_delete_pci_list(list_head);
+        }
 
-        acpi_hw_delete_pci_list(list_head);
         return_ACPI_STATUS(status);
 }
 
@@ -187,6 +188,10 @@ acpi_hw_build_pci_list(acpi_handle root_pci_device,
         while (1) {
                 status = acpi_get_parent(current_device, &parent_device);
                 if (ACPI_FAILURE(status)) {
+
+                        /* Must delete the list before exit */
+
+                        acpi_hw_delete_pci_list(*return_list_head);
                         return (status);
                 }
 
@@ -199,6 +204,10 @@ acpi_hw_build_pci_list(acpi_handle root_pci_device,
 
                 list_element = ACPI_ALLOCATE(sizeof(struct acpi_pci_device));
                 if (!list_element) {
+
+                        /* Must delete the list before exit */
+
+                        acpi_hw_delete_pci_list(*return_list_head);
                         return (AE_NO_MEMORY);
                 }
 
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 75d369050657..049d9c22a0f9 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -72,6 +72,8 @@ acpi_buffer_to_resource(u8 *aml_buffer,
         void *resource;
         void *current_resource_ptr;
 
+        ACPI_FUNCTION_TRACE(acpi_buffer_to_resource);
+
         /*
          * Note: we allow AE_AML_NO_RESOURCE_END_TAG, since an end tag
          * is not required here.
@@ -85,7 +87,7 @@ acpi_buffer_to_resource(u8 *aml_buffer,
                 status = AE_OK;
         }
         if (ACPI_FAILURE(status)) {
-                return (status);
+                return_ACPI_STATUS(status);
         }
 
         /* Allocate a buffer for the converted resource */
@@ -93,7 +95,7 @@ acpi_buffer_to_resource(u8 *aml_buffer,
         resource = ACPI_ALLOCATE_ZEROED(list_size_needed);
         current_resource_ptr = resource;
         if (!resource) {
-                return (AE_NO_MEMORY);
+                return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
         /* Perform the AML-to-Resource conversion */
@@ -110,9 +112,11 @@ acpi_buffer_to_resource(u8 *aml_buffer,
                 *resource_ptr = resource;
         }
 
-        return (status);
+        return_ACPI_STATUS(status);
 }
 
+ACPI_EXPORT_SYMBOL(acpi_buffer_to_resource)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_create_resource_list
@@ -130,10 +134,9 @@ acpi_buffer_to_resource(u8 *aml_buffer,
  *              of device resources.
  *
  ******************************************************************************/
-
 acpi_status
 acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
-                             struct acpi_buffer * output_buffer)
+                             struct acpi_buffer *output_buffer)
 {
 
         acpi_status status;
diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
new file mode 100644
index 000000000000..f499c10ceb4a
--- /dev/null
+++ b/drivers/acpi/acpica/tbdata.c
@@ -0,0 +1,760 @@
+/******************************************************************************
+ *
+ * Module Name: tbdata - Table manager data structure functions
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "actables.h"
+
+#define _COMPONENT          ACPI_TABLES
+ACPI_MODULE_NAME("tbdata")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_init_table_descriptor
+ *
+ * PARAMETERS:  table_desc              - Table descriptor
+ *              address                 - Physical address of the table
+ *              flags                   - Allocation flags of the table
+ *              table                   - Pointer to the table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Initialize a new table descriptor
+ *
+ ******************************************************************************/
+void
+acpi_tb_init_table_descriptor(struct acpi_table_desc *table_desc,
+                              acpi_physical_address address,
+                              u8 flags, struct acpi_table_header *table)
+{
+
+        /*
+         * Initialize the table descriptor. Set the pointer to NULL, since the
+         * table is not fully mapped at this time.
+         */
+        ACPI_MEMSET(table_desc, 0, sizeof(struct acpi_table_desc));
+        table_desc->address = address;
+        table_desc->length = table->length;
+        table_desc->flags = flags;
+        ACPI_MOVE_32_TO_32(table_desc->signature.ascii, table->signature);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_acquire_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor
+ *              table_ptr           - Where table is returned
+ *              table_length        - Where table length is returned
+ *              table_flags         - Where table allocation flags are returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Acquire an ACPI table. It can be used for tables not
+ *              maintained in the acpi_gbl_root_table_list.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_tb_acquire_table(struct acpi_table_desc *table_desc,
+                      struct acpi_table_header **table_ptr,
+                      u32 *table_length, u8 *table_flags)
+{
+        struct acpi_table_header *table = NULL;
+
+        switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {
+        case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
+
+                table =
+                    acpi_os_map_memory(table_desc->address, table_desc->length);
+                break;
+
+        case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
+        case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
+
+                table =
+                    ACPI_CAST_PTR(struct acpi_table_header,
+                                  table_desc->address);
+                break;
+
+        default:
+
+                break;
+        }
+
+        /* Table is not valid yet */
+
+        if (!table) {
+                return (AE_NO_MEMORY);
+        }
+
+        /* Fill the return values */
+
+        *table_ptr = table;
+        *table_length = table_desc->length;
+        *table_flags = table_desc->flags;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_release_table
+ *
+ * PARAMETERS:  table               - Pointer for the table
+ *              table_length        - Length for the table
+ *              table_flags         - Allocation flags for the table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Release a table. The inverse of acpi_tb_acquire_table().
+ *
+ ******************************************************************************/
+
+void
+acpi_tb_release_table(struct acpi_table_header *table,
+                      u32 table_length, u8 table_flags)
+{
+
+        switch (table_flags & ACPI_TABLE_ORIGIN_MASK) {
+        case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
+
+                acpi_os_unmap_memory(table, table_length);
+                break;
+
+        case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
+        case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
+        default:
+
+                break;
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_acquire_temp_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor to be acquired
+ *              address             - Address of the table
+ *              flags               - Allocation flags of the table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function validates the table header to obtain the length
+ *              of a table and fills the table descriptor to make its state as
+ *              "INSTALLED". Such a table descriptor is only used for verified
+ *              installation.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_tb_acquire_temp_table(struct acpi_table_desc *table_desc,
+                           acpi_physical_address address, u8 flags)
+{
+        struct acpi_table_header *table_header;
+
+        switch (flags & ACPI_TABLE_ORIGIN_MASK) {
+        case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
+
+                /* Get the length of the full table from the header */
+
+                table_header =
+                    acpi_os_map_memory(address,
+                                       sizeof(struct acpi_table_header));
+                if (!table_header) {
+                        return (AE_NO_MEMORY);
+                }
+
+                acpi_tb_init_table_descriptor(table_desc, address, flags,
+                                              table_header);
+                acpi_os_unmap_memory(table_header,
+                                     sizeof(struct acpi_table_header));
+                return (AE_OK);
+
+        case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
+        case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
+
+                table_header = ACPI_CAST_PTR(struct acpi_table_header, address);
+                if (!table_header) {
+                        return (AE_NO_MEMORY);
+                }
+
+                acpi_tb_init_table_descriptor(table_desc, address, flags,
+                                              table_header);
+                return (AE_OK);
+
+        default:
+
+                break;
+        }
+
+        /* Table is not valid yet */
+
+        return (AE_NO_MEMORY);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_release_temp_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor to be released
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: The inverse of acpi_tb_acquire_temp_table().
+ *
+ *****************************************************************************/
+
+void acpi_tb_release_temp_table(struct acpi_table_desc *table_desc)
+{
+
+        /*
+         * Note that the .Address is maintained by the callers of
+         * acpi_tb_acquire_temp_table(), thus do not invoke acpi_tb_uninstall_table()
+         * where .Address will be freed.
+         */
+        acpi_tb_invalidate_table(table_desc);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_validate_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to validate the table, the returned
+ *              table descriptor is in "VALIDATED" state.
+ *
+ *****************************************************************************/
+
+acpi_status acpi_tb_validate_table(struct acpi_table_desc *table_desc)
+{
+        acpi_status status = AE_OK;
+
+        ACPI_FUNCTION_TRACE(tb_validate_table);
+
+        /* Validate the table if necessary */
+
+        if (!table_desc->pointer) {
+                status = acpi_tb_acquire_table(table_desc, &table_desc->pointer,
+                                               &table_desc->length,
+                                               &table_desc->flags);
+                if (!table_desc->pointer) {
+                        status = AE_NO_MEMORY;
+                }
+        }
+
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_invalidate_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Invalidate one internal ACPI table, this is the inverse of
+ *              acpi_tb_validate_table().
+ *
+ ******************************************************************************/
+
+void acpi_tb_invalidate_table(struct acpi_table_desc *table_desc)
+{
+
+        ACPI_FUNCTION_TRACE(tb_invalidate_table);
+
+        /* Table must be validated */
+
+        if (!table_desc->pointer) {
+                return_VOID;
+        }
+
+        acpi_tb_release_table(table_desc->pointer, table_desc->length,
+                              table_desc->flags);
+        table_desc->pointer = NULL;
+
+        return_VOID;
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_validate_temp_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to validate the table, the returned
+ *              table descriptor is in "VALIDATED" state.
+ *
+ *****************************************************************************/
+
+acpi_status acpi_tb_validate_temp_table(struct acpi_table_desc *table_desc)
+{
+
+        if (!table_desc->pointer && !acpi_gbl_verify_table_checksum) {
+                /*
+                 * Only validates the header of the table.
+                 * Note that Length contains the size of the mapping after invoking
+                 * this work around, this value is required by
+                 * acpi_tb_release_temp_table().
+                 * We can do this because in acpi_init_table_descriptor(), the Length
+                 * field of the installed descriptor is filled with the actual
+                 * table length obtaining from the table header.
+                 */
+                table_desc->length = sizeof(struct acpi_table_header);
+        }
+
+        return (acpi_tb_validate_table(table_desc));
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_verify_temp_table
+ *
+ * PARAMETERS:  table_desc          - Table descriptor
+ *              signature           - Table signature to verify
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to validate and verify the table, the
+ *              returned table descriptor is in "VALIDATED" state.
+ *
+ *****************************************************************************/
+
+acpi_status
+acpi_tb_verify_temp_table(struct acpi_table_desc * table_desc, char *signature)
+{
+        acpi_status status = AE_OK;
+
+        ACPI_FUNCTION_TRACE(tb_verify_temp_table);
+
+        /* Validate the table */
+
+        status = acpi_tb_validate_temp_table(table_desc);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        /* If a particular signature is expected (DSDT/FACS), it must match */
+
+        if (signature && !ACPI_COMPARE_NAME(&table_desc->signature, signature)) {
+                ACPI_BIOS_ERROR((AE_INFO,
+                                 "Invalid signature 0x%X for ACPI table, expected [%s]",
+                                 table_desc->signature.integer, signature));
+                status = AE_BAD_SIGNATURE;
+                goto invalidate_and_exit;
+        }
+
+        /* Verify the checksum */
+
+        if (acpi_gbl_verify_table_checksum) {
+                status =
+                    acpi_tb_verify_checksum(table_desc->pointer,
+                                            table_desc->length);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
+                                        "%4.4s " ACPI_PRINTF_UINT
+                                        " Attempted table install failed",
+                                        acpi_ut_valid_acpi_name(table_desc->
+                                                                signature.
+                                                                ascii) ?
+                                        table_desc->signature.ascii : "????",
+                                        ACPI_FORMAT_TO_UINT(table_desc->
+                                                            address)));
+                        goto invalidate_and_exit;
+                }
+        }
+
+        return_ACPI_STATUS(AE_OK);
+
+invalidate_and_exit:
+        acpi_tb_invalidate_table(table_desc);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_resize_root_table_list
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Expand the size of global table array
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_resize_root_table_list(void)
+{
+        struct acpi_table_desc *tables;
+        u32 table_count;
+
+        ACPI_FUNCTION_TRACE(tb_resize_root_table_list);
+
+        /* allow_resize flag is a parameter to acpi_initialize_tables */
+
+        if (!(acpi_gbl_root_table_list.flags & ACPI_ROOT_ALLOW_RESIZE)) {
+                ACPI_ERROR((AE_INFO,
+                            "Resize of Root Table Array is not allowed"));
+                return_ACPI_STATUS(AE_SUPPORT);
+        }
+
+        /* Increase the Table Array size */
+
+        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
+                table_count = acpi_gbl_root_table_list.max_table_count;
+        } else {
+                table_count = acpi_gbl_root_table_list.current_table_count;
+        }
+
+        tables = ACPI_ALLOCATE_ZEROED(((acpi_size) table_count +
+                                       ACPI_ROOT_TABLE_SIZE_INCREMENT) *
+                                      sizeof(struct acpi_table_desc));
+        if (!tables) {
+                ACPI_ERROR((AE_INFO,
+                            "Could not allocate new root table array"));
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        /* Copy and free the previous table array */
+
+        if (acpi_gbl_root_table_list.tables) {
+                ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
+                            (acpi_size) table_count *
+                            sizeof(struct acpi_table_desc));
+
+                if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
+                        ACPI_FREE(acpi_gbl_root_table_list.tables);
+                }
+        }
+
+        acpi_gbl_root_table_list.tables = tables;
+        acpi_gbl_root_table_list.max_table_count =
+            table_count + ACPI_ROOT_TABLE_SIZE_INCREMENT;
+        acpi_gbl_root_table_list.flags |= ACPI_ROOT_ORIGIN_ALLOCATED;
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_get_next_root_index
+ *
+ * PARAMETERS:  table_index         - Where table index is returned
+ *
+ * RETURN:      Status and table index.
+ *
+ * DESCRIPTION: Allocate a new ACPI table entry to the global table list
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_get_next_root_index(u32 *table_index)
+{
+        acpi_status status;
+
+        /* Ensure that there is room for the table in the Root Table List */
+
+        if (acpi_gbl_root_table_list.current_table_count >=
+            acpi_gbl_root_table_list.max_table_count) {
+                status = acpi_tb_resize_root_table_list();
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        *table_index = acpi_gbl_root_table_list.current_table_count;
+        acpi_gbl_root_table_list.current_table_count++;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_terminate
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Delete all internal ACPI tables
+ *
+ ******************************************************************************/
+
+void acpi_tb_terminate(void)
+{
+        u32 i;
+
+        ACPI_FUNCTION_TRACE(tb_terminate);
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+
+        /* Delete the individual tables */
+
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; i++) {
+                acpi_tb_uninstall_table(&acpi_gbl_root_table_list.tables[i]);
+        }
+
+        /*
+         * Delete the root table array if allocated locally. Array cannot be
+         * mapped, so we don't need to check for that flag.
+         */
+        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
+                ACPI_FREE(acpi_gbl_root_table_list.tables);
+        }
+
+        acpi_gbl_root_table_list.tables = NULL;
+        acpi_gbl_root_table_list.flags = 0;
+        acpi_gbl_root_table_list.current_table_count = 0;
+
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_delete_namespace_by_owner
+ *
+ * PARAMETERS:  table_index         - Table index
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Delete all namespace objects created when this table was loaded.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_delete_namespace_by_owner(u32 table_index)
+{
+        acpi_owner_id owner_id;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(tb_delete_namespace_by_owner);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        if (table_index >= acpi_gbl_root_table_list.current_table_count) {
+
+                /* The table index does not exist */
+
+                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        /* Get the owner ID for this table, used to delete namespace nodes */
+
+        owner_id = acpi_gbl_root_table_list.tables[table_index].owner_id;
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+
+        /*
+         * Need to acquire the namespace writer lock to prevent interference
+         * with any concurrent namespace walks. The interpreter must be
+         * released during the deletion since the acquisition of the deletion
+         * lock may block, and also since the execution of a namespace walk
+         * must be allowed to use the interpreter.
+         */
+        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
+        status = acpi_ut_acquire_write_lock(&acpi_gbl_namespace_rw_lock);
+
+        acpi_ns_delete_namespace_by_owner(owner_id);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        acpi_ut_release_write_lock(&acpi_gbl_namespace_rw_lock);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_allocate_owner_id
+ *
+ * PARAMETERS:  table_index         - Table index
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Allocates owner_id in table_desc
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_allocate_owner_id(u32 table_index)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+
+        ACPI_FUNCTION_TRACE(tb_allocate_owner_id);
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
+                status =
+                    acpi_ut_allocate_owner_id(&
+                                              (acpi_gbl_root_table_list.
+                                               tables[table_index].owner_id));
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_release_owner_id
+ *
+ * PARAMETERS:  table_index         - Table index
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Releases owner_id in table_desc
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_release_owner_id(u32 table_index)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+
+        ACPI_FUNCTION_TRACE(tb_release_owner_id);
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
+                acpi_ut_release_owner_id(&
+                                         (acpi_gbl_root_table_list.
+                                          tables[table_index].owner_id));
+                status = AE_OK;
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_get_owner_id
+ *
+ * PARAMETERS:  table_index         - Table index
+ *              owner_id            - Where the table owner_id is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: returns owner_id for the ACPI table
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id * owner_id)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+
+        ACPI_FUNCTION_TRACE(tb_get_owner_id);
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
+                *owner_id =
+                    acpi_gbl_root_table_list.tables[table_index].owner_id;
+                status = AE_OK;
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_is_table_loaded
+ *
+ * PARAMETERS:  table_index         - Index into the root table
+ *
+ * RETURN:      Table Loaded Flag
+ *
+ ******************************************************************************/
+
+u8 acpi_tb_is_table_loaded(u32 table_index)
+{
+        u8 is_loaded = FALSE;
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
+                is_loaded = (u8)
+                    (acpi_gbl_root_table_list.tables[table_index].flags &
+                     ACPI_TABLE_IS_LOADED);
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return (is_loaded);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_set_table_loaded_flag
+ *
+ * PARAMETERS:  table_index         - Table index
+ *              is_loaded           - TRUE if table is loaded, FALSE otherwise
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Sets the table loaded flag to either TRUE or FALSE.
+ *
+ ******************************************************************************/
+
+void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded)
+{
+
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (table_index < acpi_gbl_root_table_list.current_table_count) {
+                if (is_loaded) {
+                        acpi_gbl_root_table_list.tables[table_index].flags |=
+                            ACPI_TABLE_IS_LOADED;
+                } else {
+                        acpi_gbl_root_table_list.tables[table_index].flags &=
+                            ~ACPI_TABLE_IS_LOADED;
+                }
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+}
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index ec14588254d4..41519a958083 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -52,7 +52,8 @@ ACPI_MODULE_NAME("tbfadt")
 static void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
                              u8 space_id,
-                             u8 byte_width, u64 address, char *register_name);
+                             u8 byte_width,
+                             u64 address, char *register_name, u8 flags);
 
 static void acpi_tb_convert_fadt(void);
 
@@ -69,13 +70,14 @@ typedef struct acpi_fadt_info {
         u16 address32;
         u16 length;
         u8 default_length;
-        u8 type;
+        u8 flags;
 
 } acpi_fadt_info;
 
 #define ACPI_FADT_OPTIONAL          0
 #define ACPI_FADT_REQUIRED          1
 #define ACPI_FADT_SEPARATE_LENGTH   2
+#define ACPI_FADT_GPE_REGISTER      4
 
 static struct acpi_fadt_info fadt_info_table[] = {
         {"Pm1aEventBlock",
@@ -125,14 +127,14 @@ static struct acpi_fadt_info fadt_info_table[] = {
          ACPI_FADT_OFFSET(gpe0_block),
          ACPI_FADT_OFFSET(gpe0_block_length),
          0,
-         ACPI_FADT_SEPARATE_LENGTH},
+         ACPI_FADT_SEPARATE_LENGTH | ACPI_FADT_GPE_REGISTER},
 
         {"Gpe1Block",
          ACPI_FADT_OFFSET(xgpe1_block),
          ACPI_FADT_OFFSET(gpe1_block),
          ACPI_FADT_OFFSET(gpe1_block_length),
          0,
-         ACPI_FADT_SEPARATE_LENGTH}
+         ACPI_FADT_SEPARATE_LENGTH | ACPI_FADT_GPE_REGISTER}
 };
 
 #define ACPI_FADT_INFO_ENTRIES \
@@ -189,19 +191,29 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
 static void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
                              u8 space_id,
-                             u8 byte_width, u64 address, char *register_name)
+                             u8 byte_width,
+                             u64 address, char *register_name, u8 flags)
 {
         u8 bit_width;
 
-        /* Bit width field in the GAS is only one byte long, 255 max */
-
+        /*
+         * Bit width field in the GAS is only one byte long, 255 max.
+         * Check for bit_width overflow in GAS.
+         */
         bit_width = (u8)(byte_width * 8);
-
-        if (byte_width > 31) {  /* (31*8)=248 */
-                ACPI_ERROR((AE_INFO,
-                            "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
-                            "to convert to GAS struct - 255 bits max, truncating",
-                            register_name, byte_width, (byte_width * 8)));
+        if (byte_width > 31) {  /* (31*8)=248, (32*8)=256 */
+                /*
+                 * No error for GPE blocks, because we do not use the bit_width
+                 * for GPEs, the legacy length (byte_width) is used instead to
+                 * allow for a large number of GPEs.
+                 */
+                if (!(flags & ACPI_FADT_GPE_REGISTER)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
+                                    "to convert to GAS struct - 255 bits max, truncating",
+                                    register_name, byte_width,
+                                    (byte_width * 8)));
+                }
 
                 bit_width = 255;
         }
@@ -332,15 +344,15 @@ void acpi_tb_parse_fadt(u32 table_index)
 
         /* Obtain the DSDT and FACS tables via their addresses within the FADT */
 
-        acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
-                              ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
+        acpi_tb_install_fixed_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
+                                    ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
 
         /* If Hardware Reduced flag is set, there is no FACS */
 
         if (!acpi_gbl_reduced_hardware) {
-                acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.
-                                      Xfacs, ACPI_SIG_FACS,
-                                      ACPI_TABLE_INDEX_FACS);
+                acpi_tb_install_fixed_table((acpi_physical_address)
+                                            acpi_gbl_FADT.Xfacs, ACPI_SIG_FACS,
+                                            ACPI_TABLE_INDEX_FACS);
         }
 }
 
@@ -450,6 +462,7 @@ static void acpi_tb_convert_fadt(void)
         struct acpi_generic_address *address64;
         u32 address32;
         u8 length;
+        u8 flags;
         u32 i;
 
         /*
@@ -515,6 +528,7 @@ static void acpi_tb_convert_fadt(void)
                                        fadt_info_table[i].length);
 
                 name = fadt_info_table[i].name;
+                flags = fadt_info_table[i].flags;
 
                 /*
                  * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
@@ -554,7 +568,7 @@ static void acpi_tb_convert_fadt(void)
                                                                            [i].
                                                                            length),
                                                              (u64)address32,
-                                                             name);
+                                                             name, flags);
                         } else if (address64->address != (u64)address32) {
 
                                 /* Address mismatch */
@@ -582,7 +596,8 @@ static void acpi_tb_convert_fadt(void)
                                                                       length),
                                                                      (u64)
                                                                      address32,
-                                                                     name);
+                                                                     name,
+                                                                     flags);
                                 }
                         }
                 }
@@ -603,7 +618,7 @@ static void acpi_tb_convert_fadt(void)
                                            address64->bit_width));
                 }
 
-                if (fadt_info_table[i].type & ACPI_FADT_REQUIRED) {
+                if (fadt_info_table[i].flags & ACPI_FADT_REQUIRED) {
                         /*
                          * Field is required (Pm1a_event, Pm1a_control).
                          * Both the address and length must be non-zero.
@@ -617,7 +632,7 @@ static void acpi_tb_convert_fadt(void)
                                                                     address),
                                                  length));
                         }
-                } else if (fadt_info_table[i].type & ACPI_FADT_SEPARATE_LENGTH) {
+                } else if (fadt_info_table[i].flags & ACPI_FADT_SEPARATE_LENGTH) {
                         /*
                          * Field is optional (Pm2_control, GPE0, GPE1) AND has its own
                          * length field. If present, both the address and length must
@@ -726,7 +741,7 @@ static void acpi_tb_setup_fadt_registers(void)
                                                      (fadt_pm_info_table[i].
                                                       register_num *
                                                       pm1_register_byte_width),
-                                                     "PmRegisters");
+                                                     "PmRegisters", 0);
                 }
         }
 }
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index c12003947bd5..cb947700206c 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -99,8 +99,8 @@ acpi_tb_find_table(char *signature,
                         /* Table is not currently mapped, map it */
 
                         status =
-                            acpi_tb_verify_table(&acpi_gbl_root_table_list.
-                                                 tables[i]);
+                            acpi_tb_validate_table(&acpi_gbl_root_table_list.
+                                                   tables[i]);
                         if (ACPI_FAILURE(status)) {
                                 return_ACPI_STATUS(status);
                         }
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index e3040947e9a0..755b90c40ddf 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -43,688 +43,483 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "acnamesp.h"
 #include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbinstal")
 
-/******************************************************************************
+/* Local prototypes */
+static u8
+acpi_tb_compare_tables(struct acpi_table_desc *table_desc, u32 table_index);
+
+/*******************************************************************************
  *
- * FUNCTION:    acpi_tb_verify_table
+ * FUNCTION:    acpi_tb_compare_tables
  *
- * PARAMETERS:  table_desc          - table
+ * PARAMETERS:  table_desc          - Table 1 descriptor to be compared
+ *              table_index         - Index of table 2 to be compared
  *
- * RETURN:      Status
+ * RETURN:      TRUE if both tables are identical.
  *
- * DESCRIPTION: this function is called to verify and map table
+ * DESCRIPTION: This function compares a table with another table that has
+ *              already been installed in the root table list.
  *
- *****************************************************************************/
-acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc)
+ ******************************************************************************/
+
+static u8
+acpi_tb_compare_tables(struct acpi_table_desc *table_desc, u32 table_index)
 {
         acpi_status status = AE_OK;
+        u8 is_identical;
+        struct acpi_table_header *table;
+        u32 table_length;
+        u8 table_flags;
 
-        ACPI_FUNCTION_TRACE(tb_verify_table);
-
-        /* Map the table if necessary */
-
-        if (!table_desc->pointer) {
-                if ((table_desc->flags & ACPI_TABLE_ORIGIN_MASK) ==
-                    ACPI_TABLE_ORIGIN_MAPPED) {
-                        table_desc->pointer =
-                            acpi_os_map_memory(table_desc->address,
-                                               table_desc->length);
-                }
-                if (!table_desc->pointer) {
-                        return_ACPI_STATUS(AE_NO_MEMORY);
-                }
+        status =
+            acpi_tb_acquire_table(&acpi_gbl_root_table_list.tables[table_index],
+                                  &table, &table_length, &table_flags);
+        if (ACPI_FAILURE(status)) {
+                return (FALSE);
         }
 
-        /* Always calculate checksum, ignore bad checksum if requested */
+        /*
+         * Check for a table match on the entire table length,
+         * not just the header.
+         */
+        is_identical = (u8)((table_desc->length != table_length ||
+                             ACPI_MEMCMP(table_desc->pointer, table,
+                                         table_length)) ? FALSE : TRUE);
 
-        status =
-            acpi_tb_verify_checksum(table_desc->pointer, table_desc->length);
+        /* Release the acquired table */
 
-        return_ACPI_STATUS(status);
+        acpi_tb_release_table(table, table_length, table_flags);
+        return (is_identical);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_add_table
+ * FUNCTION:    acpi_tb_install_table_with_override
  *
- * PARAMETERS:  table_desc          - Table descriptor
- *              table_index         - Where the table index is returned
+ * PARAMETERS:  table_index             - Index into root table array
+ *              new_table_desc          - New table descriptor to install
+ *              override                - Whether override should be performed
  *
- * RETURN:      Status
+ * RETURN:      None
  *
- * DESCRIPTION: This function is called to add an ACPI table. It is used to
- *              dynamically load tables via the Load and load_table AML
- *              operators.
+ * DESCRIPTION: Install an ACPI table into the global data structure. The
+ *              table override mechanism is called to allow the host
+ *              OS to replace any table before it is installed in the root
+ *              table array.
  *
  ******************************************************************************/
 
-acpi_status
-acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
+void
+acpi_tb_install_table_with_override(u32 table_index,
+                                    struct acpi_table_desc *new_table_desc,
+                                    u8 override)
 {
-        u32 i;
-        acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE(tb_add_table);
-
-        if (!table_desc->pointer) {
-                status = acpi_tb_verify_table(table_desc);
-                if (ACPI_FAILURE(status) || !table_desc->pointer) {
-                        return_ACPI_STATUS(status);
-                }
+        if (table_index >= acpi_gbl_root_table_list.current_table_count) {
+                return;
         }
 
         /*
-         * Validate the incoming table signature.
+         * ACPI Table Override:
          *
-         * 1) Originally, we checked the table signature for "SSDT" or "PSDT".
-         * 2) We added support for OEMx tables, signature "OEM".
-         * 3) Valid tables were encountered with a null signature, so we just
-         *    gave up on validating the signature, (05/2008).
-         * 4) We encountered non-AML tables such as the MADT, which caused
-         *    interpreter errors and kernel faults. So now, we once again allow
-         *    only "SSDT", "OEMx", and now, also a null signature. (05/2011).
+         * Before we install the table, let the host OS override it with a new
+         * one if desired. Any table within the RSDT/XSDT can be replaced,
+         * including the DSDT which is pointed to by the FADT.
          */
-        if ((table_desc->pointer->signature[0] != 0x00) &&
-            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
-            && (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
-                ACPI_BIOS_ERROR((AE_INFO,
-                                 "Table has invalid signature [%4.4s] (0x%8.8X), "
-                                 "must be SSDT or OEMx",
-                                 acpi_ut_valid_acpi_name(table_desc->pointer->
-                                                         signature) ?
-                                 table_desc->pointer->signature : "????",
-                                 *(u32 *)table_desc->pointer->signature));
-
-                return_ACPI_STATUS(AE_BAD_SIGNATURE);
+        if (override) {
+                acpi_tb_override_table(new_table_desc);
         }
 
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        acpi_tb_init_table_descriptor(&acpi_gbl_root_table_list.
+                                      tables[table_index],
+                                      new_table_desc->address,
+                                      new_table_desc->flags,
+                                      new_table_desc->pointer);
 
-        /* Check if table is already registered */
+        acpi_tb_print_table_header(new_table_desc->address,
+                                   new_table_desc->pointer);
 
-        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
-                if (!acpi_gbl_root_table_list.tables[i].pointer) {
-                        status =
-                            acpi_tb_verify_table(&acpi_gbl_root_table_list.
-                                                 tables[i]);
-                        if (ACPI_FAILURE(status)
-                            || !acpi_gbl_root_table_list.tables[i].pointer) {
-                                continue;
-                        }
-                }
+        /* Set the global integer width (based upon revision of the DSDT) */
 
-                /*
-                 * Check for a table match on the entire table length,
-                 * not just the header.
-                 */
-                if (table_desc->length !=
-                    acpi_gbl_root_table_list.tables[i].length) {
-                        continue;
-                }
-
-                if (ACPI_MEMCMP(table_desc->pointer,
-                                acpi_gbl_root_table_list.tables[i].pointer,
-                                acpi_gbl_root_table_list.tables[i].length)) {
-                        continue;
-                }
-
-                /*
-                 * Note: the current mechanism does not unregister a table if it is
-                 * dynamically unloaded. The related namespace entries are deleted,
-                 * but the table remains in the root table list.
-                 *
-                 * The assumption here is that the number of different tables that
-                 * will be loaded is actually small, and there is minimal overhead
-                 * in just keeping the table in case it is needed again.
-                 *
-                 * If this assumption changes in the future (perhaps on large
-                 * machines with many table load/unload operations), tables will
-                 * need to be unregistered when they are unloaded, and slots in the
-                 * root table list should be reused when empty.
-                 */
-
-                /*
-                 * Table is already registered.
-                 * We can delete the table that was passed as a parameter.
-                 */
-                acpi_tb_delete_table(table_desc);
-                *table_index = i;
-
-                if (acpi_gbl_root_table_list.tables[i].
-                    flags & ACPI_TABLE_IS_LOADED) {
-
-                        /* Table is still loaded, this is an error */
-
-                        status = AE_ALREADY_EXISTS;
-                        goto release;
-                } else {
-                        /* Table was unloaded, allow it to be reloaded */
-
-                        table_desc->pointer =
-                            acpi_gbl_root_table_list.tables[i].pointer;
-                        table_desc->address =
-                            acpi_gbl_root_table_list.tables[i].address;
-                        status = AE_OK;
-                        goto print_header;
-                }
+        if (table_index == ACPI_TABLE_INDEX_DSDT) {
+                acpi_ut_set_integer_width(new_table_desc->pointer->revision);
         }
-
-        /*
-         * ACPI Table Override:
-         * Allow the host to override dynamically loaded tables.
-         * NOTE: the table is fully mapped at this point, and the mapping will
-         * be deleted by tb_table_override if the table is actually overridden.
-         */
-        (void)acpi_tb_table_override(table_desc->pointer, table_desc);
-
-        /* Add the table to the global root table list */
-
-        status = acpi_tb_store_table(table_desc->address, table_desc->pointer,
-                                     table_desc->length, table_desc->flags,
-                                     table_index);
-        if (ACPI_FAILURE(status)) {
-                goto release;
-        }
-
-print_header:
-        acpi_tb_print_table_header(table_desc->address, table_desc->pointer);
-
-release:
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_table_override
+ * FUNCTION:    acpi_tb_install_fixed_table
  *
- * PARAMETERS:  table_header        - Header for the original table
- *              table_desc          - Table descriptor initialized for the
- *                                    original table. May or may not be mapped.
+ * PARAMETERS:  address                 - Physical address of DSDT or FACS
+ *              signature               - Table signature, NULL if no need to
+ *                                        match
+ *              table_index             - Index into root table array
  *
- * RETURN:      Pointer to the entire new table. NULL if table not overridden.
- *              If overridden, installs the new table within the input table
- *              descriptor.
+ * RETURN:      Status
  *
- * DESCRIPTION: Attempt table override by calling the OSL override functions.
- *              Note: If the table is overridden, then the entire new table
- *              is mapped and returned by this function.
+ * DESCRIPTION: Install a fixed ACPI table (DSDT/FACS) into the global data
+ *              structure.
  *
  ******************************************************************************/
 
-struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
-                                                 *table_header,
-                                                 struct acpi_table_desc
-                                                 *table_desc)
+acpi_status
+acpi_tb_install_fixed_table(acpi_physical_address address,
+                            char *signature, u32 table_index)
 {
+        struct acpi_table_desc new_table_desc;
         acpi_status status;
-        struct acpi_table_header *new_table = NULL;
-        acpi_physical_address new_address = 0;
-        u32 new_table_length = 0;
-        u8 new_flags;
-        char *override_type;
 
-        /* (1) Attempt logical override (returns a logical address) */
+        ACPI_FUNCTION_TRACE(tb_install_fixed_table);
 
-        status = acpi_os_table_override(table_header, &new_table);
-        if (ACPI_SUCCESS(status) && new_table) {
-                new_address = ACPI_PTR_TO_PHYSADDR(new_table);
-                new_table_length = new_table->length;
-                new_flags = ACPI_TABLE_ORIGIN_OVERRIDE;
-                override_type = "Logical";
-                goto finish_override;
+        if (!address) {
+                ACPI_ERROR((AE_INFO,
+                            "Null physical address for ACPI table [%s]",
+                            signature));
+                return (AE_NO_MEMORY);
         }
 
-        /* (2) Attempt physical override (returns a physical address) */
+        /* Fill a table descriptor for validation */
 
-        status = acpi_os_physical_table_override(table_header,
-                                                 &new_address,
-                                                 &new_table_length);
-        if (ACPI_SUCCESS(status) && new_address && new_table_length) {
-
-                /* Map the entire new table */
-
-                new_table = acpi_os_map_memory(new_address, new_table_length);
-                if (!new_table) {
-                        ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
-                                        "%4.4s " ACPI_PRINTF_UINT
-                                        " Attempted physical table override failed",
-                                        table_header->signature,
-                                        ACPI_FORMAT_TO_UINT(table_desc->
-                                                            address)));
-                        return (NULL);
-                }
-
-                override_type = "Physical";
-                new_flags = ACPI_TABLE_ORIGIN_MAPPED;
-                goto finish_override;
+        status = acpi_tb_acquire_temp_table(&new_table_desc, address,
+                                            ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO, "Could not acquire table length at %p",
+                            ACPI_CAST_PTR(void, address)));
+                return_ACPI_STATUS(status);
         }
 
-        return (NULL);          /* There was no override */
-
-finish_override:
-
-        ACPI_INFO((AE_INFO, "%4.4s " ACPI_PRINTF_UINT
-                   " %s table override, new table: " ACPI_PRINTF_UINT,
-                   table_header->signature,
-                   ACPI_FORMAT_TO_UINT(table_desc->address),
-                   override_type, ACPI_FORMAT_TO_UINT(new_table)));
+        /* Validate and verify a table before installation */
 
-        /* We can now unmap/delete the original table (if fully mapped) */
+        status = acpi_tb_verify_temp_table(&new_table_desc, signature);
+        if (ACPI_FAILURE(status)) {
+                goto release_and_exit;
+        }
 
-        acpi_tb_delete_table(table_desc);
+        acpi_tb_install_table_with_override(table_index, &new_table_desc, TRUE);
 
-        /* Setup descriptor for the new table */
+release_and_exit:
 
-        table_desc->address = new_address;
-        table_desc->pointer = new_table;
-        table_desc->length = new_table_length;
-        table_desc->flags = new_flags;
+        /* Release the temporary table descriptor */
 
-        return (new_table);
+        acpi_tb_release_temp_table(&new_table_desc);
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_resize_root_table_list
+ * FUNCTION:    acpi_tb_install_standard_table
  *
- * PARAMETERS:  None
+ * PARAMETERS:  address             - Address of the table (might be a virtual
+ *                                    address depending on the table_flags)
+ *              flags               - Flags for the table
+ *              reload              - Whether reload should be performed
+ *              override            - Whether override should be performed
+ *              table_index         - Where the table index is returned
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Expand the size of global table array
+ * DESCRIPTION: This function is called to install an ACPI table that is
+ *              neither DSDT nor FACS (a "standard" table.)
+ *              When this function is called by "Load" or "LoadTable" opcodes,
+ *              or by acpi_load_table() API, the "Reload" parameter is set.
+ *              After sucessfully returning from this function, table is
+ *              "INSTALLED" but not "VALIDATED".
  *
  ******************************************************************************/
 
-acpi_status acpi_tb_resize_root_table_list(void)
+acpi_status
+acpi_tb_install_standard_table(acpi_physical_address address,
+                               u8 flags,
+                               u8 reload, u8 override, u32 *table_index)
 {
-        struct acpi_table_desc *tables;
-        u32 table_count;
-
-        ACPI_FUNCTION_TRACE(tb_resize_root_table_list);
-
-        /* allow_resize flag is a parameter to acpi_initialize_tables */
+        u32 i;
+        acpi_status status = AE_OK;
+        struct acpi_table_desc new_table_desc;
 
-        if (!(acpi_gbl_root_table_list.flags & ACPI_ROOT_ALLOW_RESIZE)) {
-                ACPI_ERROR((AE_INFO,
-                            "Resize of Root Table Array is not allowed"));
-                return_ACPI_STATUS(AE_SUPPORT);
-        }
+        ACPI_FUNCTION_TRACE(tb_install_standard_table);
 
-        /* Increase the Table Array size */
+        /* Acquire a temporary table descriptor for validation */
 
-        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
-                table_count = acpi_gbl_root_table_list.max_table_count;
-        } else {
-                table_count = acpi_gbl_root_table_list.current_table_count;
+        status = acpi_tb_acquire_temp_table(&new_table_desc, address, flags);
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO, "Could not acquire table length at %p",
+                            ACPI_CAST_PTR(void, address)));
+                return_ACPI_STATUS(status);
         }
 
-        tables = ACPI_ALLOCATE_ZEROED(((acpi_size) table_count +
-                                       ACPI_ROOT_TABLE_SIZE_INCREMENT) *
-                                      sizeof(struct acpi_table_desc));
-        if (!tables) {
-                ACPI_ERROR((AE_INFO,
-                            "Could not allocate new root table array"));
-                return_ACPI_STATUS(AE_NO_MEMORY);
+        /*
+         * Optionally do not load any SSDTs from the RSDT/XSDT. This can
+         * be useful for debugging ACPI problems on some machines.
+         */
+        if (!reload &&
+            acpi_gbl_disable_ssdt_table_install &&
+            ACPI_COMPARE_NAME(&new_table_desc.signature, ACPI_SIG_SSDT)) {
+                ACPI_INFO((AE_INFO, "Ignoring installation of %4.4s at %p",
+                           new_table_desc.signature.ascii, ACPI_CAST_PTR(void,
+                                                                         address)));
+                goto release_and_exit;
         }
 
-        /* Copy and free the previous table array */
-
-        if (acpi_gbl_root_table_list.tables) {
-                ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
-                            (acpi_size) table_count *
-                            sizeof(struct acpi_table_desc));
+        /* Validate and verify a table before installation */
 
-                if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
-                        ACPI_FREE(acpi_gbl_root_table_list.tables);
-                }
+        status = acpi_tb_verify_temp_table(&new_table_desc, NULL);
+        if (ACPI_FAILURE(status)) {
+                goto release_and_exit;
         }
 
-        acpi_gbl_root_table_list.tables = tables;
-        acpi_gbl_root_table_list.max_table_count =
-            table_count + ACPI_ROOT_TABLE_SIZE_INCREMENT;
-        acpi_gbl_root_table_list.flags |= ACPI_ROOT_ORIGIN_ALLOCATED;
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_store_table
- *
- * PARAMETERS:  address             - Table address
- *              table               - Table header
- *              length              - Table length
- *              flags               - flags
- *
- * RETURN:      Status and table index.
- *
- * DESCRIPTION: Add an ACPI table to the global table list
- *
- ******************************************************************************/
+        if (reload) {
+                /*
+                 * Validate the incoming table signature.
+                 *
+                 * 1) Originally, we checked the table signature for "SSDT" or "PSDT".
+                 * 2) We added support for OEMx tables, signature "OEM".
+                 * 3) Valid tables were encountered with a null signature, so we just
+                 *    gave up on validating the signature, (05/2008).
+                 * 4) We encountered non-AML tables such as the MADT, which caused
+                 *    interpreter errors and kernel faults. So now, we once again allow
+                 *    only "SSDT", "OEMx", and now, also a null signature. (05/2011).
+                 */
+                if ((new_table_desc.signature.ascii[0] != 0x00) &&
+                    (!ACPI_COMPARE_NAME
+                     (&new_table_desc.signature, ACPI_SIG_SSDT))
+                    && (ACPI_STRNCMP(new_table_desc.signature.ascii, "OEM", 3)))
+                {
+                        ACPI_BIOS_ERROR((AE_INFO,
+                                         "Table has invalid signature [%4.4s] (0x%8.8X), "
+                                         "must be SSDT or OEMx",
+                                         acpi_ut_valid_acpi_name(new_table_desc.
+                                                                 signature.
+                                                                 ascii) ?
+                                         new_table_desc.signature.
+                                         ascii : "????",
+                                         new_table_desc.signature.integer));
+
+                        status = AE_BAD_SIGNATURE;
+                        goto release_and_exit;
+                }
 
-acpi_status
-acpi_tb_store_table(acpi_physical_address address,
-                    struct acpi_table_header *table,
-                    u32 length, u8 flags, u32 *table_index)
-{
-        acpi_status status;
-        struct acpi_table_desc *new_table;
+                /* Check if table is already registered */
 
-        /* Ensure that there is room for the table in the Root Table List */
+                for (i = 0; i < acpi_gbl_root_table_list.current_table_count;
+                     ++i) {
+                        /*
+                         * Check for a table match on the entire table length,
+                         * not just the header.
+                         */
+                        if (!acpi_tb_compare_tables(&new_table_desc, i)) {
+                                continue;
+                        }
 
-        if (acpi_gbl_root_table_list.current_table_count >=
-            acpi_gbl_root_table_list.max_table_count) {
-                status = acpi_tb_resize_root_table_list();
-                if (ACPI_FAILURE(status)) {
-                        return (status);
+                        /*
+                         * Note: the current mechanism does not unregister a table if it is
+                         * dynamically unloaded. The related namespace entries are deleted,
+                         * but the table remains in the root table list.
+                         *
+                         * The assumption here is that the number of different tables that
+                         * will be loaded is actually small, and there is minimal overhead
+                         * in just keeping the table in case it is needed again.
+                         *
+                         * If this assumption changes in the future (perhaps on large
+                         * machines with many table load/unload operations), tables will
+                         * need to be unregistered when they are unloaded, and slots in the
+                         * root table list should be reused when empty.
+                         */
+                        if (acpi_gbl_root_table_list.tables[i].
+                            flags & ACPI_TABLE_IS_LOADED) {
+
+                                /* Table is still loaded, this is an error */
+
+                                status = AE_ALREADY_EXISTS;
+                                goto release_and_exit;
+                        } else {
+                                /*
+                                 * Table was unloaded, allow it to be reloaded.
+                                 * As we are going to return AE_OK to the caller, we should
+                                 * take the responsibility of freeing the input descriptor.
+                                 * Refill the input descriptor to ensure
+                                 * acpi_tb_install_table_with_override() can be called again to
+                                 * indicate the re-installation.
+                                 */
+                                acpi_tb_uninstall_table(&new_table_desc);
+                                *table_index = i;
+                                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                                return_ACPI_STATUS(AE_OK);
+                        }
                 }
         }
 
-        new_table =
-            &acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.
-                                             current_table_count];
-
-        /* Initialize added table */
-
-        new_table->address = address;
-        new_table->pointer = table;
-        new_table->length = length;
-        new_table->owner_id = 0;
-        new_table->flags = flags;
-
-        ACPI_MOVE_32_TO_32(&new_table->signature, table->signature);
-
-        *table_index = acpi_gbl_root_table_list.current_table_count;
-        acpi_gbl_root_table_list.current_table_count++;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_delete_table
- *
- * PARAMETERS:  table_index         - Table index
- *
- * RETURN:      None
- *
- * DESCRIPTION: Delete one internal ACPI table
- *
- ******************************************************************************/
+        /* Add the table to the global root table list */
 
-void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
-{
-        /* Table must be mapped or allocated */
-        if (!table_desc->pointer) {
-                return;
+        status = acpi_tb_get_next_root_index(&i);
+        if (ACPI_FAILURE(status)) {
+                goto release_and_exit;
         }
-        switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {
-        case ACPI_TABLE_ORIGIN_MAPPED:
-
-                acpi_os_unmap_memory(table_desc->pointer, table_desc->length);
-                break;
-
-        case ACPI_TABLE_ORIGIN_ALLOCATED:
 
-                ACPI_FREE(table_desc->pointer);
-                break;
+        *table_index = i;
+        acpi_tb_install_table_with_override(i, &new_table_desc, override);
 
-                /* Not mapped or allocated, there is nothing we can do */
+release_and_exit:
 
-        default:
+        /* Release the temporary table descriptor */
 
-                return;
-        }
-
-        table_desc->pointer = NULL;
+        acpi_tb_release_temp_table(&new_table_desc);
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_terminate
+ * FUNCTION:    acpi_tb_override_table
  *
- * PARAMETERS:  None
+ * PARAMETERS:  old_table_desc      - Validated table descriptor to be
+ *                                    overridden
  *
  * RETURN:      None
  *
- * DESCRIPTION: Delete all internal ACPI tables
+ * DESCRIPTION: Attempt table override by calling the OSL override functions.
+ *              Note: If the table is overridden, then the entire new table
+ *              is acquired and returned by this function.
+ *              Before/after invocation, the table descriptor is in a state
+ *              that is "VALIDATED".
  *
  ******************************************************************************/
 
-void acpi_tb_terminate(void)
+void acpi_tb_override_table(struct acpi_table_desc *old_table_desc)
 {
-        u32 i;
-
-        ACPI_FUNCTION_TRACE(tb_terminate);
-
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-
-        /* Delete the individual tables */
+        acpi_status status;
+        char *override_type;
+        struct acpi_table_desc new_table_desc;
+        struct acpi_table_header *table;
+        acpi_physical_address address;
+        u32 length;
 
-        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; i++) {
-                acpi_tb_delete_table(&acpi_gbl_root_table_list.tables[i]);
-        }
+        /* (1) Attempt logical override (returns a logical address) */
 
-        /*
-         * Delete the root table array if allocated locally. Array cannot be
-         * mapped, so we don't need to check for that flag.
-         */
-        if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
-                ACPI_FREE(acpi_gbl_root_table_list.tables);
+        status = acpi_os_table_override(old_table_desc->pointer, &table);
+        if (ACPI_SUCCESS(status) && table) {
+                acpi_tb_acquire_temp_table(&new_table_desc,
+                                           ACPI_PTR_TO_PHYSADDR(table),
+                                           ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL);
+                override_type = "Logical";
+                goto finish_override;
         }
 
-        acpi_gbl_root_table_list.tables = NULL;
-        acpi_gbl_root_table_list.flags = 0;
-        acpi_gbl_root_table_list.current_table_count = 0;
+        /* (2) Attempt physical override (returns a physical address) */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        status = acpi_os_physical_table_override(old_table_desc->pointer,
+                                                 &address, &length);
+        if (ACPI_SUCCESS(status) && address && length) {
+                acpi_tb_acquire_temp_table(&new_table_desc, address,
+                                           ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);
+                override_type = "Physical";
+                goto finish_override;
+        }
 
-        return_VOID;
-}
+        return;                 /* There was no override */
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_delete_namespace_by_owner
- *
- * PARAMETERS:  table_index         - Table index
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Delete all namespace objects created when this table was loaded.
- *
- ******************************************************************************/
-
-acpi_status acpi_tb_delete_namespace_by_owner(u32 table_index)
-{
-        acpi_owner_id owner_id;
-        acpi_status status;
+finish_override:
 
-        ACPI_FUNCTION_TRACE(tb_delete_namespace_by_owner);
+        /* Validate and verify a table before overriding */
 
-        status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        status = acpi_tb_verify_temp_table(&new_table_desc, NULL);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                return;
         }
 
-        if (table_index >= acpi_gbl_root_table_list.current_table_count) {
-
-                /* The table index does not exist */
-
-                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
+        ACPI_INFO((AE_INFO, "%4.4s " ACPI_PRINTF_UINT
+                   " %s table override, new table: " ACPI_PRINTF_UINT,
+                   old_table_desc->signature.ascii,
+                   ACPI_FORMAT_TO_UINT(old_table_desc->address),
+                   override_type, ACPI_FORMAT_TO_UINT(new_table_desc.address)));
 
-        /* Get the owner ID for this table, used to delete namespace nodes */
+        /* We can now uninstall the original table */
 
-        owner_id = acpi_gbl_root_table_list.tables[table_index].owner_id;
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        acpi_tb_uninstall_table(old_table_desc);
 
         /*
-         * Need to acquire the namespace writer lock to prevent interference
-         * with any concurrent namespace walks. The interpreter must be
-         * released during the deletion since the acquisition of the deletion
-         * lock may block, and also since the execution of a namespace walk
-         * must be allowed to use the interpreter.
+         * Replace the original table descriptor and keep its state as
+         * "VALIDATED".
          */
-        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
-        status = acpi_ut_acquire_write_lock(&acpi_gbl_namespace_rw_lock);
+        acpi_tb_init_table_descriptor(old_table_desc, new_table_desc.address,
+                                      new_table_desc.flags,
+                                      new_table_desc.pointer);
+        acpi_tb_validate_temp_table(old_table_desc);
 
-        acpi_ns_delete_namespace_by_owner(owner_id);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
+        /* Release the temporary table descriptor */
 
-        acpi_ut_release_write_lock(&acpi_gbl_namespace_rw_lock);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
-        return_ACPI_STATUS(status);
+        acpi_tb_release_temp_table(&new_table_desc);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_allocate_owner_id
+ * FUNCTION:    acpi_tb_store_table
  *
- * PARAMETERS:  table_index         - Table index
+ * PARAMETERS:  address             - Table address
+ *              table               - Table header
+ *              length              - Table length
+ *              flags               - Install flags
+ *              table_index         - Where the table index is returned
  *
- * RETURN:      Status
+ * RETURN:      Status and table index.
  *
- * DESCRIPTION: Allocates owner_id in table_desc
+ * DESCRIPTION: Add an ACPI table to the global table list
  *
  ******************************************************************************/
 
-acpi_status acpi_tb_allocate_owner_id(u32 table_index)
+acpi_status
+acpi_tb_store_table(acpi_physical_address address,
+                    struct acpi_table_header * table,
+                    u32 length, u8 flags, u32 *table_index)
 {
-        acpi_status status = AE_BAD_PARAMETER;
-
-        ACPI_FUNCTION_TRACE(tb_allocate_owner_id);
+        acpi_status status;
+        struct acpi_table_desc *table_desc;
 
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.current_table_count) {
-                status = acpi_ut_allocate_owner_id
-                    (&(acpi_gbl_root_table_list.tables[table_index].owner_id));
+        status = acpi_tb_get_next_root_index(table_index);
+        if (ACPI_FAILURE(status)) {
+                return (status);
         }
 
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_release_owner_id
- *
- * PARAMETERS:  table_index         - Table index
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Releases owner_id in table_desc
- *
- ******************************************************************************/
-
-acpi_status acpi_tb_release_owner_id(u32 table_index)
-{
-        acpi_status status = AE_BAD_PARAMETER;
-
-        ACPI_FUNCTION_TRACE(tb_release_owner_id);
-
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.current_table_count) {
-                acpi_ut_release_owner_id(&
-                                         (acpi_gbl_root_table_list.
-                                          tables[table_index].owner_id));
-                status = AE_OK;
-        }
+        /* Initialize added table */
 
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
+        table_desc = &acpi_gbl_root_table_list.tables[*table_index];
+        acpi_tb_init_table_descriptor(table_desc, address, flags, table);
+        table_desc->pointer = table;
+        return (AE_OK);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_get_owner_id
+ * FUNCTION:    acpi_tb_uninstall_table
  *
- * PARAMETERS:  table_index         - Table index
- *              owner_id            - Where the table owner_id is returned
+ * PARAMETERS:  table_desc          - Table descriptor
  *
- * RETURN:      Status
+ * RETURN:      None
  *
- * DESCRIPTION: returns owner_id for the ACPI table
+ * DESCRIPTION: Delete one internal ACPI table
  *
  ******************************************************************************/
 
-acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id)
+void acpi_tb_uninstall_table(struct acpi_table_desc *table_desc)
 {
-        acpi_status status = AE_BAD_PARAMETER;
-
-        ACPI_FUNCTION_TRACE(tb_get_owner_id);
 
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.current_table_count) {
-                *owner_id =
-                    acpi_gbl_root_table_list.tables[table_index].owner_id;
-                status = AE_OK;
-        }
+        ACPI_FUNCTION_TRACE(tb_uninstall_table);
 
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_is_table_loaded
- *
- * PARAMETERS:  table_index         - Table index
- *
- * RETURN:      Table Loaded Flag
- *
- ******************************************************************************/
+        /* Table must be installed */
 
-u8 acpi_tb_is_table_loaded(u32 table_index)
-{
-        u8 is_loaded = FALSE;
-
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.current_table_count) {
-                is_loaded = (u8)
-                    (acpi_gbl_root_table_list.tables[table_index].flags &
-                     ACPI_TABLE_IS_LOADED);
+        if (!table_desc->address) {
+                return_VOID;
         }
 
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return (is_loaded);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_set_table_loaded_flag
- *
- * PARAMETERS:  table_index         - Table index
- *              is_loaded           - TRUE if table is loaded, FALSE otherwise
- *
- * RETURN:      None
- *
- * DESCRIPTION: Sets the table loaded flag to either TRUE or FALSE.
- *
- ******************************************************************************/
-
-void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded)
-{
+        acpi_tb_invalidate_table(table_desc);
 
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        if (table_index < acpi_gbl_root_table_list.current_table_count) {
-                if (is_loaded) {
-                        acpi_gbl_root_table_list.tables[table_index].flags |=
-                            ACPI_TABLE_IS_LOADED;
-                } else {
-                        acpi_gbl_root_table_list.tables[table_index].flags &=
-                            ~ACPI_TABLE_IS_LOADED;
-                }
+        if ((table_desc->flags & ACPI_TABLE_ORIGIN_MASK) ==
+            ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL) {
+                ACPI_FREE(ACPI_CAST_PTR(void, table_desc->address));
         }
 
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        table_desc->address = ACPI_PTR_TO_PHYSADDR(NULL);
+        return_VOID;
 }
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 9fb85f38de90..6b1ca9991b90 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -49,8 +49,6 @@
 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);
 
@@ -178,9 +176,13 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
         }
 
         ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length);
-        acpi_tb_delete_table(table_desc);
-        table_desc->pointer = new_table;
-        table_desc->flags = ACPI_TABLE_ORIGIN_ALLOCATED;
+        acpi_tb_uninstall_table(table_desc);
+
+        acpi_tb_init_table_descriptor(&acpi_gbl_root_table_list.
+                                      tables[ACPI_TABLE_INDEX_DSDT],
+                                      ACPI_PTR_TO_PHYSADDR(new_table),
+                                      ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
+                                      new_table);
 
         ACPI_INFO((AE_INFO,
                    "Forced DSDT copy: length 0x%05X copied locally, original unmapped",
@@ -191,116 +193,6 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_install_table
- *
- * PARAMETERS:  address                 - Physical address of DSDT or FACS
- *              signature               - Table signature, NULL if no need to
- *                                        match
- *              table_index             - Index into root table array
- *
- * RETURN:      None
- *
- * DESCRIPTION: Install an ACPI table into the global data structure. The
- *              table override mechanism is called to allow the host
- *              OS to replace any table before it is installed in the root
- *              table array.
- *
- ******************************************************************************/
-
-void
-acpi_tb_install_table(acpi_physical_address address,
-                      char *signature, u32 table_index)
-{
-        struct acpi_table_header *table;
-        struct acpi_table_header *final_table;
-        struct acpi_table_desc *table_desc;
-
-        if (!address) {
-                ACPI_ERROR((AE_INFO,
-                            "Null physical address for ACPI table [%s]",
-                            signature));
-                return;
-        }
-
-        /* Map just the table header */
-
-        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
-        if (!table) {
-                ACPI_ERROR((AE_INFO,
-                            "Could not map memory for table [%s] at %p",
-                            signature, ACPI_CAST_PTR(void, address)));
-                return;
-        }
-
-        /* If a particular signature is expected (DSDT/FACS), it must match */
-
-        if (signature && !ACPI_COMPARE_NAME(table->signature, signature)) {
-                ACPI_BIOS_ERROR((AE_INFO,
-                                 "Invalid signature 0x%X for ACPI table, expected [%s]",
-                                 *ACPI_CAST_PTR(u32, table->signature),
-                                 signature));
-                goto unmap_and_exit;
-        }
-
-        /*
-         * Initialize the table entry. Set the pointer to NULL, since the
-         * table is not fully mapped at this time.
-         */
-        table_desc = &acpi_gbl_root_table_list.tables[table_index];
-
-        table_desc->address = address;
-        table_desc->pointer = NULL;
-        table_desc->length = table->length;
-        table_desc->flags = ACPI_TABLE_ORIGIN_MAPPED;
-        ACPI_MOVE_32_TO_32(table_desc->signature.ascii, table->signature);
-
-        /*
-         * ACPI Table Override:
-         *
-         * Before we install the table, let the host OS override it with a new
-         * one if desired. Any table within the RSDT/XSDT can be replaced,
-         * including the DSDT which is pointed to by the FADT.
-         *
-         * NOTE: If the table is overridden, then final_table will contain a
-         * mapped pointer to the full new table. If the table is not overridden,
-         * or if there has been a physical override, then the table will be
-         * fully mapped later (in verify table). In any case, we must
-         * unmap the header that was mapped above.
-         */
-        final_table = acpi_tb_table_override(table, table_desc);
-        if (!final_table) {
-                final_table = table;    /* There was no override */
-        }
-
-        acpi_tb_print_table_header(table_desc->address, final_table);
-
-        /* Set the global integer width (based upon revision of the DSDT) */
-
-        if (table_index == ACPI_TABLE_INDEX_DSDT) {
-                acpi_ut_set_integer_width(final_table->revision);
-        }
-
-        /*
-         * If we have a physical override during this early loading of the ACPI
-         * tables, unmap the table for now. It will be mapped again later when
-         * it is actually used. This supports very early loading of ACPI tables,
-         * before virtual memory is fully initialized and running within the
-         * host OS. Note: A logical override has the ACPI_TABLE_ORIGIN_OVERRIDE
-         * flag set and will not be deleted below.
-         */
-        if (final_table != table) {
-                acpi_tb_delete_table(table_desc);
-        }
-
-unmap_and_exit:
-
-        /* Always unmap the table header that we mapped above */
-
-        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_tb_get_root_table_entry
  *
  * PARAMETERS:  table_entry         - Pointer to the RSDT/XSDT table entry
@@ -357,87 +249,6 @@ 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
@@ -461,10 +272,10 @@ 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 rsdt_address;
         u32 length;
         u8 *table_entry;
         acpi_status status;
+        u32 table_index;
 
         ACPI_FUNCTION_TRACE(tb_parse_root_table);
 
@@ -489,14 +300,11 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
                  * as per the ACPI specification.
                  */
                 address = (acpi_physical_address) rsdp->xsdt_physical_address;
-                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;
-                rsdt_address = address;
                 table_entry_size = ACPI_RSDT_ENTRY_SIZE;
         }
 
@@ -506,24 +314,6 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
          */
         acpi_os_unmap_memory(rsdp, sizeof(struct acpi_table_rsdp));
 
-        /*
-         * 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 = rsdt_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));
@@ -576,55 +366,36 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
         /* 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) {
-
-                        /* There is no more room in the root table array, attempt resize */
-
-                        status = acpi_tb_resize_root_table_list();
-                        if (ACPI_FAILURE(status)) {
-                                ACPI_WARNING((AE_INFO,
-                                              "Truncating %u table entries!",
-                                              (unsigned) (table_count -
-                                               (acpi_gbl_root_table_list.
-                                                          current_table_count -
-                                                          2))));
-                                break;
-                        }
-                }
 
                 /* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
 
-                acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.
-                                                current_table_count].address =
+                address =
                     acpi_tb_get_root_table_entry(table_entry, table_entry_size);
 
-                table_entry += table_entry_size;
-                acpi_gbl_root_table_list.current_table_count++;
-        }
-
-        /*
-         * It is not possible to map more than one entry in some environments,
-         * so unmap the root table here before mapping other tables
-         */
-        acpi_os_unmap_memory(table, length);
+                /* Skip NULL entries in RSDT/XSDT */
 
-        /*
-         * Complete the initialization of the root table array by examining
-         * the header of each table
-         */
-        for (i = 2; i < acpi_gbl_root_table_list.current_table_count; i++) {
-                acpi_tb_install_table(acpi_gbl_root_table_list.tables[i].
-                                      address, NULL, i);
+                if (!address) {
+                        goto next_table;
+                }
 
-                /* Special case for FADT - validate it then get the DSDT and FACS */
+                status = acpi_tb_install_standard_table(address,
+                                                        ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
+                                                        FALSE, TRUE,
+                                                        &table_index);
 
-                if (ACPI_COMPARE_NAME
-                    (&acpi_gbl_root_table_list.tables[i].signature,
-                     ACPI_SIG_FADT)) {
-                        acpi_tb_parse_fadt(i);
+                if (ACPI_SUCCESS(status) &&
+                    ACPI_COMPARE_NAME(&acpi_gbl_root_table_list.
+                                      tables[table_index].signature,
+                                      ACPI_SIG_FADT)) {
+                        acpi_tb_parse_fadt(table_index);
                 }
+
+next_table:
+
+                table_entry += table_entry_size;
         }
 
+        acpi_os_unmap_memory(table, length);
+
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index a1593159d9ea..6482b0ded652 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -206,8 +206,8 @@ acpi_status
 acpi_get_table_header(char *signature,
                       u32 instance, struct acpi_table_header *out_table_header)
 {
-       u32 i;
-       u32 j;
+        u32 i;
+        u32 j;
         struct acpi_table_header *header;
 
         /* Parameter validation */
@@ -233,7 +233,7 @@ acpi_get_table_header(char *signature,
                 if (!acpi_gbl_root_table_list.tables[i].pointer) {
                         if ((acpi_gbl_root_table_list.tables[i].flags &
                              ACPI_TABLE_ORIGIN_MASK) ==
-                            ACPI_TABLE_ORIGIN_MAPPED) {
+                            ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL) {
                                 header =
                                     acpi_os_map_memory(acpi_gbl_root_table_list.
                                                        tables[i].address,
@@ -321,8 +321,8 @@ acpi_get_table_with_size(char *signature,
                u32 instance, struct acpi_table_header **out_table,
                acpi_size *tbl_size)
 {
-       u32 i;
-       u32 j;
+        u32 i;
+        u32 j;
         acpi_status status;
 
         /* Parameter validation */
@@ -346,7 +346,7 @@ acpi_get_table_with_size(char *signature,
                 }
 
                 status =
-                    acpi_tb_verify_table(&acpi_gbl_root_table_list.tables[i]);
+                    acpi_tb_validate_table(&acpi_gbl_root_table_list.tables[i]);
                 if (ACPI_SUCCESS(status)) {
                         *out_table = acpi_gbl_root_table_list.tables[i].pointer;
                         *tbl_size = acpi_gbl_root_table_list.tables[i].length;
@@ -390,7 +390,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)
  *
  ******************************************************************************/
 acpi_status
-acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
+acpi_get_table_by_index(u32 table_index, struct acpi_table_header ** table)
 {
         acpi_status status;
 
@@ -416,8 +416,8 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
                 /* Table is not mapped, map it */
 
                 status =
-                    acpi_tb_verify_table(&acpi_gbl_root_table_list.
-                                         tables[table_index]);
+                    acpi_tb_validate_table(&acpi_gbl_root_table_list.
+                                           tables[table_index]);
                 if (ACPI_FAILURE(status)) {
                         (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
                         return_ACPI_STATUS(status);
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index 0909420fc776..ab5308b81aa8 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -117,7 +117,7 @@ static acpi_status acpi_tb_load_namespace(void)
                                 tables[ACPI_TABLE_INDEX_DSDT].signature),
                                ACPI_SIG_DSDT)
             ||
-            ACPI_FAILURE(acpi_tb_verify_table
+            ACPI_FAILURE(acpi_tb_validate_table
                          (&acpi_gbl_root_table_list.
                           tables[ACPI_TABLE_INDEX_DSDT]))) {
                 status = AE_NO_ACPI_TABLES;
@@ -128,7 +128,7 @@ static acpi_status acpi_tb_load_namespace(void)
          * Save the DSDT pointer for simple access. This is the mapped memory
          * address. We must take care here because the address of the .Tables
          * array can change dynamically as tables are loaded at run-time. Note:
-         * .Pointer field is not validated until after call to acpi_tb_verify_table.
+         * .Pointer field is not validated until after call to acpi_tb_validate_table.
          */
         acpi_gbl_DSDT =
             acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer;
@@ -174,24 +174,11 @@ static acpi_status acpi_tb_load_namespace(void)
                                         (acpi_gbl_root_table_list.tables[i].
                                          signature), ACPI_SIG_PSDT))
                     ||
-                    ACPI_FAILURE(acpi_tb_verify_table
+                    ACPI_FAILURE(acpi_tb_validate_table
                                  (&acpi_gbl_root_table_list.tables[i]))) {
                         continue;
                 }
 
-                /*
-                 * Optionally do not load any SSDTs from the RSDT/XSDT. This can
-                 * be useful for debugging ACPI problems on some machines.
-                 */
-                if (acpi_gbl_disable_ssdt_table_load) {
-                        ACPI_INFO((AE_INFO, "Ignoring %4.4s at %p",
-                                   acpi_gbl_root_table_list.tables[i].signature.
-                                   ascii, ACPI_CAST_PTR(void,
-                                                        acpi_gbl_root_table_list.
-                                                        tables[i].address)));
-                        continue;
-                }
-
                 /* Ignore errors while loading tables, get as many as possible */
 
                 (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
@@ -208,6 +195,45 @@ unlock_and_exit:
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_install_table
+ *
+ * PARAMETERS:  address             - Address of the ACPI table to be installed.
+ *              physical            - Whether the address is a physical table
+ *                                    address or not
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Dynamically install an ACPI table.
+ *              Note: This function should only be invoked after
+ *                    acpi_initialize_tables() and before acpi_load_tables().
+ *
+ ******************************************************************************/
+
+acpi_status __init
+acpi_install_table(acpi_physical_address address, u8 physical)
+{
+        acpi_status status;
+        u8 flags;
+        u32 table_index;
+
+        ACPI_FUNCTION_TRACE(acpi_install_table);
+
+        if (physical) {
+                flags = ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL;
+        } else {
+                flags = ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL;
+        }
+
+        status = acpi_tb_install_standard_table(address, flags,
+                                                FALSE, FALSE, &table_index);
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL_INIT(acpi_install_table)
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_load_table
  *
  * PARAMETERS:  table               - Pointer to a buffer containing the ACPI
@@ -222,11 +248,9 @@ unlock_and_exit:
  *              to ensure that the table is not deleted or unmapped.
  *
  ******************************************************************************/
-
 acpi_status acpi_load_table(struct acpi_table_header *table)
 {
         acpi_status status;
-        struct acpi_table_desc table_desc;
         u32 table_index;
 
         ACPI_FUNCTION_TRACE(acpi_load_table);
@@ -237,14 +261,6 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Init local table descriptor */
-
-        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
-        table_desc.address = ACPI_PTR_TO_PHYSADDR(table);
-        table_desc.pointer = table;
-        table_desc.length = table->length;
-        table_desc.flags = ACPI_TABLE_ORIGIN_UNKNOWN;
-
         /* Must acquire the interpreter lock during this operation */
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
@@ -255,7 +271,24 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
         /* Install the table and load it into the namespace */
 
         ACPI_INFO((AE_INFO, "Host-directed Dynamic ACPI Table Load:"));
-        status = acpi_tb_add_table(&table_desc, &table_index);
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+
+        status = acpi_tb_install_standard_table(ACPI_PTR_TO_PHYSADDR(table),
+                                                ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
+                                                TRUE, FALSE, &table_index);
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
+
+        /*
+         * Note: Now table is "INSTALLED", it must be validated before
+         * using.
+         */
+        status =
+            acpi_tb_validate_table(&acpi_gbl_root_table_list.
+                                   tables[table_index]);
         if (ACPI_FAILURE(status)) {
                 goto unlock_and_exit;
         }
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index fbfa9eca011f..90ec37c473c6 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -462,7 +462,7 @@ char *acpi_ut_get_mutex_name(u32 mutex_id)
 
 /* Names for Notify() values, used for debug output */
 
-static const char *acpi_gbl_notify_value_names[ACPI_NOTIFY_MAX + 1] = {
+static const char *acpi_gbl_generic_notify[ACPI_NOTIFY_MAX + 1] = {
         /* 00 */ "Bus Check",
         /* 01 */ "Device Check",
         /* 02 */ "Device Wake",
@@ -473,23 +473,75 @@ static const char *acpi_gbl_notify_value_names[ACPI_NOTIFY_MAX + 1] = {
         /* 07 */ "Power Fault",
         /* 08 */ "Capabilities Check",
         /* 09 */ "Device PLD Check",
-        /* 10 */ "Reserved",
-        /* 11 */ "System Locality Update",
-        /* 12 */ "Shutdown Request"
+        /* 0A */ "Reserved",
+        /* 0B */ "System Locality Update",
+        /* 0C */ "Shutdown Request"
 };
 
-const char *acpi_ut_get_notify_name(u32 notify_value)
+static const char *acpi_gbl_device_notify[4] = {
+        /* 80 */ "Status Change",
+        /* 81 */ "Information Change",
+        /* 82 */ "Device-Specific Change",
+        /* 83 */ "Device-Specific Change"
+};
+
+static const char *acpi_gbl_processor_notify[4] = {
+        /* 80 */ "Performance Capability Change",
+        /* 81 */ "C-State Change",
+        /* 82 */ "Throttling Capability Change",
+        /* 83 */ "Device-Specific Change"
+};
+
+static const char *acpi_gbl_thermal_notify[4] = {
+        /* 80 */ "Thermal Status Change",
+        /* 81 */ "Thermal Trip Point Change",
+        /* 82 */ "Thermal Device List Change",
+        /* 83 */ "Thermal Relationship Change"
+};
+
+const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
 {
 
+        /* 00 - 0C are common to all object types */
+
         if (notify_value <= ACPI_NOTIFY_MAX) {
-                return (acpi_gbl_notify_value_names[notify_value]);
-        } else if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
+                return (acpi_gbl_generic_notify[notify_value]);
+        }
+
+        /* 0D - 7F are reserved */
+
+        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
                 return ("Reserved");
-        } else if (notify_value <= ACPI_MAX_DEVICE_SPECIFIC_NOTIFY) {
-                return ("Device Specific");
-        } else {
-                return ("Hardware Specific");
         }
+
+        /* 80 - 83 are per-object-type */
+
+        if (notify_value <= 0x83) {
+                switch (type) {
+                case ACPI_TYPE_ANY:
+                case ACPI_TYPE_DEVICE:
+                        return (acpi_gbl_device_notify[notify_value - 0x80]);
+
+                case ACPI_TYPE_PROCESSOR:
+                        return (acpi_gbl_processor_notify[notify_value - 0x80]);
+
+                case ACPI_TYPE_THERMAL:
+                        return (acpi_gbl_thermal_notify[notify_value - 0x80]);
+
+                default:
+                        return ("Target object type does not support notifies");
+                }
+        }
+
+        /* 84 - BF are device-specific */
+
+        if (notify_value <= ACPI_MAX_DEVICE_SPECIFIC_NOTIFY) {
+                return ("Device-Specific");
+        }
+
+        /* C0 and above are hardware-specific */
+
+        return ("Hardware-Specific");
 }
 #endif
 
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index f3abeae9d2f8..d69be3cb3fae 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -55,28 +55,7 @@ ACPI_MODULE_NAME("utglobal")
  * Static global variable initialization.
  *
  ******************************************************************************/
-/* Debug output control masks */
-u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
-
-u32 acpi_dbg_layer = 0;
-
-/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */
-
-struct acpi_table_fadt acpi_gbl_FADT;
-u32 acpi_gbl_trace_flags;
-acpi_name acpi_gbl_trace_method_name;
-u8 acpi_gbl_system_awake_and_running;
-u32 acpi_current_gpe_count;
-
-/*
- * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
- * that the ACPI hardware is no longer required. A flag in the FADT indicates
- * a reduced HW machine, and that flag is duplicated here for convenience.
- */
-u8 acpi_gbl_reduced_hardware;
-
 /* Various state name strings */
-
 const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT] = {
         "\\_S0_",
         "\\_S1_",
@@ -337,7 +316,6 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_acpi_hardware_present = TRUE;
         acpi_gbl_last_owner_id_index = 0;
         acpi_gbl_next_owner_id_offset = 0;
-        acpi_gbl_trace_method_name = 0;
         acpi_gbl_trace_dbg_level = 0;
         acpi_gbl_trace_dbg_layer = 0;
         acpi_gbl_debugger_configuration = DEBUGGER_THREADING;
@@ -377,9 +355,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_disable_mem_tracking = FALSE;
 #endif
 
-#ifdef ACPI_DEBUGGER
-        acpi_gbl_db_terminate_threads = FALSE;
-#endif
+        ACPI_DEBUGGER_EXEC(acpi_gbl_db_terminate_threads = FALSE);
 
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c
index 77219336c7e0..6dc54b3c28b0 100644
--- a/drivers/acpi/acpica/utstring.c
+++ b/drivers/acpi/acpica/utstring.c
@@ -353,7 +353,7 @@ void acpi_ut_print_string(char *string, u16 max_length)
         }
 
         acpi_os_printf("\"");
-        for (i = 0; string[i] && (i < max_length); i++) {
+        for (i = 0; (i < max_length) && string[i]; i++) {
 
                 /* Escape sequences */
 
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index edd861102f1b..88ef77f3cf88 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -53,6 +53,7 @@ ACPI_MODULE_NAME("utxferror")
  * This module is used for the in-kernel ACPICA as well as the ACPICA
  * tools/applications.
  */
+#ifndef ACPI_NO_ERROR_MESSAGES  /* Entire module */
 /*******************************************************************************
  *
  * FUNCTION:    acpi_error
@@ -249,3 +250,4 @@ acpi_bios_warning(const char *module_name,
 }
 
 ACPI_EXPORT_SYMBOL(acpi_bios_warning)
+#endif                          /* ACPI_NO_ERROR_MESSAGES */
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 1be6f5564485..a095d4f858da 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -202,7 +202,7 @@ static void check_vendor_extension(u64 paddr,
 
         if (!offset)
                 return;
-        v = acpi_os_map_memory(paddr + offset, sizeof(*v));
+        v = acpi_os_map_iomem(paddr + offset, sizeof(*v));
         if (!v)
                 return;
         sbdf = v->pcie_sbdf;
@@ -210,7 +210,7 @@ static void check_vendor_extension(u64 paddr,
                 sbdf >> 24, (sbdf >> 16) & 0xff,
                 (sbdf >> 11) & 0x1f, (sbdf >> 8) & 0x7,
                  v->vendor_id, v->device_id, v->rev_id);
-        acpi_os_unmap_memory(v, sizeof(*v));
+        acpi_os_unmap_iomem(v, sizeof(*v));
 }
 
 static void *einj_get_parameter_address(void)
@@ -236,7 +236,7 @@ static void *einj_get_parameter_address(void)
         if (pa_v5) {
                 struct set_error_type_with_address *v5param;
 
-                v5param = acpi_os_map_memory(pa_v5, sizeof(*v5param));
+                v5param = acpi_os_map_iomem(pa_v5, sizeof(*v5param));
                 if (v5param) {
                         acpi5 = 1;
                         check_vendor_extension(pa_v5, v5param);
@@ -246,11 +246,11 @@ static void *einj_get_parameter_address(void)
         if (param_extension && pa_v4) {
                 struct einj_parameter *v4param;
 
-                v4param = acpi_os_map_memory(pa_v4, sizeof(*v4param));
+                v4param = acpi_os_map_iomem(pa_v4, sizeof(*v4param));
                 if (!v4param)
                         return NULL;
                 if (v4param->reserved1 || v4param->reserved2) {
-                        acpi_os_unmap_memory(v4param, sizeof(*v4param));
+                        acpi_os_unmap_iomem(v4param, sizeof(*v4param));
                         return NULL;
                 }
                 return v4param;
@@ -794,7 +794,7 @@ err_unmap:
                         sizeof(struct set_error_type_with_address) :
                         sizeof(struct einj_parameter);
 
-                acpi_os_unmap_memory(einj_param, size);
+                acpi_os_unmap_iomem(einj_param, size);
         }
         apei_exec_post_unmap_gars(&ctx);
 err_release:
@@ -816,7 +816,7 @@ static void __exit einj_exit(void)
                         sizeof(struct set_error_type_with_address) :
                         sizeof(struct einj_parameter);
 
-                acpi_os_unmap_memory(einj_param, size);
+                acpi_os_unmap_iomem(einj_param, size);
         }
         einj_exec_ctx_init(&ctx);
         apei_exec_post_unmap_gars(&ctx);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 6e7b2a12860d..e48fc98e71c4 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -56,6 +56,10 @@
 /* Battery power unit: 0 means mW, 1 means mA */
 #define ACPI_BATTERY_POWER_UNIT_MA      1
 
+#define ACPI_BATTERY_STATE_DISCHARGING  0x1
+#define ACPI_BATTERY_STATE_CHARGING     0x2
+#define ACPI_BATTERY_STATE_CRITICAL     0x4
+
 #define _COMPONENT              ACPI_BATTERY_COMPONENT
 
 ACPI_MODULE_NAME("battery");
@@ -169,7 +173,7 @@ static int acpi_battery_get_state(struct acpi_battery *battery);
 
 static int acpi_battery_is_charged(struct acpi_battery *battery)
 {
-        /* either charging or discharging */
+        /* charging, discharging or critical low */
         if (battery->state != 0)
                 return 0;
 
@@ -204,9 +208,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 return -ENODEV;
         switch (psp) {
         case POWER_SUPPLY_PROP_STATUS:
-                if (battery->state & 0x01)
+                if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
                         val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-                else if (battery->state & 0x02)
+                else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
                         val->intval = POWER_SUPPLY_STATUS_CHARGING;
                 else if (acpi_battery_is_charged(battery))
                         val->intval = POWER_SUPPLY_STATUS_FULL;
@@ -269,6 +273,17 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 else
                         val->intval = 0;
                 break;
+        case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
+                if (battery->state & ACPI_BATTERY_STATE_CRITICAL)
+                        val->intval = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
+                else if (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&
+                        (battery->capacity_now <= battery->alarm))
+                        val->intval = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
+                else if (acpi_battery_is_charged(battery))
+                        val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
+                else
+                        val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
+                break;
         case POWER_SUPPLY_PROP_MODEL_NAME:
                 val->strval = battery->model_number;
                 break;
@@ -296,6 +311,7 @@ static enum power_supply_property charge_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL,
         POWER_SUPPLY_PROP_CHARGE_NOW,
         POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_CAPACITY_LEVEL,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -313,6 +329,7 @@ static enum power_supply_property energy_battery_props[] = {
         POWER_SUPPLY_PROP_ENERGY_FULL,
         POWER_SUPPLY_PROP_ENERGY_NOW,
         POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_CAPACITY_LEVEL,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -605,7 +622,8 @@ static int sysfs_add_battery(struct acpi_battery *battery)
         battery->bat.type = POWER_SUPPLY_TYPE_BATTERY;
         battery->bat.get_property = acpi_battery_get_property;
 
-        result = power_supply_register(&battery->device->dev, &battery->bat);
+        result = power_supply_register_no_ws(&battery->device->dev, &battery->bat);
+
         if (result)
                 return result;
         return device_create_file(battery->bat.dev, &alarm_attr);
@@ -696,7 +714,7 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
         }
 }
 
-static int acpi_battery_update(struct acpi_battery *battery)
+static int acpi_battery_update(struct acpi_battery *battery, bool resume)
 {
         int result, old_present = acpi_battery_present(battery);
         result = acpi_battery_get_status(battery);
@@ -707,6 +725,10 @@ static int acpi_battery_update(struct acpi_battery *battery)
                 battery->update_time = 0;
                 return 0;
         }
+
+        if (resume)
+                return 0;
+
         if (!battery->update_time ||
             old_present != acpi_battery_present(battery)) {
                 result = acpi_battery_get_info(battery);
@@ -720,7 +742,19 @@ static int acpi_battery_update(struct acpi_battery *battery)
                         return result;
         }
         result = acpi_battery_get_state(battery);
+        if (result)
+                return result;
         acpi_battery_quirks(battery);
+
+        /*
+         * Wakeup the system if battery is critical low
+         * or lower than the alarm level
+         */
+        if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||
+            (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&
+            (battery->capacity_now <= battery->alarm)))
+                pm_wakeup_event(&battery->device->dev, 0);
+
         return result;
 }
 
@@ -915,7 +949,7 @@ static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = {
 static int acpi_battery_read(int fid, struct seq_file *seq)
 {
         struct acpi_battery *battery = seq->private;
-        int result = acpi_battery_update(battery);
+        int result = acpi_battery_update(battery, false);
         return acpi_print_funcs[fid](seq, result);
 }
 
@@ -1030,7 +1064,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
         old = battery->bat.dev;
         if (event == ACPI_BATTERY_NOTIFY_INFO)
                 acpi_battery_refresh(battery);
-        acpi_battery_update(battery);
+        acpi_battery_update(battery, false);
         acpi_bus_generate_netlink_event(device->pnp.device_class,
                                         dev_name(&device->dev), event,
                                         acpi_battery_present(battery));
@@ -1045,13 +1079,27 @@ static int battery_notify(struct notifier_block *nb,
 {
         struct acpi_battery *battery = container_of(nb, struct acpi_battery,
                                                     pm_nb);
+        int result;
+
         switch (mode) {
         case PM_POST_HIBERNATION:
         case PM_POST_SUSPEND:
-                if (battery->bat.dev) {
-                        sysfs_remove_battery(battery);
-                        sysfs_add_battery(battery);
-                }
+                if (!acpi_battery_present(battery))
+                        return 0;
+
+                if (!battery->bat.dev) {
+                        result = acpi_battery_get_info(battery);
+                        if (result)
+                                return result;
+
+                        result = sysfs_add_battery(battery);
+                        if (result)
+                                return result;
+                } else
+                        acpi_battery_refresh(battery);
+
+                acpi_battery_init_alarm(battery);
+                acpi_battery_get_state(battery);
                 break;
         }
 
@@ -1087,7 +1135,7 @@ static int acpi_battery_add(struct acpi_device *device)
         mutex_init(&battery->sysfs_lock);
         if (acpi_has_method(battery->device->handle, "_BIX"))
                 set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
-        result = acpi_battery_update(battery);
+        result = acpi_battery_update(battery, false);
         if (result)
                 goto fail;
 #ifdef CONFIG_ACPI_PROCFS_POWER
@@ -1107,6 +1155,8 @@ static int acpi_battery_add(struct acpi_device *device)
         battery->pm_nb.notifier_call = battery_notify;
         register_pm_notifier(&battery->pm_nb);
 
+        device_init_wakeup(&device->dev, 1);
+
         return result;
 
 fail:
@@ -1123,6 +1173,7 @@ static int acpi_battery_remove(struct acpi_device *device)
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
+        device_init_wakeup(&device->dev, 0);
         battery = acpi_driver_data(device);
         unregister_pm_notifier(&battery->pm_nb);
 #ifdef CONFIG_ACPI_PROCFS_POWER
@@ -1149,7 +1200,7 @@ static int acpi_battery_resume(struct device *dev)
                 return -EINVAL;
 
         battery->update_time = 0;
-        acpi_battery_update(battery);
+        acpi_battery_update(battery, true);
         return 0;
 }
 #else
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index cf925c4f36b7..c5bc8cfe09fa 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -52,6 +52,12 @@ struct proc_dir_entry *acpi_root_dir;
 EXPORT_SYMBOL(acpi_root_dir);
 
 #ifdef CONFIG_X86
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+static inline int set_copy_dsdt(const struct dmi_system_id *id)
+{
+        return 0;
+}
+#else
 static int set_copy_dsdt(const struct dmi_system_id *id)
 {
         printk(KERN_NOTICE "%s detected - "
@@ -59,6 +65,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
         acpi_gbl_copy_dsdt_locally = 1;
         return 0;
 }
+#endif
 
 static struct dmi_system_id dsdt_dmi_table[] __initdata = {
         /*
@@ -132,6 +139,21 @@ void acpi_bus_private_data_handler(acpi_handle handle,
 }
 EXPORT_SYMBOL(acpi_bus_private_data_handler);
 
+int acpi_bus_attach_private_data(acpi_handle handle, void *data)
+{
+        acpi_status status;
+
+        status = acpi_attach_data(handle,
+                        acpi_bus_private_data_handler, data);
+        if (ACPI_FAILURE(status)) {
+                acpi_handle_debug(handle, "Error attaching device data\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_bus_attach_private_data);
+
 int acpi_bus_get_private_data(acpi_handle handle, void **data)
 {
         acpi_status status;
@@ -140,15 +162,20 @@ int acpi_bus_get_private_data(acpi_handle handle, void **data)
                 return -EINVAL;
 
         status = acpi_get_data(handle, acpi_bus_private_data_handler, data);
-        if (ACPI_FAILURE(status) || !*data) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n",
-                                handle));
+        if (ACPI_FAILURE(status)) {
+                acpi_handle_debug(handle, "No context for object\n");
                 return -ENODEV;
         }
 
         return 0;
 }
-EXPORT_SYMBOL(acpi_bus_get_private_data);
+EXPORT_SYMBOL_GPL(acpi_bus_get_private_data);
+
+void acpi_bus_detach_private_data(acpi_handle handle)
+{
+        acpi_detach_data(handle, acpi_bus_private_data_handler);
+}
+EXPORT_SYMBOL_GPL(acpi_bus_detach_private_data);
 
 void acpi_bus_no_hotplug(acpi_handle handle)
 {
@@ -340,16 +367,18 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
 {
         struct acpi_device *adev;
         struct acpi_driver *driver;
-        acpi_status status;
         u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE;
+        bool hotplug_event = false;
 
         switch (type) {
         case ACPI_NOTIFY_BUS_CHECK:
                 acpi_handle_debug(handle, "ACPI_NOTIFY_BUS_CHECK event\n");
+                hotplug_event = true;
                 break;
 
         case ACPI_NOTIFY_DEVICE_CHECK:
                 acpi_handle_debug(handle, "ACPI_NOTIFY_DEVICE_CHECK event\n");
+                hotplug_event = true;
                 break;
 
         case ACPI_NOTIFY_DEVICE_WAKE:
@@ -358,6 +387,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
 
         case ACPI_NOTIFY_EJECT_REQUEST:
                 acpi_handle_debug(handle, "ACPI_NOTIFY_EJECT_REQUEST event\n");
+                hotplug_event = true;
                 break;
 
         case ACPI_NOTIFY_DEVICE_CHECK_LIGHT:
@@ -393,16 +423,9 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
             (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))
                 driver->ops.notify(adev, type);
 
-        switch (type) {
-        case ACPI_NOTIFY_BUS_CHECK:
-        case ACPI_NOTIFY_DEVICE_CHECK:
-        case ACPI_NOTIFY_EJECT_REQUEST:
-                status = acpi_hotplug_schedule(adev, type);
-                if (ACPI_SUCCESS(status))
-                        return;
-        default:
-                break;
-        }
+        if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
+                return;
+
         acpi_bus_put_acpi_device(adev);
         return;
 
@@ -466,6 +489,9 @@ void __init acpi_early_init(void)
 
         printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);
 
+        /* It's safe to verify table checksums during late stage */
+        acpi_gbl_verify_table_checksum = TRUE;
+
         /* enable workarounds, unless strict ACPI spec. compliance */
         if (!acpi_strict)
                 acpi_gbl_enable_interpreter_slack = TRUE;
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 63119d09b354..76f7cff64594 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -41,6 +41,8 @@ static const struct acpi_device_id container_device_ids[] = {
         {"", 0},
 };
 
+#ifdef CONFIG_ACPI_CONTAINER
+
 static int acpi_container_offline(struct container_dev *cdev)
 {
         struct acpi_device *adev = ACPI_COMPANION(&cdev->dev);
@@ -109,5 +111,18 @@ static struct acpi_scan_handler container_handler = {
 
 void __init acpi_container_init(void)
 {
+        acpi_scan_add_handler(&container_handler);
+}
+
+#else
+
+static struct acpi_scan_handler container_handler = {
+        .ids = container_device_ids,
+};
+
+void __init acpi_container_init(void)
+{
         acpi_scan_add_handler_with_hotplug(&container_handler, "container");
 }
+
+#endif /* CONFIG_ACPI_CONTAINER */
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index d047739f3380..49a51277f81d 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -900,18 +900,47 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early);
  */
 int acpi_subsys_prepare(struct device *dev)
 {
-        /*
-         * Devices having power.ignore_children set may still be necessary for
-         * suspending their children in the next phase of device suspend.
-         */
-        if (dev->power.ignore_children)
-                pm_runtime_resume(dev);
+        struct acpi_device *adev = ACPI_COMPANION(dev);
+        u32 sys_target;
+        int ret, state;
+
+        ret = pm_generic_prepare(dev);
+        if (ret < 0)
+                return ret;
+
+        if (!adev || !pm_runtime_suspended(dev)
+            || device_may_wakeup(dev) != !!adev->wakeup.prepare_count)
+                return 0;
+
+        sys_target = acpi_target_system_state();
+        if (sys_target == ACPI_STATE_S0)
+                return 1;
 
-        return pm_generic_prepare(dev);
+        if (adev->power.flags.dsw_present)
+                return 0;
+
+        ret = acpi_dev_pm_get_state(dev, adev, sys_target, NULL, &state);
+        return !ret && state == adev->power.state;
 }
 EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
 
 /**
+ * acpi_subsys_complete - Finalize device's resume during system resume.
+ * @dev: Device to handle.
+ */
+void acpi_subsys_complete(struct device *dev)
+{
+        /*
+         * If the device had been runtime-suspended before the system went into
+         * the sleep state it is going out of and it has never been resumed till
+         * now, resume it in case the firmware powered it up.
+         */
+        if (dev->power.direct_complete)
+                pm_request_resume(dev);
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_complete);
+
+/**
  * acpi_subsys_suspend - Run the device driver's suspend callback.
  * @dev: Device to handle.
  *
@@ -923,6 +952,7 @@ int acpi_subsys_suspend(struct device *dev)
         pm_runtime_resume(dev);
         return pm_generic_suspend(dev);
 }
+EXPORT_SYMBOL_GPL(acpi_subsys_suspend);
 
 /**
  * acpi_subsys_suspend_late - Suspend device using ACPI.
@@ -968,6 +998,7 @@ int acpi_subsys_freeze(struct device *dev)
         pm_runtime_resume(dev);
         return pm_generic_freeze(dev);
 }
+EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
 
 #endif /* CONFIG_PM_SLEEP */
 
@@ -979,6 +1010,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
 #endif
 #ifdef CONFIG_PM_SLEEP
                 .prepare = acpi_subsys_prepare,
+                .complete = acpi_subsys_complete,
                 .suspend = acpi_subsys_suspend,
                 .suspend_late = acpi_subsys_suspend_late,
                 .resume_early = acpi_subsys_resume_early,
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 957391306cbf..7de5b603f272 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -30,12 +30,10 @@ void acpi_pci_root_init(void);
 void acpi_pci_link_init(void);
 void acpi_processor_init(void);
 void acpi_platform_init(void);
+void acpi_pnp_init(void);
 int acpi_sysfs_init(void);
-#ifdef CONFIG_ACPI_CONTAINER
 void acpi_container_init(void);
-#else
-static inline void acpi_container_init(void) {}
-#endif
+void acpi_memory_hotplug_init(void);
 #ifdef CONFIG_ACPI_DOCK
 void register_dock_dependent_device(struct acpi_device *adev,
                                     acpi_handle dshandle);
@@ -47,11 +45,6 @@ static inline void register_dock_dependent_device(struct acpi_device *adev,
 static inline int dock_notify(struct acpi_device *adev, u32 event) { return -ENODEV; }
 static inline void acpi_dock_add(struct acpi_device *adev) {}
 #endif
-#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
-void acpi_memory_hotplug_init(void);
-#else
-static inline void acpi_memory_hotplug_init(void) {}
-#endif
 #ifdef CONFIG_X86
 void acpi_cmos_rtc_init(void);
 #else
@@ -72,11 +65,7 @@ int acpi_debugfs_init(void);
 #else
 static inline void acpi_debugfs_init(void) { return; }
 #endif
-#ifdef CONFIG_X86_INTEL_LPSS
 void acpi_lpss_init(void);
-#else
-static inline void acpi_lpss_init(void) {}
-#endif
 
 acpi_status acpi_hotplug_schedule(struct acpi_device *adev, u32 src);
 bool acpi_queue_hotplug_work(struct work_struct *work);
@@ -180,8 +169,7 @@ static inline void suspend_nvs_restore(void) {}
   -------------------------------------------------------------------------- */
 struct platform_device;
 
-int acpi_create_platform_device(struct acpi_device *adev,
-                                const struct acpi_device_id *id);
+struct platform_device *acpi_create_platform_device(struct acpi_device *adev);
 
 /*--------------------------------------------------------------------------
                                         Video
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
index de4fe03873c5..85287b8fe3aa 100644
--- a/drivers/acpi/nvs.c
+++ b/drivers/acpi/nvs.c
@@ -139,8 +139,8 @@ void suspend_nvs_free(void)
                                         iounmap(entry->kaddr);
                                         entry->unmap = false;
                                 } else {
-                                        acpi_os_unmap_memory(entry->kaddr,
-                                                             entry->size);
+                                        acpi_os_unmap_iomem(entry->kaddr,
+                                                            entry->size);
                                 }
                                 entry->kaddr = NULL;
                         }
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6776c599816f..147bc1b91b42 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -355,7 +355,7 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)
 }
 
 void __iomem *__init_refok
-acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
+acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)
 {
         struct acpi_ioremap *map;
         void __iomem *virt;
@@ -401,10 +401,17 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 
         list_add_tail_rcu(&map->list, &acpi_ioremaps);
 
- out:
+out:
         mutex_unlock(&acpi_ioremap_lock);
         return map->virt + (phys - map->phys);
 }
+EXPORT_SYMBOL_GPL(acpi_os_map_iomem);
+
+void *__init_refok
+acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
+{
+        return (void *)acpi_os_map_iomem(phys, size);
+}
 EXPORT_SYMBOL_GPL(acpi_os_map_memory);
 
 static void acpi_os_drop_map_ref(struct acpi_ioremap *map)
@@ -422,7 +429,7 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map)
         }
 }
 
-void __ref acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
+void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size)
 {
         struct acpi_ioremap *map;
 
@@ -443,6 +450,12 @@ void __ref acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
 
         acpi_os_map_cleanup(map);
 }
+EXPORT_SYMBOL_GPL(acpi_os_unmap_iomem);
+
+void __ref acpi_os_unmap_memory(void *virt, acpi_size size)
+{
+        return acpi_os_unmap_iomem((void __iomem *)virt, size);
+}
 EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
 
 void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
@@ -464,7 +477,7 @@ int acpi_os_map_generic_address(struct acpi_generic_address *gas)
         if (!addr || !gas->bit_width)
                 return -EINVAL;
 
-        virt = acpi_os_map_memory(addr, gas->bit_width / 8);
+        virt = acpi_os_map_iomem(addr, gas->bit_width / 8);
         if (!virt)
                 return -EIO;
 
@@ -1770,16 +1783,15 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
 }
 #endif
 
-static int __init acpi_no_auto_ssdt_setup(char *s)
+static int __init acpi_no_static_ssdt_setup(char *s)
 {
-        printk(KERN_NOTICE PREFIX "SSDT auto-load disabled\n");
+        acpi_gbl_disable_ssdt_table_install = TRUE;
+        pr_info("ACPI: static SSDT installation disabled\n");
 
-        acpi_gbl_disable_ssdt_table_load = TRUE;
-
-        return 1;
+        return 0;
 }
 
-__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
+early_param("acpi_no_static_ssdt", acpi_no_static_ssdt_setup);
 
 static int __init acpi_disable_return_repair(char *s)
 {
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 7f70f3182d50..4fcbd670415c 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -121,6 +121,13 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
         struct acpi_processor *pr = per_cpu(processors, cpu);
         struct acpi_device *device;
 
+        /*
+         * CPU_STARTING and CPU_DYING must not sleep. Return here since
+         * acpi_bus_get_device() may sleep.
+         */
+        if (action == CPU_STARTING || action == CPU_DYING)
+                return NOTIFY_DONE;
+
         if (!pr || acpi_bus_get_device(pr->handle, &device))
                 return NOTIFY_DONE;
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7efe546a8c42..f775fa0d850f 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(acpi_initialize_hp_context);
 
 int acpi_scan_add_handler(struct acpi_scan_handler *handler)
 {
-        if (!handler || !handler->attach)
+        if (!handler)
                 return -EINVAL;
 
         list_add_tail(&handler->list_node, &acpi_scan_handlers_list);
@@ -1551,9 +1551,13 @@ static void acpi_bus_get_power_flags(struct acpi_device *device)
          */
         if (acpi_has_method(device->handle, "_PSC"))
                 device->power.flags.explicit_get = 1;
+
         if (acpi_has_method(device->handle, "_IRC"))
                 device->power.flags.inrush_current = 1;
 
+        if (acpi_has_method(device->handle, "_DSW"))
+                device->power.flags.dsw_present = 1;
+
         /*
          * Enumerate supported power management states
          */
@@ -1793,8 +1797,10 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
                         return;
                 }
 
-                if (info->valid & ACPI_VALID_HID)
+                if (info->valid & ACPI_VALID_HID) {
                         acpi_add_id(pnp, info->hardware_id.string);
+                        pnp->type.platform_id = 1;
+                }
                 if (info->valid & ACPI_VALID_CID) {
                         cid_list = &info->compatible_id_list;
                         for (i = 0; i < cid_list->count; i++)
@@ -1973,6 +1979,9 @@ static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
 {
         const struct acpi_device_id *devid;
 
+        if (handler->match)
+                return handler->match(idstr, matchid);
+
         for (devid = handler->ids; devid->id[0]; devid++)
                 if (!strcmp((char *)devid->id, idstr)) {
                         if (matchid)
@@ -2061,6 +2070,44 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
         return AE_OK;
 }
 
+static int acpi_check_spi_i2c_slave(struct acpi_resource *ares, void *data)
+{
+        bool *is_spi_i2c_slave_p = data;
+
+        if (ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS)
+                return 1;
+
+        /*
+         * devices that are connected to UART still need to be enumerated to
+         * platform bus
+         */
+        if (ares->data.common_serial_bus.type != ACPI_RESOURCE_SERIAL_TYPE_UART)
+                *is_spi_i2c_slave_p = true;
+
+         /* no need to do more checking */
+        return -1;
+}
+
+static void acpi_default_enumeration(struct acpi_device *device)
+{
+        struct list_head resource_list;
+        bool is_spi_i2c_slave = false;
+
+        if (!device->pnp.type.platform_id || device->handler)
+                return;
+
+        /*
+         * Do not enemerate SPI/I2C slaves as they will be enuerated by their
+         * respective parents.
+         */
+        INIT_LIST_HEAD(&resource_list);
+        acpi_dev_get_resources(device, &resource_list, acpi_check_spi_i2c_slave,
+                               &is_spi_i2c_slave);
+        acpi_dev_free_resource_list(&resource_list);
+        if (!is_spi_i2c_slave)
+                acpi_create_platform_device(device);
+}
+
 static int acpi_scan_attach_handler(struct acpi_device *device)
 {
         struct acpi_hardware_id *hwid;
@@ -2072,6 +2119,10 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
 
                 handler = acpi_scan_match_handler(hwid->id, &devid);
                 if (handler) {
+                        if (!handler->attach) {
+                                device->pnp.type.platform_id = 0;
+                                continue;
+                        }
                         device->handler = handler;
                         ret = handler->attach(device, devid);
                         if (ret > 0)
@@ -2082,6 +2133,9 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
                                 break;
                 }
         }
+        if (!ret)
+                acpi_default_enumeration(device);
+
         return ret;
 }
 
@@ -2241,11 +2295,11 @@ int __init acpi_scan_init(void)
         acpi_pci_root_init();
         acpi_pci_link_init();
         acpi_processor_init();
-        acpi_platform_init();
         acpi_lpss_init();
         acpi_cmos_rtc_init();
         acpi_container_init();
         acpi_memory_hotplug_init();
+        acpi_pnp_init();
 
         mutex_lock(&acpi_scan_lock);
         /*
@@ -2259,12 +2313,16 @@ int __init acpi_scan_init(void)
         if (result)
                 goto out;
 
-        result = acpi_bus_scan_fixed();
-        if (result) {
-                acpi_detach_data(acpi_root->handle, acpi_scan_drop_device);
-                acpi_device_del(acpi_root);
-                put_device(&acpi_root->dev);
-                goto out;
+        /* Fixed feature devices do not exist on HW-reduced platform */
+        if (!acpi_gbl_reduced_hardware) {
+                result = acpi_bus_scan_fixed();
+                if (result) {
+                        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();
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index c40fb2e81bbc..c11e3795431b 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -89,6 +89,7 @@ u32 acpi_target_system_state(void)
 {
         return acpi_target_sleep_state;
 }
+EXPORT_SYMBOL_GPL(acpi_target_system_state);
 
 static bool pwr_btn_event_pending;
 
@@ -611,6 +612,22 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = {
         .recover = acpi_pm_finish,
 };
 
+static int acpi_freeze_begin(void)
+{
+        acpi_scan_lock_acquire();
+        return 0;
+}
+
+static void acpi_freeze_end(void)
+{
+        acpi_scan_lock_release();
+}
+
+static const struct platform_freeze_ops acpi_freeze_ops = {
+        .begin = acpi_freeze_begin,
+        .end = acpi_freeze_end,
+};
+
 static void acpi_sleep_suspend_setup(void)
 {
         int i;
@@ -621,7 +638,9 @@ static void acpi_sleep_suspend_setup(void)
 
         suspend_set_ops(old_suspend_ordering ?
                 &acpi_suspend_ops_old : &acpi_suspend_ops);
+        freeze_set_ops(&acpi_freeze_ops);
 }
+
 #else /* !CONFIG_SUSPEND */
 static inline void acpi_sleep_suspend_setup(void) {}
 #endif /* !CONFIG_SUSPEND */
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 21782290df41..05550ba44d32 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -44,6 +44,12 @@ static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;
 
 static int acpi_apic_instance __initdata;
 
+/*
+ * Disable table checksum verification for the early stage due to the size
+ * limitation of the current x86 early mapping implementation.
+ */
+static bool acpi_verify_table_checksum __initdata = false;
+
 void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
 {
         if (!header)
@@ -333,6 +339,14 @@ int __init acpi_table_init(void)
 {
         acpi_status status;
 
+        if (acpi_verify_table_checksum) {
+                pr_info("Early table checksum verification enabled\n");
+                acpi_gbl_verify_table_checksum = TRUE;
+        } else {
+                pr_info("Early table checksum verification disabled\n");
+                acpi_gbl_verify_table_checksum = FALSE;
+        }
+
         status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
         if (ACPI_FAILURE(status))
                 return -EINVAL;
@@ -354,3 +368,12 @@ static int __init acpi_parse_apic_instance(char *str)
 }
 
 early_param("acpi_apic_instance", acpi_parse_apic_instance);
+
+static int __init acpi_force_table_verification_setup(char *s)
+{
+        acpi_verify_table_checksum = true;
+
+        return 0;
+}
+
+early_param("acpi_force_table_verification", acpi_force_table_verification_setup);
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 25bbc55dca89..112817e963e0 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -925,13 +925,10 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
         if (result)
                 return result;
 
-        status = acpi_attach_data(tz->device->handle,
-                                  acpi_bus_private_data_handler,
-                                  tz->thermal_zone);
-        if (ACPI_FAILURE(status)) {
-                pr_err(PREFIX "Error attaching device data\n");
+        status =  acpi_bus_attach_private_data(tz->device->handle,
+                                               tz->thermal_zone);
+        if (ACPI_FAILURE(status))
                 return -ENODEV;
-        }
 
         tz->tz_enabled = 1;
 
@@ -946,7 +943,7 @@ static void acpi_thermal_unregister_thermal_zone(struct acpi_thermal *tz)
         sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
         thermal_zone_device_unregister(tz->thermal_zone);
         tz->thermal_zone = NULL;
-        acpi_detach_data(tz->device->handle, acpi_bus_private_data_handler);
+        acpi_bus_detach_private_data(tz->device->handle);
 }
 
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index bba526148583..07c8c5a5ee95 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -30,6 +30,7 @@
 #include <linux/types.h>
 #include <linux/hardirq.h>
 #include <linux/acpi.h>
+#include <linux/dynamic_debug.h>
 
 #include "internal.h"
 
@@ -457,6 +458,24 @@ acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,
 EXPORT_SYMBOL(acpi_evaluate_ost);
 
 /**
+ * acpi_handle_path: Return the object path of handle
+ *
+ * Caller must free the returned buffer
+ */
+static char *acpi_handle_path(acpi_handle handle)
+{
+        struct acpi_buffer buffer = {
+                .length = ACPI_ALLOCATE_BUFFER,
+                .pointer = NULL
+        };
+
+        if (in_interrupt() ||
+            acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK)
+                return NULL;
+        return buffer.pointer;
+}
+
+/**
  * acpi_handle_printk: Print message with ACPI prefix and object path
  *
  * This function is called through acpi_handle_<level> macros and prints
@@ -469,29 +488,50 @@ acpi_handle_printk(const char *level, acpi_handle handle, const char *fmt, ...)
 {
         struct va_format vaf;
         va_list args;
-        struct acpi_buffer buffer = {
-                .length = ACPI_ALLOCATE_BUFFER,
-                .pointer = NULL
-        };
         const char *path;
 
         va_start(args, fmt);
         vaf.fmt = fmt;
         vaf.va = &args;
 
-        if (in_interrupt() ||
-            acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK)
-                path = "<n/a>";
-        else
-                path = buffer.pointer;
-
-        printk("%sACPI: %s: %pV", level, path, &vaf);
+        path = acpi_handle_path(handle);
+        printk("%sACPI: %s: %pV", level, path ? path : "<n/a>" , &vaf);
 
         va_end(args);
-        kfree(buffer.pointer);
+        kfree(path);
 }
 EXPORT_SYMBOL(acpi_handle_printk);
 
+#if defined(CONFIG_DYNAMIC_DEBUG)
+/**
+ * __acpi_handle_debug: pr_debug with ACPI prefix and object path
+ *
+ * This function is called through acpi_handle_debug macro and debug
+ * prints a message with ACPI prefix and object path. This function
+ * acquires the global namespace mutex to obtain an object path.  In
+ * interrupt context, it shows the object path as <n/a>.
+ */
+void
+__acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle,
+                    const char *fmt, ...)
+{
+        struct va_format vaf;
+        va_list args;
+        const char *path;
+
+        va_start(args, fmt);
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        path = acpi_handle_path(handle);
+        __dynamic_pr_debug(descriptor, "ACPI: %s: %pV", path ? path : "<n/a>", &vaf);
+
+        va_end(args);
+        kfree(path);
+}
+EXPORT_SYMBOL(__acpi_handle_debug);
+#endif
+
 /**
  * acpi_has_method: Check whether @handle has a method named @name
  * @handle: ACPI device handle
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f8bc5a755dda..101fb090dcb9 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
 MODULE_DESCRIPTION("ACPI Video Driver");
 MODULE_LICENSE("GPL");
 
-static bool brightness_switch_enabled = 1;
+static bool brightness_switch_enabled;
 module_param(brightness_switch_enabled, bool, 0644);
 
 /*
@@ -150,6 +150,8 @@ struct acpi_video_enumerated_device {
 
 struct acpi_video_bus {
         struct acpi_device *device;
+        bool backlight_registered;
+        bool backlight_notifier_registered;
         u8 dos_setting;
         struct acpi_video_enumerated_device *attached_array;
         u8 attached_count;
@@ -161,6 +163,7 @@ struct acpi_video_bus {
         struct input_dev *input;
         char phys[32];  /* for input device */
         struct notifier_block pm_nb;
+        struct notifier_block backlight_nb;
 };
 
 struct acpi_video_device_flags {
@@ -473,6 +476,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
         },
         {
          .callback = video_set_use_native_backlight,
+         .ident = "ThinkPad W530",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
         .ident = "ThinkPad X1 Carbon",
         .matches = {
                 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -488,6 +499,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 },
         },
         {
+         .callback = video_set_use_native_backlight,
+         .ident = "Lenovo Yoga 2 11",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2 11"),
+                },
+        },
+        {
         .callback = video_set_use_native_backlight,
         .ident = "Thinkpad Helix",
         .matches = {
@@ -521,6 +540,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
         },
         {
          .callback = video_set_use_native_backlight,
+         .ident = "Acer Aspire V5-171",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "V5-171"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
          .ident = "Acer Aspire V5-431",
          .matches = {
                 DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -528,6 +555,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 },
         },
         {
+         .callback = video_set_use_native_backlight,
+         .ident = "Acer Aspire V5-471G",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-471G"),
+                },
+        },
+        {
         .callback = video_set_use_native_backlight,
         .ident = "HP ProBook 4340s",
         .matches = {
@@ -579,6 +614,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
         },
         {
         .callback = video_set_use_native_backlight,
+        .ident = "HP EliteBook 8470p",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8470p"),
+                },
+        },
+        {
+        .callback = video_set_use_native_backlight,
         .ident = "HP EliteBook 8780w",
         .matches = {
                 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
@@ -1658,88 +1701,92 @@ acpi_video_bus_match(acpi_handle handle, u32 level, void *context,
 
 static void acpi_video_dev_register_backlight(struct acpi_video_device *device)
 {
-        if (acpi_video_verify_backlight_support()) {
-                struct backlight_properties props;
-                struct pci_dev *pdev;
-                acpi_handle acpi_parent;
-                struct device *parent = NULL;
-                int result;
-                static int count;
-                char *name;
-
-                result = acpi_video_init_brightness(device);
-                if (result)
-                        return;
-                name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
-                if (!name)
-                        return;
-                count++;
+        struct backlight_properties props;
+        struct pci_dev *pdev;
+        acpi_handle acpi_parent;
+        struct device *parent = NULL;
+        int result;
+        static int count;
+        char *name;
 
-                acpi_get_parent(device->dev->handle, &acpi_parent);
+        result = acpi_video_init_brightness(device);
+        if (result)
+                return;
+        name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
+        if (!name)
+                return;
+        count++;
 
-                pdev = acpi_get_pci_dev(acpi_parent);
-                if (pdev) {
-                        parent = &pdev->dev;
-                        pci_dev_put(pdev);
-                }
+        acpi_get_parent(device->dev->handle, &acpi_parent);
 
-                memset(&props, 0, sizeof(struct backlight_properties));
-                props.type = BACKLIGHT_FIRMWARE;
-                props.max_brightness = device->brightness->count - 3;
-                device->backlight = backlight_device_register(name,
-                                                              parent,
-                                                              device,
-                                                              &acpi_backlight_ops,
-                                                              &props);
-                kfree(name);
-                if (IS_ERR(device->backlight))
-                        return;
+        pdev = acpi_get_pci_dev(acpi_parent);
+        if (pdev) {
+                parent = &pdev->dev;
+                pci_dev_put(pdev);
+        }
 
-                /*
-                 * Save current brightness level in case we have to restore it
-                 * before acpi_video_device_lcd_set_level() is called next time.
-                 */
-                device->backlight->props.brightness =
-                                acpi_video_get_brightness(device->backlight);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.type = BACKLIGHT_FIRMWARE;
+        props.max_brightness = device->brightness->count - 3;
+        device->backlight = backlight_device_register(name,
+                                                      parent,
+                                                      device,
+                                                      &acpi_backlight_ops,
+                                                      &props);
+        kfree(name);
+        if (IS_ERR(device->backlight))
+                return;
 
-                device->cooling_dev = thermal_cooling_device_register("LCD",
-                                        device->dev, &video_cooling_ops);
-                if (IS_ERR(device->cooling_dev)) {
-                        /*
-                         * Set cooling_dev to NULL so we don't crash trying to
-                         * free it.
-                         * Also, why the hell we are returning early and
-                         * not attempt to register video output if cooling
-                         * device registration failed?
-                         * -- dtor
-                         */
-                        device->cooling_dev = NULL;
-                        return;
-                }
+        /*
+         * Save current brightness level in case we have to restore it
+         * before acpi_video_device_lcd_set_level() is called next time.
+         */
+        device->backlight->props.brightness =
+                        acpi_video_get_brightness(device->backlight);
 
-                dev_info(&device->dev->dev, "registered as cooling_device%d\n",
-                         device->cooling_dev->id);
-                result = sysfs_create_link(&device->dev->dev.kobj,
-                                &device->cooling_dev->device.kobj,
-                                "thermal_cooling");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
-                result = sysfs_create_link(&device->cooling_dev->device.kobj,
-                                &device->dev->dev.kobj, "device");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
+        device->cooling_dev = thermal_cooling_device_register("LCD",
+                                device->dev, &video_cooling_ops);
+        if (IS_ERR(device->cooling_dev)) {
+                /*
+                 * Set cooling_dev to NULL so we don't crash trying to free it.
+                 * Also, why the hell we are returning early and not attempt to
+                 * register video output if cooling device registration failed?
+                 * -- dtor
+                 */
+                device->cooling_dev = NULL;
+                return;
         }
+
+        dev_info(&device->dev->dev, "registered as cooling_device%d\n",
+                 device->cooling_dev->id);
+        result = sysfs_create_link(&device->dev->dev.kobj,
+                        &device->cooling_dev->device.kobj,
+                        "thermal_cooling");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+        result = sysfs_create_link(&device->cooling_dev->device.kobj,
+                        &device->dev->dev.kobj, "device");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
 }
 
 static int acpi_video_bus_register_backlight(struct acpi_video_bus *video)
 {
         struct acpi_video_device *dev;
 
+        if (video->backlight_registered)
+                return 0;
+
+        if (!acpi_video_verify_backlight_support())
+                return 0;
+
         mutex_lock(&video->device_list_lock);
         list_for_each_entry(dev, &video->video_device_list, entry)
                 acpi_video_dev_register_backlight(dev);
         mutex_unlock(&video->device_list_lock);
 
+        video->backlight_registered = true;
+
         video->pm_nb.notifier_call = acpi_video_resume;
         video->pm_nb.priority = 0;
         return register_pm_notifier(&video->pm_nb);
@@ -1767,13 +1814,20 @@ static void acpi_video_dev_unregister_backlight(struct acpi_video_device *device
 static int acpi_video_bus_unregister_backlight(struct acpi_video_bus *video)
 {
         struct acpi_video_device *dev;
-        int error = unregister_pm_notifier(&video->pm_nb);
+        int error;
+
+        if (!video->backlight_registered)
+                return 0;
+
+        error = unregister_pm_notifier(&video->pm_nb);
 
         mutex_lock(&video->device_list_lock);
         list_for_each_entry(dev, &video->video_device_list, entry)
                 acpi_video_dev_unregister_backlight(dev);
         mutex_unlock(&video->device_list_lock);
 
+        video->backlight_registered = false;
+
         return error;
 }
 
@@ -1867,6 +1921,56 @@ static void acpi_video_bus_remove_notify_handler(struct acpi_video_bus *video)
         video->input = NULL;
 }
 
+static int acpi_video_backlight_notify(struct notifier_block *nb,
+                                        unsigned long val, void *bd)
+{
+        struct backlight_device *backlight = bd;
+        struct acpi_video_bus *video;
+
+        /* acpi_video_verify_backlight_support only cares about raw devices */
+        if (backlight->props.type != BACKLIGHT_RAW)
+                return NOTIFY_DONE;
+
+        video = container_of(nb, struct acpi_video_bus, backlight_nb);
+
+        switch (val) {
+        case BACKLIGHT_REGISTERED:
+                if (!acpi_video_verify_backlight_support())
+                        acpi_video_bus_unregister_backlight(video);
+                break;
+        case BACKLIGHT_UNREGISTERED:
+                acpi_video_bus_register_backlight(video);
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static int acpi_video_bus_add_backlight_notify_handler(
+                                                struct acpi_video_bus *video)
+{
+        int error;
+
+        video->backlight_nb.notifier_call = acpi_video_backlight_notify;
+        video->backlight_nb.priority = 0;
+        error = backlight_register_notifier(&video->backlight_nb);
+        if (error == 0)
+                video->backlight_notifier_registered = true;
+
+        return error;
+}
+
+static int acpi_video_bus_remove_backlight_notify_handler(
+                                                struct acpi_video_bus *video)
+{
+        if (!video->backlight_notifier_registered)
+                return 0;
+
+        video->backlight_notifier_registered = false;
+
+        return backlight_unregister_notifier(&video->backlight_nb);
+}
+
 static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 {
         struct acpi_video_device *dev, *next;
@@ -1948,6 +2052,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
 
         acpi_video_bus_register_backlight(video);
         acpi_video_bus_add_notify_handler(video);
+        acpi_video_bus_add_backlight_notify_handler(video);
 
         return 0;
 
@@ -1971,6 +2076,7 @@ static int acpi_video_bus_remove(struct acpi_device *device)
 
         video = acpi_driver_data(device);
 
+        acpi_video_bus_remove_backlight_notify_handler(video);
         acpi_video_bus_remove_notify_handler(video);
         acpi_video_bus_unregister_backlight(video);
         acpi_video_bus_put_devices(video);
@@ -2061,6 +2167,20 @@ void acpi_video_unregister(void)
 }
 EXPORT_SYMBOL(acpi_video_unregister);
 
+void acpi_video_unregister_backlight(void)
+{
+        struct acpi_video_bus *video;
+
+        if (!register_count)
+                return;
+
+        mutex_lock(&video_list_lock);
+        list_for_each_entry(video, &video_bus_head, entry)
+                acpi_video_bus_unregister_backlight(video);
+        mutex_unlock(&video_list_lock);
+}
+EXPORT_SYMBOL(acpi_video_unregister_backlight);
+
 /*
  * This is kind of nasty. Hardware using Intel chipsets may require
  * the video opregion code to be run first in order to initialise
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 86d5e4fb5b98..343ffad59377 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -479,7 +479,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn
         TRACE_DEVICE(dev);
         TRACE_RESUME(0);
 
-        if (dev->power.syscore)
+        if (dev->power.syscore || dev->power.direct_complete)
                 goto Out;
 
         if (!dev->power.is_noirq_suspended)
@@ -605,7 +605,7 @@ static int device_resume_early(struct device *dev, pm_message_t state, bool asyn
         TRACE_DEVICE(dev);
         TRACE_RESUME(0);
 
-        if (dev->power.syscore)
+        if (dev->power.syscore || dev->power.direct_complete)
                 goto Out;
 
         if (!dev->power.is_late_suspended)
@@ -735,6 +735,12 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
         if (dev->power.syscore)
                 goto Complete;
 
+        if (dev->power.direct_complete) {
+                /* Match the pm_runtime_disable() in __device_suspend(). */
+                pm_runtime_enable(dev);
+                goto Complete;
+        }
+
         dpm_wait(dev->parent, async);
         dpm_watchdog_set(&wd, dev);
         device_lock(dev);
@@ -1007,7 +1013,7 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
                 goto Complete;
         }
 
-        if (dev->power.syscore)
+        if (dev->power.syscore || dev->power.direct_complete)
                 goto Complete;
 
         dpm_wait_for_children(dev, async);
@@ -1146,7 +1152,7 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
                 goto Complete;
         }
 
-        if (dev->power.syscore)
+        if (dev->power.syscore || dev->power.direct_complete)
                 goto Complete;
 
         dpm_wait_for_children(dev, async);
@@ -1332,6 +1338,17 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         if (dev->power.syscore)
                 goto Complete;
 
+        if (dev->power.direct_complete) {
+                if (pm_runtime_status_suspended(dev)) {
+                        pm_runtime_disable(dev);
+                        if (pm_runtime_suspended_if_enabled(dev))
+                                goto Complete;
+
+                        pm_runtime_enable(dev);
+                }
+                dev->power.direct_complete = false;
+        }
+
         dpm_watchdog_set(&wd, dev);
         device_lock(dev);
 
@@ -1382,10 +1399,19 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 
  End:
         if (!error) {
+                struct device *parent = dev->parent;
+
                 dev->power.is_suspended = true;
-                if (dev->power.wakeup_path
-                    && dev->parent && !dev->parent->power.ignore_children)
-                        dev->parent->power.wakeup_path = true;
+                if (parent) {
+                        spin_lock_irq(&parent->power.lock);
+
+                        dev->parent->power.direct_complete = false;
+                        if (dev->power.wakeup_path
+                            && !dev->parent->power.ignore_children)
+                                dev->parent->power.wakeup_path = true;
+
+                        spin_unlock_irq(&parent->power.lock);
+                }
         }
 
         device_unlock(dev);
@@ -1487,7 +1513,7 @@ static int device_prepare(struct device *dev, pm_message_t state)
 {
         int (*callback)(struct device *) = NULL;
         char *info = NULL;
-        int error = 0;
+        int ret = 0;
 
         if (dev->power.syscore)
                 return 0;
@@ -1523,17 +1549,27 @@ static int device_prepare(struct device *dev, pm_message_t state)
                 callback = dev->driver->pm->prepare;
         }
 
-        if (callback) {
-                error = callback(dev);
-                suspend_report_result(callback, error);
-        }
+        if (callback)
+                ret = callback(dev);
 
         device_unlock(dev);
 
-        if (error)
+        if (ret < 0) {
+                suspend_report_result(callback, ret);
                 pm_runtime_put(dev);
-
-        return error;
+                return ret;
+        }
+        /*
+         * A positive return value from ->prepare() means "this device appears
+         * to be runtime-suspended and its state is fine, so if it really is
+         * runtime-suspended, you can leave it in that state provided that you
+         * will do the same thing with all of its descendants".  This only
+         * applies to suspend transitions, however.
+         */
+        spin_lock_irq(&dev->power.lock);
+        dev->power.direct_complete = ret > 0 && state.event == PM_EVENT_SUSPEND;
+        spin_unlock_irq(&dev->power.lock);
+        return 0;
 }
 
 /**
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 25538675d59e..89ced955fafa 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/slab.h>
-#include <linux/cpufreq.h>
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/rculist.h>
@@ -394,6 +393,13 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor);
  * to keep the integrity of the internal data structures. Callers should ensure
  * that this function is *NOT* called under RCU protection or in contexts where
  * mutex cannot be locked.
+ *
+ * Return:
+ * 0:           On success OR
+ *              Duplicate OPPs (both freq and volt are same) and opp->available
+ * -EEXIST:     Freq are same and volt are different OR
+ *              Duplicate OPPs (both freq and volt are same) and !opp->available
+ * -ENOMEM:     Memory allocation failure
  */
 int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
 {
@@ -443,15 +449,31 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
         new_opp->u_volt = u_volt;
         new_opp->available = true;
 
-        /* Insert new OPP in order of increasing frequency */
+        /*
+         * Insert new OPP in order of increasing frequency
+         * and discard if already present
+         */
         head = &dev_opp->opp_list;
         list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) {
-                if (new_opp->rate < opp->rate)
+                if (new_opp->rate <= opp->rate)
                         break;
                 else
                         head = &opp->node;
         }
 
+        /* Duplicate OPPs ? */
+        if (new_opp->rate == opp->rate) {
+                int ret = opp->available && new_opp->u_volt == opp->u_volt ?
+                        0 : -EEXIST;
+
+                dev_warn(dev, "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n",
+                         __func__, opp->rate, opp->u_volt, opp->available,
+                         new_opp->rate, new_opp->u_volt, new_opp->available);
+                mutex_unlock(&dev_opp_list_lock);
+                kfree(new_opp);
+                return ret;
+        }
+
         list_add_rcu(&new_opp->node, head);
         mutex_unlock(&dev_opp_list_lock);
 
@@ -596,96 +618,6 @@ int dev_pm_opp_disable(struct device *dev, unsigned long freq)
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_disable);
 
-#ifdef CONFIG_CPU_FREQ
-/**
- * dev_pm_opp_init_cpufreq_table() - create a cpufreq table for a device
- * @dev:        device for which we do this operation
- * @table:      Cpufreq table returned back to caller
- *
- * Generate a cpufreq table for a provided device- this assumes that the
- * opp list is already initialized and ready for usage.
- *
- * This function allocates required memory for the cpufreq table. It is
- * expected that the caller does the required maintenance such as freeing
- * the table as required.
- *
- * Returns -EINVAL for bad pointers, -ENODEV if the device is not found, -ENOMEM
- * if no memory available for the operation (table is not populated), returns 0
- * if successful and table is populated.
- *
- * WARNING: It is  important for the callers to ensure refreshing their copy of
- * the table if any of the mentioned functions have been invoked in the interim.
- *
- * Locking: The internal device_opp and opp structures are RCU protected.
- * To simplify the logic, we pretend we are updater and hold relevant mutex here
- * Callers should ensure that this function is *NOT* called under RCU protection
- * or in contexts where mutex locking cannot be used.
- */
-int dev_pm_opp_init_cpufreq_table(struct device *dev,
-                            struct cpufreq_frequency_table **table)
-{
-        struct device_opp *dev_opp;
-        struct dev_pm_opp *opp;
-        struct cpufreq_frequency_table *freq_table;
-        int i = 0;
-
-        /* Pretend as if I am an updater */
-        mutex_lock(&dev_opp_list_lock);
-
-        dev_opp = find_device_opp(dev);
-        if (IS_ERR(dev_opp)) {
-                int r = PTR_ERR(dev_opp);
-                mutex_unlock(&dev_opp_list_lock);
-                dev_err(dev, "%s: Device OPP not found (%d)\n", __func__, r);
-                return r;
-        }
-
-        freq_table = kzalloc(sizeof(struct cpufreq_frequency_table) *
-                             (dev_pm_opp_get_opp_count(dev) + 1), GFP_KERNEL);
-        if (!freq_table) {
-                mutex_unlock(&dev_opp_list_lock);
-                dev_warn(dev, "%s: Unable to allocate frequency table\n",
-                        __func__);
-                return -ENOMEM;
-        }
-
-        list_for_each_entry(opp, &dev_opp->opp_list, node) {
-                if (opp->available) {
-                        freq_table[i].driver_data = i;
-                        freq_table[i].frequency = opp->rate / 1000;
-                        i++;
-                }
-        }
-        mutex_unlock(&dev_opp_list_lock);
-
-        freq_table[i].driver_data = i;
-        freq_table[i].frequency = CPUFREQ_TABLE_END;
-
-        *table = &freq_table[0];
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(dev_pm_opp_init_cpufreq_table);
-
-/**
- * dev_pm_opp_free_cpufreq_table() - free the cpufreq table
- * @dev:        device for which we do this operation
- * @table:      table to free
- *
- * Free up the table allocated by dev_pm_opp_init_cpufreq_table
- */
-void dev_pm_opp_free_cpufreq_table(struct device *dev,
-                                struct cpufreq_frequency_table **table)
-{
-        if (!table)
-                return;
-
-        kfree(*table);
-        *table = NULL;
-}
-EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table);
-#endif          /* CONFIG_CPU_FREQ */
-
 /**
  * dev_pm_opp_get_notifier() - find notifier_head of the device with opp
  * @dev:        device pointer used to lookup device OPPs.
@@ -734,11 +666,9 @@ int of_init_opp_table(struct device *dev)
                 unsigned long freq = be32_to_cpup(val++) * 1000;
                 unsigned long volt = be32_to_cpup(val++);
 
-                if (dev_pm_opp_add(dev, freq, volt)) {
+                if (dev_pm_opp_add(dev, freq, volt))
                         dev_warn(dev, "%s: Failed to add OPP %ld\n",
                                  __func__, freq);
-                        continue;
-                }
                 nr -= 2;
         }
 
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 2d56f4113ae7..eb1bd2ecad8b 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -318,10 +318,16 @@ int device_init_wakeup(struct device *dev, bool enable)
 {
         int ret = 0;
 
+        if (!dev)
+                return -EINVAL;
+
         if (enable) {
                 device_set_wakeup_capable(dev, true);
                 ret = device_wakeup_enable(dev);
         } else {
+                if (dev->power.can_wakeup)
+                        device_wakeup_disable(dev);
+
                 device_set_wakeup_capable(dev, false);
         }
 
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index b9a57fa4b710..565a9478cb94 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -95,7 +95,7 @@ int read_log(struct tpm_bios_log *log)
 
         log->bios_event_log_end = log->bios_event_log + len;
 
-        virt = acpi_os_map_memory(start, len);
+        virt = acpi_os_map_iomem(start, len);
         if (!virt) {
                 kfree(log->bios_event_log);
                 printk("%s: ERROR - Unable to map memory\n", __func__);
@@ -104,6 +104,6 @@ int read_log(struct tpm_bios_log *log)
 
         memcpy_fromio(log->bios_event_log, virt, len);
 
-        acpi_os_unmap_memory(virt, len);
+        acpi_os_unmap_iomem(virt, len);
         return 0;
 }
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 17d7f13d19a5..50b2a7ebd747 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_COMMON_CLK)	+= clk-fixed-rate.o
 obj-$(CONFIG_COMMON_CLK)        += clk-gate.o
 obj-$(CONFIG_COMMON_CLK)        += clk-mux.o
 obj-$(CONFIG_COMMON_CLK)        += clk-composite.o
+obj-$(CONFIG_COMMON_CLK)        += clk-fractional-divider.o
 
 # hardware specific clock types
 # please keep this section sorted lexicographically by file/directory path name
diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c
new file mode 100644
index 000000000000..ede685ca0d20
--- /dev/null
+++ b/drivers/clk/clk-fractional-divider.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2014 Intel Corporation
+ *
+ * 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.
+ *
+ * Adjustable fractional divider clock implementation.
+ * Output rate = (m / n) * parent_rate.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/gcd.h>
+
+#define to_clk_fd(_hw) container_of(_hw, struct clk_fractional_divider, hw)
+
+static unsigned long clk_fd_recalc_rate(struct clk_hw *hw,
+                                        unsigned long parent_rate)
+{
+        struct clk_fractional_divider *fd = to_clk_fd(hw);
+        unsigned long flags = 0;
+        u32 val, m, n;
+        u64 ret;
+
+        if (fd->lock)
+                spin_lock_irqsave(fd->lock, flags);
+
+        val = clk_readl(fd->reg);
+
+        if (fd->lock)
+                spin_unlock_irqrestore(fd->lock, flags);
+
+        m = (val & fd->mmask) >> fd->mshift;
+        n = (val & fd->nmask) >> fd->nshift;
+
+        ret = parent_rate * m;
+        do_div(ret, n);
+
+        return ret;
+}
+
+static long clk_fd_round_rate(struct clk_hw *hw, unsigned long rate,
+                              unsigned long *prate)
+{
+        struct clk_fractional_divider *fd = to_clk_fd(hw);
+        unsigned maxn = (fd->nmask >> fd->nshift) + 1;
+        unsigned div;
+
+        if (!rate || rate >= *prate)
+                return *prate;
+
+        div = gcd(*prate, rate);
+
+        while ((*prate / div) > maxn) {
+                div <<= 1;
+                rate <<= 1;
+        }
+
+        return rate;
+}
+
+static int clk_fd_set_rate(struct clk_hw *hw, unsigned long rate,
+                           unsigned long parent_rate)
+{
+        struct clk_fractional_divider *fd = to_clk_fd(hw);
+        unsigned long flags = 0;
+        unsigned long div;
+        unsigned n, m;
+        u32 val;
+
+        div = gcd(parent_rate, rate);
+        m = rate / div;
+        n = parent_rate / div;
+
+        if (fd->lock)
+                spin_lock_irqsave(fd->lock, flags);
+
+        val = clk_readl(fd->reg);
+        val &= ~(fd->mmask | fd->nmask);
+        val |= (m << fd->mshift) | (n << fd->nshift);
+        clk_writel(val, fd->reg);
+
+        if (fd->lock)
+                spin_unlock_irqrestore(fd->lock, flags);
+
+        return 0;
+}
+
+const struct clk_ops clk_fractional_divider_ops = {
+        .recalc_rate = clk_fd_recalc_rate,
+        .round_rate = clk_fd_round_rate,
+        .set_rate = clk_fd_set_rate,
+};
+EXPORT_SYMBOL_GPL(clk_fractional_divider_ops);
+
+struct clk *clk_register_fractional_divider(struct device *dev,
+                const char *name, const char *parent_name, unsigned long flags,
+                void __iomem *reg, u8 mshift, u8 mwidth, u8 nshift, u8 nwidth,
+                u8 clk_divider_flags, spinlock_t *lock)
+{
+        struct clk_fractional_divider *fd;
+        struct clk_init_data init;
+        struct clk *clk;
+
+        fd = kzalloc(sizeof(*fd), GFP_KERNEL);
+        if (!fd) {
+                dev_err(dev, "could not allocate fractional divider clk\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        init.name = name;
+        init.ops = &clk_fractional_divider_ops;
+        init.flags = flags | CLK_IS_BASIC;
+        init.parent_names = parent_name ? &parent_name : NULL;
+        init.num_parents = parent_name ? 1 : 0;
+
+        fd->reg = reg;
+        fd->mshift = mshift;
+        fd->mmask = (BIT(mwidth) - 1) << mshift;
+        fd->nshift = nshift;
+        fd->nmask = (BIT(nwidth) - 1) << nshift;
+        fd->flags = clk_divider_flags;
+        fd->lock = lock;
+        fd->hw.init = &init;
+
+        clk = clk_register(dev, &fd->hw);
+        if (IS_ERR(clk))
+                kfree(fd);
+
+        return clk;
+}
+EXPORT_SYMBOL_GPL(clk_register_fractional_divider);
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index d2c7b4b8ffd5..36d20d0fce27 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -5,7 +5,8 @@
 # big LITTLE core layer and glue drivers
 config ARM_BIG_LITTLE_CPUFREQ
         tristate "Generic ARM big LITTLE CPUfreq driver"
-        depends on ARM && BIG_LITTLE && ARM_CPU_TOPOLOGY && HAVE_CLK
+        depends on (BIG_LITTLE && ARM_CPU_TOPOLOGY) || (ARM64 && SMP)
+        depends on HAVE_CLK
         select PM_OPP
         help
           This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.
@@ -85,7 +86,7 @@ config ARM_EXYNOS_CPU_FREQ_BOOST_SW
           It allows usage of special frequencies for Samsung Exynos
           processors if thermal conditions are appropriate.
 
-          It reguires, for safe operation, thermal framework with properly
+          It requires, for safe operation, thermal framework with properly
           defined trip points.
 
           If in doubt, say N.
@@ -186,7 +187,7 @@ config ARM_S3C2416_CPUFREQ
           S3C2450 SoC. The S3C2416 supports changing the rate of the
           armdiv clock source and also entering a so called dynamic
           voltage scaling mode in which it is possible to reduce the
-          core voltage of the cpu.
+          core voltage of the CPU.
 
           If in doubt, say N.
 
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index d369349eeaab..89ae88f91895 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -10,7 +10,7 @@ config X86_INTEL_PSTATE
           The driver implements an internal governor and will become
           the scaling driver and governor for Sandy bridge processors.
 
-          When this driver is enabled it will become the perferred
+          When this driver is enabled it will become the preferred
           scaling driver for Sandy bridge processors.
 
           If in doubt, say N.
@@ -52,7 +52,7 @@ config X86_ACPI_CPUFREQ_CPB
         help
           The powernow-k8 driver used to provide a sysfs knob called "cpb"
           to disable the Core Performance Boosting feature of AMD CPUs. This
-          file has now been superseeded by the more generic "boost" entry.
+          file has now been superseded by the more generic "boost" entry.
 
           By enabling this option the acpi_cpufreq driver provides the old
           entry in addition to the new boost ones, for compatibility reasons.
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 0dbb963c1aef..738c8b7b17dc 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -1,5 +1,7 @@
 # CPUfreq core
 obj-$(CONFIG_CPU_FREQ)                  += cpufreq.o freq_table.o
+obj-$(CONFIG_PM_OPP)                    += cpufreq_opp.o
+
 # CPUfreq stats
 obj-$(CONFIG_CPU_FREQ_STAT)             += cpufreq_stats.o
 
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 000e4e0afd7e..b0c18ed8d83f 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -213,7 +213,7 @@ static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
 
 static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 {
-        int i;
+        struct cpufreq_frequency_table *pos;
         struct acpi_processor_performance *perf;
 
         if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
@@ -223,10 +223,9 @@ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 
         perf = data->acpi_data;
 
-        for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                if (msr == perf->states[data->freq_table[i].driver_data].status)
-                        return data->freq_table[i].frequency;
-        }
+        cpufreq_for_each_entry(pos, data->freq_table)
+                if (msr == perf->states[pos->driver_data].status)
+                        return pos->frequency;
         return data->freq_table[0].frequency;
 }
 
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index bad2ed317ba2..1f4d4e315057 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -226,22 +226,22 @@ static inline u32 get_table_count(struct cpufreq_frequency_table *table)
 /* get the minimum frequency in the cpufreq_frequency_table */
 static inline u32 get_table_min(struct cpufreq_frequency_table *table)
 {
-        int i;
+        struct cpufreq_frequency_table *pos;
         uint32_t min_freq = ~0;
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++)
-                if (table[i].frequency < min_freq)
-                        min_freq = table[i].frequency;
+        cpufreq_for_each_entry(pos, table)
+                if (pos->frequency < min_freq)
+                        min_freq = pos->frequency;
         return min_freq;
 }
 
 /* get the maximum frequency in the cpufreq_frequency_table */
 static inline u32 get_table_max(struct cpufreq_frequency_table *table)
 {
-        int i;
+        struct cpufreq_frequency_table *pos;
         uint32_t max_freq = 0;
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++)
-                if (table[i].frequency > max_freq)
-                        max_freq = table[i].frequency;
+        cpufreq_for_each_entry(pos, table)
+                if (pos->frequency > max_freq)
+                        max_freq = pos->frequency;
         return max_freq;
 }
 
diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c
index bc447b9003c3..a2258090b58b 100644
--- a/drivers/cpufreq/cpufreq-nforce2.c
+++ b/drivers/cpufreq/cpufreq-nforce2.c
@@ -379,7 +379,7 @@ static struct cpufreq_driver nforce2_driver = {
 };
 
 #ifdef MODULE
-static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
+static const struct pci_device_id nforce2_ids[] = {
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2 },
         {}
 };
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index abda6609d3e7..ae11dd51f81d 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -354,6 +354,18 @@ static void cpufreq_notify_post_transition(struct cpufreq_policy *policy,
 void cpufreq_freq_transition_begin(struct cpufreq_policy *policy,
                 struct cpufreq_freqs *freqs)
 {
+
+        /*
+         * Catch double invocations of _begin() which lead to self-deadlock.
+         * ASYNC_NOTIFICATION drivers are left out because the cpufreq core
+         * doesn't invoke _begin() on their behalf, and hence the chances of
+         * double invocations are very low. Moreover, there are scenarios
+         * where these checks can emit false-positive warnings in these
+         * drivers; so we avoid that by skipping them altogether.
+         */
+        WARN_ON(!(cpufreq_driver->flags & CPUFREQ_ASYNC_NOTIFICATION)
+                                && current == policy->transition_task);
+
 wait:
         wait_event(policy->transition_wait, !policy->transition_ongoing);
 
@@ -365,6 +377,7 @@ wait:
         }
 
         policy->transition_ongoing = true;
+        policy->transition_task = current;
 
         spin_unlock(&policy->transition_lock);
 
@@ -381,6 +394,7 @@ void cpufreq_freq_transition_end(struct cpufreq_policy *policy,
         cpufreq_notify_post_transition(policy, freqs, transition_failed);
 
         policy->transition_ongoing = false;
+        policy->transition_task = NULL;
 
         wake_up(&policy->transition_wait);
 }
@@ -1802,12 +1816,43 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier);
  *                              GOVERNORS                            *
  *********************************************************************/
 
+static int __target_index(struct cpufreq_policy *policy,
+                          struct cpufreq_frequency_table *freq_table, int index)
+{
+        struct cpufreq_freqs freqs;
+        int retval = -EINVAL;
+        bool notify;
+
+        notify = !(cpufreq_driver->flags & CPUFREQ_ASYNC_NOTIFICATION);
+
+        if (notify) {
+                freqs.old = policy->cur;
+                freqs.new = freq_table[index].frequency;
+                freqs.flags = 0;
+
+                pr_debug("%s: cpu: %d, oldfreq: %u, new freq: %u\n",
+                         __func__, policy->cpu, freqs.old, freqs.new);
+
+                cpufreq_freq_transition_begin(policy, &freqs);
+        }
+
+        retval = cpufreq_driver->target_index(policy, index);
+        if (retval)
+                pr_err("%s: Failed to change cpu frequency: %d\n", __func__,
+                       retval);
+
+        if (notify)
+                cpufreq_freq_transition_end(policy, &freqs, retval);
+
+        return retval;
+}
+
 int __cpufreq_driver_target(struct cpufreq_policy *policy,
                             unsigned int target_freq,
                             unsigned int relation)
 {
-        int retval = -EINVAL;
         unsigned int old_target_freq = target_freq;
+        int retval = -EINVAL;
 
         if (cpufreq_disabled())
                 return -ENODEV;
@@ -1834,8 +1879,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
                 retval = cpufreq_driver->target(policy, target_freq, relation);
         else if (cpufreq_driver->target_index) {
                 struct cpufreq_frequency_table *freq_table;
-                struct cpufreq_freqs freqs;
-                bool notify;
                 int index;
 
                 freq_table = cpufreq_frequency_get_table(policy->cpu);
@@ -1856,26 +1899,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
                         goto out;
                 }
 
-                notify = !(cpufreq_driver->flags & CPUFREQ_ASYNC_NOTIFICATION);
-
-                if (notify) {
-                        freqs.old = policy->cur;
-                        freqs.new = freq_table[index].frequency;
-                        freqs.flags = 0;
-
-                        pr_debug("%s: cpu: %d, oldfreq: %u, new freq: %u\n",
-                                 __func__, policy->cpu, freqs.old, freqs.new);
-
-                        cpufreq_freq_transition_begin(policy, &freqs);
-                }
-
-                retval = cpufreq_driver->target_index(policy, index);
-                if (retval)
-                        pr_err("%s: Failed to change cpu frequency: %d\n",
-                               __func__, retval);
-
-                if (notify)
-                        cpufreq_freq_transition_end(policy, &freqs, retval);
+                retval = __target_index(policy, freq_table, index);
         }
 
 out:
diff --git a/drivers/cpufreq/cpufreq_opp.c b/drivers/cpufreq/cpufreq_opp.c
new file mode 100644
index 000000000000..c0c6f4a4eccf
--- /dev/null
+++ b/drivers/cpufreq/cpufreq_opp.c
@@ -0,0 +1,110 @@
+/*
+ * Generic OPP helper interface for CPUFreq drivers
+ *
+ * Copyright (C) 2009-2014 Texas Instruments Incorporated.
+ *      Nishanth Menon
+ *      Romit Dasgupta
+ *      Kevin Hilman
+ *
+ * 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/cpufreq.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/export.h>
+#include <linux/kernel.h>
+#include <linux/pm_opp.h>
+#include <linux/rcupdate.h>
+#include <linux/slab.h>
+
+/**
+ * dev_pm_opp_init_cpufreq_table() - create a cpufreq table for a device
+ * @dev:        device for which we do this operation
+ * @table:      Cpufreq table returned back to caller
+ *
+ * Generate a cpufreq table for a provided device- this assumes that the
+ * opp list is already initialized and ready for usage.
+ *
+ * This function allocates required memory for the cpufreq table. It is
+ * expected that the caller does the required maintenance such as freeing
+ * the table as required.
+ *
+ * Returns -EINVAL for bad pointers, -ENODEV if the device is not found, -ENOMEM
+ * if no memory available for the operation (table is not populated), returns 0
+ * if successful and table is populated.
+ *
+ * WARNING: It is  important for the callers to ensure refreshing their copy of
+ * the table if any of the mentioned functions have been invoked in the interim.
+ *
+ * Locking: The internal device_opp and opp structures are RCU protected.
+ * Since we just use the regular accessor functions to access the internal data
+ * structures, we use RCU read lock inside this function. As a result, users of
+ * this function DONOT need to use explicit locks for invoking.
+ */
+int dev_pm_opp_init_cpufreq_table(struct device *dev,
+                                  struct cpufreq_frequency_table **table)
+{
+        struct dev_pm_opp *opp;
+        struct cpufreq_frequency_table *freq_table = NULL;
+        int i, max_opps, ret = 0;
+        unsigned long rate;
+
+        rcu_read_lock();
+
+        max_opps = dev_pm_opp_get_opp_count(dev);
+        if (max_opps <= 0) {
+                ret = max_opps ? max_opps : -ENODATA;
+                goto out;
+        }
+
+        freq_table = kzalloc(sizeof(*freq_table) * (max_opps + 1), GFP_KERNEL);
+        if (!freq_table) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        for (i = 0, rate = 0; i < max_opps; i++, rate++) {
+                /* find next rate */
+                opp = dev_pm_opp_find_freq_ceil(dev, &rate);
+                if (IS_ERR(opp)) {
+                        ret = PTR_ERR(opp);
+                        goto out;
+                }
+                freq_table[i].driver_data = i;
+                freq_table[i].frequency = rate / 1000;
+        }
+
+        freq_table[i].driver_data = i;
+        freq_table[i].frequency = CPUFREQ_TABLE_END;
+
+        *table = &freq_table[0];
+
+out:
+        rcu_read_unlock();
+        if (ret)
+                kfree(freq_table);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(dev_pm_opp_init_cpufreq_table);
+
+/**
+ * dev_pm_opp_free_cpufreq_table() - free the cpufreq table
+ * @dev:        device for which we do this operation
+ * @table:      table to free
+ *
+ * Free up the table allocated by dev_pm_opp_init_cpufreq_table
+ */
+void dev_pm_opp_free_cpufreq_table(struct device *dev,
+                                   struct cpufreq_frequency_table **table)
+{
+        if (!table)
+                return;
+
+        kfree(*table);
+        *table = NULL;
+}
+EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table);
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index ecaaebf969fc..0cd9b4dcef99 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -182,11 +182,11 @@ static void cpufreq_stats_free_table(unsigned int cpu)
 
 static int __cpufreq_stats_create_table(struct cpufreq_policy *policy)
 {
-        unsigned int i, j, count = 0, ret = 0;
+        unsigned int i, count = 0, ret = 0;
         struct cpufreq_stats *stat;
         unsigned int alloc_size;
         unsigned int cpu = policy->cpu;
-        struct cpufreq_frequency_table *table;
+        struct cpufreq_frequency_table *pos, *table;
 
         table = cpufreq_frequency_get_table(cpu);
         if (unlikely(!table))
@@ -205,12 +205,8 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy)
         stat->cpu = cpu;
         per_cpu(cpufreq_stats_table, cpu) = stat;
 
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                unsigned int freq = table[i].frequency;
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, table)
                 count++;
-        }
 
         alloc_size = count * sizeof(int) + count * sizeof(u64);
 
@@ -228,15 +224,11 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy)
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
         stat->trans_table = stat->freq_table + count;
 #endif
-        j = 0;
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                unsigned int freq = table[i].frequency;
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
-                if (freq_table_get_index(stat, freq) == -1)
-                        stat->freq_table[j++] = freq;
-        }
-        stat->state_num = j;
+        i = 0;
+        cpufreq_for_each_valid_entry(pos, table)
+                if (freq_table_get_index(stat, pos->frequency) == -1)
+                        stat->freq_table[i++] = pos->frequency;
+        stat->state_num = i;
         spin_lock(&cpufreq_stats_lock);
         stat->last_time = get_jiffies_64();
         stat->last_index = freq_table_get_index(stat, policy->cur);
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 412a78bb0c94..4bebc1b5db48 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -45,7 +45,7 @@ static struct cpufreq_driver dbx500_cpufreq_driver = {
 
 static int dbx500_cpufreq_probe(struct platform_device *pdev)
 {
-        int i = 0;
+        struct cpufreq_frequency_table *pos;
 
         freq_table = dev_get_platdata(&pdev->dev);
         if (!freq_table) {
@@ -60,10 +60,8 @@ static int dbx500_cpufreq_probe(struct platform_device *pdev)
         }
 
         pr_info("dbx500-cpufreq: Available frequencies:\n");
-        while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
-                pr_info("  %d Mhz\n", freq_table[i].frequency/1000);
-                i++;
-        }
+        cpufreq_for_each_entry(pos, freq_table)
+                pr_info("  %d Mhz\n", pos->frequency / 1000);
 
         return cpufreq_register_driver(&dbx500_cpufreq_driver);
 }
diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c
index 7f5d2a68c353..1c06e786c9ba 100644
--- a/drivers/cpufreq/elanfreq.c
+++ b/drivers/cpufreq/elanfreq.c
@@ -147,7 +147,7 @@ static int elanfreq_target(struct cpufreq_policy *policy,
 static int elanfreq_cpu_init(struct cpufreq_policy *policy)
 {
         struct cpuinfo_x86 *c = &cpu_data(0);
-        unsigned int i;
+        struct cpufreq_frequency_table *pos;
 
         /* capability check */
         if ((c->x86_vendor != X86_VENDOR_AMD) ||
@@ -159,10 +159,9 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
                 max_freq = elanfreq_get_cpu_frequency(0);
 
         /* table init */
-        for (i = 0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                if (elanfreq_table[i].frequency > max_freq)
-                        elanfreq_table[i].frequency = CPUFREQ_ENTRY_INVALID;
-        }
+        cpufreq_for_each_entry(pos, elanfreq_table)
+                if (pos->frequency > max_freq)
+                        pos->frequency = CPUFREQ_ENTRY_INVALID;
 
         /* cpuinfo and default policy values */
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 348c8bafe436..1e0ec57bf6e3 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -28,17 +28,16 @@ static unsigned int locking_frequency;
 static int exynos_cpufreq_get_index(unsigned int freq)
 {
         struct cpufreq_frequency_table *freq_table = exynos_info->freq_table;
-        int index;
+        struct cpufreq_frequency_table *pos;
 
-        for (index = 0;
-                freq_table[index].frequency != CPUFREQ_TABLE_END; index++)
-                if (freq_table[index].frequency == freq)
+        cpufreq_for_each_entry(pos, freq_table)
+                if (pos->frequency == freq)
                         break;
 
-        if (freq_table[index].frequency == CPUFREQ_TABLE_END)
+        if (pos->frequency == CPUFREQ_TABLE_END)
                 return -EINVAL;
 
-        return index;
+        return pos - freq_table;
 }
 
 static int exynos_cpufreq_scale(unsigned int target_freq)
@@ -48,6 +47,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
         struct cpufreq_policy *policy = cpufreq_cpu_get(0);
         unsigned int arm_volt, safe_arm_volt = 0;
         unsigned int mpll_freq_khz = exynos_info->mpll_freq_khz;
+        struct device *dev = exynos_info->dev;
         unsigned int old_freq;
         int index, old_index;
         int ret = 0;
@@ -89,8 +89,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 /* Firstly, voltage up to increase frequency */
                 ret = regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
                 if (ret) {
-                        pr_err("%s: failed to set cpu voltage to %d\n",
-                                __func__, arm_volt);
+                        dev_err(dev, "failed to set cpu voltage to %d\n",
+                                arm_volt);
                         return ret;
                 }
         }
@@ -99,8 +99,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 ret = regulator_set_voltage(arm_regulator, safe_arm_volt,
                                       safe_arm_volt);
                 if (ret) {
-                        pr_err("%s: failed to set cpu voltage to %d\n",
-                                __func__, safe_arm_volt);
+                        dev_err(dev, "failed to set cpu voltage to %d\n",
+                                safe_arm_volt);
                         return ret;
                 }
         }
@@ -114,8 +114,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 ret = regulator_set_voltage(arm_regulator, arm_volt,
                                 arm_volt);
                 if (ret) {
-                        pr_err("%s: failed to set cpu voltage to %d\n",
-                                __func__, arm_volt);
+                        dev_err(dev, "failed to set cpu voltage to %d\n",
+                                arm_volt);
                         goto out;
                 }
         }
@@ -162,6 +162,8 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
         if (!exynos_info)
                 return -ENOMEM;
 
+        exynos_info->dev = &pdev->dev;
+
         if (of_machine_is_compatible("samsung,exynos4210")) {
                 exynos_info->type = EXYNOS_SOC_4210;
                 ret = exynos4210_cpufreq_init(exynos_info);
@@ -183,13 +185,13 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
                 goto err_vdd_arm;
 
         if (exynos_info->set_freq == NULL) {
-                pr_err("%s: No set_freq function (ERR)\n", __func__);
+                dev_err(&pdev->dev, "No set_freq function (ERR)\n");
                 goto err_vdd_arm;
         }
 
         arm_regulator = regulator_get(NULL, "vdd_arm");
         if (IS_ERR(arm_regulator)) {
-                pr_err("%s: failed to get resource vdd_arm\n", __func__);
+                dev_err(&pdev->dev, "failed to get resource vdd_arm\n");
                 goto err_vdd_arm;
         }
 
@@ -199,7 +201,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
         if (!cpufreq_register_driver(&exynos_driver))
                 return 0;
 
-        pr_err("%s: failed to register cpufreq driver\n", __func__);
+        dev_err(&pdev->dev, "failed to register cpufreq driver\n");
         regulator_put(arm_regulator);
 err_vdd_arm:
         kfree(exynos_info);
diff --git a/drivers/cpufreq/exynos-cpufreq.h b/drivers/cpufreq/exynos-cpufreq.h
index 51af42e1b7fe..9f2062a7cc02 100644
--- a/drivers/cpufreq/exynos-cpufreq.h
+++ b/drivers/cpufreq/exynos-cpufreq.h
@@ -42,6 +42,7 @@ struct apll_freq {
 
 struct exynos_dvfs_info {
         enum exynos_soc_type type;
+        struct device   *dev;
         unsigned long   mpll_freq_khz;
         unsigned int    pll_safe_idx;
         struct clk      *cpu_clk;
diff --git a/drivers/cpufreq/exynos5440-cpufreq.c b/drivers/cpufreq/exynos5440-cpufreq.c
index a6b8214d7b77..f33f25b483ca 100644
--- a/drivers/cpufreq/exynos5440-cpufreq.c
+++ b/drivers/cpufreq/exynos5440-cpufreq.c
@@ -114,25 +114,23 @@ static struct cpufreq_freqs freqs;
 
 static int init_div_table(void)
 {
-        struct cpufreq_frequency_table *freq_tbl = dvfs_info->freq_table;
+        struct cpufreq_frequency_table *pos, *freq_tbl = dvfs_info->freq_table;
         unsigned int tmp, clk_div, ema_div, freq, volt_id;
-        int i = 0;
         struct dev_pm_opp *opp;
 
         rcu_read_lock();
-        for (i = 0; freq_tbl[i].frequency != CPUFREQ_TABLE_END; i++) {
-
+        cpufreq_for_each_entry(pos, freq_tbl) {
                 opp = dev_pm_opp_find_freq_exact(dvfs_info->dev,
-                                        freq_tbl[i].frequency * 1000, true);
+                                        pos->frequency * 1000, true);
                 if (IS_ERR(opp)) {
                         rcu_read_unlock();
                         dev_err(dvfs_info->dev,
                                 "failed to find valid OPP for %u KHZ\n",
-                                freq_tbl[i].frequency);
+                                pos->frequency);
                         return PTR_ERR(opp);
                 }
 
-                freq = freq_tbl[i].frequency / 1000; /* In MHZ */
+                freq = pos->frequency / 1000; /* In MHZ */
                 clk_div = ((freq / CPU_DIV_FREQ_MAX) & P0_7_CPUCLKDEV_MASK)
                                         << P0_7_CPUCLKDEV_SHIFT;
                 clk_div |= ((freq / CPU_ATB_FREQ_MAX) & P0_7_ATBCLKDEV_MASK)
@@ -157,7 +155,8 @@ static int init_div_table(void)
                 tmp = (clk_div | ema_div | (volt_id << P0_7_VDD_SHIFT)
                         | ((freq / FREQ_UNIT) << P0_7_FREQ_SHIFT));
 
-                __raw_writel(tmp, dvfs_info->base + XMU_PMU_P0_7 + 4 * i);
+                __raw_writel(tmp, dvfs_info->base + XMU_PMU_P0_7 + 4 *
+                                                (pos - freq_tbl));
         }
 
         rcu_read_unlock();
@@ -166,8 +165,9 @@ static int init_div_table(void)
 
 static void exynos_enable_dvfs(unsigned int cur_frequency)
 {
-        unsigned int tmp, i, cpu;
+        unsigned int tmp, cpu;
         struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table;
+        struct cpufreq_frequency_table *pos;
         /* Disable DVFS */
         __raw_writel(0, dvfs_info->base + XMU_DVFS_CTRL);
 
@@ -182,15 +182,15 @@ static void exynos_enable_dvfs(unsigned int cur_frequency)
          __raw_writel(tmp, dvfs_info->base + XMU_PMUIRQEN);
 
         /* Set initial performance index */
-        for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++)
-                if (freq_table[i].frequency == cur_frequency)
+        cpufreq_for_each_entry(pos, freq_table)
+                if (pos->frequency == cur_frequency)
                         break;
 
-        if (freq_table[i].frequency == CPUFREQ_TABLE_END) {
+        if (pos->frequency == CPUFREQ_TABLE_END) {
                 dev_crit(dvfs_info->dev, "Boot up frequency not supported\n");
                 /* Assign the highest frequency */
-                i = 0;
-                cur_frequency = freq_table[i].frequency;
+                pos = freq_table;
+                cur_frequency = pos->frequency;
         }
 
         dev_info(dvfs_info->dev, "Setting dvfs initial frequency = %uKHZ",
@@ -199,7 +199,7 @@ static void exynos_enable_dvfs(unsigned int cur_frequency)
         for (cpu = 0; cpu < CONFIG_NR_CPUS; cpu++) {
                 tmp = __raw_readl(dvfs_info->base + XMU_C0_3_PSTATE + cpu * 4);
                 tmp &= ~(P_VALUE_MASK << C0_3_PSTATE_NEW_SHIFT);
-                tmp |= (i << C0_3_PSTATE_NEW_SHIFT);
+                tmp |= ((pos - freq_table) << C0_3_PSTATE_NEW_SHIFT);
                 __raw_writel(tmp, dvfs_info->base + XMU_C0_3_PSTATE + cpu * 4);
         }
 
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index 08e7bbcf6d73..1632981c4b25 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -21,22 +21,19 @@
 int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
                                     struct cpufreq_frequency_table *table)
 {
+        struct cpufreq_frequency_table *pos;
         unsigned int min_freq = ~0;
         unsigned int max_freq = 0;
-        unsigned int i;
+        unsigned int freq;
 
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                unsigned int freq = table[i].frequency;
-                if (freq == CPUFREQ_ENTRY_INVALID) {
-                        pr_debug("table entry %u is invalid, skipping\n", i);
+        cpufreq_for_each_valid_entry(pos, table) {
+                freq = pos->frequency;
 
-                        continue;
-                }
                 if (!cpufreq_boost_enabled()
-                    && (table[i].flags & CPUFREQ_BOOST_FREQ))
+                    && (pos->flags & CPUFREQ_BOOST_FREQ))
                         continue;
 
-                pr_debug("table entry %u: %u kHz\n", i, freq);
+                pr_debug("table entry %u: %u kHz\n", (int)(pos - table), freq);
                 if (freq < min_freq)
                         min_freq = freq;
                 if (freq > max_freq)
@@ -57,7 +54,8 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_cpuinfo);
 int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
                                    struct cpufreq_frequency_table *table)
 {
-        unsigned int next_larger = ~0, freq, i = 0;
+        struct cpufreq_frequency_table *pos;
+        unsigned int freq, next_larger = ~0;
         bool found = false;
 
         pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n",
@@ -65,9 +63,9 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
 
         cpufreq_verify_within_cpu_limits(policy);
 
-        for (; freq = table[i].frequency, freq != CPUFREQ_TABLE_END; i++) {
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, table) {
+                freq = pos->frequency;
+
                 if ((freq >= policy->min) && (freq <= policy->max)) {
                         found = true;
                         break;
@@ -118,7 +116,8 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                 .driver_data = ~0,
                 .frequency = 0,
         };
-        unsigned int i;
+        struct cpufreq_frequency_table *pos;
+        unsigned int freq, i = 0;
 
         pr_debug("request for target %u kHz (relation: %u) for cpu %u\n",
                                         target_freq, relation, policy->cpu);
@@ -132,15 +131,19 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                 break;
         }
 
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                unsigned int freq = table[i].frequency;
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, table) {
+                freq = pos->frequency;
+
+                i = pos - table;
                 if ((freq < policy->min) || (freq > policy->max))
                         continue;
+                if (freq == target_freq) {
+                        optimal.driver_data = i;
+                        break;
+                }
                 switch (relation) {
                 case CPUFREQ_RELATION_H:
-                        if (freq <= target_freq) {
+                        if (freq < target_freq) {
                                 if (freq >= optimal.frequency) {
                                         optimal.frequency = freq;
                                         optimal.driver_data = i;
@@ -153,7 +156,7 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                         }
                         break;
                 case CPUFREQ_RELATION_L:
-                        if (freq >= target_freq) {
+                        if (freq > target_freq) {
                                 if (freq <= optimal.frequency) {
                                         optimal.frequency = freq;
                                         optimal.driver_data = i;
@@ -184,8 +187,7 @@ 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;
+        struct cpufreq_frequency_table *pos, *table;
 
         table = cpufreq_frequency_get_table(policy->cpu);
         if (unlikely(!table)) {
@@ -193,10 +195,9 @@ int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
                 return -ENOENT;
         }
 
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                if (table[i].frequency == freq)
-                        return i;
-        }
+        cpufreq_for_each_valid_entry(pos, table)
+                if (pos->frequency == freq)
+                        return pos - table;
 
         return -EINVAL;
 }
@@ -208,16 +209,13 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_get_index);
 static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf,
                                     bool show_boost)
 {
-        unsigned int i = 0;
         ssize_t count = 0;
-        struct cpufreq_frequency_table *table = policy->freq_table;
+        struct cpufreq_frequency_table *pos, *table = policy->freq_table;
 
         if (!table)
                 return -ENODEV;
 
-        for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, table) {
                 /*
                  * show_boost = true and driver_data = BOOST freq
                  * display BOOST freqs
@@ -229,10 +227,10 @@ static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf,
                  * show_boost = false and driver_data != BOOST freq
                  * display NON BOOST freqs
                  */
-                if (show_boost ^ (table[i].flags & CPUFREQ_BOOST_FREQ))
+                if (show_boost ^ (pos->flags & CPUFREQ_BOOST_FREQ))
                         continue;
 
-                count += sprintf(&buf[count], "%d ", table[i].frequency);
+                count += sprintf(&buf[count], "%d ", pos->frequency);
         }
         count += sprintf(&buf[count], "\n");
 
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index e27fca86fe4f..af366c21d4b4 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/cpu.h>
 #include <linux/cpufreq.h>
-#include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -170,25 +169,25 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        arm_clk = devm_clk_get(cpu_dev, "arm");
-        pll1_sys_clk = devm_clk_get(cpu_dev, "pll1_sys");
-        pll1_sw_clk = devm_clk_get(cpu_dev, "pll1_sw");
-        step_clk = devm_clk_get(cpu_dev, "step");
-        pll2_pfd2_396m_clk = devm_clk_get(cpu_dev, "pll2_pfd2_396m");
+        arm_clk = clk_get(cpu_dev, "arm");
+        pll1_sys_clk = clk_get(cpu_dev, "pll1_sys");
+        pll1_sw_clk = clk_get(cpu_dev, "pll1_sw");
+        step_clk = clk_get(cpu_dev, "step");
+        pll2_pfd2_396m_clk = clk_get(cpu_dev, "pll2_pfd2_396m");
         if (IS_ERR(arm_clk) || IS_ERR(pll1_sys_clk) || IS_ERR(pll1_sw_clk) ||
             IS_ERR(step_clk) || IS_ERR(pll2_pfd2_396m_clk)) {
                 dev_err(cpu_dev, "failed to get clocks\n");
                 ret = -ENOENT;
-                goto put_node;
+                goto put_clk;
         }
 
-        arm_reg = devm_regulator_get(cpu_dev, "arm");
-        pu_reg = devm_regulator_get(cpu_dev, "pu");
-        soc_reg = devm_regulator_get(cpu_dev, "soc");
+        arm_reg = regulator_get(cpu_dev, "arm");
+        pu_reg = regulator_get(cpu_dev, "pu");
+        soc_reg = regulator_get(cpu_dev, "soc");
         if (IS_ERR(arm_reg) || IS_ERR(pu_reg) || IS_ERR(soc_reg)) {
                 dev_err(cpu_dev, "failed to get regulators\n");
                 ret = -ENOENT;
-                goto put_node;
+                goto put_reg;
         }
 
         /*
@@ -201,21 +200,21 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                 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;
+                        goto put_reg;
                 }
 
                 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;
+                        goto put_reg;
                 }
         }
 
         ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table);
         if (ret) {
                 dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret);
-                goto put_node;
+                goto put_reg;
         }
 
         /* Make imx6_soc_volt array's size same as arm opp number */
@@ -301,7 +300,24 @@ soc_opp_out:
 
 free_freq_table:
         dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
-put_node:
+put_reg:
+        if (!IS_ERR(arm_reg))
+                regulator_put(arm_reg);
+        if (!IS_ERR(pu_reg))
+                regulator_put(pu_reg);
+        if (!IS_ERR(soc_reg))
+                regulator_put(soc_reg);
+put_clk:
+        if (!IS_ERR(arm_clk))
+                clk_put(arm_clk);
+        if (!IS_ERR(pll1_sys_clk))
+                clk_put(pll1_sys_clk);
+        if (!IS_ERR(pll1_sw_clk))
+                clk_put(pll1_sw_clk);
+        if (!IS_ERR(step_clk))
+                clk_put(step_clk);
+        if (!IS_ERR(pll2_pfd2_396m_clk))
+                clk_put(pll2_pfd2_396m_clk);
         of_node_put(np);
         return ret;
 }
@@ -310,6 +326,14 @@ static int imx6q_cpufreq_remove(struct platform_device *pdev)
 {
         cpufreq_unregister_driver(&imx6q_cpufreq_driver);
         dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
+        regulator_put(arm_reg);
+        regulator_put(pu_reg);
+        regulator_put(soc_reg);
+        clk_put(arm_clk);
+        clk_put(pll1_sys_clk);
+        clk_put(pll1_sw_clk);
+        clk_put(step_clk);
+        clk_put(pll2_pfd2_396m_clk);
 
         return 0;
 }
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index eab8ccfe6beb..aebd4572eb6d 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -32,18 +32,16 @@
 #include <asm/msr.h>
 #include <asm/cpu_device_id.h>
 
-#define SAMPLE_COUNT            3
-
 #define BYT_RATIOS              0x66a
 #define BYT_VIDS                0x66b
 #define BYT_TURBO_RATIOS        0x66c
 #define BYT_TURBO_VIDS          0x66d
 
 
-#define FRAC_BITS 6
+#define FRAC_BITS 8
 #define int_tofp(X) ((int64_t)(X) << FRAC_BITS)
 #define fp_toint(X) ((X) >> FRAC_BITS)
-#define FP_ROUNDUP(X) ((X) += 1 << FRAC_BITS)
+
 
 static inline int32_t mul_fp(int32_t x, int32_t y)
 {
@@ -59,8 +57,8 @@ struct sample {
         int32_t core_pct_busy;
         u64 aperf;
         u64 mperf;
-        unsigned long long tsc;
         int freq;
+        ktime_t time;
 };
 
 struct pstate_data {
@@ -90,17 +88,15 @@ struct _pid {
 struct cpudata {
         int cpu;
 
-        char name[64];
-
         struct timer_list timer;
 
         struct pstate_data pstate;
         struct vid_data vid;
         struct _pid pid;
 
+        ktime_t last_sample_time;
         u64     prev_aperf;
         u64     prev_mperf;
-        unsigned long long prev_tsc;
         struct sample sample;
 };
 
@@ -200,7 +196,10 @@ static signed int pid_calc(struct _pid *pid, int32_t busy)
         pid->last_err = fp_error;
 
         result = pterm + mul_fp(pid->integral, pid->i_gain) + dterm;
-
+        if (result >= 0)
+                result = result + (1 << (FRAC_BITS-1));
+        else
+                result = result - (1 << (FRAC_BITS-1));
         return (signed int)fp_toint(result);
 }
 
@@ -546,8 +545,6 @@ static inline void intel_pstate_pstate_decrease(struct cpudata *cpu, int steps)
 
 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
 {
-        sprintf(cpu->name, "Intel 2nd generation core");
-
         cpu->pstate.min_pstate = pstate_funcs.get_min();
         cpu->pstate.max_pstate = pstate_funcs.get_max();
         cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
@@ -557,50 +554,45 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
         intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
 }
 
-static inline void intel_pstate_calc_busy(struct cpudata *cpu,
-                                        struct sample *sample)
+static inline void intel_pstate_calc_busy(struct cpudata *cpu)
 {
-        int32_t core_pct;
-        int32_t c0_pct;
+        struct sample *sample = &cpu->sample;
+        int64_t core_pct;
+        int32_t rem;
 
-        core_pct = div_fp(int_tofp((sample->aperf)),
-                        int_tofp((sample->mperf)));
-        core_pct = mul_fp(core_pct, int_tofp(100));
-        FP_ROUNDUP(core_pct);
+        core_pct = int_tofp(sample->aperf) * int_tofp(100);
+        core_pct = div_u64_rem(core_pct, int_tofp(sample->mperf), &rem);
 
-        c0_pct = div_fp(int_tofp(sample->mperf), int_tofp(sample->tsc));
+        if ((rem << 1) >= int_tofp(sample->mperf))
+                core_pct += 1;
 
         sample->freq = fp_toint(
                 mul_fp(int_tofp(cpu->pstate.max_pstate * 1000), core_pct));
 
-        sample->core_pct_busy = mul_fp(core_pct, c0_pct);
+        sample->core_pct_busy = (int32_t)core_pct;
 }
 
 static inline void intel_pstate_sample(struct cpudata *cpu)
 {
         u64 aperf, mperf;
-        unsigned long long tsc;
 
         rdmsrl(MSR_IA32_APERF, aperf);
         rdmsrl(MSR_IA32_MPERF, mperf);
-        tsc = native_read_tsc();
 
         aperf = aperf >> FRAC_BITS;
         mperf = mperf >> FRAC_BITS;
-        tsc = tsc >> FRAC_BITS;
 
+        cpu->last_sample_time = cpu->sample.time;
+        cpu->sample.time = ktime_get();
         cpu->sample.aperf = aperf;
         cpu->sample.mperf = mperf;
-        cpu->sample.tsc = tsc;
         cpu->sample.aperf -= cpu->prev_aperf;
         cpu->sample.mperf -= cpu->prev_mperf;
-        cpu->sample.tsc -= cpu->prev_tsc;
 
-        intel_pstate_calc_busy(cpu, &cpu->sample);
+        intel_pstate_calc_busy(cpu);
 
         cpu->prev_aperf = aperf;
         cpu->prev_mperf = mperf;
-        cpu->prev_tsc = tsc;
 }
 
 static inline void intel_pstate_set_sample_time(struct cpudata *cpu)
@@ -614,13 +606,25 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu)
 
 static inline int32_t intel_pstate_get_scaled_busy(struct cpudata *cpu)
 {
-        int32_t core_busy, max_pstate, current_pstate;
+        int32_t core_busy, max_pstate, current_pstate, sample_ratio;
+        u32 duration_us;
+        u32 sample_time;
 
         core_busy = cpu->sample.core_pct_busy;
         max_pstate = int_tofp(cpu->pstate.max_pstate);
         current_pstate = int_tofp(cpu->pstate.current_pstate);
         core_busy = mul_fp(core_busy, div_fp(max_pstate, current_pstate));
-        return FP_ROUNDUP(core_busy);
+
+        sample_time = (pid_params.sample_rate_ms  * USEC_PER_MSEC);
+        duration_us = (u32) ktime_us_delta(cpu->sample.time,
+                                        cpu->last_sample_time);
+        if (duration_us > sample_time * 3) {
+                sample_ratio = div_fp(int_tofp(sample_time),
+                                int_tofp(duration_us));
+                core_busy = mul_fp(core_busy, sample_ratio);
+        }
+
+        return core_busy;
 }
 
 static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu)
@@ -674,10 +678,13 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(0x37, byt_params),
         ICPU(0x3a, core_params),
         ICPU(0x3c, core_params),
+        ICPU(0x3d, core_params),
         ICPU(0x3e, core_params),
         ICPU(0x3f, core_params),
         ICPU(0x45, core_params),
         ICPU(0x46, core_params),
+        ICPU(0x4f, core_params),
+        ICPU(0x56, core_params),
         {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index 5c4369b5d834..c913906a719e 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -530,6 +530,7 @@ static int longhaul_get_ranges(void)
 
 static void longhaul_setup_voltagescaling(void)
 {
+        struct cpufreq_frequency_table *freq_pos;
         union msr_longhaul longhaul;
         struct mV_pos minvid, maxvid, vid;
         unsigned int j, speed, pos, kHz_step, numvscales;
@@ -608,18 +609,16 @@ static void longhaul_setup_voltagescaling(void)
         /* Calculate kHz for one voltage step */
         kHz_step = (highest_speed - min_vid_speed) / numvscales;
 
-        j = 0;
-        while (longhaul_table[j].frequency != CPUFREQ_TABLE_END) {
-                speed = longhaul_table[j].frequency;
+        cpufreq_for_each_entry(freq_pos, longhaul_table) {
+                speed = freq_pos->frequency;
                 if (speed > min_vid_speed)
                         pos = (speed - min_vid_speed) / kHz_step + minvid.pos;
                 else
                         pos = minvid.pos;
-                longhaul_table[j].driver_data |= mV_vrm_table[pos] << 8;
+                freq_pos->driver_data |= mV_vrm_table[pos] << 8;
                 vid = vrm_mV_table[mV_vrm_table[pos]];
                 printk(KERN_INFO PFX "f: %d kHz, index: %d, vid: %d mV\n",
-                                speed, j, vid.mV);
-                j++;
+                        speed, (int)(freq_pos - longhaul_table), vid.mV);
         }
 
         can_scale_voltage = 1;
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 84c84b5f0f3a..35dd4d7ffee0 100644
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -136,9 +136,10 @@ void restore_astate(int cpu)
 
 static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
+        struct cpufreq_frequency_table *pos;
         const u32 *max_freqp;
         u32 max_freq;
-        int i, cur_astate;
+        int cur_astate;
         struct resource res;
         struct device_node *cpu, *dn;
         int err = -ENODEV;
@@ -197,10 +198,9 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
         pr_debug("initializing frequency table\n");
 
         /* initialize frequency table */
-        for (i=0; pas_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
-                pas_freqs[i].frequency =
-                        get_astate_freq(pas_freqs[i].driver_data) * 100000;
-                pr_debug("%d: %d\n", i, pas_freqs[i].frequency);
+        cpufreq_for_each_entry(pos, pas_freqs) {
+                pos->frequency = get_astate_freq(pos->driver_data) * 100000;
+                pr_debug("%d: %d\n", (int)(pos - pas_freqs), pos->frequency);
         }
 
         cur_astate = get_cur_astate(policy->cpu);
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index 78904e6ca4a0..c8012bc86910 100644
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -151,6 +151,7 @@ static int powernow_k6_target(struct cpufreq_policy *policy,
 
 static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
 {
+        struct cpufreq_frequency_table *pos;
         unsigned int i, f;
         unsigned khz;
 
@@ -168,12 +169,11 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
                 }
         }
         if (param_max_multiplier) {
-                for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
-                        if (clock_ratio[i].driver_data == param_max_multiplier) {
+                cpufreq_for_each_entry(pos, clock_ratio)
+                        if (pos->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;
         }
@@ -201,12 +201,12 @@ have_busfreq:
         param_busfreq = busfreq * 10;
 
         /* table init */
-        for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
-                f = clock_ratio[i].driver_data;
+        cpufreq_for_each_entry(pos, clock_ratio) {
+                f = pos->driver_data;
                 if (f > max_multiplier)
-                        clock_ratio[i].frequency = CPUFREQ_ENTRY_INVALID;
+                        pos->frequency = CPUFREQ_ENTRY_INVALID;
                 else
-                        clock_ratio[i].frequency = busfreq * f;
+                        pos->frequency = busfreq * f;
         }
 
         /* cpuinfo and default policy values */
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 1b6ae6b57c11..f9ce7e4bf0fe 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -27,6 +27,8 @@
  *  power and thermal data sheets, (e.g. 30417.pdf, 30430.pdf, 43375.pdf)
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/smp.h>
 #include <linux/module.h>
@@ -45,7 +47,6 @@
 #include <linux/mutex.h>
 #include <acpi/processor.h>
 
-#define PFX "powernow-k8: "
 #define VERSION "version 2.20.00"
 #include "powernow-k8.h"
 
@@ -161,7 +162,7 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid)
         u32 i = 0;
 
         if ((fid & INVALID_FID_MASK) || (data->currvid & INVALID_VID_MASK)) {
-                printk(KERN_ERR PFX "internal error - overflow on fid write\n");
+                pr_err("internal error - overflow on fid write\n");
                 return 1;
         }
 
@@ -175,9 +176,7 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid)
         do {
                 wrmsr(MSR_FIDVID_CTL, lo, data->plllock * PLL_LOCK_CONVERSION);
                 if (i++ > 100) {
-                        printk(KERN_ERR PFX
-                                "Hardware error - pending bit very stuck - "
-                                "no further pstate changes possible\n");
+                        pr_err("Hardware error - pending bit very stuck - no further pstate changes possible\n");
                         return 1;
                 }
         } while (query_current_values_with_pending_wait(data));
@@ -185,15 +184,13 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid)
         count_off_irt(data);
 
         if (savevid != data->currvid) {
-                printk(KERN_ERR PFX
-                        "vid change on fid trans, old 0x%x, new 0x%x\n",
-                        savevid, data->currvid);
+                pr_err("vid change on fid trans, old 0x%x, new 0x%x\n",
+                       savevid, data->currvid);
                 return 1;
         }
 
         if (fid != data->currfid) {
-                printk(KERN_ERR PFX
-                        "fid trans failed, fid 0x%x, curr 0x%x\n", fid,
+                pr_err("fid trans failed, fid 0x%x, curr 0x%x\n", fid,
                         data->currfid);
                 return 1;
         }
@@ -209,7 +206,7 @@ static int write_new_vid(struct powernow_k8_data *data, u32 vid)
         int i = 0;
 
         if ((data->currfid & INVALID_FID_MASK) || (vid & INVALID_VID_MASK)) {
-                printk(KERN_ERR PFX "internal error - overflow on vid write\n");
+                pr_err("internal error - overflow on vid write\n");
                 return 1;
         }
 
@@ -223,23 +220,19 @@ static int write_new_vid(struct powernow_k8_data *data, u32 vid)
         do {
                 wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS);
                 if (i++ > 100) {
-                        printk(KERN_ERR PFX "internal error - pending bit "
-                                        "very stuck - no further pstate "
-                                        "changes possible\n");
+                        pr_err("internal error - pending bit very stuck - no further pstate changes possible\n");
                         return 1;
                 }
         } while (query_current_values_with_pending_wait(data));
 
         if (savefid != data->currfid) {
-                printk(KERN_ERR PFX "fid changed on vid trans, old "
-                        "0x%x new 0x%x\n",
-                       savefid, data->currfid);
+                pr_err("fid changed on vid trans, old 0x%x new 0x%x\n",
+                        savefid, data->currfid);
                 return 1;
         }
 
         if (vid != data->currvid) {
-                printk(KERN_ERR PFX "vid trans failed, vid 0x%x, "
-                                "curr 0x%x\n",
+                pr_err("vid trans failed, vid 0x%x, curr 0x%x\n",
                                 vid, data->currvid);
                 return 1;
         }
@@ -283,8 +276,7 @@ static int transition_fid_vid(struct powernow_k8_data *data,
                 return 1;
 
         if ((reqfid != data->currfid) || (reqvid != data->currvid)) {
-                printk(KERN_ERR PFX "failed (cpu%d): req 0x%x 0x%x, "
-                                "curr 0x%x 0x%x\n",
+                pr_err("failed (cpu%d): req 0x%x 0x%x, curr 0x%x 0x%x\n",
                                 smp_processor_id(),
                                 reqfid, reqvid, data->currfid, data->currvid);
                 return 1;
@@ -304,8 +296,7 @@ static int core_voltage_pre_transition(struct powernow_k8_data *data,
         u32 savefid = data->currfid;
         u32 maxvid, lo, rvomult = 1;
 
-        pr_debug("ph1 (cpu%d): start, currfid 0x%x, currvid 0x%x, "
-                "reqvid 0x%x, rvo 0x%x\n",
+        pr_debug("ph1 (cpu%d): start, currfid 0x%x, currvid 0x%x, reqvid 0x%x, rvo 0x%x\n",
                 smp_processor_id(),
                 data->currfid, data->currvid, reqvid, data->rvo);
 
@@ -342,8 +333,7 @@ static int core_voltage_pre_transition(struct powernow_k8_data *data,
                 return 1;
 
         if (savefid != data->currfid) {
-                printk(KERN_ERR PFX "ph1 err, currfid changed 0x%x\n",
-                                data->currfid);
+                pr_err("ph1 err, currfid changed 0x%x\n", data->currfid);
                 return 1;
         }
 
@@ -360,13 +350,11 @@ static int core_frequency_transition(struct powernow_k8_data *data, u32 reqfid)
         u32 fid_interval, savevid = data->currvid;
 
         if (data->currfid == reqfid) {
-                printk(KERN_ERR PFX "ph2 null fid transition 0x%x\n",
-                                data->currfid);
+                pr_err("ph2 null fid transition 0x%x\n", data->currfid);
                 return 0;
         }
 
-        pr_debug("ph2 (cpu%d): starting, currfid 0x%x, currvid 0x%x, "
-                "reqfid 0x%x\n",
+        pr_debug("ph2 (cpu%d): starting, currfid 0x%x, currvid 0x%x, reqfid 0x%x\n",
                 smp_processor_id(),
                 data->currfid, data->currvid, reqfid);
 
@@ -409,15 +397,13 @@ static int core_frequency_transition(struct powernow_k8_data *data, u32 reqfid)
                 return 1;
 
         if (data->currfid != reqfid) {
-                printk(KERN_ERR PFX
-                        "ph2: mismatch, failed fid transition, "
-                        "curr 0x%x, req 0x%x\n",
+                pr_err("ph2: mismatch, failed fid transition, curr 0x%x, req 0x%x\n",
                         data->currfid, reqfid);
                 return 1;
         }
 
         if (savevid != data->currvid) {
-                printk(KERN_ERR PFX "ph2: vid changed, save 0x%x, curr 0x%x\n",
+                pr_err("ph2: vid changed, save 0x%x, curr 0x%x\n",
                         savevid, data->currvid);
                 return 1;
         }
@@ -444,17 +430,14 @@ static int core_voltage_post_transition(struct powernow_k8_data *data,
                         return 1;
 
                 if (savefid != data->currfid) {
-                        printk(KERN_ERR PFX
-                               "ph3: bad fid change, save 0x%x, curr 0x%x\n",
-                               savefid, data->currfid);
+                        pr_err("ph3: bad fid change, save 0x%x, curr 0x%x\n",
+                                savefid, data->currfid);
                         return 1;
                 }
 
                 if (data->currvid != reqvid) {
-                        printk(KERN_ERR PFX
-                               "ph3: failed vid transition\n, "
-                               "req 0x%x, curr 0x%x",
-                               reqvid, data->currvid);
+                        pr_err("ph3: failed vid transition\n, req 0x%x, curr 0x%x",
+                                reqvid, data->currvid);
                         return 1;
                 }
         }
@@ -498,23 +481,20 @@ static void check_supported_cpu(void *_rc)
         if ((eax & CPUID_XFAM) == CPUID_XFAM_K8) {
                 if (((eax & CPUID_USE_XFAM_XMOD) != CPUID_USE_XFAM_XMOD) ||
                     ((eax & CPUID_XMOD) > CPUID_XMOD_REV_MASK)) {
-                        printk(KERN_INFO PFX
-                                "Processor cpuid %x not supported\n", eax);
+                        pr_info("Processor cpuid %x not supported\n", eax);
                         return;
                 }
 
                 eax = cpuid_eax(CPUID_GET_MAX_CAPABILITIES);
                 if (eax < CPUID_FREQ_VOLT_CAPABILITIES) {
-                        printk(KERN_INFO PFX
-                               "No frequency change capabilities detected\n");
+                        pr_info("No frequency change capabilities detected\n");
                         return;
                 }
 
                 cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &eax, &ebx, &ecx, &edx);
                 if ((edx & P_STATE_TRANSITION_CAPABLE)
                         != P_STATE_TRANSITION_CAPABLE) {
-                        printk(KERN_INFO PFX
-                                "Power state transitions not supported\n");
+                        pr_info("Power state transitions not supported\n");
                         return;
                 }
                 *rc = 0;
@@ -529,43 +509,39 @@ static int check_pst_table(struct powernow_k8_data *data, struct pst_s *pst,
 
         for (j = 0; j < data->numps; j++) {
                 if (pst[j].vid > LEAST_VID) {
-                        printk(KERN_ERR FW_BUG PFX "vid %d invalid : 0x%x\n",
-                               j, pst[j].vid);
+                        pr_err(FW_BUG "vid %d invalid : 0x%x\n", j,
+                                pst[j].vid);
                         return -EINVAL;
                 }
                 if (pst[j].vid < data->rvo) {
                         /* vid + rvo >= 0 */
-                        printk(KERN_ERR FW_BUG PFX "0 vid exceeded with pstate"
-                               " %d\n", j);
+                        pr_err(FW_BUG "0 vid exceeded with pstate %d\n", j);
                         return -ENODEV;
                 }
                 if (pst[j].vid < maxvid + data->rvo) {
                         /* vid + rvo >= maxvid */
-                        printk(KERN_ERR FW_BUG PFX "maxvid exceeded with pstate"
-                               " %d\n", j);
+                        pr_err(FW_BUG "maxvid exceeded with pstate %d\n", j);
                         return -ENODEV;
                 }
                 if (pst[j].fid > MAX_FID) {
-                        printk(KERN_ERR FW_BUG PFX "maxfid exceeded with pstate"
-                               " %d\n", j);
+                        pr_err(FW_BUG "maxfid exceeded with pstate %d\n", j);
                         return -ENODEV;
                 }
                 if (j && (pst[j].fid < HI_FID_TABLE_BOTTOM)) {
                         /* Only first fid is allowed to be in "low" range */
-                        printk(KERN_ERR FW_BUG PFX "two low fids - %d : "
-                               "0x%x\n", j, pst[j].fid);
+                        pr_err(FW_BUG "two low fids - %d : 0x%x\n", j,
+                                pst[j].fid);
                         return -EINVAL;
                 }
                 if (pst[j].fid < lastfid)
                         lastfid = pst[j].fid;
         }
         if (lastfid & 1) {
-                printk(KERN_ERR FW_BUG PFX "lastfid invalid\n");
+                pr_err(FW_BUG "lastfid invalid\n");
                 return -EINVAL;
         }
         if (lastfid > LO_FID_TABLE_TOP)
-                printk(KERN_INFO FW_BUG PFX
-                        "first fid not from lo freq table\n");
+                pr_info(FW_BUG "first fid not from lo freq table\n");
 
         return 0;
 }
@@ -582,16 +558,14 @@ static void print_basics(struct powernow_k8_data *data)
         for (j = 0; j < data->numps; j++) {
                 if (data->powernow_table[j].frequency !=
                                 CPUFREQ_ENTRY_INVALID) {
-                                printk(KERN_INFO PFX
-                                        "fid 0x%x (%d MHz), vid 0x%x\n",
-                                        data->powernow_table[j].driver_data & 0xff,
-                                        data->powernow_table[j].frequency/1000,
-                                        data->powernow_table[j].driver_data >> 8);
+                        pr_info("fid 0x%x (%d MHz), vid 0x%x\n",
+                                data->powernow_table[j].driver_data & 0xff,
+                                data->powernow_table[j].frequency/1000,
+                                data->powernow_table[j].driver_data >> 8);
                 }
         }
         if (data->batps)
-                printk(KERN_INFO PFX "Only %d pstates on battery\n",
-                                data->batps);
+                pr_info("Only %d pstates on battery\n", data->batps);
 }
 
 static int fill_powernow_table(struct powernow_k8_data *data,
@@ -602,21 +576,20 @@ static int fill_powernow_table(struct powernow_k8_data *data,
 
         if (data->batps) {
                 /* use ACPI support to get full speed on mains power */
-                printk(KERN_WARNING PFX
-                        "Only %d pstates usable (use ACPI driver for full "
-                        "range\n", data->batps);
+                pr_warn("Only %d pstates usable (use ACPI driver for full range\n",
+                        data->batps);
                 data->numps = data->batps;
         }
 
         for (j = 1; j < data->numps; j++) {
                 if (pst[j-1].fid >= pst[j].fid) {
-                        printk(KERN_ERR PFX "PST out of sequence\n");
+                        pr_err("PST out of sequence\n");
                         return -EINVAL;
                 }
         }
 
         if (data->numps < 2) {
-                printk(KERN_ERR PFX "no p states to transition\n");
+                pr_err("no p states to transition\n");
                 return -ENODEV;
         }
 
@@ -626,7 +599,7 @@ static int fill_powernow_table(struct powernow_k8_data *data,
         powernow_table = kzalloc((sizeof(*powernow_table)
                 * (data->numps + 1)), GFP_KERNEL);
         if (!powernow_table) {
-                printk(KERN_ERR PFX "powernow_table memory alloc failure\n");
+                pr_err("powernow_table memory alloc failure\n");
                 return -ENOMEM;
         }
 
@@ -681,13 +654,13 @@ static int find_psb_table(struct powernow_k8_data *data)
 
                 pr_debug("table vers: 0x%x\n", psb->tableversion);
                 if (psb->tableversion != PSB_VERSION_1_4) {
-                        printk(KERN_ERR FW_BUG PFX "PSB table is not v1.4\n");
+                        pr_err(FW_BUG "PSB table is not v1.4\n");
                         return -ENODEV;
                 }
 
                 pr_debug("flags: 0x%x\n", psb->flags1);
                 if (psb->flags1) {
-                        printk(KERN_ERR FW_BUG PFX "unknown flags\n");
+                        pr_err(FW_BUG "unknown flags\n");
                         return -ENODEV;
                 }
 
@@ -716,7 +689,7 @@ static int find_psb_table(struct powernow_k8_data *data)
                                 cpst = 1;
                 }
                 if (cpst != 1) {
-                        printk(KERN_ERR FW_BUG PFX "numpst must be 1\n");
+                        pr_err(FW_BUG "numpst must be 1\n");
                         return -ENODEV;
                 }
 
@@ -742,9 +715,8 @@ static int find_psb_table(struct powernow_k8_data *data)
          * BIOS and Kernel Developer's Guide, which is available on
          * www.amd.com
          */
-        printk(KERN_ERR FW_BUG PFX "No PSB or ACPI _PSS objects\n");
-        printk(KERN_ERR PFX "Make sure that your BIOS is up to date"
-                " and Cool'N'Quiet support is enabled in BIOS setup\n");
+        pr_err(FW_BUG "No PSB or ACPI _PSS objects\n");
+        pr_err("Make sure that your BIOS is up to date and Cool'N'Quiet support is enabled in BIOS setup\n");
         return -ENODEV;
 }
 
@@ -819,8 +791,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
         acpi_processor_notify_smm(THIS_MODULE);
 
         if (!zalloc_cpumask_var(&data->acpi_data.shared_cpu_map, GFP_KERNEL)) {
-                printk(KERN_ERR PFX
-                                "unable to alloc powernow_k8_data cpumask\n");
+                pr_err("unable to alloc powernow_k8_data cpumask\n");
                 ret_val = -ENOMEM;
                 goto err_out_mem;
         }
@@ -885,9 +856,8 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data,
                 }
 
                 if (freq != (data->acpi_data.states[i].core_frequency * 1000)) {
-                        printk(KERN_INFO PFX "invalid freq entries "
-                                "%u kHz vs. %u kHz\n", freq,
-                                (unsigned int)
+                        pr_info("invalid freq entries %u kHz vs. %u kHz\n",
+                                freq, (unsigned int)
                                 (data->acpi_data.states[i].core_frequency
                                  * 1000));
                         invalidate_entry(powernow_table, i);
@@ -916,7 +886,7 @@ static int get_transition_latency(struct powernow_k8_data *data)
                         max_latency = cur_latency;
         }
         if (max_latency == 0) {
-                pr_err(FW_WARN PFX "Invalid zero transition latency\n");
+                pr_err(FW_WARN "Invalid zero transition latency\n");
                 max_latency = 1;
         }
         /* value in usecs, needs to be in nanoseconds */
@@ -991,7 +961,7 @@ static long powernowk8_target_fn(void *arg)
         checkvid = data->currvid;
 
         if (pending_bit_stuck()) {
-                printk(KERN_ERR PFX "failing targ, change pending bit set\n");
+                pr_err("failing targ, change pending bit set\n");
                 return -EIO;
         }
 
@@ -1003,12 +973,11 @@ static long powernowk8_target_fn(void *arg)
                 return -EIO;
 
         pr_debug("targ: curr fid 0x%x, vid 0x%x\n",
-                 data->currfid, data->currvid);
+                data->currfid, data->currvid);
 
         if ((checkvid != data->currvid) ||
             (checkfid != data->currfid)) {
-                pr_info(PFX
-                       "error - out of sync, fix 0x%x 0x%x, vid 0x%x 0x%x\n",
+                pr_info("error - out of sync, fix 0x%x 0x%x, vid 0x%x 0x%x\n",
                        checkfid, data->currfid,
                        checkvid, data->currvid);
         }
@@ -1020,7 +989,7 @@ static long powernowk8_target_fn(void *arg)
         ret = transition_frequency_fidvid(data, newstate);
 
         if (ret) {
-                printk(KERN_ERR PFX "transition frequency failed\n");
+                pr_err("transition frequency failed\n");
                 mutex_unlock(&fidvid_mutex);
                 return 1;
         }
@@ -1049,7 +1018,7 @@ static void powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
         struct init_on_cpu *init_on_cpu = _init_on_cpu;
 
         if (pending_bit_stuck()) {
-                printk(KERN_ERR PFX "failing init, change pending bit set\n");
+                pr_err("failing init, change pending bit set\n");
                 init_on_cpu->rc = -ENODEV;
                 return;
         }
@@ -1064,11 +1033,10 @@ static void powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
         init_on_cpu->rc = 0;
 }
 
-static const char missing_pss_msg[] =
-        KERN_ERR
-        FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
-        FW_BUG PFX "First, make sure Cool'N'Quiet is enabled in the BIOS.\n"
-        FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
+#define MISSING_PSS_MSG \
+        FW_BUG "No compatible ACPI _PSS objects found.\n" \
+        FW_BUG "First, make sure Cool'N'Quiet is enabled in the BIOS.\n" \
+        FW_BUG "If that doesn't help, try upgrading your BIOS.\n"
 
 /* per CPU init entry point to the driver */
 static int powernowk8_cpu_init(struct cpufreq_policy *pol)
@@ -1083,7 +1051,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
 
         data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data) {
-                printk(KERN_ERR PFX "unable to alloc powernow_k8_data");
+                pr_err("unable to alloc powernow_k8_data");
                 return -ENOMEM;
         }
 
@@ -1095,13 +1063,11 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
                  * an UP version, and is deprecated by AMD.
                  */
                 if (num_online_cpus() != 1) {
-                        printk_once(missing_pss_msg);
+                        pr_err_once(MISSING_PSS_MSG);
                         goto err_out;
                 }
                 if (pol->cpu != 0) {
-                        printk(KERN_ERR FW_BUG PFX "No ACPI _PSS objects for "
-                               "CPU other than CPU0. Complain to your BIOS "
-                               "vendor.\n");
+                        pr_err(FW_BUG "No ACPI _PSS objects for CPU other than CPU0. Complain to your BIOS vendor.\n");
                         goto err_out;
                 }
                 rc = find_psb_table(data);
@@ -1129,7 +1095,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
 
         /* min/max the cpu is capable of */
         if (cpufreq_table_validate_and_show(pol, data->powernow_table)) {
-                printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");
+                pr_err(FW_BUG "invalid powernow_table\n");
                 powernow_k8_cpu_exit_acpi(data);
                 kfree(data->powernow_table);
                 kfree(data);
@@ -1137,7 +1103,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
         }
 
         pr_debug("cpu_init done, current fid 0x%x, vid 0x%x\n",
-                 data->currfid, data->currvid);
+                data->currfid, data->currvid);
 
         /* Point all the CPUs in this policy to the same data */
         for_each_cpu(cpu, pol->cpus)
@@ -1220,12 +1186,12 @@ static void __request_acpi_cpufreq(void)
                 goto request;
 
         if (strncmp(cur_drv, drv, min_t(size_t, strlen(cur_drv), strlen(drv))))
-                pr_warn(PFX "WTF driver: %s\n", cur_drv);
+                pr_warn("WTF driver: %s\n", cur_drv);
 
         return;
 
  request:
-        pr_warn(PFX "This CPU is not supported anymore, using acpi-cpufreq instead.\n");
+        pr_warn("This CPU is not supported anymore, using acpi-cpufreq instead.\n");
         request_module(drv);
 }
 
@@ -1260,7 +1226,7 @@ static int powernowk8_init(void)
         if (ret)
                 return ret;
 
-        pr_info(PFX "Found %d %s (%d cpu cores) (" VERSION ")\n",
+        pr_info("Found %d %s (%d cpu cores) (" VERSION ")\n",
                 num_online_nodes(), boot_cpu_data.x86_model_id, supported_cpus);
 
         return ret;
@@ -1274,8 +1240,8 @@ static void __exit powernowk8_exit(void)
         cpufreq_unregister_driver(&cpufreq_amd64_driver);
 }
 
-MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and "
-                "Mark Langsdorf <mark.langsdorf@amd.com>");
+MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com>");
+MODULE_AUTHOR("Mark Langsdorf <mark.langsdorf@amd.com>");
 MODULE_DESCRIPTION("AMD Athlon 64 and Opteron processor frequency driver.");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/cpufreq/powernow-k8.h b/drivers/cpufreq/powernow-k8.h
index 79329d4d5abe..45ce11e86626 100644
--- a/drivers/cpufreq/powernow-k8.h
+++ b/drivers/cpufreq/powernow-k8.h
@@ -19,7 +19,7 @@ struct powernow_k8_data {
         u32 vidmvs;  /* usable value calculated from mvs */
         u32 vstable; /* voltage stabilization time, units 20 us */
         u32 plllock; /* pll lock time, units 1 us */
-        u32 exttype; /* extended interface = 1 */
+        u32 exttype; /* extended interface = 1 */
 
         /* keep track of the current fid / vid or pstate */
         u32 currvid;
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index af4968813e76..bb1d08dc8cc8 100644
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -235,7 +235,7 @@ static void powernv_read_cpu_freq(void *arg)
  * firmware for CPU 'cpu'. This value is reported through the sysfs
  * file cpuinfo_cur_freq.
  */
-unsigned int powernv_cpufreq_get(unsigned int cpu)
+static unsigned int powernv_cpufreq_get(unsigned int cpu)
 {
         struct powernv_smp_call_data freq_data;
 
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index 5be8a48dba74..5a4c5a639f61 100644
--- a/drivers/cpufreq/ppc_cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -67,9 +67,10 @@ static int set_pmode(unsigned int cpu, unsigned int slow_mode)
 
 static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
+        struct cpufreq_frequency_table *pos;
         const u32 *max_freqp;
         u32 max_freq;
-        int i, cur_pmode;
+        int cur_pmode;
         struct device_node *cpu;
 
         cpu = of_get_cpu_node(policy->cpu, NULL);
@@ -102,9 +103,9 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
         pr_debug("initializing frequency table\n");
 
         /* initialize frequency table */
-        for (i=0; cbe_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
-                cbe_freqs[i].frequency = max_freq / cbe_freqs[i].driver_data;
-                pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
+        cpufreq_for_each_entry(pos, cbe_freqs) {
+                pos->frequency = max_freq / pos->driver_data;
+                pr_debug("%d: %d\n", (int)(pos - cbe_freqs), pos->frequency);
         }
 
         /* if DEBUG is enabled set_pmode() measures the latency
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 4626f90559b5..2fd53eaaec20 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -266,7 +266,7 @@ out:
 static void __init s3c2416_cpufreq_cfg_regulator(struct s3c2416_data *s3c_freq)
 {
         int count, v, i, found;
-        struct cpufreq_frequency_table *freq;
+        struct cpufreq_frequency_table *pos;
         struct s3c2416_dvfs *dvfs;
 
         count = regulator_count_voltages(s3c_freq->vddarm);
@@ -275,12 +275,11 @@ static void __init s3c2416_cpufreq_cfg_regulator(struct s3c2416_data *s3c_freq)
                 return;
         }
 
-        freq = s3c_freq->freq_table;
-        while (count > 0 && freq->frequency != CPUFREQ_TABLE_END) {
-                if (freq->frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        if (!count)
+                goto out;
 
-                dvfs = &s3c2416_dvfs_table[freq->driver_data];
+        cpufreq_for_each_valid_entry(pos, s3c_freq->freq_table) {
+                dvfs = &s3c2416_dvfs_table[pos->driver_data];
                 found = 0;
 
                 /* Check only the min-voltage, more is always ok on S3C2416 */
@@ -292,13 +291,12 @@ static void __init s3c2416_cpufreq_cfg_regulator(struct s3c2416_data *s3c_freq)
 
                 if (!found) {
                         pr_debug("cpufreq: %dkHz unsupported by regulator\n",
-                                 freq->frequency);
-                        freq->frequency = CPUFREQ_ENTRY_INVALID;
+                                 pos->frequency);
+                        pos->frequency = CPUFREQ_ENTRY_INVALID;
                 }
-
-                freq++;
         }
 
+out:
         /* Guessed */
         s3c_freq->regulator_latency = 1 * 1000 * 1000;
 }
@@ -338,7 +336,7 @@ static struct notifier_block s3c2416_cpufreq_reboot_notifier = {
 static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
 {
         struct s3c2416_data *s3c_freq = &s3c2416_cpufreq;
-        struct cpufreq_frequency_table *freq;
+        struct cpufreq_frequency_table *pos;
         struct clk *msysclk;
         unsigned long rate;
         int ret;
@@ -427,31 +425,27 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
         s3c_freq->regulator_latency = 0;
 #endif
 
-        freq = s3c_freq->freq_table;
-        while (freq->frequency != CPUFREQ_TABLE_END) {
+        cpufreq_for_each_entry(pos, s3c_freq->freq_table) {
                 /* special handling for dvs mode */
-                if (freq->driver_data == 0) {
+                if (pos->driver_data == 0) {
                         if (!s3c_freq->hclk) {
                                 pr_debug("cpufreq: %dkHz unsupported as it would need unavailable dvs mode\n",
-                                         freq->frequency);
-                                freq->frequency = CPUFREQ_ENTRY_INVALID;
+                                         pos->frequency);
+                                pos->frequency = CPUFREQ_ENTRY_INVALID;
                         } else {
-                                freq++;
                                 continue;
                         }
                 }
 
                 /* Check for frequencies we can generate */
                 rate = clk_round_rate(s3c_freq->armdiv,
-                                      freq->frequency * 1000);
+                                      pos->frequency * 1000);
                 rate /= 1000;
-                if (rate != freq->frequency) {
+                if (rate != pos->frequency) {
                         pr_debug("cpufreq: %dkHz unsupported by clock (clk_round_rate return %lu)\n",
-                                 freq->frequency, rate);
-                        freq->frequency = CPUFREQ_ENTRY_INVALID;
+                                pos->frequency, rate);
+                        pos->frequency = CPUFREQ_ENTRY_INVALID;
                 }
-
-                freq++;
         }
 
         /* Datasheet says PLL stabalisation time must be at least 300us,
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index ff7d3ecb85f0..176e84cc3991 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -118,11 +118,10 @@ static void __init s3c64xx_cpufreq_config_regulator(void)
                 pr_err("Unable to check supported voltages\n");
         }
 
-        freq = s3c64xx_freq_table;
-        while (count > 0 && freq->frequency != CPUFREQ_TABLE_END) {
-                if (freq->frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        if (!count)
+                goto out;
 
+        cpufreq_for_each_valid_entry(freq, s3c64xx_freq_table) {
                 dvfs = &s3c64xx_dvfs_table[freq->driver_data];
                 found = 0;
 
@@ -137,10 +136,9 @@ static void __init s3c64xx_cpufreq_config_regulator(void)
                                  freq->frequency);
                         freq->frequency = CPUFREQ_ENTRY_INVALID;
                 }
-
-                freq++;
         }
 
+out:
         /* Guess based on having to do an I2C/SPI write; in future we
          * will be able to query the regulator performance here. */
         regulator_latency = 1 * 1000 * 1000;
@@ -179,8 +177,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
         }
 #endif
 
-        freq = s3c64xx_freq_table;
-        while (freq->frequency != CPUFREQ_TABLE_END) {
+        cpufreq_for_each_entry(freq, s3c64xx_freq_table) {
                 unsigned long r;
 
                 /* Check for frequencies we can generate */
@@ -196,8 +193,6 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
                  * frequency is the maximum we can support. */
                 if (!vddarm && freq->frequency > clk_get_rate(policy->clk) / 1000)
                         freq->frequency = CPUFREQ_ENTRY_INVALID;
-
-                freq++;
         }
 
         /* Datasheet says PLL stabalisation time (if we were to use
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index ab2c1a40d437..19a10b89fef7 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -175,10 +175,8 @@ static int s5pv210_target(struct cpufreq_policy *policy, unsigned int index)
         mutex_lock(&set_freq_lock);
 
         if (no_cpufreq_access) {
-#ifdef CONFIG_PM_VERBOSE
-                pr_err("%s:%d denied access to %s as it is disabled"
-                                "temporarily\n", __FILE__, __LINE__, __func__);
-#endif
+                pr_err("Denied access to %s as it is disabled temporarily\n",
+                       __func__);
                 ret = -EINVAL;
                 goto exit;
         }
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 6723f0390f20..7d4a31571608 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -28,7 +28,7 @@
 #include <asm/cpu_device_id.h>
 
 #define PFX             "speedstep-centrino: "
-#define MAINTAINER      "cpufreq@vger.kernel.org"
+#define MAINTAINER      "linux-pm@vger.kernel.org"
 
 #define INTEL_MSR_RANGE (0xffff)
 
diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c
index 63f00598a251..6e774c6ac20b 100644
--- a/drivers/cpufreq/tegra-cpufreq.c
+++ b/drivers/cpufreq/tegra-cpufreq.c
@@ -82,9 +82,9 @@ out:
         return ret;
 }
 
-static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
-                unsigned long rate)
+static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
 {
+        unsigned long rate = freq_table[index].frequency;
         int ret = 0;
 
         /*
@@ -106,11 +106,6 @@ static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
         return ret;
 }
 
-static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
-{
-        return tegra_update_cpu_speed(policy, freq_table[index].frequency);
-}
-
 static int tegra_cpu_init(struct cpufreq_policy *policy)
 {
         int ret;
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index ae1d78ea7df7..b6d69e899f5d 100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -18,6 +18,12 @@ config ARM_BIG_LITTLE_CPUIDLE
           define different C-states for little and big cores through the
           multiple CPU idle drivers infrastructure.
 
+config ARM_CLPS711X_CPUIDLE
+        bool "CPU Idle Driver for CLPS711X processors"
+        depends on ARCH_CLPS711X || COMPILE_TEST
+        help
+          Select this to enable cpuidle on Cirrus Logic CLPS711X SOCs.
+
 config ARM_HIGHBANK_CPUIDLE
         bool "CPU Idle Driver for Calxeda processors"
         depends on ARM_PSCI
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index cd3ab59f8461..9b5b2b560d70 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 # ARM SoC drivers
 obj-$(CONFIG_ARM_ARMADA_370_XP_CPUIDLE) += cpuidle-armada-370-xp.o
 obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE)    += cpuidle-big_little.o
+obj-$(CONFIG_ARM_CLPS711X_CPUIDLE)      += cpuidle-clps711x.o
 obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)      += cpuidle-calxeda.o
 obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)      += cpuidle-kirkwood.o
 obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)          += cpuidle-zynq.o
diff --git a/drivers/cpuidle/cpuidle-clps711x.c b/drivers/cpuidle/cpuidle-clps711x.c
new file mode 100644
index 000000000000..5243811daa6e
--- /dev/null
+++ b/drivers/cpuidle/cpuidle-clps711x.c
@@ -0,0 +1,64 @@
+/*
+ *  CLPS711X CPU idle driver
+ *
+ *  Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/cpuidle.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#define CLPS711X_CPUIDLE_NAME   "clps711x-cpuidle"
+
+static void __iomem *clps711x_halt;
+
+static int clps711x_cpuidle_halt(struct cpuidle_device *dev,
+                                 struct cpuidle_driver *drv, int index)
+{
+        writel(0xaa, clps711x_halt);
+
+        return index;
+}
+
+static struct cpuidle_driver clps711x_idle_driver = {
+        .name           = CLPS711X_CPUIDLE_NAME,
+        .owner          = THIS_MODULE,
+        .states[0]      = {
+                .name           = "HALT",
+                .desc           = "CLPS711X HALT",
+                .enter          = clps711x_cpuidle_halt,
+                .exit_latency   = 1,
+        },
+        .state_count    = 1,
+};
+
+static int __init clps711x_cpuidle_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        clps711x_halt = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(clps711x_halt))
+                return PTR_ERR(clps711x_halt);
+
+        return cpuidle_register(&clps711x_idle_driver, NULL);
+}
+
+static struct platform_driver clps711x_cpuidle_driver = {
+        .driver = {
+                .name   = CLPS711X_CPUIDLE_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+module_platform_driver_probe(clps711x_cpuidle_driver, clps711x_cpuidle_probe);
+
+MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>");
+MODULE_DESCRIPTION("CLPS711X CPU idle driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index 7d2f43550700..49e74c1fc639 100644
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -70,19 +70,20 @@ config ARM_EXYNOS4_BUS_DEVFREQ
         depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
         select ARCH_HAS_OPP
         select DEVFREQ_GOV_SIMPLE_ONDEMAND
+        select PM_OPP
         help
           This adds the DEVFREQ driver for Exynos4210 memory bus (vdd_int)
           and Exynos4212/4412 memory interface and bus (vdd_mif + vdd_int).
           It reads PPMU counters of memory controllers and adjusts
           the operating frequencies and voltages with OPP support.
-          To operate with optimal voltages, ASV support is required
-          (CONFIG_EXYNOS_ASV).
+          This does not yet operate with optimal voltages.
 
 config ARM_EXYNOS5_BUS_DEVFREQ
         bool "ARM Exynos5250 Bus DEVFREQ Driver"
         depends on SOC_EXYNOS5250
         select ARCH_HAS_OPP
         select DEVFREQ_GOV_SIMPLE_ONDEMAND
+        select PM_OPP
         help
           This adds the DEVFREQ driver for Exynos5250 bus interface (vdd_int).
           It reads PPMU counters of memory controllers and adjusts the
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 2042ec3656ba..9f90369dd6bd 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -394,7 +394,7 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type,
  * @devfreq:    the devfreq struct
  * @skip:       skip calling device_unregister().
  */
-static void _remove_devfreq(struct devfreq *devfreq, bool skip)
+static void _remove_devfreq(struct devfreq *devfreq)
 {
         mutex_lock(&devfreq_list_lock);
         if (IS_ERR(find_device_devfreq(devfreq->dev.parent))) {
@@ -412,11 +412,6 @@ static void _remove_devfreq(struct devfreq *devfreq, bool skip)
         if (devfreq->profile->exit)
                 devfreq->profile->exit(devfreq->dev.parent);
 
-        if (!skip && get_device(&devfreq->dev)) {
-                device_unregister(&devfreq->dev);
-                put_device(&devfreq->dev);
-        }
-
         mutex_destroy(&devfreq->lock);
         kfree(devfreq);
 }
@@ -426,14 +421,12 @@ static void _remove_devfreq(struct devfreq *devfreq, bool skip)
  * @dev:        the devfreq device
  *
  * This calls _remove_devfreq() if _remove_devfreq() is not called.
- * Note that devfreq_dev_release() could be called by _remove_devfreq() as
- * well as by others unregistering the device.
  */
 static void devfreq_dev_release(struct device *dev)
 {
         struct devfreq *devfreq = to_devfreq(dev);
 
-        _remove_devfreq(devfreq, true);
+        _remove_devfreq(devfreq);
 }
 
 /**
@@ -544,12 +537,76 @@ int devfreq_remove_device(struct devfreq *devfreq)
         if (!devfreq)
                 return -EINVAL;
 
-        _remove_devfreq(devfreq, false);
+        device_unregister(&devfreq->dev);
+        put_device(&devfreq->dev);
 
         return 0;
 }
 EXPORT_SYMBOL(devfreq_remove_device);
 
+static int devm_devfreq_dev_match(struct device *dev, void *res, void *data)
+{
+        struct devfreq **r = res;
+
+        if (WARN_ON(!r || !*r))
+                return 0;
+
+        return *r == data;
+}
+
+static void devm_devfreq_dev_release(struct device *dev, void *res)
+{
+        devfreq_remove_device(*(struct devfreq **)res);
+}
+
+/**
+ * devm_devfreq_add_device() - Resource-managed devfreq_add_device()
+ * @dev:        the device to add devfreq feature.
+ * @profile:    device-specific profile to run devfreq.
+ * @governor_name:      name of the policy to choose frequency.
+ * @data:       private data for the governor. The devfreq framework does not
+ *              touch this value.
+ *
+ * This function manages automatically the memory of devfreq device using device
+ * resource management and simplify the free operation for memory of devfreq
+ * device.
+ */
+struct devfreq *devm_devfreq_add_device(struct device *dev,
+                                        struct devfreq_dev_profile *profile,
+                                        const char *governor_name,
+                                        void *data)
+{
+        struct devfreq **ptr, *devfreq;
+
+        ptr = devres_alloc(devm_devfreq_dev_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        devfreq = devfreq_add_device(dev, profile, governor_name, data);
+        if (IS_ERR(devfreq)) {
+                devres_free(ptr);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        *ptr = devfreq;
+        devres_add(dev, ptr);
+
+        return devfreq;
+}
+EXPORT_SYMBOL(devm_devfreq_add_device);
+
+/**
+ * devm_devfreq_remove_device() - Resource-managed devfreq_remove_device()
+ * @dev:        the device to add devfreq feature.
+ * @devfreq:    the devfreq instance to be removed
+ */
+void devm_devfreq_remove_device(struct device *dev, struct devfreq *devfreq)
+{
+        WARN_ON(devres_release(dev, devm_devfreq_dev_release,
+                               devm_devfreq_dev_match, devfreq));
+}
+EXPORT_SYMBOL(devm_devfreq_remove_device);
+
 /**
  * devfreq_suspend_device() - Suspend devfreq of a device.
  * @devfreq: the devfreq instance to be suspended
@@ -1112,6 +1169,54 @@ int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq)
         return ret;
 }
 
+static void devm_devfreq_opp_release(struct device *dev, void *res)
+{
+        devfreq_unregister_opp_notifier(dev, *(struct devfreq **)res);
+}
+
+/**
+ * devm_ devfreq_register_opp_notifier()
+ *              - Resource-managed devfreq_register_opp_notifier()
+ * @dev:        The devfreq user device. (parent of devfreq)
+ * @devfreq:    The devfreq object.
+ */
+int devm_devfreq_register_opp_notifier(struct device *dev,
+                                       struct devfreq *devfreq)
+{
+        struct devfreq **ptr;
+        int ret;
+
+        ptr = devres_alloc(devm_devfreq_opp_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        ret = devfreq_register_opp_notifier(dev, devfreq);
+        if (ret) {
+                devres_free(ptr);
+                return ret;
+        }
+
+        *ptr = devfreq;
+        devres_add(dev, ptr);
+
+        return 0;
+}
+EXPORT_SYMBOL(devm_devfreq_register_opp_notifier);
+
+/**
+ * devm_devfreq_unregister_opp_notifier()
+ *              - Resource-managed devfreq_unregister_opp_notifier()
+ * @dev:        The devfreq user device. (parent of devfreq)
+ * @devfreq:    The devfreq object.
+ */
+void devm_devfreq_unregister_opp_notifier(struct device *dev,
+                                         struct devfreq *devfreq)
+{
+        WARN_ON(devres_release(dev, devm_devfreq_opp_release,
+                               devm_devfreq_dev_match, devfreq));
+}
+EXPORT_SYMBOL(devm_devfreq_unregister_opp_notifier);
+
 MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
 MODULE_DESCRIPTION("devfreq class support");
 MODULE_LICENSE("GPL");
diff --git a/drivers/devfreq/exynos/Makefile b/drivers/devfreq/exynos/Makefile
index bfaaf5b0d61d..49bc9175f923 100644
--- a/drivers/devfreq/exynos/Makefile
+++ b/drivers/devfreq/exynos/Makefile
@@ -1,3 +1,3 @@
 # Exynos DEVFREQ Drivers
-obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ)   += exynos4_bus.o
+obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ)   += exynos_ppmu.o exynos4_bus.o
 obj-$(CONFIG_ARM_EXYNOS5_BUS_DEVFREQ)   += exynos_ppmu.o exynos5_bus.o
diff --git a/drivers/devfreq/exynos/exynos4_bus.c b/drivers/devfreq/exynos/exynos4_bus.c
index e07b0c68c715..d9b08d3b6830 100644
--- a/drivers/devfreq/exynos/exynos4_bus.c
+++ b/drivers/devfreq/exynos/exynos4_bus.c
@@ -25,13 +25,9 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 
-/* Exynos4 ASV has been in the mailing list, but not upstreamed, yet. */
-#ifdef CONFIG_EXYNOS_ASV
-extern unsigned int exynos_result_of_asv;
-#endif
-
 #include <mach/map.h>
 
+#include "exynos_ppmu.h"
 #include "exynos4_bus.h"
 
 #define MAX_SAFEVOLT    1200000 /* 1.2V */
@@ -44,22 +40,6 @@ enum exynos4_busf_type {
 /* Assume that the bus is saturated if the utilization is 40% */
 #define BUS_SATURATION_RATIO    40
 
-enum ppmu_counter {
-        PPMU_PMNCNT0 = 0,
-        PPMU_PMCCNT1,
-        PPMU_PMNCNT2,
-        PPMU_PMNCNT3,
-        PPMU_PMNCNT_MAX,
-};
-struct exynos4_ppmu {
-        void __iomem *hw_base;
-        unsigned int ccnt;
-        unsigned int event;
-        unsigned int count[PPMU_PMNCNT_MAX];
-        bool ccnt_overflow;
-        bool count_overflow[PPMU_PMNCNT_MAX];
-};
-
 enum busclk_level_idx {
         LV_0 = 0,
         LV_1,
@@ -68,6 +48,13 @@ enum busclk_level_idx {
         LV_4,
         _LV_END
 };
+
+enum exynos_ppmu_idx {
+        PPMU_DMC0,
+        PPMU_DMC1,
+        PPMU_END,
+};
+
 #define EX4210_LV_MAX   LV_2
 #define EX4x12_LV_MAX   LV_4
 #define EX4210_LV_NUM   (LV_2 + 1)
@@ -91,7 +78,7 @@ struct busfreq_data {
         struct regulator *vdd_int;
         struct regulator *vdd_mif; /* Exynos4412/4212 only */
         struct busfreq_opp_info curr_oppinfo;
-        struct exynos4_ppmu dmc[2];
+        struct busfreq_ppmu_data ppmu_data;
 
         struct notifier_block pm_notifier;
         struct mutex lock;
@@ -101,12 +88,6 @@ struct busfreq_data {
         unsigned int top_divtable[_LV_END];
 };
 
-struct bus_opp_table {
-        unsigned int idx;
-        unsigned long clk;
-        unsigned long volt;
-};
-
 /* 4210 controls clock of mif and voltage of int */
 static struct bus_opp_table exynos4210_busclk_table[] = {
         {LV_0, 400000, 1150000},
@@ -524,57 +505,6 @@ static int exynos4x12_set_busclk(struct busfreq_data *data,
         return 0;
 }
 
-
-static void busfreq_mon_reset(struct busfreq_data *data)
-{
-        unsigned int i;
-
-        for (i = 0; i < 2; i++) {
-                void __iomem *ppmu_base = data->dmc[i].hw_base;
-
-                /* Reset PPMU */
-                __raw_writel(0x8000000f, ppmu_base + 0xf010);
-                __raw_writel(0x8000000f, ppmu_base + 0xf050);
-                __raw_writel(0x6, ppmu_base + 0xf000);
-                __raw_writel(0x0, ppmu_base + 0xf100);
-
-                /* Set PPMU Event */
-                data->dmc[i].event = 0x6;
-                __raw_writel(((data->dmc[i].event << 12) | 0x1),
-                             ppmu_base + 0xfc);
-
-                /* Start PPMU */
-                __raw_writel(0x1, ppmu_base + 0xf000);
-        }
-}
-
-static void exynos4_read_ppmu(struct busfreq_data *data)
-{
-        int i, j;
-
-        for (i = 0; i < 2; i++) {
-                void __iomem *ppmu_base = data->dmc[i].hw_base;
-                u32 overflow;
-
-                /* Stop PPMU */
-                __raw_writel(0x0, ppmu_base + 0xf000);
-
-                /* Update local data from PPMU */
-                overflow = __raw_readl(ppmu_base + 0xf050);
-
-                data->dmc[i].ccnt = __raw_readl(ppmu_base + 0xf100);
-                data->dmc[i].ccnt_overflow = overflow & (1 << 31);
-
-                for (j = 0; j < PPMU_PMNCNT_MAX; j++) {
-                        data->dmc[i].count[j] = __raw_readl(
-                                        ppmu_base + (0xf110 + (0x10 * j)));
-                        data->dmc[i].count_overflow[j] = overflow & (1 << j);
-                }
-        }
-
-        busfreq_mon_reset(data);
-}
-
 static int exynos4x12_get_intspec(unsigned long mifclk)
 {
         int i = 0;
@@ -698,84 +628,35 @@ out:
         return err;
 }
 
-static int exynos4_get_busier_dmc(struct busfreq_data *data)
-{
-        u64 p0 = data->dmc[0].count[0];
-        u64 p1 = data->dmc[1].count[0];
-
-        p0 *= data->dmc[1].ccnt;
-        p1 *= data->dmc[0].ccnt;
-
-        if (data->dmc[1].ccnt == 0)
-                return 0;
-
-        if (p0 > p1)
-                return 0;
-        return 1;
-}
-
 static int exynos4_bus_get_dev_status(struct device *dev,
                                       struct devfreq_dev_status *stat)
 {
         struct busfreq_data *data = dev_get_drvdata(dev);
-        int busier_dmc;
-        int cycles_x2 = 2; /* 2 x cycles */
-        void __iomem *addr;
-        u32 timing;
-        u32 memctrl;
-
-        exynos4_read_ppmu(data);
-        busier_dmc = exynos4_get_busier_dmc(data);
-        stat->current_frequency = data->curr_oppinfo.rate;
+        struct busfreq_ppmu_data *ppmu_data = &data->ppmu_data;
+        int busier;
 
-        if (busier_dmc)
-                addr = S5P_VA_DMC1;
-        else
-                addr = S5P_VA_DMC0;
-
-        memctrl = __raw_readl(addr + 0x04); /* one of DDR2/3/LPDDR2 */
-        timing = __raw_readl(addr + 0x38); /* CL or WL/RL values */
-
-        switch ((memctrl >> 8) & 0xf) {
-        case 0x4: /* DDR2 */
-                cycles_x2 = ((timing >> 16) & 0xf) * 2;
-                break;
-        case 0x5: /* LPDDR2 */
-        case 0x6: /* DDR3 */
-                cycles_x2 = ((timing >> 8) & 0xf) + ((timing >> 0) & 0xf);
-                break;
-        default:
-                pr_err("%s: Unknown Memory Type(%d).\n", __func__,
-                       (memctrl >> 8) & 0xf);
-                return -EINVAL;
-        }
+        exynos_read_ppmu(ppmu_data);
+        busier = exynos_get_busier_ppmu(ppmu_data);
+        stat->current_frequency = data->curr_oppinfo.rate;
 
         /* Number of cycles spent on memory access */
-        stat->busy_time = data->dmc[busier_dmc].count[0] / 2 * (cycles_x2 + 2);
+        stat->busy_time = ppmu_data->ppmu[busier].count[PPMU_PMNCNT3];
         stat->busy_time *= 100 / BUS_SATURATION_RATIO;
-        stat->total_time = data->dmc[busier_dmc].ccnt;
+        stat->total_time = ppmu_data->ppmu[busier].ccnt;
 
         /* If the counters have overflown, retry */
-        if (data->dmc[busier_dmc].ccnt_overflow ||
-            data->dmc[busier_dmc].count_overflow[0])
+        if (ppmu_data->ppmu[busier].ccnt_overflow ||
+            ppmu_data->ppmu[busier].count_overflow[0])
                 return -EAGAIN;
 
         return 0;
 }
 
-static void exynos4_bus_exit(struct device *dev)
-{
-        struct busfreq_data *data = dev_get_drvdata(dev);
-
-        devfreq_unregister_opp_notifier(dev, data->devfreq);
-}
-
 static struct devfreq_dev_profile exynos4_devfreq_profile = {
         .initial_freq   = 400000,
         .polling_ms     = 50,
         .target         = exynos4_bus_target,
         .get_dev_status = exynos4_bus_get_dev_status,
-        .exit           = exynos4_bus_exit,
 };
 
 static int exynos4210_init_tables(struct busfreq_data *data)
@@ -837,11 +718,11 @@ static int exynos4210_init_tables(struct busfreq_data *data)
                 data->top_divtable[i] = tmp;
         }
 
-#ifdef CONFIG_EXYNOS_ASV
-        tmp = exynos4_result_of_asv;
-#else
+        /*
+         * TODO: init tmp based on busfreq_data
+         * (device-tree or platform-data)
+         */
         tmp = 0; /* Max voltages for the reliability of the unknown */
-#endif
 
         pr_debug("ASV Group of Exynos4 is %d\n", tmp);
         /* Use merged grouping for voltage */
@@ -922,11 +803,7 @@ static int exynos4x12_init_tables(struct busfreq_data *data)
                 data->dmc_divtable[i] = tmp;
         }
 
-#ifdef CONFIG_EXYNOS_ASV
-        tmp = exynos4_result_of_asv;
-#else
         tmp = 0; /* Max voltages for the reliability of the unknown */
-#endif
 
         if (tmp > 8)
                 tmp = 0;
@@ -1020,6 +897,7 @@ unlock:
 static int exynos4_busfreq_probe(struct platform_device *pdev)
 {
         struct busfreq_data *data;
+        struct busfreq_ppmu_data *ppmu_data;
         struct dev_pm_opp *opp;
         struct device *dev = &pdev->dev;
         int err = 0;
@@ -1030,9 +908,19 @@ static int exynos4_busfreq_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        ppmu_data = &data->ppmu_data;
+        ppmu_data->ppmu_end = PPMU_END;
+        ppmu_data->ppmu = devm_kzalloc(dev,
+                                       sizeof(struct exynos_ppmu) * PPMU_END,
+                                       GFP_KERNEL);
+        if (!ppmu_data->ppmu) {
+                dev_err(dev, "Failed to allocate memory for exynos_ppmu\n");
+                return -ENOMEM;
+        }
+
         data->type = pdev->id_entry->driver_data;
-        data->dmc[0].hw_base = S5P_VA_DMC0;
-        data->dmc[1].hw_base = S5P_VA_DMC1;
+        ppmu_data->ppmu[PPMU_DMC0].hw_base = S5P_VA_DMC0;
+        ppmu_data->ppmu[PPMU_DMC1].hw_base = S5P_VA_DMC1;
         data->pm_notifier.notifier_call = exynos4_busfreq_pm_notifier_event;
         data->dev = dev;
         mutex_init(&data->lock);
@@ -1048,8 +936,11 @@ static int exynos4_busfreq_probe(struct platform_device *pdev)
                 dev_err(dev, "Cannot determine the device id %d\n", data->type);
                 err = -EINVAL;
         }
-        if (err)
+        if (err) {
+                dev_err(dev, "Cannot initialize busfreq table %d\n",
+                             data->type);
                 return err;
+        }
 
         data->vdd_int = devm_regulator_get(dev, "vdd_int");
         if (IS_ERR(data->vdd_int)) {
@@ -1079,19 +970,28 @@ static int exynos4_busfreq_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, data);
 
-        busfreq_mon_reset(data);
-
-        data->devfreq = devfreq_add_device(dev, &exynos4_devfreq_profile,
+        data->devfreq = devm_devfreq_add_device(dev, &exynos4_devfreq_profile,
                                            "simple_ondemand", NULL);
         if (IS_ERR(data->devfreq))
                 return PTR_ERR(data->devfreq);
 
-        devfreq_register_opp_notifier(dev, data->devfreq);
+        /*
+         * Start PPMU (Performance Profiling Monitoring Unit) to check
+         * utilization of each IP in the Exynos4 SoC.
+         */
+        busfreq_mon_reset(ppmu_data);
 
+        /* Register opp_notifier for Exynos4 busfreq */
+        err = devm_devfreq_register_opp_notifier(dev, data->devfreq);
+        if (err < 0) {
+                dev_err(dev, "Failed to register opp notifier\n");
+                return err;
+        }
+
+        /* Register pm_notifier for Exynos4 busfreq */
         err = register_pm_notifier(&data->pm_notifier);
         if (err) {
                 dev_err(dev, "Failed to setup pm notifier\n");
-                devfreq_remove_device(data->devfreq);
                 return err;
         }
 
@@ -1102,23 +1002,24 @@ static int exynos4_busfreq_remove(struct platform_device *pdev)
 {
         struct busfreq_data *data = platform_get_drvdata(pdev);
 
+        /* Unregister all of notifier chain */
         unregister_pm_notifier(&data->pm_notifier);
-        devfreq_remove_device(data->devfreq);
 
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int exynos4_busfreq_resume(struct device *dev)
 {
         struct busfreq_data *data = dev_get_drvdata(dev);
+        struct busfreq_ppmu_data *ppmu_data = &data->ppmu_data;
 
-        busfreq_mon_reset(data);
+        busfreq_mon_reset(ppmu_data);
         return 0;
 }
+#endif
 
-static const struct dev_pm_ops exynos4_busfreq_pm = {
-        .resume = exynos4_busfreq_resume,
-};
+static SIMPLE_DEV_PM_OPS(exynos4_busfreq_pm_ops, NULL, exynos4_busfreq_resume);
 
 static const struct platform_device_id exynos4_busfreq_id[] = {
         { "exynos4210-busfreq", TYPE_BUSF_EXYNOS4210 },
@@ -1134,7 +1035,7 @@ static struct platform_driver exynos4_busfreq_driver = {
         .driver = {
                 .name   = "exynos4-busfreq",
                 .owner  = THIS_MODULE,
-                .pm     = &exynos4_busfreq_pm,
+                .pm     = &exynos4_busfreq_pm_ops,
         },
 };
 
diff --git a/drivers/devfreq/exynos/exynos5_bus.c b/drivers/devfreq/exynos/exynos5_bus.c
index 6eef1f7397c6..6cd0392e2798 100644
--- a/drivers/devfreq/exynos/exynos5_bus.c
+++ b/drivers/devfreq/exynos/exynos5_bus.c
@@ -50,7 +50,7 @@ struct busfreq_data_int {
         struct device *dev;
         struct devfreq *devfreq;
         struct regulator *vdd_int;
-        struct exynos_ppmu ppmu[PPMU_END];
+        struct busfreq_ppmu_data ppmu_data;
         unsigned long curr_freq;
         bool disabled;
 
@@ -75,49 +75,6 @@ static struct int_bus_opp_table exynos5_int_opp_table[] = {
         {0, 0, 0},
 };
 
-static void busfreq_mon_reset(struct busfreq_data_int *data)
-{
-        unsigned int i;
-
-        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
-                void __iomem *ppmu_base = data->ppmu[i].hw_base;
-
-                /* Reset the performance and cycle counters */
-                exynos_ppmu_reset(ppmu_base);
-
-                /* Setup count registers to monitor read/write transactions */
-                data->ppmu[i].event[PPMU_PMNCNT3] = RDWR_DATA_COUNT;
-                exynos_ppmu_setevent(ppmu_base, PPMU_PMNCNT3,
-                                        data->ppmu[i].event[PPMU_PMNCNT3]);
-
-                exynos_ppmu_start(ppmu_base);
-        }
-}
-
-static void exynos5_read_ppmu(struct busfreq_data_int *data)
-{
-        int i, j;
-
-        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
-                void __iomem *ppmu_base = data->ppmu[i].hw_base;
-
-                exynos_ppmu_stop(ppmu_base);
-
-                /* Update local data from PPMU */
-                data->ppmu[i].ccnt = __raw_readl(ppmu_base + PPMU_CCNT);
-
-                for (j = PPMU_PMNCNT0; j < PPMU_PMNCNT_MAX; j++) {
-                        if (data->ppmu[i].event[j] == 0)
-                                data->ppmu[i].count[j] = 0;
-                        else
-                                data->ppmu[i].count[j] =
-                                        exynos_ppmu_read(ppmu_base, j);
-                }
-        }
-
-        busfreq_mon_reset(data);
-}
-
 static int exynos5_int_setvolt(struct busfreq_data_int *data,
                                 unsigned long volt)
 {
@@ -185,59 +142,33 @@ out:
         return err;
 }
 
-static int exynos5_get_busier_dmc(struct busfreq_data_int *data)
-{
-        int i, j;
-        int busy = 0;
-        unsigned int temp = 0;
-
-        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
-                for (j = PPMU_PMNCNT0; j < PPMU_PMNCNT_MAX; j++) {
-                        if (data->ppmu[i].count[j] > temp) {
-                                temp = data->ppmu[i].count[j];
-                                busy = i;
-                        }
-                }
-        }
-
-        return busy;
-}
-
 static int exynos5_int_get_dev_status(struct device *dev,
                                       struct devfreq_dev_status *stat)
 {
         struct platform_device *pdev = container_of(dev, struct platform_device,
                                                     dev);
         struct busfreq_data_int *data = platform_get_drvdata(pdev);
+        struct busfreq_ppmu_data *ppmu_data = &data->ppmu_data;
         int busier_dmc;
 
-        exynos5_read_ppmu(data);
-        busier_dmc = exynos5_get_busier_dmc(data);
+        exynos_read_ppmu(ppmu_data);
+        busier_dmc = exynos_get_busier_ppmu(ppmu_data);
 
         stat->current_frequency = data->curr_freq;
 
         /* Number of cycles spent on memory access */
-        stat->busy_time = data->ppmu[busier_dmc].count[PPMU_PMNCNT3];
+        stat->busy_time = ppmu_data->ppmu[busier_dmc].count[PPMU_PMNCNT3];
         stat->busy_time *= 100 / INT_BUS_SATURATION_RATIO;
-        stat->total_time = data->ppmu[busier_dmc].ccnt;
+        stat->total_time = ppmu_data->ppmu[busier_dmc].ccnt;
 
         return 0;
 }
-static void exynos5_int_exit(struct device *dev)
-{
-        struct platform_device *pdev = container_of(dev, struct platform_device,
-                                                    dev);
-        struct busfreq_data_int *data = platform_get_drvdata(pdev);
-
-        devfreq_unregister_opp_notifier(dev, data->devfreq);
-}
 
 static struct devfreq_dev_profile exynos5_devfreq_int_profile = {
         .initial_freq           = 160000,
         .polling_ms             = 100,
         .target                 = exynos5_busfreq_int_target,
         .get_dev_status         = exynos5_int_get_dev_status,
-        .exit                   = exynos5_int_exit,
 };
 
 static int exynos5250_init_int_tables(struct busfreq_data_int *data)
@@ -315,6 +246,7 @@ unlock:
 static int exynos5_busfreq_int_probe(struct platform_device *pdev)
 {
         struct busfreq_data_int *data;
+        struct busfreq_ppmu_data *ppmu_data;
         struct dev_pm_opp *opp;
         struct device *dev = &pdev->dev;
         struct device_node *np;
@@ -330,16 +262,26 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        ppmu_data = &data->ppmu_data;
+        ppmu_data->ppmu_end = PPMU_END;
+        ppmu_data->ppmu = devm_kzalloc(dev,
+                                       sizeof(struct exynos_ppmu) * PPMU_END,
+                                       GFP_KERNEL);
+        if (!ppmu_data->ppmu) {
+                dev_err(dev, "Failed to allocate memory for exynos_ppmu\n");
+                return -ENOMEM;
+        }
+
         np = of_find_compatible_node(NULL, NULL, "samsung,exynos5250-ppmu");
         if (np == NULL) {
                 pr_err("Unable to find PPMU node\n");
                 return -ENOENT;
         }
 
-        for (i = PPMU_RIGHT; i < PPMU_END; i++) {
+        for (i = 0; i < ppmu_data->ppmu_end; i++) {
                 /* map PPMU memory region */
-                data->ppmu[i].hw_base = of_iomap(np, i);
-                if (data->ppmu[i].hw_base == NULL) {
+                ppmu_data->ppmu[i].hw_base = of_iomap(np, i);
+                if (ppmu_data->ppmu[i].hw_base == NULL) {
                         dev_err(&pdev->dev, "failed to map memory region\n");
                         return -ENOMEM;
                 }
@@ -390,32 +332,29 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, data);
 
-        busfreq_mon_reset(data);
+        busfreq_mon_reset(ppmu_data);
 
-        data->devfreq = devfreq_add_device(dev, &exynos5_devfreq_int_profile,
+        data->devfreq = devm_devfreq_add_device(dev, &exynos5_devfreq_int_profile,
                                            "simple_ondemand", NULL);
+        if (IS_ERR(data->devfreq))
+                return PTR_ERR(data->devfreq);
 
-        if (IS_ERR(data->devfreq)) {
-                err = PTR_ERR(data->devfreq);
-                goto err_devfreq_add;
+        err = devm_devfreq_register_opp_notifier(dev, data->devfreq);
+        if (err < 0) {
+                dev_err(dev, "Failed to register opp notifier\n");
+                return err;
         }
 
-        devfreq_register_opp_notifier(dev, data->devfreq);
-
         err = register_pm_notifier(&data->pm_notifier);
         if (err) {
                 dev_err(dev, "Failed to setup pm notifier\n");
-                goto err_devfreq_add;
+                return err;
         }
 
         /* TODO: Add a new QOS class for int/mif bus */
         pm_qos_add_request(&data->int_req, PM_QOS_NETWORK_THROUGHPUT, -1);
 
         return 0;
-
-err_devfreq_add:
-        devfreq_remove_device(data->devfreq);
-        return err;
 }
 
 static int exynos5_busfreq_int_remove(struct platform_device *pdev)
@@ -424,24 +363,27 @@ static int exynos5_busfreq_int_remove(struct platform_device *pdev)
 
         pm_qos_remove_request(&data->int_req);
         unregister_pm_notifier(&data->pm_notifier);
-        devfreq_remove_device(data->devfreq);
 
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int exynos5_busfreq_int_resume(struct device *dev)
 {
         struct platform_device *pdev = container_of(dev, struct platform_device,
                                                     dev);
         struct busfreq_data_int *data = platform_get_drvdata(pdev);
+        struct busfreq_ppmu_data *ppmu_data = &data->ppmu_data;
 
-        busfreq_mon_reset(data);
+        busfreq_mon_reset(ppmu_data);
         return 0;
 }
-
 static const struct dev_pm_ops exynos5_busfreq_int_pm = {
         .resume = exynos5_busfreq_int_resume,
 };
+#endif
+static SIMPLE_DEV_PM_OPS(exynos5_busfreq_int_pm_ops, NULL,
+                         exynos5_busfreq_int_resume);
 
 /* platform device pointer for exynos5 devfreq device. */
 static struct platform_device *exynos5_devfreq_pdev;
@@ -452,7 +394,7 @@ static struct platform_driver exynos5_busfreq_int_driver = {
         .driver         = {
                 .name           = "exynos5-bus-int",
                 .owner          = THIS_MODULE,
-                .pm             = &exynos5_busfreq_int_pm,
+                .pm             = &exynos5_busfreq_int_pm_ops,
         },
 };
 
diff --git a/drivers/devfreq/exynos/exynos_ppmu.c b/drivers/devfreq/exynos/exynos_ppmu.c
index 85fc5ac1036a..75fcc5140ffb 100644
--- a/drivers/devfreq/exynos/exynos_ppmu.c
+++ b/drivers/devfreq/exynos/exynos_ppmu.c
@@ -54,3 +54,63 @@ unsigned int exynos_ppmu_read(void __iomem *ppmu_base, unsigned int ch)
 
         return total;
 }
+
+void busfreq_mon_reset(struct busfreq_ppmu_data *ppmu_data)
+{
+        unsigned int i;
+
+        for (i = 0; i < ppmu_data->ppmu_end; i++) {
+                void __iomem *ppmu_base = ppmu_data->ppmu[i].hw_base;
+
+                /* Reset the performance and cycle counters */
+                exynos_ppmu_reset(ppmu_base);
+
+                /* Setup count registers to monitor read/write transactions */
+                ppmu_data->ppmu[i].event[PPMU_PMNCNT3] = RDWR_DATA_COUNT;
+                exynos_ppmu_setevent(ppmu_base, PPMU_PMNCNT3,
+                                        ppmu_data->ppmu[i].event[PPMU_PMNCNT3]);
+
+                exynos_ppmu_start(ppmu_base);
+        }
+}
+
+void exynos_read_ppmu(struct busfreq_ppmu_data *ppmu_data)
+{
+        int i, j;
+
+        for (i = 0; i < ppmu_data->ppmu_end; i++) {
+                void __iomem *ppmu_base = ppmu_data->ppmu[i].hw_base;
+
+                exynos_ppmu_stop(ppmu_base);
+
+                /* Update local data from PPMU */
+                ppmu_data->ppmu[i].ccnt = __raw_readl(ppmu_base + PPMU_CCNT);
+
+                for (j = PPMU_PMNCNT0; j < PPMU_PMNCNT_MAX; j++) {
+                        if (ppmu_data->ppmu[i].event[j] == 0)
+                                ppmu_data->ppmu[i].count[j] = 0;
+                        else
+                                ppmu_data->ppmu[i].count[j] =
+                                        exynos_ppmu_read(ppmu_base, j);
+                }
+        }
+
+        busfreq_mon_reset(ppmu_data);
+}
+
+int exynos_get_busier_ppmu(struct busfreq_ppmu_data *ppmu_data)
+{
+        unsigned int count = 0;
+        int i, j, busy = 0;
+
+        for (i = 0; i < ppmu_data->ppmu_end; i++) {
+                for (j = PPMU_PMNCNT0; j < PPMU_PMNCNT_MAX; j++) {
+                        if (ppmu_data->ppmu[i].count[j] > count) {
+                                count = ppmu_data->ppmu[i].count[j];
+                                busy = i;
+                        }
+                }
+        }
+
+        return busy;
+}
diff --git a/drivers/devfreq/exynos/exynos_ppmu.h b/drivers/devfreq/exynos/exynos_ppmu.h
index 7dfb221eaccd..71f17ba3563c 100644
--- a/drivers/devfreq/exynos/exynos_ppmu.h
+++ b/drivers/devfreq/exynos/exynos_ppmu.h
@@ -69,10 +69,18 @@ struct exynos_ppmu {
         bool count_overflow[PPMU_PMNCNT_MAX];
 };
 
+struct busfreq_ppmu_data {
+        struct exynos_ppmu *ppmu;
+        int ppmu_end;
+};
+
 void exynos_ppmu_reset(void __iomem *ppmu_base);
 void exynos_ppmu_setevent(void __iomem *ppmu_base, unsigned int ch,
                         unsigned int evt);
 void exynos_ppmu_start(void __iomem *ppmu_base);
 void exynos_ppmu_stop(void __iomem *ppmu_base);
 unsigned int exynos_ppmu_read(void __iomem *ppmu_base, unsigned int ch);
+void busfreq_mon_reset(struct busfreq_ppmu_data *ppmu_data);
+void exynos_read_ppmu(struct busfreq_ppmu_data *ppmu_data);
+int exynos_get_busier_ppmu(struct busfreq_ppmu_data *ppmu_data);
 #endif /* __DEVFREQ_EXYNOS_PPMU_H */
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 630f6e84fc01..2c1e4aad7da3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -31,7 +31,6 @@
  */
 
 #include <linux/backlight.h>
-#include <linux/acpi.h>
 
 #include "nouveau_drm.h"
 #include "nouveau_reg.h"
@@ -222,14 +221,6 @@ nouveau_backlight_init(struct drm_device *dev)
         struct nouveau_device *device = nv_device(drm->device);
         struct drm_connector *connector;
 
-#ifdef CONFIG_ACPI
-        if (acpi_video_backlight_support()) {
-                NV_INFO(drm, "ACPI backlight interface available, "
-                             "not registering our own\n");
-                return 0;
-        }
-#endif
-
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS &&
                     connector->connector_type != DRM_MODE_CONNECTOR_eDP)
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 7694e0700d34..b11fdd63eecd 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -1734,18 +1734,17 @@ static struct cpufreq_frequency_table db8500_cpufreq_table[] = {
 
 static long round_armss_rate(unsigned long rate)
 {
+        struct cpufreq_frequency_table *pos;
         long freq = 0;
-        int i = 0;
 
         /* cpufreq table frequencies is in KHz. */
         rate = rate / 1000;
 
         /* Find the corresponding arm opp from the cpufreq table. */
-        while (db8500_cpufreq_table[i].frequency != CPUFREQ_TABLE_END) {
-                freq = db8500_cpufreq_table[i].frequency;
+        cpufreq_for_each_entry(pos, db8500_cpufreq_table) {
+                freq = pos->frequency;
                 if (freq == rate)
                         break;
-                i++;
         }
 
         /* Return the last valid value, even if a match was not found. */
@@ -1886,23 +1885,21 @@ static void set_clock_rate(u8 clock, unsigned long rate)
 
 static int set_armss_rate(unsigned long rate)
 {
-        int i = 0;
+        struct cpufreq_frequency_table *pos;
 
         /* cpufreq table frequencies is in KHz. */
         rate = rate / 1000;
 
         /* Find the corresponding arm opp from the cpufreq table. */
-        while (db8500_cpufreq_table[i].frequency != CPUFREQ_TABLE_END) {
-                if (db8500_cpufreq_table[i].frequency == rate)
+        cpufreq_for_each_entry(pos, db8500_cpufreq_table)
+                if (pos->frequency == rate)
                         break;
-                i++;
-        }
 
-        if (db8500_cpufreq_table[i].frequency != rate)
+        if (pos->frequency != rate)
                 return -EINVAL;
 
         /* Set the new arm opp. */
-        return db8500_prcmu_set_arm_opp(db8500_cpufreq_table[i].driver_data);
+        return db8500_prcmu_set_arm_opp(pos->driver_data);
 }
 
 static int set_plldsi_rate(unsigned long rate)
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index cadf52e22464..e3fe9a286136 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -217,21 +217,17 @@ crc_init_out:
 static u32 sh_sir_find_sclk(struct clk *irda_clk)
 {
         struct cpufreq_frequency_table *freq_table = irda_clk->freq_table;
+        struct cpufreq_frequency_table *pos;
         struct clk *pclk = clk_get(NULL, "peripheral_clk");
         u32 limit, min = 0xffffffff, tmp;
-        int i, index = 0;
+        int index = 0;
 
         limit = clk_get_rate(pclk);
         clk_put(pclk);
 
         /* IrDA can not set over peripheral_clk */
-        for (i = 0;
-             freq_table[i].frequency != CPUFREQ_TABLE_END;
-             i++) {
-                u32 freq = freq_table[i].frequency;
-
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
+        cpufreq_for_each_valid_entry(pos, freq_table) {
+                u32 freq = pos->frequency;
 
                 /* IrDA should not over peripheral_clk */
                 if (freq > limit)
@@ -240,7 +236,7 @@ static u32 sh_sir_find_sclk(struct clk *irda_clk)
                 tmp = freq % SCLK_BASE;
                 if (tmp < min) {
                         min = tmp;
-                        index = i;
+                        index = pos - freq_table;
                 }
         }
 
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index c91f69b39db4..bbf78b2d6d93 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -570,6 +570,14 @@ static const struct dmi_system_id video_vendor_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750"),
                 },
         },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer Aspire 5741",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5741"),
+                },
+        },
         {}
 };
 
@@ -2228,7 +2236,7 @@ static int __init acer_wmi_init(void)
                 pr_info("Brightness must be controlled by acpi video driver\n");
         } else {
                 pr_info("Disabling ACPI video driver\n");
-                acpi_video_unregister();
+                acpi_video_unregister_backlight();
         }
 
         if (wmi_has_guid(WMID_GUID3)) {
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index c31aa07b3ba5..b81448b2c75d 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -30,26 +30,6 @@
 
 static int num;
 
-/* We need only to blacklist devices that have already an acpi driver that
- * can't use pnp layer. We don't need to blacklist device that are directly
- * used by the kernel (PCI root, ...), as it is harmless and there were
- * already present in pnpbios. But there is an exception for devices that
- * have irqs (PIC, Timer) because we call acpi_register_gsi.
- * Finally, only devices that have a CRS method need to be in this list.
- */
-static struct acpi_device_id excluded_id_list[] __initdata = {
-        {"PNP0C09", 0},         /* EC */
-        {"PNP0C0F", 0},         /* Link device */
-        {"PNP0000", 0},         /* PIC */
-        {"PNP0100", 0},         /* Timer */
-        {"", 0},
-};
-
-static inline int __init is_exclusive_device(struct acpi_device *dev)
-{
-        return (!acpi_match_device_ids(dev, excluded_id_list));
-}
-
 /*
  * Compatible Device IDs
  */
@@ -266,7 +246,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         if (!pnpid)
                 return 0;
 
-        if (is_exclusive_device(device) || !device->status.present)
+        if (!device->status.present)
                 return 0;
 
         dev = pnp_alloc_dev(&pnpacpi_protocol, num, pnpid);
@@ -326,10 +306,10 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
 {
         struct acpi_device *device;
 
-        if (!acpi_bus_get_device(handle, &device))
-                pnpacpi_add_device(device);
-        else
+        if (acpi_bus_get_device(handle, &device))
                 return AE_CTRL_DEPTH;
+        if (acpi_is_pnp_device(device))
+                pnpacpi_add_device(device);
         return AE_OK;
 }
 
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 01712cbfd92e..782e82289571 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
                 return 1;
 
         /* check if the resource is valid */
-        if (*irq < 0 || *irq > 15)
+        if (*irq > 15)
                 return 0;
 
         /* check if the resource is reserved */
@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
                 return 1;
 
         /* check if the resource is valid */
-        if (*dma < 0 || *dma == 4 || *dma > 7)
+        if (*dma == 4 || *dma > 7)
                 return 0;
 
         /* check if the resource is reserved */
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 26606641fe44..5a5a24e7d43c 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -537,7 +537,7 @@ static void psy_unregister_cooler(struct power_supply *psy)
 }
 #endif
 
-int power_supply_register(struct device *parent, struct power_supply *psy)
+int __power_supply_register(struct device *parent, struct power_supply *psy, bool ws)
 {
         struct device *dev;
         int rc;
@@ -568,7 +568,7 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
         }
 
         spin_lock_init(&psy->changed_lock);
-        rc = device_init_wakeup(dev, true);
+        rc = device_init_wakeup(dev, ws);
         if (rc)
                 goto wakeup_init_failed;
 
@@ -606,8 +606,19 @@ dev_set_name_failed:
 success:
         return rc;
 }
+
+int power_supply_register(struct device *parent, struct power_supply *psy)
+{
+        return __power_supply_register(parent, psy, true);
+}
 EXPORT_SYMBOL_GPL(power_supply_register);
 
+int power_supply_register_no_ws(struct device *parent, struct power_supply *psy)
+{
+        return __power_supply_register(parent, psy, false);
+}
+EXPORT_SYMBOL_GPL(power_supply_register_no_ws);
+
 void power_supply_unregister(struct power_supply *psy)
 {
         cancel_work_sync(&psy->changed_work);
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index d9a0770b6c73..b1cda6ffdbcc 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -951,7 +951,9 @@ static const struct x86_cpu_id rapl_ids[] = {
         { X86_VENDOR_INTEL, 6, 0x2d},/* Sandy Bridge EP */
         { X86_VENDOR_INTEL, 6, 0x37},/* Valleyview */
         { X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */
-        { X86_VENDOR_INTEL, 6, 0x45},/* Haswell */
+        { X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */
+        { X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */
+        { X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */
         /* TODO: Add more CPU IDs after testing */
         {}
 };
@@ -1124,8 +1126,7 @@ err_cleanup_package:
 static int rapl_check_domain(int cpu, int domain)
 {
         unsigned msr;
-        u64 val1, val2 = 0;
-        int retry = 0;
+        u64 val = 0;
 
         switch (domain) {
         case RAPL_DOMAIN_PACKAGE:
@@ -1144,26 +1145,13 @@ static int rapl_check_domain(int cpu, int domain)
                 pr_err("invalid domain id %d\n", domain);
                 return -EINVAL;
         }
-        if (rdmsrl_safe_on_cpu(cpu, msr, &val1))
-                return -ENODEV;
-
-        /* PP1/uncore/graphics domain may not be active at the time of
-         * driver loading. So skip further checks.
+        /* make sure domain counters are available and contains non-zero
+         * values, otherwise skip it.
          */
-        if (domain == RAPL_DOMAIN_PP1)
-                return 0;
-        /* energy counters roll slowly on some domains */
-        while (++retry < 10) {
-                usleep_range(10000, 15000);
-                rdmsrl_safe_on_cpu(cpu, msr, &val2);
-                if ((val1 & ENERGY_STATUS_MASK) != (val2 & ENERGY_STATUS_MASK))
-                        return 0;
-        }
-        /* if energy counter does not change, report as bad domain */
-        pr_info("domain %s energy ctr %llu:%llu not working, skip\n",
-                rapl_domain_names[domain], val1, val2);
+        if (rdmsrl_safe_on_cpu(cpu, msr, &val) || !val)
+                return -ENODEV;
 
-        return -ENODEV;
+        return 0;
 }
 
 /* Detect active and valid domains for the given CPU, caller must
@@ -1180,6 +1168,9 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu)
                 /* use physical package id to read counters */
                 if (!rapl_check_domain(cpu, i))
                         rp->domain_map |= 1 << i;
+                else
+                        pr_warn("RAPL domain %s detection failed\n",
+                                rapl_domain_names[i]);
         }
         rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX);
         if (!rp->nr_domains) {
diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
index 74727851820d..be56b22ca941 100644
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
@@ -196,17 +196,11 @@ int clk_rate_table_find(struct clk *clk,
                         struct cpufreq_frequency_table *freq_table,
                         unsigned long rate)
 {
-        int i;
-
-        for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                unsigned long freq = freq_table[i].frequency;
+        struct cpufreq_frequency_table *pos;
 
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
-
-                if (freq == rate)
-                        return i;
-        }
+        cpufreq_for_each_valid_entry(pos, freq_table)
+                if (pos->frequency == rate)
+                        return pos - freq_table;
 
         return -ENOENT;
 }
@@ -575,11 +569,7 @@ long clk_round_parent(struct clk *clk, unsigned long target,
                 return abs(target - *best_freq);
         }
 
-        for (freq = parent->freq_table; freq->frequency != CPUFREQ_TABLE_END;
-             freq++) {
-                if (freq->frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
-
+        cpufreq_for_each_valid_entry(freq, parent->freq_table) {
                 if (unlikely(freq->frequency / target <= div_min - 1)) {
                         unsigned long freq_max;
 
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 4246262c4bd2..84a75f89bf74 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -144,11 +144,11 @@ static int get_property(unsigned int cpu, unsigned long input,
                         unsigned int *output,
                         enum cpufreq_cooling_property property)
 {
-        int i, j;
+        int i;
         unsigned long max_level = 0, level = 0;
         unsigned int freq = CPUFREQ_ENTRY_INVALID;
         int descend = -1;
-        struct cpufreq_frequency_table *table =
+        struct cpufreq_frequency_table *pos, *table =
                                         cpufreq_frequency_get_table(cpu);
 
         if (!output)
@@ -157,20 +157,16 @@ static int get_property(unsigned int cpu, unsigned long input,
         if (!table)
                 return -EINVAL;
 
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                /* ignore invalid entries */
-                if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
-
+        cpufreq_for_each_valid_entry(pos, table) {
                 /* ignore duplicate entry */
-                if (freq == table[i].frequency)
+                if (freq == pos->frequency)
                         continue;
 
                 /* get the frequency order */
                 if (freq != CPUFREQ_ENTRY_INVALID && descend == -1)
-                        descend = !!(freq > table[i].frequency);
+                        descend = freq > pos->frequency;
 
-                freq = table[i].frequency;
+                freq = pos->frequency;
                 max_level++;
         }
 
@@ -190,29 +186,26 @@ static int get_property(unsigned int cpu, unsigned long input,
         if (property == GET_FREQ)
                 level = descend ? input : (max_level - input);
 
-        for (i = 0, j = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                /* ignore invalid entry */
-                if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
-                        continue;
-
+        i = 0;
+        cpufreq_for_each_valid_entry(pos, table) {
                 /* ignore duplicate entry */
-                if (freq == table[i].frequency)
+                if (freq == pos->frequency)
                         continue;
 
                 /* now we have a valid frequency entry */
-                freq = table[i].frequency;
+                freq = pos->frequency;
 
                 if (property == GET_LEVEL && (unsigned int)input == freq) {
                         /* get level by frequency */
-                        *output = descend ? j : (max_level - j);
+                        *output = descend ? i : (max_level - i);
                         return 0;
                 }
-                if (property == GET_FREQ && level == j) {
+                if (property == GET_FREQ && level == i) {
                         /* get frequency by level */
                         *output = freq;
                         return 0;
                 }
-                j++;
+                i++;
         }
 
         return -EINVAL;
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index bd2172c2d650..428089009cd5 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -23,6 +23,7 @@
 
 static struct list_head backlight_dev_list;
 static struct mutex backlight_dev_list_mutex;
+static struct blocking_notifier_head backlight_notifier;
 
 static const char *const backlight_types[] = {
         [BACKLIGHT_RAW] = "raw",
@@ -370,6 +371,9 @@ struct backlight_device *backlight_device_register(const char *name,
         list_add(&new_bd->entry, &backlight_dev_list);
         mutex_unlock(&backlight_dev_list_mutex);
 
+        blocking_notifier_call_chain(&backlight_notifier,
+                                     BACKLIGHT_REGISTERED, new_bd);
+
         return new_bd;
 }
 EXPORT_SYMBOL(backlight_device_register);
@@ -413,6 +417,10 @@ void backlight_device_unregister(struct backlight_device *bd)
                 pmac_backlight = NULL;
         mutex_unlock(&pmac_backlight_mutex);
 #endif
+
+        blocking_notifier_call_chain(&backlight_notifier,
+                                     BACKLIGHT_UNREGISTERED, bd);
+
         mutex_lock(&bd->ops_lock);
         bd->ops = NULL;
         mutex_unlock(&bd->ops_lock);
@@ -438,6 +446,36 @@ static int devm_backlight_device_match(struct device *dev, void *res,
 }
 
 /**
+ * backlight_register_notifier - get notified of backlight (un)registration
+ * @nb: notifier block with the notifier to call on backlight (un)registration
+ *
+ * @return 0 on success, otherwise a negative error code
+ *
+ * Register a notifier to get notified when backlight devices get registered
+ * or unregistered.
+ */
+int backlight_register_notifier(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&backlight_notifier, nb);
+}
+EXPORT_SYMBOL(backlight_register_notifier);
+
+/**
+ * backlight_unregister_notifier - unregister a backlight notifier
+ * @nb: notifier block to unregister
+ *
+ * @return 0 on success, otherwise a negative error code
+ *
+ * Register a notifier to get notified when backlight devices get registered
+ * or unregistered.
+ */
+int backlight_unregister_notifier(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&backlight_notifier, nb);
+}
+EXPORT_SYMBOL(backlight_unregister_notifier);
+
+/**
  * devm_backlight_device_register - resource managed backlight_device_register()
  * @dev: the device to register
  * @name: the name of the device
@@ -544,6 +582,8 @@ static int __init backlight_class_init(void)
         backlight_class->pm = &backlight_class_dev_pm_ops;
         INIT_LIST_HEAD(&backlight_dev_list);
         mutex_init(&backlight_dev_list_mutex);
+        BLOCKING_INIT_NOTIFIER_HEAD(&backlight_notifier);
+
         return 0;
 }
 
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index ca0cb603b171..a08e55a263c9 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -62,8 +62,6 @@
 #include <acpi/acrestyp.h>              /* Resource Descriptor structs */
 #include <acpi/acpiosxf.h>              /* OSL interfaces (ACPICA-to-OS) */
 #include <acpi/acpixf.h>                /* ACPI core subsystem external interfaces */
-#ifdef ACPI_NATIVE_INTERFACE_HEADER
-#include ACPI_NATIVE_INTERFACE_HEADER
-#endif
+#include <acpi/platform/acenvex.h>      /* Extra environment-specific items */
 
 #endif                          /* __ACPI_H__ */
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 84a2e29a2314..b5714580801a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -131,6 +131,7 @@ static inline struct acpi_hotplug_profile *to_acpi_hotplug_profile(
 struct acpi_scan_handler {
         const struct acpi_device_id *ids;
         struct list_head list_node;
+        bool (*match)(char *idstr, const struct acpi_device_id **matchid);
         int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);
         void (*detach)(struct acpi_device *dev);
         void (*bind)(struct device *phys_dev);
@@ -232,7 +233,8 @@ struct acpi_hardware_id {
 struct acpi_pnp_type {
         u32 hardware_id:1;
         u32 bus_address:1;
-        u32 reserved:30;
+        u32 platform_id:1;
+        u32 reserved:29;
 };
 
 struct acpi_device_pnp {
@@ -261,7 +263,8 @@ struct acpi_device_power_flags {
         u32 inrush_current:1;   /* Serialize Dx->D0 */
         u32 power_removed:1;    /* Optimize Dx->D0 */
         u32 ignore_parent:1;    /* Power is independent of parent power state */
-        u32 reserved:27;
+        u32 dsw_present:1;      /* _DSW present? */
+        u32 reserved:26;
 };
 
 struct acpi_device_power_state {
@@ -406,6 +409,8 @@ extern struct kobject *acpi_kobj;
 extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
 void acpi_bus_private_data_handler(acpi_handle, void *);
 int acpi_bus_get_private_data(acpi_handle, void **);
+int acpi_bus_attach_private_data(acpi_handle, void *);
+void acpi_bus_detach_private_data(acpi_handle);
 void acpi_bus_no_hotplug(acpi_handle handle);
 extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);
 extern int register_acpi_notifier(struct notifier_block *);
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index d504613bbf80..ea6428b7dacb 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -96,7 +96,12 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle);
 /* Arch-defined function to add a bus to the system */
 
 struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
+
+#ifdef CONFIG_X86
 void pci_acpi_crs_quirks(void);
+#else
+static inline void pci_acpi_crs_quirks(void) { }
+#endif
 
 /* --------------------------------------------------------------------------
                                     Processor
diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
index 2be858018c7f..444671e9c65d 100644
--- a/include/acpi/acpi_io.h
+++ b/include/acpi/acpi_io.h
@@ -9,6 +9,9 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
        return ioremap_cache(phys, size);
 }
 
+void __iomem *__init_refok
+acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
+void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
 void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
 
 int acpi_os_map_generic_address(struct acpi_generic_address *addr);
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 44f5e9749601..35b525c19711 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                 0x20140214
+#define ACPI_CA_VERSION                 0x20140424
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
@@ -55,233 +55,478 @@
 
 extern u8 acpi_gbl_permanent_mmap;
 
+/*****************************************************************************
+ *
+ * Macros used for ACPICA globals and configuration
+ *
+ ****************************************************************************/
+
 /*
- * Globals that are publically available
+ * Ensure that global variables are defined and initialized only once.
+ *
+ * The use of these macros allows for a single list of globals (here)
+ * in order to simplify maintenance of the code.
  */
-extern u32 acpi_current_gpe_count;
-extern struct acpi_table_fadt acpi_gbl_FADT;
-extern u8 acpi_gbl_system_awake_and_running;
-extern u8 acpi_gbl_reduced_hardware;    /* ACPI 5.0 */
-extern u8 acpi_gbl_osi_data;
+#ifdef DEFINE_ACPI_GLOBALS
+#define ACPI_GLOBAL(type,name) \
+        extern type name; \
+        type name
 
-/* Runtime configuration of debug print levels */
+#define ACPI_INIT_GLOBAL(type,name,value) \
+        type name=value
 
-extern u32 acpi_dbg_level;
-extern u32 acpi_dbg_layer;
-
-/* ACPICA runtime options */
+#else
+#ifndef ACPI_GLOBAL
+#define ACPI_GLOBAL(type,name) \
+        extern type name
+#endif
 
-extern u8 acpi_gbl_auto_serialize_methods;
-extern u8 acpi_gbl_copy_dsdt_locally;
-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 u8 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;
+#ifndef ACPI_INIT_GLOBAL
+#define ACPI_INIT_GLOBAL(type,name,value) \
+        extern type name
+#endif
+#endif
 
 /*
- * Hardware-reduced prototypes. All interfaces that use these macros will
- * be configured out of the ACPICA build if the ACPI_REDUCED_HARDWARE flag
- * is set to TRUE.
+ * These macros configure the various ACPICA interfaces. They are
+ * useful for generating stub inline functions for features that are
+ * configured out of the current kernel or ACPICA application.
  */
-#if (!ACPI_REDUCED_HARDWARE)
-#define ACPI_HW_DEPENDENT_RETURN_STATUS(prototype) \
+#ifndef ACPI_EXTERNAL_RETURN_STATUS
+#define ACPI_EXTERNAL_RETURN_STATUS(prototype) \
         prototype;
+#endif
 
-#define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \
+#ifndef ACPI_EXTERNAL_RETURN_OK
+#define ACPI_EXTERNAL_RETURN_OK(prototype) \
         prototype;
+#endif
 
-#define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \
+#ifndef ACPI_EXTERNAL_RETURN_VOID
+#define ACPI_EXTERNAL_RETURN_VOID(prototype) \
         prototype;
+#endif
 
-#else
-#define ACPI_HW_DEPENDENT_RETURN_STATUS(prototype) \
-        static ACPI_INLINE prototype {return(AE_NOT_CONFIGURED);}
-
-#define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \
-        static ACPI_INLINE prototype {return(AE_OK);}
+#ifndef ACPI_EXTERNAL_RETURN_UINT32
+#define ACPI_EXTERNAL_RETURN_UINT32(prototype) \
+        prototype;
+#endif
 
-#define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \
-        static ACPI_INLINE prototype {return;}
+#ifndef ACPI_EXTERNAL_RETURN_PTR
+#define ACPI_EXTERNAL_RETURN_PTR(prototype) \
+        prototype;
+#endif
 
-#endif                          /* !ACPI_REDUCED_HARDWARE */
+/*****************************************************************************
+ *
+ * Public globals and runtime configuration options
+ *
+ ****************************************************************************/
 
 /*
- * Initialization
+ * Enable "slack mode" of the AML interpreter?  Default is FALSE, and the
+ * interpreter strictly follows the ACPI specification. Setting to TRUE
+ * allows the interpreter to ignore certain errors and/or bad AML constructs.
+ *
+ * Currently, these features are enabled by this flag:
+ *
+ * 1) Allow "implicit return" of last value in a control method
+ * 2) Allow access beyond the end of an operation region
+ * 3) Allow access to uninitialized locals/args (auto-init to integer 0)
+ * 4) Allow ANY object type to be a source operand for the Store() operator
+ * 5) Allow unresolved references (invalid target name) in package objects
+ * 6) Enable warning messages for behavior that is not ACPI spec compliant
  */
-acpi_status __init
-acpi_initialize_tables(struct acpi_table_desc *initial_storage,
-                       u32 initial_table_count, u8 allow_resize);
-
-acpi_status __init acpi_initialize_subsystem(void);
+ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_interpreter_slack, FALSE);
 
-acpi_status __init acpi_enable_subsystem(u32 flags);
-
-acpi_status __init acpi_initialize_objects(u32 flags);
+/*
+ * Automatically serialize all methods that create named objects? Default
+ * is TRUE, meaning that all non_serialized methods are scanned once at
+ * table load time to determine those that create named objects. Methods
+ * that create named objects are marked Serialized in order to prevent
+ * possible run-time problems if they are entered by more than one thread.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_auto_serialize_methods, TRUE);
 
-acpi_status __init acpi_terminate(void);
+/*
+ * Create the predefined _OSI method in the namespace? Default is TRUE
+ * because ACPICA is fully compatible with other ACPI implementations.
+ * Changing this will revert ACPICA (and machine ASL) to pre-OSI behavior.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_create_osi_method, TRUE);
 
 /*
- * Miscellaneous global interfaces
+ * Optionally use default values for the ACPI register widths. Set this to
+ * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
  */
-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);
-#endif
+ACPI_INIT_GLOBAL(u8, acpi_gbl_use_default_register_widths, TRUE);
 
-#ifdef ACPI_FUTURE_USAGE
-acpi_status acpi_get_system_info(struct acpi_buffer *ret_buffer);
-#endif
+/*
+ * Whether or not to verify the table checksum before installation. Set
+ * this to TRUE to verify the table checksum before install it to the table
+ * manager. Note that enabling this option causes errors to happen in some
+ * OSPMs during early initialization stages. Default behavior is to do such
+ * verification.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_verify_table_checksum, TRUE);
 
-acpi_status acpi_get_statistics(struct acpi_statistics *stats);
+/*
+ * Optionally enable output from the AML Debug Object.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_aml_debug_object, FALSE);
 
-const char *acpi_format_exception(acpi_status exception);
+/*
+ * Optionally copy the entire DSDT to local memory (instead of simply
+ * mapping it.) There are some BIOSs that corrupt or replace the original
+ * DSDT, creating the need for this option. Default is FALSE, do not copy
+ * the DSDT.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_copy_dsdt_locally, FALSE);
 
-acpi_status acpi_purge_cached_objects(void);
+/*
+ * 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.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
 
-acpi_status acpi_install_interface(acpi_string interface_name);
+/*
+ * 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 TRUE, favor the 32-bit addresses.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, TRUE);
 
-acpi_status acpi_remove_interface(acpi_string interface_name);
+/*
+ * 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
+ * requested by the BIOS.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_truncate_io_addresses, FALSE);
 
-acpi_status acpi_update_interfaces(u8 action);
+/*
+ * Disable runtime checking and repair of values returned by control methods.
+ * Use only if the repair is causing a problem on a particular machine.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_auto_repair, FALSE);
 
-u32
-acpi_check_address_range(acpi_adr_space_type space_id,
-                         acpi_physical_address address,
-                         acpi_size length, u8 warn);
+/*
+ * Optionally do not install any SSDTs from the RSDT/XSDT during initialization.
+ * This can be useful for debugging ACPI problems on some machines.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_ssdt_table_install, FALSE);
 
-acpi_status
-acpi_decode_pld_buffer(u8 *in_buffer,
-                       acpi_size length, struct acpi_pld_info **return_buffer);
+/*
+ * We keep track of the latest version of Windows that has been requested by
+ * the BIOS. ACPI 5.0.
+ */
+ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0);
 
 /*
- * ACPI table load/unload interfaces
+ * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
+ * that the ACPI hardware is no longer required. A flag in the FADT indicates
+ * a reduced HW machine, and that flag is duplicated here for convenience.
  */
-acpi_status acpi_load_table(struct acpi_table_header *table);
+ACPI_INIT_GLOBAL(u8, acpi_gbl_reduced_hardware, FALSE);
 
-acpi_status acpi_unload_parent_table(acpi_handle object);
+/*
+ * This mechanism is used to trace a specified AML method. The method is
+ * traced each time it is executed.
+ */
+ACPI_INIT_GLOBAL(u32, acpi_gbl_trace_flags, 0);
+ACPI_INIT_GLOBAL(acpi_name, acpi_gbl_trace_method_name, 0);
 
-acpi_status __init acpi_load_tables(void);
+/*
+ * Runtime configuration of debug output control masks. We want the debug
+ * switches statically initialized so they are already set when the debugger
+ * is entered.
+ */
+ACPI_INIT_GLOBAL(u32, acpi_dbg_level, ACPI_DEBUG_DEFAULT);
+ACPI_INIT_GLOBAL(u32, acpi_dbg_layer, 0);
 
 /*
- * ACPI table manipulation interfaces
+ * Other miscellaneous globals
  */
-acpi_status __init acpi_reallocate_root_table(void);
+ACPI_GLOBAL(struct acpi_table_fadt, acpi_gbl_FADT);
+ACPI_GLOBAL(u32, acpi_current_gpe_count);
+ACPI_GLOBAL(u8, acpi_gbl_system_awake_and_running);
 
-acpi_status __init acpi_find_root_pointer(acpi_size *rsdp_address);
+/*****************************************************************************
+ *
+ * ACPICA public interface configuration.
+ *
+ * Interfaces that are configured out of the ACPICA build are replaced
+ * by inlined stubs by default.
+ *
+ ****************************************************************************/
 
-acpi_status acpi_unload_table_id(acpi_owner_id id);
+/*
+ * Hardware-reduced prototypes (default: Not hardware reduced).
+ *
+ * All ACPICA hardware-related interfaces that use these macros will be
+ * configured out of the ACPICA build if the ACPI_REDUCED_HARDWARE flag
+ * is set to TRUE.
+ *
+ * Note: This static build option for reduced hardware is intended to
+ * reduce ACPICA code size if desired or necessary. However, even if this
+ * option is not specified, the runtime behavior of ACPICA is dependent
+ * on the actual FADT reduced hardware flag (HW_REDUCED_ACPI). If set,
+ * the flag will enable similar behavior -- ACPICA will not attempt
+ * to access any ACPI-relate hardware (SCI, GPEs, Fixed Events, etc.)
+ */
+#if (!ACPI_REDUCED_HARDWARE)
+#define ACPI_HW_DEPENDENT_RETURN_STATUS(prototype) \
+        ACPI_EXTERNAL_RETURN_STATUS(prototype)
 
-acpi_status
-acpi_get_table_header(acpi_string signature,
-                      u32 instance, struct acpi_table_header *out_table_header);
+#define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \
+        ACPI_EXTERNAL_RETURN_OK(prototype)
 
-acpi_status
-acpi_get_table_with_size(acpi_string signature,
-               u32 instance, struct acpi_table_header **out_table,
-               acpi_size *tbl_size);
+#define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \
+        ACPI_EXTERNAL_RETURN_VOID(prototype)
 
-acpi_status
-acpi_get_table(acpi_string signature,
-               u32 instance, struct acpi_table_header **out_table);
+#else
+#define ACPI_HW_DEPENDENT_RETURN_STATUS(prototype) \
+        static ACPI_INLINE prototype {return(AE_NOT_CONFIGURED);}
 
-acpi_status
-acpi_get_table_by_index(u32 table_index, struct acpi_table_header **out_table);
+#define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \
+        static ACPI_INLINE prototype {return(AE_OK);}
 
-acpi_status
-acpi_install_table_handler(acpi_table_handler handler, void *context);
+#define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \
+        static ACPI_INLINE prototype {return;}
 
-acpi_status acpi_remove_table_handler(acpi_table_handler handler);
+#endif                          /* !ACPI_REDUCED_HARDWARE */
 
 /*
- * Namespace and name interfaces
+ * Error message prototypes (default: error messages enabled).
+ *
+ * All interfaces related to error and warning messages
+ * will be configured out of the ACPICA build if the
+ * ACPI_NO_ERROR_MESSAGE flag is defined.
  */
-acpi_status
-acpi_walk_namespace(acpi_object_type type,
-                    acpi_handle start_object,
-                    u32 max_depth,
-                    acpi_walk_callback descending_callback,
-                    acpi_walk_callback ascending_callback,
-                    void *context, void **return_value);
+#ifndef ACPI_NO_ERROR_MESSAGES
+#define ACPI_MSG_DEPENDENT_RETURN_VOID(prototype) \
+        prototype;
 
-acpi_status
-acpi_get_devices(const char *HID,
-                 acpi_walk_callback user_function,
-                 void *context, void **return_value);
+#else
+#define ACPI_MSG_DEPENDENT_RETURN_VOID(prototype) \
+        static ACPI_INLINE prototype {return;}
 
-acpi_status
-acpi_get_name(acpi_handle object,
-              u32 name_type, struct acpi_buffer *ret_path_ptr);
+#endif                          /* ACPI_NO_ERROR_MESSAGES */
 
-acpi_status
-acpi_get_handle(acpi_handle parent,
-                acpi_string pathname, acpi_handle * ret_handle);
+/*
+ * Debugging output prototypes (default: no debug output).
+ *
+ * All interfaces related to debug output messages
+ * will be configured out of the ACPICA build unless the
+ * ACPI_DEBUG_OUTPUT flag is defined.
+ */
+#ifdef ACPI_DEBUG_OUTPUT
+#define ACPI_DBG_DEPENDENT_RETURN_VOID(prototype) \
+        prototype;
 
-acpi_status
-acpi_attach_data(acpi_handle object, acpi_object_handler handler, void *data);
+#else
+#define ACPI_DBG_DEPENDENT_RETURN_VOID(prototype) \
+        static ACPI_INLINE prototype {return;}
 
-acpi_status acpi_detach_data(acpi_handle object, acpi_object_handler handler);
+#endif                          /* ACPI_DEBUG_OUTPUT */
 
-acpi_status
-acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data,
-                   void (*callback)(void *));
+/*****************************************************************************
+ *
+ * ACPICA public interface prototypes
+ *
+ ****************************************************************************/
 
-acpi_status
-acpi_get_data(acpi_handle object, acpi_object_handler handler, void **data);
+/*
+ * Initialization
+ */
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
+                            acpi_initialize_tables(struct acpi_table_desc
+                                                   *initial_storage,
+                                                   u32 initial_table_count,
+                                                   u8 allow_resize))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_initialize_subsystem(void))
 
-acpi_status
-acpi_debug_trace(char *name, u32 debug_level, u32 debug_layer, u32 flags);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_enable_subsystem(u32 flags))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
+                            acpi_initialize_objects(u32 flags))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_terminate(void))
 
 /*
- * Object manipulation and enumeration
+ * Miscellaneous global interfaces
  */
-acpi_status
-acpi_evaluate_object(acpi_handle object,
-                     acpi_string pathname,
-                     struct acpi_object_list *parameter_objects,
-                     struct acpi_buffer *return_object_buffer);
+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_EXTERNAL_RETURN_STATUS(acpi_status acpi_subsystem_status(void))
+#endif
 
-acpi_status
-acpi_evaluate_object_typed(acpi_handle object,
-                           acpi_string pathname,
-                           struct acpi_object_list *external_params,
-                           struct acpi_buffer *return_buffer,
-                           acpi_object_type return_type);
+#ifdef ACPI_FUTURE_USAGE
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_system_info(struct acpi_buffer
+                                                 *ret_buffer))
+#endif
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_statistics(struct acpi_statistics *stats))
+ACPI_EXTERNAL_RETURN_PTR(const char
+                          *acpi_format_exception(acpi_status exception))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_purge_cached_objects(void))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_install_interface(acpi_string interface_name))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_remove_interface(acpi_string interface_name))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_update_interfaces(u8 action))
+
+ACPI_EXTERNAL_RETURN_UINT32(u32
+                            acpi_check_address_range(acpi_adr_space_type
+                                                     space_id,
+                                                     acpi_physical_address
+                                                     address, acpi_size length,
+                                                     u8 warn))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_decode_pld_buffer(u8 *in_buffer,
+                                                    acpi_size length,
+                                                    struct acpi_pld_info
+                                                    **return_buffer))
 
-acpi_status
-acpi_get_object_info(acpi_handle object,
-                     struct acpi_device_info **return_buffer);
+/*
+ * ACPI table load/unload interfaces
+ */
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
+                            acpi_install_table(acpi_physical_address address,
+                                               u8 physical))
 
-acpi_status acpi_install_method(u8 *buffer);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_load_table(struct acpi_table_header *table))
 
-acpi_status
-acpi_get_next_object(acpi_object_type type,
-                     acpi_handle parent,
-                     acpi_handle child, acpi_handle * out_handle);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_unload_parent_table(acpi_handle object))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_load_tables(void))
 
-acpi_status acpi_get_type(acpi_handle object, acpi_object_type * out_type);
+/*
+ * ACPI table manipulation interfaces
+ */
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_reallocate_root_table(void))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
+                            acpi_find_root_pointer(acpi_size * rsdp_address))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_table_header(acpi_string signature,
+                                                  u32 instance,
+                                                  struct acpi_table_header
+                                                  *out_table_header))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_table(acpi_string signature, u32 instance,
+                                            struct acpi_table_header
+                                            **out_table))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_table_by_index(u32 table_index,
+                                                     struct acpi_table_header
+                                                     **out_table))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_install_table_handler(acpi_table_handler
+                                                        handler, void *context))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_remove_table_handler(acpi_table_handler
+                                                       handler))
 
-acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type);
+/*
+ * Namespace and name interfaces
+ */
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_walk_namespace(acpi_object_type type,
+                                                acpi_handle start_object,
+                                                u32 max_depth,
+                                                acpi_walk_callback
+                                                descending_callback,
+                                                acpi_walk_callback
+                                                ascending_callback,
+                                                void *context,
+                                                void **return_value))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_devices(const char *HID,
+                                              acpi_walk_callback user_function,
+                                              void *context,
+                                              void **return_value))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_name(acpi_handle object, u32 name_type,
+                                           struct acpi_buffer *ret_path_ptr))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_handle(acpi_handle parent,
+                                             acpi_string pathname,
+                                             acpi_handle * ret_handle))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_attach_data(acpi_handle object,
+                                              acpi_object_handler handler,
+                                              void *data))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_detach_data(acpi_handle object,
+                                              acpi_object_handler handler))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_data(acpi_handle object,
+                                           acpi_object_handler handler,
+                                           void **data))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_debug_trace(char *name, u32 debug_level,
+                                              u32 debug_layer, u32 flags))
 
-acpi_status acpi_get_parent(acpi_handle object, acpi_handle * out_handle);
+/*
+ * Object manipulation and enumeration
+ */
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_evaluate_object(acpi_handle object,
+                                                 acpi_string pathname,
+                                                 struct acpi_object_list
+                                                 *parameter_objects,
+                                                 struct acpi_buffer
+                                                 *return_object_buffer))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_evaluate_object_typed(acpi_handle object,
+                                                        acpi_string pathname,
+                                                        struct acpi_object_list
+                                                        *external_params,
+                                                        struct acpi_buffer
+                                                        *return_buffer,
+                                                        acpi_object_type
+                                                        return_type))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_object_info(acpi_handle object,
+                                                  struct acpi_device_info
+                                                  **return_buffer))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_install_method(u8 *buffer))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_next_object(acpi_object_type type,
+                                                 acpi_handle parent,
+                                                 acpi_handle child,
+                                                 acpi_handle * out_handle))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_type(acpi_handle object,
+                                          acpi_object_type * out_type))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_parent(acpi_handle object,
+                                            acpi_handle * out_handle))
 
 /*
  * Handler interfaces
  */
-acpi_status
-acpi_install_initialization_handler(acpi_init_handler handler, u32 function);
-
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_install_initialization_handler
+                            (acpi_init_handler handler, u32 function))
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
-                                acpi_install_sci_handler(acpi_sci_handler
-                                                         address,
-                                                         void *context))
+                                 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))
@@ -313,30 +558,42 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                                          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_status
-acpi_remove_notify_handler(acpi_handle device,
-                           u32 handler_type, acpi_notify_handler handler);
-
-acpi_status
-acpi_install_address_space_handler(acpi_handle device,
-                                   acpi_adr_space_type space_id,
-                                   acpi_adr_space_handler handler,
-                                   acpi_adr_space_setup setup, void *context);
-
-acpi_status
-acpi_remove_address_space_handler(acpi_handle device,
-                                  acpi_adr_space_type space_id,
-                                  acpi_adr_space_handler handler);
-
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_install_notify_handler(acpi_handle device,
+                                                         u32 handler_type,
+                                                         acpi_notify_handler
+                                                         handler,
+                                                         void *context))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_remove_notify_handler(acpi_handle device,
+                                                        u32 handler_type,
+                                                        acpi_notify_handler
+                                                        handler))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_install_address_space_handler(acpi_handle
+                                                                device,
+                                                                acpi_adr_space_type
+                                                                space_id,
+                                                                acpi_adr_space_handler
+                                                                handler,
+                                                                acpi_adr_space_setup
+                                                                setup,
+                                                                void *context))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_remove_address_space_handler(acpi_handle
+                                                               device,
+                                                               acpi_adr_space_type
+                                                               space_id,
+                                                               acpi_adr_space_handler
+                                                               handler))
 #ifdef ACPI_FUTURE_USAGE
-acpi_status acpi_install_exception_handler(acpi_exception_handler handler);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_install_exception_handler
+                             (acpi_exception_handler handler))
 #endif
-
-acpi_status acpi_install_interface_handler(acpi_interface_handler handler);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_install_interface_handler
+                             (acpi_interface_handler handler))
 
 /*
  * Global Lock interfaces
@@ -351,10 +608,14 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
 /*
  * Interfaces to AML mutex objects
  */
-acpi_status
-acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_acquire_mutex(acpi_handle handle,
+                                               acpi_string pathname,
+                                               u16 timeout))
 
-acpi_status acpi_release_mutex(acpi_handle handle, acpi_string pathname);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_release_mutex(acpi_handle handle,
+                                               acpi_string pathname))
 
 /*
  * Fixed Event interfaces
@@ -434,57 +695,69 @@ typedef
 acpi_status(*acpi_walk_resource_callback) (struct acpi_resource * resource,
                                            void *context);
 
-acpi_status
-acpi_get_vendor_resource(acpi_handle device,
-                         char *name,
-                         struct acpi_vendor_uuid *uuid,
-                         struct acpi_buffer *ret_buffer);
-
-acpi_status
-acpi_get_current_resources(acpi_handle device, struct acpi_buffer *ret_buffer);
-
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_vendor_resource(acpi_handle device,
+                                                     char *name,
+                                                     struct acpi_vendor_uuid
+                                                     *uuid,
+                                                     struct acpi_buffer
+                                                     *ret_buffer))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_current_resources(acpi_handle device,
+                                                        struct acpi_buffer
+                                                        *ret_buffer))
 #ifdef ACPI_FUTURE_USAGE
-acpi_status
-acpi_get_possible_resources(acpi_handle device, struct acpi_buffer *ret_buffer);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_possible_resources(acpi_handle device,
+                                                         struct acpi_buffer
+                                                         *ret_buffer))
 #endif
-
-acpi_status
-acpi_get_event_resources(acpi_handle device_handle,
-                         struct acpi_buffer *ret_buffer);
-
-acpi_status
-acpi_walk_resource_buffer(struct acpi_buffer *buffer,
-                          acpi_walk_resource_callback user_function,
-                          void *context);
-
-acpi_status
-acpi_walk_resources(acpi_handle device,
-                    char *name,
-                    acpi_walk_resource_callback user_function, void *context);
-
-acpi_status
-acpi_set_current_resources(acpi_handle device, struct acpi_buffer *in_buffer);
-
-acpi_status
-acpi_get_irq_routing_table(acpi_handle device, struct acpi_buffer *ret_buffer);
-
-acpi_status
-acpi_resource_to_address64(struct acpi_resource *resource,
-                           struct acpi_resource_address64 *out);
-
-acpi_status
-acpi_buffer_to_resource(u8 *aml_buffer,
-                        u16 aml_buffer_length,
-                        struct acpi_resource **resource_ptr);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_event_resources(acpi_handle device_handle,
+                                                      struct acpi_buffer
+                                                      *ret_buffer))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_walk_resource_buffer(struct acpi_buffer
+                                                       *buffer,
+                                                       acpi_walk_resource_callback
+                                                       user_function,
+                                                       void *context))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_walk_resources(acpi_handle device, char *name,
+                                                 acpi_walk_resource_callback
+                                                 user_function, void *context))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_set_current_resources(acpi_handle device,
+                                                        struct acpi_buffer
+                                                        *in_buffer))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_get_irq_routing_table(acpi_handle device,
+                                                        struct acpi_buffer
+                                                        *ret_buffer))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_resource_to_address64(struct acpi_resource
+                                                        *resource,
+                                                        struct
+                                                        acpi_resource_address64
+                                                        *out))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                             acpi_buffer_to_resource(u8 *aml_buffer,
+                                                     u16 aml_buffer_length,
+                                                     struct acpi_resource
+                                                     **resource_ptr))
 
 /*
  * Hardware (ACPI device) interfaces
  */
-acpi_status acpi_reset(void);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_reset(void))
 
-acpi_status acpi_read(u64 *value, struct acpi_generic_address *reg);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_read(u64 *value,
+                                      struct acpi_generic_address *reg))
 
-acpi_status acpi_write(u64 value, struct acpi_generic_address *reg);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_write(u64 value,
+                                       struct acpi_generic_address *reg))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                 acpi_read_bit_register(u32 register_id,
@@ -497,18 +770,20 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
 /*
  * Sleep/Wake interfaces
  */
-acpi_status
-acpi_get_sleep_type_data(u8 sleep_state, u8 *slp_typ_a, u8 *slp_typ_b);
-
-acpi_status acpi_enter_sleep_state_prep(u8 sleep_state);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_sleep_type_data(u8 sleep_state,
+                                                     u8 *slp_typ_a,
+                                                     u8 *slp_typ_b))
 
-acpi_status acpi_enter_sleep_state(u8 sleep_state);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_enter_sleep_state_prep(u8 sleep_state))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_enter_sleep_state(u8 sleep_state))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enter_sleep_state_s4bios(void))
 
-acpi_status acpi_leave_sleep_state_prep(u8 sleep_state);
-
-acpi_status acpi_leave_sleep_state(u8 sleep_state);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_leave_sleep_state_prep(u8 sleep_state))
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                 acpi_set_firmware_waking_vector(u32
@@ -535,53 +810,72 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
 /*
  * Error/Warning output
  */
-ACPI_PRINTF_LIKE(3)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_error(const char *module_name, u32 line_number, const char *format, ...);
-
-ACPI_PRINTF_LIKE(4)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_exception(const char *module_name,
-               u32 line_number, acpi_status status, const char *format, ...);
-
-ACPI_PRINTF_LIKE(3)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_warning(const char *module_name, u32 line_number, const char *format, ...);
-
-ACPI_PRINTF_LIKE(3)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_info(const char *module_name, u32 line_number, const char *format, ...);
-
-ACPI_PRINTF_LIKE(3)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_bios_error(const char *module_name,
-                u32 line_number, const char *format, ...);
-
-ACPI_PRINTF_LIKE(3)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_bios_warning(const char *module_name,
-                  u32 line_number, const char *format, ...);
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
+                               void ACPI_INTERNAL_VAR_XFACE
+                               acpi_error(const char *module_name,
+                                          u32 line_number,
+                                          const char *format, ...))
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(4)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_exception(const char *module_name,
+                                               u32 line_number,
+                                               acpi_status status,
+                                               const char *format, ...))
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_warning(const char *module_name,
+                                             u32 line_number,
+                                             const char *format, ...))
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_info(const char *module_name,
+                                          u32 line_number,
+                                          const char *format, ...))
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_bios_error(const char *module_name,
+                                                u32 line_number,
+                                                const char *format, ...))
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_bios_warning(const char *module_name,
+                                                  u32 line_number,
+                                                  const char *format, ...))
 
 /*
  * Debug output
  */
-#ifdef ACPI_DEBUG_OUTPUT
+ACPI_DBG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(6)
+                               void ACPI_INTERNAL_VAR_XFACE
+                               acpi_debug_print(u32 requested_debug_level,
+                                                u32 line_number,
+                                                const char *function_name,
+                                                const char *module_name,
+                                                u32 component_id,
+                                                const char *format, ...))
+ACPI_DBG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(6)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_debug_print_raw(u32 requested_debug_level,
+                                                     u32 line_number,
+                                                     const char *function_name,
+                                                     const char *module_name,
+                                                     u32 component_id,
+                                                     const char *format, ...))
 
-ACPI_PRINTF_LIKE(6)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_debug_print(u32 requested_debug_level,
-                 u32 line_number,
-                 const char *function_name,
-                 const char *module_name,
-                 u32 component_id, const char *format, ...);
-
-ACPI_PRINTF_LIKE(6)
-void ACPI_INTERNAL_VAR_XFACE
-acpi_debug_print_raw(u32 requested_debug_level,
-                     u32 line_number,
-                     const char *function_name,
-                     const char *module_name,
-                     u32 component_id, const char *format, ...);
-#endif
+/*
+ * Divergences
+ */
+acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type);
+
+acpi_status acpi_unload_table_id(acpi_owner_id id);
+
+acpi_status
+acpi_get_table_with_size(acpi_string signature,
+               u32 instance, struct acpi_table_header **out_table,
+               acpi_size *tbl_size);
+
+acpi_status
+acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data,
+                   void (*callback)(void *));
 
 #endif                          /* __ACXFACE_H__ */
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 3b30e36b53b5..1cc7ef13c01a 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -367,12 +367,11 @@ struct acpi_table_desc {
 
 /* Masks for Flags field above */
 
-#define ACPI_TABLE_ORIGIN_UNKNOWN       (0)
-#define ACPI_TABLE_ORIGIN_MAPPED        (1)
-#define ACPI_TABLE_ORIGIN_ALLOCATED     (2)
-#define ACPI_TABLE_ORIGIN_OVERRIDE      (4)
-#define ACPI_TABLE_ORIGIN_MASK          (7)
-#define ACPI_TABLE_IS_LOADED            (8)
+#define ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL  (0) /* Virtual address, external maintained */
+#define ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL (1) /* Physical address, internally mapped */
+#define ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL  (2) /* Virtual address, internallly allocated */
+#define ACPI_TABLE_ORIGIN_MASK              (3)
+#define ACPI_TABLE_IS_LOADED                (8)
 
 /*
  * Get the remaining ACPI tables
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 212c65de75df..4ad7da805180 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -675,7 +675,7 @@ enum acpi_madt_type {
 };
 
 /*
- * MADT Sub-tables, correspond to Type in struct acpi_subtable_header
+ * MADT Subtables, correspond to Type in struct acpi_subtable_header
  */
 
 /* 0: Processor Local APIC */
@@ -918,7 +918,7 @@ enum acpi_srat_type {
 };
 
 /*
- * SRAT Sub-tables, correspond to Type in struct acpi_subtable_header
+ * SRAT Subtables, correspond to Type in struct acpi_subtable_header
  */
 
 /* 0: Processor Local APIC/SAPIC Affinity */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index c8adad9c6b6a..860e5c883eb3 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -70,6 +70,7 @@
 #define ACPI_SIG_HPET           "HPET"  /* High Precision Event Timer table */
 #define ACPI_SIG_IBFT           "IBFT"  /* iSCSI Boot Firmware Table */
 #define ACPI_SIG_IVRS           "IVRS"  /* I/O Virtualization Reporting Structure */
+#define ACPI_SIG_LPIT           "LPIT"  /* Low Power Idle Table */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
 #define ACPI_SIG_MTMR           "MTMR"  /* MID Timer table */
@@ -456,7 +457,7 @@ struct acpi_dmar_pci_path {
 };
 
 /*
- * DMAR Sub-tables, correspond to Type in struct acpi_dmar_header
+ * DMAR Subtables, correspond to Type in struct acpi_dmar_header
  */
 
 /* 0: Hardware Unit Definition */
@@ -820,7 +821,71 @@ struct acpi_ivrs_memory {
 
 /*******************************************************************************
  *
- * MCFG - PCI Memory Mapped Configuration table and sub-table
+ * LPIT - Low Power Idle Table
+ *
+ * Conforms to "ACPI Low Power Idle Table (LPIT) and _LPD Proposal (DRAFT)"
+ *
+ ******************************************************************************/
+
+struct acpi_table_lpit {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* LPIT subtable header */
+
+struct acpi_lpit_header {
+        u32 type;               /* Subtable type */
+        u32 length;             /* Subtable length */
+        u16 unique_id;
+        u16 reserved;
+        u32 flags;
+};
+
+/* Values for subtable Type above */
+
+enum acpi_lpit_type {
+        ACPI_LPIT_TYPE_NATIVE_CSTATE = 0x00,
+        ACPI_LPIT_TYPE_SIMPLE_IO = 0x01
+};
+
+/* Masks for Flags field above  */
+
+#define ACPI_LPIT_STATE_DISABLED    (1)
+#define ACPI_LPIT_NO_COUNTER        (1<<1)
+
+/*
+ * LPIT subtables, correspond to Type in struct acpi_lpit_header
+ */
+
+/* 0x00: Native C-state instruction based LPI structure */
+
+struct acpi_lpit_native {
+        struct acpi_lpit_header header;
+        struct acpi_generic_address entry_trigger;
+        u32 residency;
+        u32 latency;
+        struct acpi_generic_address residency_counter;
+        u64 counter_frequency;
+};
+
+/* 0x01: Simple I/O based LPI structure */
+
+struct acpi_lpit_io {
+        struct acpi_lpit_header header;
+        struct acpi_generic_address entry_trigger;
+        u32 trigger_action;
+        u64 trigger_value;
+        u64 trigger_mask;
+        struct acpi_generic_address minimum_idle_state;
+        u32 residency;
+        u32 latency;
+        struct acpi_generic_address residency_counter;
+        u64 counter_frequency;
+};
+
+/*******************************************************************************
+ *
+ * MCFG - PCI Memory Mapped Configuration table and subtable
  *        Version 1
  *
  * Conforms to "PCI Firmware Specification", Revision 3.0, June 20, 2005
@@ -923,7 +988,7 @@ enum acpi_slic_type {
 };
 
 /*
- * SLIC Sub-tables, correspond to Type in struct acpi_slic_header
+ * SLIC Subtables, correspond to Type in struct acpi_slic_header
  */
 
 /* 0: Public Key Structure */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index e76356574374..19b26bb69a70 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -329,6 +329,15 @@ typedef u32 acpi_physical_address;
  *
  ******************************************************************************/
 
+#ifdef ACPI_NO_MEM_ALLOCATIONS
+
+#define ACPI_ALLOCATE(a)                NULL
+#define ACPI_ALLOCATE_ZEROED(a)         NULL
+#define ACPI_FREE(a)
+#define ACPI_MEM_TRACKING(a)
+
+#else                           /* ACPI_NO_MEM_ALLOCATIONS */
+
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 /*
  * Memory allocation tracking (used by acpi_exec to detect memory leaks)
@@ -350,6 +359,8 @@ typedef u32 acpi_physical_address;
 
 #endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
 
+#endif                          /* ACPI_NO_MEM_ALLOCATIONS */
+
 /******************************************************************************
  *
  * ACPI Specification constants (Do not change unless the specification changes)
@@ -928,9 +939,19 @@ struct acpi_object_list {
  * Miscellaneous common Data Structures used by the interfaces
  */
 #define ACPI_NO_BUFFER              0
+
+#ifdef ACPI_NO_MEM_ALLOCATIONS
+
+#define ACPI_ALLOCATE_BUFFER        (acpi_size) (0)
+#define ACPI_ALLOCATE_LOCAL_BUFFER  (acpi_size) (0)
+
+#else                           /* ACPI_NO_MEM_ALLOCATIONS */
+
 #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) */
 
+#endif                          /* ACPI_NO_MEM_ALLOCATIONS */
+
 struct acpi_buffer {
         acpi_size length;       /* Length in bytes of the buffer */
         void *pointer;          /* pointer to buffer */
diff --git a/include/acpi/platform/acenvex.h b/include/acpi/platform/acenvex.h
new file mode 100644
index 000000000000..2b612384c994
--- /dev/null
+++ b/include/acpi/platform/acenvex.h
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ * Name: acenvex.h - Extra host and compiler configuration
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACENVEX_H__
+#define __ACENVEX_H__
+
+/*! [Begin] no source code translation */
+
+/******************************************************************************
+ *
+ * Extra host configuration files. All ACPICA headers are included before
+ * including these files.
+ *
+ *****************************************************************************/
+
+#if defined(_LINUX) || defined(__linux__)
+#include <acpi/platform/aclinuxex.h>
+
+#endif
+
+/*! [End] no source code translation !*/
+
+#endif                          /* __ACENVEX_H__ */
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index a476b9118b49..384875da3713 100644
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -64,4 +64,15 @@
  */
 #define ACPI_UNUSED_VAR __attribute__ ((unused))
 
+/*
+ * Some versions of gcc implement strchr() with a buggy macro. So,
+ * undef it here. Prevents error messages of this form (usually from the
+ * file getopt.c):
+ *
+ * error: logical '&&' with non-zero constant will always evaluate as true
+ */
+#ifdef strchr
+#undef strchr
+#endif
+
 #endif                          /* __ACGCC_H__ */
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 93c55ed7c53d..cd1f052d55bb 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -48,7 +48,6 @@
 
 #define ACPI_USE_SYSTEM_CLIBRARY
 #define ACPI_USE_DO_WHILE_0
-#define ACPI_MUTEX_TYPE             ACPI_BINARY_SEMAPHORE
 
 #ifdef __KERNEL__
 
@@ -71,169 +70,65 @@
 #ifdef EXPORT_ACPI_INTERFACES
 #include <linux/export.h>
 #endif
-#include <asm/acpi.h>
+#include <asm/acenv.h>
 
-/* Host-dependent types and defines for in-kernel ACPICA */
+#ifndef CONFIG_ACPI
 
-#define ACPI_MACHINE_WIDTH          BITS_PER_LONG
-#define ACPI_EXPORT_SYMBOL(symbol)  EXPORT_SYMBOL(symbol);
-#define strtoul                     simple_strtoul
+/* External globals for __KERNEL__, stubs is needed */
 
-#define acpi_cache_t                        struct kmem_cache
-#define acpi_spinlock                       spinlock_t *
-#define acpi_cpu_flags                      unsigned long
+#define ACPI_GLOBAL(t,a)
+#define ACPI_INIT_GLOBAL(t,a,b)
 
-#else                           /* !__KERNEL__ */
+/* Generating stubs for configurable ACPICA macros */
 
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
+#define ACPI_NO_MEM_ALLOCATIONS
 
-/* Disable kernel specific declarators */
+/* Generating stubs for configurable ACPICA functions */
 
-#ifndef __init
-#define __init
-#endif
-
-#ifndef __iomem
-#define __iomem
-#endif
+#define ACPI_NO_ERROR_MESSAGES
+#undef ACPI_DEBUG_OUTPUT
 
-/* Host-dependent types and defines for user-space ACPICA */
-
-#define ACPI_FLUSH_CPU_CACHE()
-#define ACPI_CAST_PTHREAD_T(pthread) ((acpi_thread_id) (pthread))
+/* External interface for __KERNEL__, stub is needed */
 
-#if defined(__ia64__) || defined(__x86_64__) || defined(__aarch64__)
-#define ACPI_MACHINE_WIDTH          64
-#define COMPILER_DEPENDENT_INT64    long
-#define COMPILER_DEPENDENT_UINT64   unsigned long
-#else
-#define ACPI_MACHINE_WIDTH          32
-#define COMPILER_DEPENDENT_INT64    long long
-#define COMPILER_DEPENDENT_UINT64   unsigned long long
-#define ACPI_USE_NATIVE_DIVIDE
-#endif
+#define ACPI_EXTERNAL_RETURN_STATUS(prototype) \
+        static ACPI_INLINE prototype {return(AE_NOT_CONFIGURED);}
+#define ACPI_EXTERNAL_RETURN_OK(prototype) \
+        static ACPI_INLINE prototype {return(AE_OK);}
+#define ACPI_EXTERNAL_RETURN_VOID(prototype) \
+        static ACPI_INLINE prototype {return;}
+#define ACPI_EXTERNAL_RETURN_UINT32(prototype) \
+        static ACPI_INLINE prototype {return(0);}
+#define ACPI_EXTERNAL_RETURN_PTR(prototype) \
+        static ACPI_INLINE prototype {return(NULL);}
 
-#ifndef __cdecl
-#define __cdecl
-#endif
+#endif                          /* CONFIG_ACPI */
 
-#endif                          /* __KERNEL__ */
+/* Host-dependent types and defines for in-kernel ACPICA */
 
-/* Linux uses GCC */
+#define ACPI_MACHINE_WIDTH          BITS_PER_LONG
+#define ACPI_EXPORT_SYMBOL(symbol)  EXPORT_SYMBOL(symbol);
+#define strtoul                     simple_strtoul
 
-#include <acpi/platform/acgcc.h>
+#define acpi_cache_t                        struct kmem_cache
+#define acpi_spinlock                       spinlock_t *
+#define acpi_cpu_flags                      unsigned long
 
-#ifdef __KERNEL__
+/* Use native linux version of acpi_os_allocate_zeroed */
 
-/*
- * FIXME: Inclusion of actypes.h
- * Linux kernel need this before defining inline OSL interfaces as
- * actypes.h need to be included to find ACPICA type definitions.
- * Since from ACPICA's perspective, the actypes.h should be included after
- * acenv.h (aclinux.h), this leads to a inclusion mis-ordering issue.
- */
-#include <acpi/actypes.h>
+#define USE_NATIVE_ALLOCATE_ZEROED
 
 /*
  * Overrides for in-kernel ACPICA
  */
-acpi_status __init acpi_os_initialize(void);
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize
-
-acpi_status acpi_os_terminate(void);
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate
-
-/*
- * Memory allocation/deallocation
- */
-
-/*
- * The irqs_disabled() check is for resume from RAM.
- * Interrupts are off during resume, just like they are for boot.
- * However, boot has  (system_state != SYSTEM_RUNNING)
- * to quiet __might_sleep() in kmalloc() and resume does not.
- */
-static inline void *acpi_os_allocate(acpi_size size)
-{
-        return kmalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
-}
-
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_allocate
-
-/* Use native linux version of acpi_os_allocate_zeroed */
-
-static inline void *acpi_os_allocate_zeroed(acpi_size size)
-{
-        return kzalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
-}
-
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_allocate_zeroed
-#define USE_NATIVE_ALLOCATE_ZEROED
-
-static inline void acpi_os_free(void *memory)
-{
-        kfree(memory);
-}
-
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_free
-
-static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
-{
-        return kmem_cache_zalloc(cache,
-                                 irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
-}
-
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_acquire_object
-
-static inline acpi_thread_id acpi_os_get_thread_id(void)
-{
-        return (acpi_thread_id) (unsigned long)current;
-}
-
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_thread_id
-
-#ifndef CONFIG_PREEMPT
-
-/*
- * Used within ACPICA to show where it is safe to preempt execution
- * when CONFIG_PREEMPT=n
- */
-#define ACPI_PREEMPTION_POINT() \
-        do { \
-                if (!irqs_disabled()) \
-                        cond_resched(); \
-        } while (0)
-
-#endif
-
-/*
- * When lockdep is enabled, the spin_lock_init() macro stringifies it's
- * argument and uses that as a name for the lock in debugging.
- * By executing spin_lock_init() in a macro the key changes from "lock" for
- * all locks to the name of the argument of acpi_os_create_lock(), which
- * prevents lockdep from reporting false positives for ACPICA locks.
- */
-#define acpi_os_create_lock(__handle) \
-        ({ \
-                spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \
-                if (lock) { \
-                        *(__handle) = lock; \
-                        spin_lock_init(*(__handle)); \
-                } \
-                lock ? AE_OK : AE_NO_MEMORY; \
-        })
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
 
-void __iomem *acpi_os_map_memory(acpi_physical_address where, acpi_size length);
-#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_map_memory
-
-void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
-#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_unmap_memory
-
 /*
  * OSL interfaces used by debugger/disassembler
  */
@@ -252,11 +147,45 @@ void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_next_filename
 #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_directory
 
-/*
- * OSL interfaces added by Linux
- */
-void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
+#else                           /* !__KERNEL__ */
+
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.h>
+
+/* Define/disable kernel-specific declarators */
+
+#ifndef __init
+#define __init
+#endif
+
+/* Host-dependent types and defines for user-space ACPICA */
+
+#define ACPI_FLUSH_CPU_CACHE()
+#define ACPI_CAST_PTHREAD_T(pthread) ((acpi_thread_id) (pthread))
+
+#if defined(__ia64__)    || defined(__x86_64__) ||\
+        defined(__aarch64__) || defined(__PPC64__)
+#define ACPI_MACHINE_WIDTH          64
+#define COMPILER_DEPENDENT_INT64    long
+#define COMPILER_DEPENDENT_UINT64   unsigned long
+#else
+#define ACPI_MACHINE_WIDTH          32
+#define COMPILER_DEPENDENT_INT64    long long
+#define COMPILER_DEPENDENT_UINT64   unsigned long long
+#define ACPI_USE_NATIVE_DIVIDE
+#endif
+
+#ifndef __cdecl
+#define __cdecl
+#endif
 
 #endif                          /* __KERNEL__ */
 
+/* Linux uses GCC */
+
+#include <acpi/platform/acgcc.h>
+
 #endif                          /* __ACLINUX_H__ */
diff --git a/include/acpi/platform/aclinuxex.h b/include/acpi/platform/aclinuxex.h
new file mode 100644
index 000000000000..191e741cfa0e
--- /dev/null
+++ b/include/acpi/platform/aclinuxex.h
@@ -0,0 +1,112 @@
+/******************************************************************************
+ *
+ * Name: aclinuxex.h - Extra OS specific defines, etc. for Linux
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACLINUXEX_H__
+#define __ACLINUXEX_H__
+
+#ifdef __KERNEL__
+
+/*
+ * Overrides for in-kernel ACPICA
+ */
+acpi_status __init acpi_os_initialize(void);
+
+acpi_status acpi_os_terminate(void);
+
+/*
+ * The irqs_disabled() check is for resume from RAM.
+ * Interrupts are off during resume, just like they are for boot.
+ * However, boot has  (system_state != SYSTEM_RUNNING)
+ * to quiet __might_sleep() in kmalloc() and resume does not.
+ */
+static inline void *acpi_os_allocate(acpi_size size)
+{
+        return kmalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
+}
+
+static inline void *acpi_os_allocate_zeroed(acpi_size size)
+{
+        return kzalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
+}
+
+static inline void acpi_os_free(void *memory)
+{
+        kfree(memory);
+}
+
+static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
+{
+        return kmem_cache_zalloc(cache,
+                                 irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
+}
+
+static inline acpi_thread_id acpi_os_get_thread_id(void)
+{
+        return (acpi_thread_id) (unsigned long)current;
+}
+
+/*
+ * When lockdep is enabled, the spin_lock_init() macro stringifies it's
+ * argument and uses that as a name for the lock in debugging.
+ * By executing spin_lock_init() in a macro the key changes from "lock" for
+ * all locks to the name of the argument of acpi_os_create_lock(), which
+ * prevents lockdep from reporting false positives for ACPICA locks.
+ */
+#define acpi_os_create_lock(__handle) \
+        ({ \
+                spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \
+                if (lock) { \
+                        *(__handle) = lock; \
+                        spin_lock_init(*(__handle)); \
+                } \
+                lock ? AE_OK : AE_NO_MEMORY; \
+        })
+
+/*
+ * OSL interfaces added by Linux
+ */
+void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
+
+#endif                          /* __KERNEL__ */
+
+#endif                          /* __ACLINUXEX_H__ */
diff --git a/include/acpi/video.h b/include/acpi/video.h
index 61109f2609fc..ea4c7bbded4d 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -19,11 +19,13 @@ struct acpi_device;
 #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
 extern int acpi_video_register(void);
 extern void acpi_video_unregister(void);
+extern void acpi_video_unregister_backlight(void);
 extern int acpi_video_get_edid(struct acpi_device *device, int type,
                                int device_id, void **edid);
 #else
 static inline int acpi_video_register(void) { return 0; }
 static inline void acpi_video_unregister(void) { return; }
+static inline void acpi_video_unregister_backlight(void) { return; }
 static inline int acpi_video_get_edid(struct acpi_device *device, int type,
                                       int device_id, void **edid)
 {
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 7a8f2cd66c8b..358c01b971db 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -37,6 +37,7 @@
 
 #include <linux/list.h>
 #include <linux/mod_devicetable.h>
+#include <linux/dynamic_debug.h>
 
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
@@ -184,6 +185,8 @@ extern int ec_transaction(u8 command,
                           u8 *rdata, unsigned rdata_len);
 extern acpi_handle ec_get_handle(void);
 
+extern bool acpi_is_pnp_device(struct acpi_device *);
+
 #if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
 
 typedef void (*wmi_notify_handler) (u32 value, void *context);
@@ -554,14 +557,20 @@ static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
 int acpi_dev_suspend_late(struct device *dev);
 int acpi_dev_resume_early(struct device *dev);
 int acpi_subsys_prepare(struct device *dev);
+void acpi_subsys_complete(struct device *dev);
 int acpi_subsys_suspend_late(struct device *dev);
 int acpi_subsys_resume_early(struct device *dev);
+int acpi_subsys_suspend(struct device *dev);
+int acpi_subsys_freeze(struct device *dev);
 #else
 static inline int acpi_dev_suspend_late(struct device *dev) { return 0; }
 static inline int acpi_dev_resume_early(struct device *dev) { return 0; }
 static inline int acpi_subsys_prepare(struct device *dev) { return 0; }
+static inline void acpi_subsys_complete(struct device *dev) {}
 static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; }
 static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
+static inline int acpi_subsys_suspend(struct device *dev) { return 0; }
+static inline int acpi_subsys_freeze(struct device *dev) { return 0; }
 #endif
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_PM)
@@ -589,6 +598,14 @@ static inline __printf(3, 4) void
 acpi_handle_printk(const char *level, void *handle, const char *fmt, ...) {}
 #endif  /* !CONFIG_ACPI */
 
+#if defined(CONFIG_ACPI) && defined(CONFIG_DYNAMIC_DEBUG)
+__printf(3, 4)
+void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const char *fmt, ...);
+#else
+#define __acpi_handle_debug(descriptor, handle, fmt, ...)               \
+        acpi_handle_printk(KERN_DEBUG, handle, fmt, ##__VA_ARGS__);
+#endif
+
 /*
  * acpi_handle_<level>: Print message with ACPI prefix and object path
  *
@@ -610,11 +627,19 @@ acpi_handle_printk(const char *level, void *handle, const char *fmt, ...) {}
 #define acpi_handle_info(handle, fmt, ...)                              \
         acpi_handle_printk(KERN_INFO, handle, fmt, ##__VA_ARGS__)
 
-/* REVISIT: Support CONFIG_DYNAMIC_DEBUG when necessary */
-#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
+#if defined(DEBUG)
 #define acpi_handle_debug(handle, fmt, ...)                             \
         acpi_handle_printk(KERN_DEBUG, handle, fmt, ##__VA_ARGS__)
 #else
+#if defined(CONFIG_DYNAMIC_DEBUG)
+#define acpi_handle_debug(handle, fmt, ...)                             \
+do {                                                                    \
+        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                 \
+        if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))          \
+                __acpi_handle_debug(&descriptor, handle, pr_fmt(fmt),   \
+                                ##__VA_ARGS__);                         \
+} while (0)
+#else
 #define acpi_handle_debug(handle, fmt, ...)                             \
 ({                                                                      \
         if (0)                                                          \
@@ -622,5 +647,6 @@ acpi_handle_printk(const char *level, void *handle, const char *fmt, ...) {}
         0;                                                              \
 })
 #endif
+#endif
 
 #endif  /*_LINUX_ACPI_H*/
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 72647429adf6..adb14a8616df 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -40,6 +40,11 @@ enum backlight_type {
         BACKLIGHT_TYPE_MAX,
 };
 
+enum backlight_notification {
+        BACKLIGHT_REGISTERED,
+        BACKLIGHT_UNREGISTERED,
+};
+
 struct backlight_device;
 struct fb_info;
 
@@ -133,6 +138,8 @@ extern void devm_backlight_device_unregister(struct device *dev,
 extern void backlight_force_update(struct backlight_device *bd,
                                    enum backlight_update_reason reason);
 extern bool backlight_device_registered(enum backlight_type type);
+extern int backlight_register_notifier(struct notifier_block *nb);
+extern int backlight_unregister_notifier(struct notifier_block *nb);
 
 #define to_backlight_device(obj) container_of(obj, struct backlight_device, dev)
 
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 511917416fb0..fb4eca6907cd 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -413,6 +413,37 @@ struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
                 const char *parent_name, unsigned long flags,
                 unsigned int mult, unsigned int div);
 
+/**
+ * struct clk_fractional_divider - adjustable fractional divider clock
+ *
+ * @hw:         handle between common and hardware-specific interfaces
+ * @reg:        register containing the divider
+ * @mshift:     shift to the numerator bit field
+ * @mwidth:     width of the numerator bit field
+ * @nshift:     shift to the denominator bit field
+ * @nwidth:     width of the denominator bit field
+ * @lock:       register lock
+ *
+ * Clock with adjustable fractional divider affecting its output frequency.
+ */
+
+struct clk_fractional_divider {
+        struct clk_hw   hw;
+        void __iomem    *reg;
+        u8              mshift;
+        u32             mmask;
+        u8              nshift;
+        u32             nmask;
+        u8              flags;
+        spinlock_t      *lock;
+};
+
+extern const struct clk_ops clk_fractional_divider_ops;
+struct clk *clk_register_fractional_divider(struct device *dev,
+                const char *name, const char *parent_name, unsigned long flags,
+                void __iomem *reg, u8 mshift, u8 mwidth, u8 nshift, u8 nwidth,
+                u8 clk_divider_flags, spinlock_t *lock);
+
 /***
  * struct clk_composite - aggregate clock of mux, divider and gate clocks
  *
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 5ae5100c1f24..3f458896d45c 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -110,6 +110,7 @@ struct cpufreq_policy {
         bool                    transition_ongoing; /* Tracks transition status */
         spinlock_t              transition_lock;
         wait_queue_head_t       transition_wait;
+        struct task_struct      *transition_task; /* Task which is doing the transition */
 };
 
 /* Only for ACPI */
@@ -468,6 +469,55 @@ struct cpufreq_frequency_table {
                                     * order */
 };
 
+#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
+int dev_pm_opp_init_cpufreq_table(struct device *dev,
+                                  struct cpufreq_frequency_table **table);
+void dev_pm_opp_free_cpufreq_table(struct device *dev,
+                                   struct cpufreq_frequency_table **table);
+#else
+static inline int dev_pm_opp_init_cpufreq_table(struct device *dev,
+                                                struct cpufreq_frequency_table
+                                                **table)
+{
+        return -EINVAL;
+}
+
+static inline void dev_pm_opp_free_cpufreq_table(struct device *dev,
+                                                 struct cpufreq_frequency_table
+                                                 **table)
+{
+}
+#endif
+
+static inline bool cpufreq_next_valid(struct cpufreq_frequency_table **pos)
+{
+        while ((*pos)->frequency != CPUFREQ_TABLE_END)
+                if ((*pos)->frequency != CPUFREQ_ENTRY_INVALID)
+                        return true;
+                else
+                        (*pos)++;
+        return false;
+}
+
+/*
+ * cpufreq_for_each_entry -     iterate over a cpufreq_frequency_table
+ * @pos:        the cpufreq_frequency_table * to use as a loop cursor.
+ * @table:      the cpufreq_frequency_table * to iterate over.
+ */
+
+#define cpufreq_for_each_entry(pos, table)      \
+        for (pos = table; pos->frequency != CPUFREQ_TABLE_END; pos++)
+
+/*
+ * cpufreq_for_each_valid_entry -     iterate over a cpufreq_frequency_table
+ *      excluding CPUFREQ_ENTRY_INVALID frequencies.
+ * @pos:        the cpufreq_frequency_table * to use as a loop cursor.
+ * @table:      the cpufreq_frequency_table * to iterate over.
+ */
+
+#define cpufreq_for_each_valid_entry(pos, table)        \
+        for (pos = table; cpufreq_next_valid(&pos); pos++)
+
 int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
                                     struct cpufreq_frequency_table *table);
 
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index d48dc00232a4..f1863dcd83ea 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -181,6 +181,12 @@ extern struct devfreq *devfreq_add_device(struct device *dev,
                                   const char *governor_name,
                                   void *data);
 extern int devfreq_remove_device(struct devfreq *devfreq);
+extern struct devfreq *devm_devfreq_add_device(struct device *dev,
+                                  struct devfreq_dev_profile *profile,
+                                  const char *governor_name,
+                                  void *data);
+extern void devm_devfreq_remove_device(struct device *dev,
+                                  struct devfreq *devfreq);
 
 /* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
 extern int devfreq_suspend_device(struct devfreq *devfreq);
@@ -193,6 +199,10 @@ extern int devfreq_register_opp_notifier(struct device *dev,
                                          struct devfreq *devfreq);
 extern int devfreq_unregister_opp_notifier(struct device *dev,
                                            struct devfreq *devfreq);
+extern int devm_devfreq_register_opp_notifier(struct device *dev,
+                                              struct devfreq *devfreq);
+extern void devm_devfreq_unregister_opp_notifier(struct device *dev,
+                                                struct devfreq *devfreq);
 
 #if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
 /**
@@ -220,7 +230,7 @@ static inline struct devfreq *devfreq_add_device(struct device *dev,
                                           const char *governor_name,
                                           void *data)
 {
-        return NULL;
+        return ERR_PTR(-ENOSYS);
 }
 
 static inline int devfreq_remove_device(struct devfreq *devfreq)
@@ -228,6 +238,19 @@ static inline int devfreq_remove_device(struct devfreq *devfreq)
         return 0;
 }
 
+static inline struct devfreq *devm_devfreq_add_device(struct device *dev,
+                                        struct devfreq_dev_profile *profile,
+                                        const char *governor_name,
+                                        void *data)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
+static inline void devm_devfreq_remove_device(struct device *dev,
+                                        struct devfreq *devfreq)
+{
+}
+
 static inline int devfreq_suspend_device(struct devfreq *devfreq)
 {
         return 0;
@@ -256,6 +279,16 @@ static inline int devfreq_unregister_opp_notifier(struct device *dev,
         return -EINVAL;
 }
 
+static inline int devm_devfreq_register_opp_notifier(struct device *dev,
+                                                     struct devfreq *devfreq)
+{
+        return -EINVAL;
+}
+
+static inline void devm_devfreq_unregister_opp_notifier(struct device *dev,
+                                                        struct devfreq *devfreq)
+{
+}
 #endif /* CONFIG_PM_DEVFREQ */
 
 #endif /* __LINUX_DEVFREQ_H__ */
diff --git a/include/linux/pm.h b/include/linux/pm.h
index d915d0345fa1..72c0fe098a27 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -93,13 +93,23 @@ typedef struct pm_message {
  *      been registered) to recover from the race condition.
  *      This method is executed for all kinds of suspend transitions and is
  *      followed by one of the suspend callbacks: @suspend(), @freeze(), or
- *      @poweroff().  The PM core executes subsystem-level @prepare() for all
- *      devices before starting to invoke suspend callbacks for any of them, so
- *      generally devices may be assumed to be functional or to respond to
- *      runtime resume requests while @prepare() is being executed.  However,
- *      device drivers may NOT assume anything about the availability of user
- *      space at that time and it is NOT valid to request firmware from within
- *      @prepare() (it's too late to do that).  It also is NOT valid to allocate
+ *      @poweroff().  If the transition is a suspend to memory or standby (that
+ *      is, not related to hibernation), the return value of @prepare() may be
+ *      used to indicate to the PM core to leave the device in runtime suspend
+ *      if applicable.  Namely, if @prepare() returns a positive number, the PM
+ *      core will understand that as a declaration that the device appears to be
+ *      runtime-suspended and it may be left in that state during the entire
+ *      transition and during the subsequent resume if all of its descendants
+ *      are left in runtime suspend too.  If that happens, @complete() will be
+ *      executed directly after @prepare() and it must ensure the proper
+ *      functioning of the device after the system resume.
+ *      The PM core executes subsystem-level @prepare() for all devices before
+ *      starting to invoke suspend callbacks for any of them, so generally
+ *      devices may be assumed to be functional or to respond to runtime resume
+ *      requests while @prepare() is being executed.  However, device drivers
+ *      may NOT assume anything about the availability of user space at that
+ *      time and it is NOT valid to request firmware from within @prepare()
+ *      (it's too late to do that).  It also is NOT valid to allocate
  *      substantial amounts of memory from @prepare() in the GFP_KERNEL mode.
  *      [To work around these limitations, drivers may register suspend and
  *      hibernation notifiers to be executed before the freezing of tasks.]
@@ -112,7 +122,16 @@ typedef struct pm_message {
  *      of the other devices that the PM core has unsuccessfully attempted to
  *      suspend earlier).
  *      The PM core executes subsystem-level @complete() after it has executed
- *      the appropriate resume callbacks for all devices.
+ *      the appropriate resume callbacks for all devices.  If the corresponding
+ *      @prepare() at the beginning of the suspend transition returned a
+ *      positive number and the device was left in runtime suspend (without
+ *      executing any suspend and resume callbacks for it), @complete() will be
+ *      the only callback executed for the device during resume.  In that case,
+ *      @complete() must be prepared to do whatever is necessary to ensure the
+ *      proper functioning of the device after the system resume.  To this end,
+ *      @complete() can check the power.direct_complete flag of the device to
+ *      learn whether (unset) or not (set) the previous suspend and resume
+ *      callbacks have been executed for it.
  *
  * @suspend: Executed before putting the system into a sleep state in which the
  *      contents of main memory are preserved.  The exact action to perform
@@ -546,6 +565,7 @@ struct dev_pm_info {
         bool                    is_late_suspended:1;
         bool                    ignore_children:1;
         bool                    early_init:1;   /* Owned by the PM core */
+        bool                    direct_complete:1;      /* Owned by the PM core */
         spinlock_t              lock;
 #ifdef CONFIG_PM_SLEEP
         struct list_head        entry;
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index 5151b0059585..0330217abfad 100644
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -15,7 +15,6 @@
 #define __LINUX_OPP_H__
 
 #include <linux/err.h>
-#include <linux/cpufreq.h>
 #include <linux/notifier.h>
 
 struct dev_pm_opp;
@@ -117,23 +116,4 @@ static inline int of_init_opp_table(struct device *dev)
 }
 #endif
 
-#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
-int dev_pm_opp_init_cpufreq_table(struct device *dev,
-                            struct cpufreq_frequency_table **table);
-void dev_pm_opp_free_cpufreq_table(struct device *dev,
-                                struct cpufreq_frequency_table **table);
-#else
-static inline int dev_pm_opp_init_cpufreq_table(struct device *dev,
-                            struct cpufreq_frequency_table **table)
-{
-        return -EINVAL;
-}
-
-static inline
-void dev_pm_opp_free_cpufreq_table(struct device *dev,
-                                struct cpufreq_frequency_table **table)
-{
-}
-#endif          /* CONFIG_CPU_FREQ */
-
 #endif          /* __LINUX_OPP_H__ */
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 2a5897a4afbc..43fd6716f662 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -101,6 +101,11 @@ static inline bool pm_runtime_status_suspended(struct device *dev)
         return dev->power.runtime_status == RPM_SUSPENDED;
 }
 
+static inline bool pm_runtime_suspended_if_enabled(struct device *dev)
+{
+        return pm_runtime_status_suspended(dev) && dev->power.disable_depth == 1;
+}
+
 static inline bool pm_runtime_enabled(struct device *dev)
 {
         return !dev->power.disable_depth;
@@ -150,6 +155,7 @@ static inline void device_set_run_wake(struct device *dev, bool enable) {}
 static inline bool pm_runtime_suspended(struct device *dev) { return false; }
 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_suspended_if_enabled(struct device *dev) { return false; }
 static inline bool pm_runtime_enabled(struct device *dev) { return false; }
 
 static inline void pm_runtime_no_callbacks(struct device *dev) {}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index c9dc4e09854c..f2b76aeaf4e4 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -264,6 +264,8 @@ static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
 
 extern int power_supply_register(struct device *parent,
                                  struct power_supply *psy);
+extern int power_supply_register_no_ws(struct device *parent,
+                                 struct power_supply *psy);
 extern void power_supply_unregister(struct power_supply *psy);
 extern int power_supply_powers(struct power_supply *psy, struct device *dev);
 
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index f73cabf59012..91d66fd8dce1 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -187,6 +187,11 @@ struct platform_suspend_ops {
         void (*recover)(void);
 };
 
+struct platform_freeze_ops {
+        int (*begin)(void);
+        void (*end)(void);
+};
+
 #ifdef CONFIG_SUSPEND
 /**
  * suspend_set_ops - set platform dependent suspend operations
@@ -194,6 +199,7 @@ struct platform_suspend_ops {
  */
 extern void suspend_set_ops(const struct platform_suspend_ops *ops);
 extern int suspend_valid_only_mem(suspend_state_t state);
+extern void freeze_set_ops(const struct platform_freeze_ops *ops);
 extern void freeze_wake(void);
 
 /**
@@ -220,6 +226,7 @@ extern int pm_suspend(suspend_state_t state);
 
 static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
+static inline void freeze_set_ops(const struct platform_freeze_ops *ops) {}
 static inline void freeze_wake(void) {}
 #endif /* !CONFIG_SUSPEND */
 
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 2fac9cc79b3d..9a83d780facd 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -257,8 +257,7 @@ config ARCH_HAS_OPP
         bool
 
 config PM_OPP
-        bool "Operating Performance Point (OPP) Layer library"
-        depends on ARCH_HAS_OPP
+        bool
         ---help---
           SOCs have a standard set of tuples consisting of frequency and
           voltage pairs that the device will support per voltage domain. This
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index f4f2073711d3..df88d55dc436 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -35,7 +35,7 @@
 static int nocompress;
 static int noresume;
 static int resume_wait;
-static int resume_delay;
+static unsigned int resume_delay;
 static char resume_file[256] = CONFIG_PM_STD_PARTITION;
 dev_t swsusp_resume_device;
 sector_t swsusp_resume_block;
@@ -228,19 +228,23 @@ static void platform_recover(int platform_mode)
 void swsusp_show_speed(struct timeval *start, struct timeval *stop,
                         unsigned nr_pages, char *msg)
 {
-        s64 elapsed_centisecs64;
-        int centisecs;
-        int k;
-        int kps;
+        u64 elapsed_centisecs64;
+        unsigned int centisecs;
+        unsigned int k;
+        unsigned int kps;
 
         elapsed_centisecs64 = timeval_to_ns(stop) - timeval_to_ns(start);
+        /*
+         * If "(s64)elapsed_centisecs64 < 0", it will print long elapsed time,
+         * it is obvious enough for what went wrong.
+         */
         do_div(elapsed_centisecs64, NSEC_PER_SEC / 100);
         centisecs = elapsed_centisecs64;
         if (centisecs == 0)
                 centisecs = 1;  /* avoid div-by-zero */
         k = nr_pages * (PAGE_SIZE / 1024);
         kps = (k * 100) / centisecs;
-        printk(KERN_INFO "PM: %s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\n",
+        printk(KERN_INFO "PM: %s %u kbytes in %u.%02u seconds (%u.%02u MB/s)\n",
                         msg, k,
                         centisecs / 100, centisecs % 100,
                         kps / 1000, (kps % 1000) / 10);
@@ -595,7 +599,8 @@ static void power_down(void)
         case HIBERNATION_PLATFORM:
                 hibernation_platform_enter();
         case HIBERNATION_SHUTDOWN:
-                kernel_power_off();
+                if (pm_power_off)
+                        kernel_power_off();
                 break;
 #ifdef CONFIG_SUSPEND
         case HIBERNATION_SUSPEND:
@@ -623,7 +628,8 @@ static void power_down(void)
          * corruption after resume.
          */
         printk(KERN_CRIT "PM: Please power down manually\n");
-        while(1);
+        while (1)
+                cpu_relax();
 }
 
 /**
@@ -1109,7 +1115,10 @@ static int __init resumewait_setup(char *str)
 
 static int __init resumedelay_setup(char *str)
 {
-        resume_delay = simple_strtoul(str, NULL, 0);
+        int rc = kstrtouint(str, 0, &resume_delay);
+
+        if (rc)
+                return rc;
         return 1;
 }
 
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 6271bc4073ef..573410d6647e 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -279,26 +279,26 @@ static inline void pm_print_times_init(void) {}
 struct kobject *power_kobj;
 
 /**
- *      state - control system power state.
+ * state - control system sleep states.
  *
- *      show() returns what states are supported, which is hard-coded to
- *      'freeze' (Low-Power Idle), 'standby' (Power-On Suspend),
- *      'mem' (Suspend-to-RAM), and 'disk' (Suspend-to-Disk).
+ * show() returns available sleep state labels, which may be "mem", "standby",
+ * "freeze" and "disk" (hibernation).  See Documentation/power/states.txt for a
+ * description of what they mean.
  *
- *      store() accepts one of those strings, translates it into the
- *      proper enumerated value, and initiates a suspend transition.
+ * store() accepts one of those strings, translates it into the proper
+ * enumerated value, and initiates a suspend transition.
  */
 static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
                           char *buf)
 {
         char *s = buf;
 #ifdef CONFIG_SUSPEND
-        int i;
+        suspend_state_t i;
+
+        for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
+                if (pm_states[i].state)
+                        s += sprintf(s,"%s ", pm_states[i].label);
 
-        for (i = 0; i < PM_SUSPEND_MAX; i++) {
-                if (pm_states[i] && valid_state(i))
-                        s += sprintf(s,"%s ", pm_states[i]);
-        }
 #endif
 #ifdef CONFIG_HIBERNATION
         s += sprintf(s, "%s\n", "disk");
@@ -314,7 +314,7 @@ static suspend_state_t decode_state(const char *buf, size_t n)
 {
 #ifdef CONFIG_SUSPEND
         suspend_state_t state = PM_SUSPEND_MIN;
-        const char * const *s;
+        struct pm_sleep_state *s;
 #endif
         char *p;
         int len;
@@ -328,8 +328,9 @@ static suspend_state_t decode_state(const char *buf, size_t n)
 
 #ifdef CONFIG_SUSPEND
         for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++)
-                if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
-                        return state;
+                if (s->state && len == strlen(s->label)
+                    && !strncmp(buf, s->label, len))
+                        return s->state;
 #endif
 
         return PM_SUSPEND_ON;
@@ -447,8 +448,8 @@ static ssize_t autosleep_show(struct kobject *kobj,
 
 #ifdef CONFIG_SUSPEND
         if (state < PM_SUSPEND_MAX)
-                return sprintf(buf, "%s\n", valid_state(state) ?
-                                                pm_states[state] : "error");
+                return sprintf(buf, "%s\n", pm_states[state].state ?
+                                        pm_states[state].label : "error");
 #endif
 #ifdef CONFIG_HIBERNATION
         return sprintf(buf, "disk\n");
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 15f37ea08719..c60f13b5270a 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -178,17 +178,20 @@ extern void swsusp_show_speed(struct timeval *, struct timeval *,
                                 unsigned int, char *);
 
 #ifdef CONFIG_SUSPEND
+struct pm_sleep_state {
+        const char *label;
+        suspend_state_t state;
+};
+
 /* kernel/power/suspend.c */
-extern const char *const pm_states[];
+extern struct pm_sleep_state pm_states[];
 
-extern bool valid_state(suspend_state_t state);
 extern int suspend_devices_and_enter(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
 static inline int suspend_devices_and_enter(suspend_state_t state)
 {
         return -ENOSYS;
 }
-static inline bool valid_state(suspend_state_t state) { return false; }
 #endif /* !CONFIG_SUSPEND */
 
 #ifdef CONFIG_PM_TEST_SUSPEND
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 155721f7f909..963e6d0f050b 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -31,13 +31,14 @@
 
 #include "power.h"
 
-const char *const pm_states[PM_SUSPEND_MAX] = {
-        [PM_SUSPEND_FREEZE]     = "freeze",
-        [PM_SUSPEND_STANDBY]    = "standby",
-        [PM_SUSPEND_MEM]        = "mem",
+struct pm_sleep_state pm_states[PM_SUSPEND_MAX] = {
+        [PM_SUSPEND_FREEZE] = { .label = "freeze", .state = PM_SUSPEND_FREEZE },
+        [PM_SUSPEND_STANDBY] = { .label = "standby", },
+        [PM_SUSPEND_MEM] = { .label = "mem", },
 };
 
 static const struct platform_suspend_ops *suspend_ops;
+static const struct platform_freeze_ops *freeze_ops;
 
 static bool need_suspend_ops(suspend_state_t state)
 {
@@ -47,6 +48,13 @@ static bool need_suspend_ops(suspend_state_t state)
 static DECLARE_WAIT_QUEUE_HEAD(suspend_freeze_wait_head);
 static bool suspend_freeze_wake;
 
+void freeze_set_ops(const struct platform_freeze_ops *ops)
+{
+        lock_system_sleep();
+        freeze_ops = ops;
+        unlock_system_sleep();
+}
+
 static void freeze_begin(void)
 {
         suspend_freeze_wake = false;
@@ -68,42 +76,62 @@ void freeze_wake(void)
 }
 EXPORT_SYMBOL_GPL(freeze_wake);
 
+static bool valid_state(suspend_state_t state)
+{
+        /*
+         * PM_SUSPEND_STANDBY and PM_SUSPEND_MEM states need low level
+         * support and need to be valid to the low level
+         * implementation, no valid callback implies that none are valid.
+         */
+        return suspend_ops && suspend_ops->valid && suspend_ops->valid(state);
+}
+
+/*
+ * If this is set, the "mem" label always corresponds to the deepest sleep state
+ * available, the "standby" label corresponds to the second deepest sleep state
+ * available (if any), and the "freeze" label corresponds to the remaining
+ * available sleep state (if there is one).
+ */
+static bool relative_states;
+
+static int __init sleep_states_setup(char *str)
+{
+        relative_states = !strncmp(str, "1", 1);
+        if (relative_states) {
+                pm_states[PM_SUSPEND_MEM].state = PM_SUSPEND_FREEZE;
+                pm_states[PM_SUSPEND_FREEZE].state = 0;
+        }
+        return 1;
+}
+
+__setup("relative_sleep_states=", sleep_states_setup);
+
 /**
  * suspend_set_ops - Set the global suspend method table.
  * @ops: Suspend operations to use.
  */
 void suspend_set_ops(const struct platform_suspend_ops *ops)
 {
+        suspend_state_t i;
+        int j = PM_SUSPEND_MAX - 1;
+
         lock_system_sleep();
+
         suspend_ops = ops;
+        for (i = PM_SUSPEND_MEM; i >= PM_SUSPEND_STANDBY; i--)
+                if (valid_state(i))
+                        pm_states[j--].state = i;
+                else if (!relative_states)
+                        pm_states[j--].state = 0;
+
+        pm_states[j--].state = PM_SUSPEND_FREEZE;
+        while (j >= PM_SUSPEND_MIN)
+                pm_states[j--].state = 0;
+
         unlock_system_sleep();
 }
 EXPORT_SYMBOL_GPL(suspend_set_ops);
 
-bool valid_state(suspend_state_t state)
-{
-        if (state == PM_SUSPEND_FREEZE) {
-#ifdef CONFIG_PM_DEBUG
-                if (pm_test_level != TEST_NONE &&
-                    pm_test_level != TEST_FREEZER &&
-                    pm_test_level != TEST_DEVICES &&
-                    pm_test_level != TEST_PLATFORM) {
-                        printk(KERN_WARNING "Unsupported pm_test mode for "
-                                        "freeze state, please choose "
-                                        "none/freezer/devices/platform.\n");
-                        return false;
-                }
-#endif
-                        return true;
-        }
-        /*
-         * PM_SUSPEND_STANDBY and PM_SUSPEND_MEMORY states need lowlevel
-         * support and need to be valid to the lowlevel
-         * implementation, no valid callback implies that none are valid.
-         */
-        return suspend_ops && suspend_ops->valid && suspend_ops->valid(state);
-}
-
 /**
  * suspend_valid_only_mem - Generic memory-only valid callback.
  *
@@ -271,6 +299,10 @@ int suspend_devices_and_enter(suspend_state_t state)
                 error = suspend_ops->begin(state);
                 if (error)
                         goto Close;
+        } else if (state == PM_SUSPEND_FREEZE && freeze_ops->begin) {
+                error = freeze_ops->begin();
+                if (error)
+                        goto Close;
         }
         suspend_console();
         suspend_test_start();
@@ -296,6 +328,9 @@ int suspend_devices_and_enter(suspend_state_t state)
  Close:
         if (need_suspend_ops(state) && suspend_ops->end)
                 suspend_ops->end();
+        else if (state == PM_SUSPEND_FREEZE && freeze_ops->end)
+                freeze_ops->end();
+
         trace_machine_suspend(PWR_EVENT_EXIT);
         return error;
 
@@ -330,9 +365,17 @@ static int enter_state(suspend_state_t state)
 {
         int error;
 
-        if (!valid_state(state))
-                return -ENODEV;
-
+        if (state == PM_SUSPEND_FREEZE) {
+#ifdef CONFIG_PM_DEBUG
+                if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) {
+                        pr_warning("PM: Unsupported test mode for freeze state,"
+                                   "please choose none/freezer/devices/platform.\n");
+                        return -EAGAIN;
+                }
+#endif
+        } else if (!valid_state(state)) {
+                return -EINVAL;
+        }
         if (!mutex_trylock(&pm_mutex))
                 return -EBUSY;
 
@@ -343,7 +386,7 @@ static int enter_state(suspend_state_t state)
         sys_sync();
         printk("done.\n");
 
-        pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
+        pr_debug("PM: Preparing system for %s sleep\n", pm_states[state].label);
         error = suspend_prepare(state);
         if (error)
                 goto Unlock;
@@ -351,7 +394,7 @@ static int enter_state(suspend_state_t state)
         if (suspend_test(TEST_FREEZER))
                 goto Finish;
 
-        pr_debug("PM: Entering %s sleep\n", pm_states[state]);
+        pr_debug("PM: Entering %s sleep\n", pm_states[state].label);
         pm_restrict_gfp_mask();
         error = suspend_devices_and_enter(state);
         pm_restore_gfp_mask();
diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 9b2a1d58558d..269b097e78ea 100644
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -92,13 +92,13 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
         }
 
         if (state == PM_SUSPEND_MEM) {
-                printk(info_test, pm_states[state]);
+                printk(info_test, pm_states[state].label);
                 status = pm_suspend(state);
                 if (status == -ENODEV)
                         state = PM_SUSPEND_STANDBY;
         }
         if (state == PM_SUSPEND_STANDBY) {
-                printk(info_test, pm_states[state]);
+                printk(info_test, pm_states[state].label);
                 status = pm_suspend(state);
         }
         if (status < 0)
@@ -136,18 +136,16 @@ static char warn_bad_state[] __initdata =
 
 static int __init setup_test_suspend(char *value)
 {
-        unsigned i;
+        suspend_state_t i;
 
         /* "=mem" ==> "mem" */
         value++;
-        for (i = 0; i < PM_SUSPEND_MAX; i++) {
-                if (!pm_states[i])
-                        continue;
-                if (strcmp(pm_states[i], value) != 0)
-                        continue;
-                test_state = (__force suspend_state_t) i;
-                return 0;
-        }
+        for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
+                if (!strcmp(pm_states[i].label, value)) {
+                        test_state = pm_states[i].state;
+                        return 0;
+                }
+
         printk(warn_bad_state, value);
         return 0;
 }
@@ -164,8 +162,8 @@ static int __init test_suspend(void)
         /* PM is initialized by now; is that state testable? */
         if (test_state == PM_SUSPEND_ON)
                 goto done;
-        if (!valid_state(test_state)) {
-                printk(warn_bad_state, pm_states[test_state]);
+        if (!pm_states[test_state].state) {
+                printk(warn_bad_state, pm_states[test_state].label);
                 goto done;
         }
 
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 8c9a4819f798..aaa3261dea5d 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -567,7 +567,7 @@ static int lzo_compress_threadfn(void *data)
 
 /**
  * save_image_lzo - Save the suspend image data compressed with LZO.
- * @handle: Swap mam handle to use for saving the image.
+ * @handle: Swap map handle to use for saving the image.
  * @snapshot: Image to read data from.
  * @nr_to_write: Number of pages to save.
  */
diff --git a/tools/power/acpi/Makefile b/tools/power/acpi/Makefile
index c2c0f20067a5..e5a3c4be2a10 100644
--- a/tools/power/acpi/Makefile
+++ b/tools/power/acpi/Makefile
@@ -19,6 +19,8 @@ OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
 $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
 endif
 
+SUBDIRS = tools/ec
+
 # --- CONFIGURATION BEGIN ---
 
 # Set the following to `true' to make a unstripped, unoptimized
@@ -68,7 +70,8 @@ WARNINGS += $(call cc-supports,-Wstrict-prototypes)
 WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
 
 KERNEL_INCLUDE := ../../../include
-CFLAGS += -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
+ACPICA_INCLUDE := ../../../drivers/acpi/acpica
+CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
 CFLAGS += $(WARNINGS)
 
 ifeq ($(strip $(V)),false)
@@ -92,10 +95,29 @@ endif
 # --- ACPIDUMP BEGIN ---
 
 vpath %.c \
-        tools/acpidump
+        ../../../drivers/acpi/acpica\
+        tools/acpidump\
+        common\
+        os_specific/service_layers
+
+CFLAGS += -DACPI_DUMP_APP -Itools/acpidump
 
 DUMP_OBJS = \
-        acpidump.o
+        apdump.o\
+        apfiles.o\
+        apmain.o\
+        osunixdir.o\
+        osunixmap.o\
+        tbprint.o\
+        tbxfroot.o\
+        utbuffer.o\
+        utexcep.o\
+        utmath.o\
+        utstring.o\
+        utxferror.o\
+        oslinuxtbl.o\
+        cmfsize.o\
+        getopt.o
 
 DUMP_OBJS := $(addprefix $(OUTPUT)tools/acpidump/,$(DUMP_OBJS))
 
diff --git a/tools/power/acpi/common/cmfsize.c b/tools/power/acpi/common/cmfsize.c
new file mode 100644
index 000000000000..5140e5edae1f
--- /dev/null
+++ b/tools/power/acpi/common/cmfsize.c
@@ -0,0 +1,101 @@
+/******************************************************************************
+ *
+ * Module Name: cfsize - Common get file size function
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acapps.h"
+#include <stdio.h>
+
+#define _COMPONENT          ACPI_TOOLS
+ACPI_MODULE_NAME("cmfsize")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    cm_get_file_size
+ *
+ * PARAMETERS:  file                    - Open file descriptor
+ *
+ * RETURN:      File Size. On error, -1 (ACPI_UINT32_MAX)
+ *
+ * DESCRIPTION: Get the size of a file. Uses seek-to-EOF. File must be open.
+ *              Does not disturb the current file pointer. Uses perror for
+ *              error messages.
+ *
+ ******************************************************************************/
+u32 cm_get_file_size(FILE * file)
+{
+        long file_size;
+        long current_offset;
+
+        /* Save the current file pointer, seek to EOF to obtain file size */
+
+        current_offset = ftell(file);
+        if (current_offset < 0) {
+                goto offset_error;
+        }
+
+        if (fseek(file, 0, SEEK_END)) {
+                goto seek_error;
+        }
+
+        file_size = ftell(file);
+        if (file_size < 0) {
+                goto offset_error;
+        }
+
+        /* Restore original file pointer */
+
+        if (fseek(file, current_offset, SEEK_SET)) {
+                goto seek_error;
+        }
+
+        return ((u32)file_size);
+
+offset_error:
+        perror("Could not get file offset");
+        return (ACPI_UINT32_MAX);
+
+seek_error:
+        perror("Could not seek file");
+        return (ACPI_UINT32_MAX);
+}
diff --git a/tools/power/acpi/common/getopt.c b/tools/power/acpi/common/getopt.c
new file mode 100644
index 000000000000..a302f52e4fd3
--- /dev/null
+++ b/tools/power/acpi/common/getopt.c
@@ -0,0 +1,239 @@
+/******************************************************************************
+ *
+ * Module Name: getopt
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/*
+ * ACPICA getopt() implementation
+ *
+ * Option strings:
+ *    "f"       - Option has no arguments
+ *    "f:"      - Option requires an argument
+ *    "f^"      - Option has optional single-char sub-options
+ *    "f|"      - Option has required single-char sub-options
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acapps.h"
+
+#define ACPI_OPTION_ERROR(msg, badchar) \
+        if (acpi_gbl_opterr) {fprintf (stderr, "%s%c\n", msg, badchar);}
+
+int acpi_gbl_opterr = 1;
+int acpi_gbl_optind = 1;
+int acpi_gbl_sub_opt_char = 0;
+char *acpi_gbl_optarg;
+
+static int current_char_ptr = 1;
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_getopt_argument
+ *
+ * PARAMETERS:  argc, argv          - from main
+ *
+ * RETURN:      0 if an argument was found, -1 otherwise. Sets acpi_gbl_Optarg
+ *              to point to the next argument.
+ *
+ * DESCRIPTION: Get the next argument. Used to obtain arguments for the
+ *              two-character options after the original call to acpi_getopt.
+ *              Note: Either the argument starts at the next character after
+ *              the option, or it is pointed to by the next argv entry.
+ *              (After call to acpi_getopt, we need to backup to the previous
+ *              argv entry).
+ *
+ ******************************************************************************/
+
+int acpi_getopt_argument(int argc, char **argv)
+{
+        acpi_gbl_optind--;
+        current_char_ptr++;
+
+        if (argv[acpi_gbl_optind][(int)(current_char_ptr + 1)] != '\0') {
+                acpi_gbl_optarg =
+                    &argv[acpi_gbl_optind++][(int)(current_char_ptr + 1)];
+        } else if (++acpi_gbl_optind >= argc) {
+                ACPI_OPTION_ERROR("Option requires an argument: -", 'v');
+
+                current_char_ptr = 1;
+                return (-1);
+        } else {
+                acpi_gbl_optarg = argv[acpi_gbl_optind++];
+        }
+
+        current_char_ptr = 1;
+        return (0);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_getopt
+ *
+ * PARAMETERS:  argc, argv          - from main
+ *              opts                - options info list
+ *
+ * RETURN:      Option character or EOF
+ *
+ * DESCRIPTION: Get the next option
+ *
+ ******************************************************************************/
+
+int acpi_getopt(int argc, char **argv, char *opts)
+{
+        int current_char;
+        char *opts_ptr;
+
+        if (current_char_ptr == 1) {
+                if (acpi_gbl_optind >= argc ||
+                    argv[acpi_gbl_optind][0] != '-' ||
+                    argv[acpi_gbl_optind][1] == '\0') {
+                        return (EOF);
+                } else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
+                        acpi_gbl_optind++;
+                        return (EOF);
+                }
+        }
+
+        /* Get the option */
+
+        current_char = argv[acpi_gbl_optind][current_char_ptr];
+
+        /* Make sure that the option is legal */
+
+        if (current_char == ':' ||
+            (opts_ptr = strchr(opts, current_char)) == NULL) {
+                ACPI_OPTION_ERROR("Illegal option: -", current_char);
+
+                if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
+                        acpi_gbl_optind++;
+                        current_char_ptr = 1;
+                }
+
+                return ('?');
+        }
+
+        /* Option requires an argument? */
+
+        if (*++opts_ptr == ':') {
+                if (argv[acpi_gbl_optind][(int)(current_char_ptr + 1)] != '\0') {
+                        acpi_gbl_optarg =
+                            &argv[acpi_gbl_optind++][(int)
+                                                     (current_char_ptr + 1)];
+                } else if (++acpi_gbl_optind >= argc) {
+                        ACPI_OPTION_ERROR("Option requires an argument: -",
+                                          current_char);
+
+                        current_char_ptr = 1;
+                        return ('?');
+                } else {
+                        acpi_gbl_optarg = argv[acpi_gbl_optind++];
+                }
+
+                current_char_ptr = 1;
+        }
+
+        /* Option has an optional argument? */
+
+        else if (*opts_ptr == '+') {
+                if (argv[acpi_gbl_optind][(int)(current_char_ptr + 1)] != '\0') {
+                        acpi_gbl_optarg =
+                            &argv[acpi_gbl_optind++][(int)
+                                                     (current_char_ptr + 1)];
+                } else if (++acpi_gbl_optind >= argc) {
+                        acpi_gbl_optarg = NULL;
+                } else {
+                        acpi_gbl_optarg = argv[acpi_gbl_optind++];
+                }
+
+                current_char_ptr = 1;
+        }
+
+        /* Option has optional single-char arguments? */
+
+        else if (*opts_ptr == '^') {
+                if (argv[acpi_gbl_optind][(int)(current_char_ptr + 1)] != '\0') {
+                        acpi_gbl_optarg =
+                            &argv[acpi_gbl_optind][(int)(current_char_ptr + 1)];
+                } else {
+                        acpi_gbl_optarg = "^";
+                }
+
+                acpi_gbl_sub_opt_char = acpi_gbl_optarg[0];
+                acpi_gbl_optind++;
+                current_char_ptr = 1;
+        }
+
+        /* Option has a required single-char argument? */
+
+        else if (*opts_ptr == '|') {
+                if (argv[acpi_gbl_optind][(int)(current_char_ptr + 1)] != '\0') {
+                        acpi_gbl_optarg =
+                            &argv[acpi_gbl_optind][(int)(current_char_ptr + 1)];
+                } else {
+                        ACPI_OPTION_ERROR
+                            ("Option requires a single-character suboption: -",
+                             current_char);
+
+                        current_char_ptr = 1;
+                        return ('?');
+                }
+
+                acpi_gbl_sub_opt_char = acpi_gbl_optarg[0];
+                acpi_gbl_optind++;
+                current_char_ptr = 1;
+        }
+
+        /* Option with no arguments */
+
+        else {
+                if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
+                        current_char_ptr = 1;
+                        acpi_gbl_optind++;
+                }
+
+                acpi_gbl_optarg = NULL;
+        }
+
+        return (current_char);
+}
diff --git a/tools/power/acpi/man/acpidump.8 b/tools/power/acpi/man/acpidump.8
index adfa99166e5e..38f095d86b52 100644
--- a/tools/power/acpi/man/acpidump.8
+++ b/tools/power/acpi/man/acpidump.8
@@ -1,18 +1,64 @@
 .TH ACPIDUMP 8
 .SH NAME
-acpidump \- Dump system's ACPI tables to an ASCII file.
+acpidump \- dump a system's ACPI tables to an ASCII file
+
 .SH SYNOPSIS
-.ft B
-.B acpidump > acpidump.out
+.B acpidump
+.RI [ options ]
+.br
+
 .SH DESCRIPTION
-\fBacpidump \fP dumps the systems ACPI tables to an ASCII file
-appropriate for attaching to a bug report.
+.B acpidump
+dumps the systems ACPI tables to an ASCII file appropriate for
+attaching to a bug report.
 
 Subsequently, they can be processed by utilities in the ACPICA package.
-.SS Options
-no options worth worrying about.
-.PP
-.SH EXAMPLE
+
+.SH OPTIONS
+acpidump options are as follow:
+.TP
+.B Options
+.TP
+.B \-b
+Dump tables to binary files
+.TP
+.B \-c
+Dump customized tables
+.TP
+.B \-h \-?
+This help message
+.TP
+.B \-o <File>
+Redirect output to file
+.TP
+.B \-r <Address>
+Dump tables from specified RSDP
+.TP
+.B \-s
+Print table summaries only
+.TP
+.B \-v
+Display version information
+.TP
+.B \-z
+Verbose mode
+.TP
+.B Table Options
+.TP
+.B \-a <Address>
+Get table via a physical address
+.TP
+.B \-f <BinaryFile>
+Get table via a binary file
+.TP
+.B \-n <Signature>
+Get table via a name/signature
+.TP
+Invocation without parameters dumps all available tables
+.TP
+Multiple mixed instances of -a, -f, and -n are supported
+
+.SH EXAMPLES
 
 .nf
 # acpidump > acpidump.out
@@ -50,10 +96,25 @@ ACPICA: https://acpica.org/
 .ta
 .nf
 /dev/mem
+/sys/firmware/acpi/tables/*
 /sys/firmware/acpi/tables/dynamic/*
+/sys/firmware/efi/systab
 .fi
 
-.PP
 .SH AUTHOR
-.nf
-Written by Len Brown <len.brown@intel.com>
+.TP
+Original by:
+ Len Brown <len.brown@intel.com>
+.TP
+Written by:
+ Chao Guan <chao.guan@intel.com>
+.TP
+Updated by:
+ Bob Moore <robert.moore@intel.com>
+ Lv Zheng <lv.zheng@intel.com>
+
+.SH SEE ALSO
+\&\fIacpixtract\fR\|(8), \fIiasl\fR\|(8).
+
+.SH COPYRIGHT
+COPYRIGHT (c) 2013, Intel Corporation.
diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
new file mode 100644
index 000000000000..28c52008e854
--- /dev/null
+++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
@@ -0,0 +1,1329 @@
+/******************************************************************************
+ *
+ * Module Name: oslinuxtbl - Linux OSL for obtaining ACPI tables
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include "acpidump.h"
+
+#define _COMPONENT          ACPI_OS_SERVICES
+ACPI_MODULE_NAME("oslinuxtbl")
+
+#ifndef PATH_MAX
+#define PATH_MAX 256
+#endif
+/* List of information about obtained ACPI tables */
+typedef struct osl_table_info {
+        struct osl_table_info *next;
+        u32 instance;
+        char signature[ACPI_NAME_SIZE];
+
+} osl_table_info;
+
+/* Local prototypes */
+
+static acpi_status osl_table_initialize(void);
+
+static acpi_status
+osl_table_name_from_file(char *filename, char *signature, u32 *instance);
+
+static acpi_status osl_add_table_to_list(char *signature, u32 instance);
+
+static acpi_status
+osl_read_table_from_file(char *filename,
+                         acpi_size file_offset,
+                         char *signature, struct acpi_table_header **table);
+
+static acpi_status
+osl_map_table(acpi_size address,
+              char *signature, struct acpi_table_header **table);
+
+static void osl_unmap_table(struct acpi_table_header *table);
+
+static acpi_physical_address osl_find_rsdp_via_efi(void);
+
+static acpi_status osl_load_rsdp(void);
+
+static acpi_status osl_list_customized_tables(char *directory);
+
+static acpi_status
+osl_get_customized_table(char *pathname,
+                         char *signature,
+                         u32 instance,
+                         struct acpi_table_header **table,
+                         acpi_physical_address * address);
+
+static acpi_status osl_list_bios_tables(void);
+
+static acpi_status
+osl_get_bios_table(char *signature,
+                   u32 instance,
+                   struct acpi_table_header **table,
+                   acpi_physical_address * address);
+
+static acpi_status osl_get_last_status(acpi_status default_status);
+
+/* File locations */
+
+#define DYNAMIC_TABLE_DIR   "/sys/firmware/acpi/tables/dynamic"
+#define STATIC_TABLE_DIR    "/sys/firmware/acpi/tables"
+#define EFI_SYSTAB          "/sys/firmware/efi/systab"
+
+/* Should we get dynamically loaded SSDTs from DYNAMIC_TABLE_DIR? */
+
+u8 gbl_dump_dynamic_tables = TRUE;
+
+/* Initialization flags */
+
+u8 gbl_table_list_initialized = FALSE;
+
+/* Local copies of main ACPI tables */
+
+struct acpi_table_rsdp gbl_rsdp;
+struct acpi_table_fadt *gbl_fadt = NULL;
+struct acpi_table_rsdt *gbl_rsdt = NULL;
+struct acpi_table_xsdt *gbl_xsdt = NULL;
+
+/* Table addresses */
+
+acpi_physical_address gbl_fadt_address = 0;
+acpi_physical_address gbl_rsdp_address = 0;
+
+/* Revision of RSD PTR */
+
+u8 gbl_revision = 0;
+
+struct osl_table_info *gbl_table_list_head = NULL;
+u32 gbl_table_count = 0;
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_get_last_status
+ *
+ * PARAMETERS:  default_status  - Default error status to return
+ *
+ * RETURN:      Status; Converted from errno.
+ *
+ * DESCRIPTION: Get last errno and conver it to acpi_status.
+ *
+ *****************************************************************************/
+
+static acpi_status osl_get_last_status(acpi_status default_status)
+{
+
+        switch (errno) {
+        case EACCES:
+        case EPERM:
+
+                return (AE_ACCESS);
+
+        case ENOENT:
+
+                return (AE_NOT_FOUND);
+
+        case ENOMEM:
+
+                return (AE_NO_MEMORY);
+
+        default:
+
+                return (default_status);
+        }
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os_get_table_by_address
+ *
+ * PARAMETERS:  address         - Physical address of the ACPI table
+ *              table           - Where a pointer to the table is returned
+ *
+ * RETURN:      Status; Table buffer is returned if AE_OK.
+ *              AE_NOT_FOUND: A valid table was not found at the address
+ *
+ * DESCRIPTION: Get an ACPI table via a physical memory address.
+ *
+ *****************************************************************************/
+
+acpi_status
+acpi_os_get_table_by_address(acpi_physical_address address,
+                             struct acpi_table_header ** table)
+{
+        u32 table_length;
+        struct acpi_table_header *mapped_table;
+        struct acpi_table_header *local_table = NULL;
+        acpi_status status = AE_OK;
+
+        /* Get main ACPI tables from memory on first invocation of this function */
+
+        status = osl_table_initialize();
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Map the table and validate it */
+
+        status = osl_map_table(address, NULL, &mapped_table);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Copy table to local buffer and return it */
+
+        table_length = ap_get_table_length(mapped_table);
+        if (table_length == 0) {
+                status = AE_BAD_HEADER;
+                goto exit;
+        }
+
+        local_table = calloc(1, table_length);
+        if (!local_table) {
+                status = AE_NO_MEMORY;
+                goto exit;
+        }
+
+        ACPI_MEMCPY(local_table, mapped_table, table_length);
+
+exit:
+        osl_unmap_table(mapped_table);
+        *table = local_table;
+        return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os_get_table_by_name
+ *
+ * PARAMETERS:  signature       - ACPI Signature for desired table. Must be
+ *                                a null terminated 4-character string.
+ *              instance        - Multiple table support for SSDT/UEFI (0...n)
+ *                                Must be 0 for other tables.
+ *              table           - Where a pointer to the table is returned
+ *              address         - Where the table physical address is returned
+ *
+ * RETURN:      Status; Table buffer and physical address returned if AE_OK.
+ *              AE_LIMIT: Instance is beyond valid limit
+ *              AE_NOT_FOUND: A table with the signature was not found
+ *
+ * NOTE:        Assumes the input signature is uppercase.
+ *
+ *****************************************************************************/
+
+acpi_status
+acpi_os_get_table_by_name(char *signature,
+                          u32 instance,
+                          struct acpi_table_header ** table,
+                          acpi_physical_address * address)
+{
+        acpi_status status;
+
+        /* Get main ACPI tables from memory on first invocation of this function */
+
+        status = osl_table_initialize();
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Not a main ACPI table, attempt to extract it from the RSDT/XSDT */
+
+        if (!gbl_dump_customized_tables) {
+
+                /* Attempt to get the table from the memory */
+
+                status =
+                    osl_get_bios_table(signature, instance, table, address);
+        } else {
+                /* Attempt to get the table from the static directory */
+
+                status = osl_get_customized_table(STATIC_TABLE_DIR, signature,
+                                                  instance, table, address);
+        }
+
+        if (ACPI_FAILURE(status) && status == AE_LIMIT) {
+                if (gbl_dump_dynamic_tables) {
+
+                        /* Attempt to get a dynamic table */
+
+                        status =
+                            osl_get_customized_table(DYNAMIC_TABLE_DIR,
+                                                     signature, instance, table,
+                                                     address);
+                }
+        }
+
+        return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_add_table_to_list
+ *
+ * PARAMETERS:  signature       - Table signature
+ *              instance        - Table instance
+ *
+ * RETURN:      Status; Successfully added if AE_OK.
+ *              AE_NO_MEMORY: Memory allocation error
+ *
+ * DESCRIPTION: Insert a table structure into OSL table list.
+ *
+ *****************************************************************************/
+
+static acpi_status osl_add_table_to_list(char *signature, u32 instance)
+{
+        struct osl_table_info *new_info;
+        struct osl_table_info *next;
+        u32 next_instance = 0;
+        u8 found = FALSE;
+
+        new_info = calloc(1, sizeof(struct osl_table_info));
+        if (!new_info) {
+                return (AE_NO_MEMORY);
+        }
+
+        ACPI_MOVE_NAME(new_info->signature, signature);
+
+        if (!gbl_table_list_head) {
+                gbl_table_list_head = new_info;
+        } else {
+                next = gbl_table_list_head;
+                while (1) {
+                        if (ACPI_COMPARE_NAME(next->signature, signature)) {
+                                if (next->instance == instance) {
+                                        found = TRUE;
+                                }
+                                if (next->instance >= next_instance) {
+                                        next_instance = next->instance + 1;
+                                }
+                        }
+
+                        if (!next->next) {
+                                break;
+                        }
+                        next = next->next;
+                }
+                next->next = new_info;
+        }
+
+        if (found) {
+                if (instance) {
+                        fprintf(stderr,
+                                "%4.4s: Warning unmatched table instance %d, expected %d\n",
+                                signature, instance, next_instance);
+                }
+                instance = next_instance;
+        }
+
+        new_info->instance = instance;
+        gbl_table_count++;
+
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os_get_table_by_index
+ *
+ * PARAMETERS:  index           - Which table to get
+ *              table           - Where a pointer to the table is returned
+ *              instance        - Where a pointer to the table instance no. is
+ *                                returned
+ *              address         - Where the table physical address is returned
+ *
+ * RETURN:      Status; Table buffer and physical address returned if AE_OK.
+ *              AE_LIMIT: Index is beyond valid limit
+ *
+ * DESCRIPTION: Get an ACPI table via an index value (0 through n). Returns
+ *              AE_LIMIT when an invalid index is reached. Index is not
+ *              necessarily an index into the RSDT/XSDT.
+ *
+ *****************************************************************************/
+
+acpi_status
+acpi_os_get_table_by_index(u32 index,
+                           struct acpi_table_header ** table,
+                           u32 *instance, acpi_physical_address * address)
+{
+        struct osl_table_info *info;
+        acpi_status status;
+        u32 i;
+
+        /* Get main ACPI tables from memory on first invocation of this function */
+
+        status = osl_table_initialize();
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Validate Index */
+
+        if (index >= gbl_table_count) {
+                return (AE_LIMIT);
+        }
+
+        /* Point to the table list entry specified by the Index argument */
+
+        info = gbl_table_list_head;
+        for (i = 0; i < index; i++) {
+                info = info->next;
+        }
+
+        /* Now we can just get the table via the signature */
+
+        status = acpi_os_get_table_by_name(info->signature, info->instance,
+                                           table, address);
+
+        if (ACPI_SUCCESS(status)) {
+                *instance = info->instance;
+        }
+        return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_find_rsdp_via_efi
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      RSDP address if found
+ *
+ * DESCRIPTION: Find RSDP address via EFI.
+ *
+ *****************************************************************************/
+
+static acpi_physical_address osl_find_rsdp_via_efi(void)
+{
+        FILE *file;
+        char buffer[80];
+        unsigned long address = 0;
+
+        file = fopen(EFI_SYSTAB, "r");
+        if (file) {
+                while (fgets(buffer, 80, file)) {
+                        if (sscanf(buffer, "ACPI20=0x%lx", &address) == 1) {
+                                break;
+                        }
+                }
+                fclose(file);
+        }
+
+        return ((acpi_physical_address) (address));
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_load_rsdp
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Scan and load RSDP.
+ *
+ *****************************************************************************/
+
+static acpi_status osl_load_rsdp(void)
+{
+        struct acpi_table_header *mapped_table;
+        u8 *rsdp_address;
+        acpi_physical_address rsdp_base;
+        acpi_size rsdp_size;
+
+        /* Get RSDP from memory */
+
+        rsdp_size = sizeof(struct acpi_table_rsdp);
+        if (gbl_rsdp_base) {
+                rsdp_base = gbl_rsdp_base;
+        } else {
+                rsdp_base = osl_find_rsdp_via_efi();
+        }
+
+        if (!rsdp_base) {
+                rsdp_base = ACPI_HI_RSDP_WINDOW_BASE;
+                rsdp_size = ACPI_HI_RSDP_WINDOW_SIZE;
+        }
+
+        rsdp_address = acpi_os_map_memory(rsdp_base, rsdp_size);
+        if (!rsdp_address) {
+                return (osl_get_last_status(AE_BAD_ADDRESS));
+        }
+
+        /* Search low memory for the RSDP */
+
+        mapped_table = ACPI_CAST_PTR(struct acpi_table_header,
+                                     acpi_tb_scan_memory_for_rsdp(rsdp_address,
+                                                                  rsdp_size));
+        if (!mapped_table) {
+                acpi_os_unmap_memory(rsdp_address, rsdp_size);
+                return (AE_NOT_FOUND);
+        }
+
+        gbl_rsdp_address =
+            rsdp_base + (ACPI_CAST8(mapped_table) - rsdp_address);
+
+        ACPI_MEMCPY(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
+        acpi_os_unmap_memory(rsdp_address, rsdp_size);
+
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_can_use_xsdt
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      TRUE if XSDT is allowed to be used.
+ *
+ * DESCRIPTION: This function collects logic that can be used to determine if
+ *              XSDT should be used instead of RSDT.
+ *
+ *****************************************************************************/
+
+static u8 osl_can_use_xsdt(void)
+{
+        if (gbl_revision && !acpi_gbl_do_not_use_xsdt) {
+                return (TRUE);
+        } else {
+                return (FALSE);
+        }
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_table_initialize
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Initialize ACPI table data. Get and store main ACPI tables to
+ *              local variables. Main ACPI tables include RSDT, FADT, RSDT,
+ *              and/or XSDT.
+ *
+ *****************************************************************************/
+
+static acpi_status osl_table_initialize(void)
+{
+        acpi_status status;
+        acpi_physical_address address;
+
+        if (gbl_table_list_initialized) {
+                return (AE_OK);
+        }
+
+        /* Get RSDP from memory */
+
+        status = osl_load_rsdp();
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Get XSDT from memory */
+
+        if (gbl_rsdp.revision && !gbl_do_not_dump_xsdt) {
+                if (gbl_xsdt) {
+                        free(gbl_xsdt);
+                        gbl_xsdt = NULL;
+                }
+
+                gbl_revision = 2;
+                status = osl_get_bios_table(ACPI_SIG_XSDT, 0,
+                                            ACPI_CAST_PTR(struct
+                                                          acpi_table_header *,
+                                                          &gbl_xsdt), &address);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        /* Get RSDT from memory */
+
+        if (gbl_rsdp.rsdt_physical_address) {
+                if (gbl_rsdt) {
+                        free(gbl_rsdt);
+                        gbl_rsdt = NULL;
+                }
+
+                status = osl_get_bios_table(ACPI_SIG_RSDT, 0,
+                                            ACPI_CAST_PTR(struct
+                                                          acpi_table_header *,
+                                                          &gbl_rsdt), &address);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        /* Get FADT from memory */
+
+        if (gbl_fadt) {
+                free(gbl_fadt);
+                gbl_fadt = NULL;
+        }
+
+        status = osl_get_bios_table(ACPI_SIG_FADT, 0,
+                                    ACPI_CAST_PTR(struct acpi_table_header *,
+                                                  &gbl_fadt),
+                                    &gbl_fadt_address);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        if (!gbl_dump_customized_tables) {
+
+                /* Add mandatory tables to global table list first */
+
+                status = osl_add_table_to_list(ACPI_RSDP_NAME, 0);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                status = osl_add_table_to_list(ACPI_SIG_RSDT, 0);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                if (gbl_revision == 2) {
+                        status = osl_add_table_to_list(ACPI_SIG_XSDT, 0);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+                }
+
+                status = osl_add_table_to_list(ACPI_SIG_DSDT, 0);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                status = osl_add_table_to_list(ACPI_SIG_FACS, 0);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                /* Add all tables found in the memory */
+
+                status = osl_list_bios_tables();
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        } else {
+                /* Add all tables found in the static directory */
+
+                status = osl_list_customized_tables(STATIC_TABLE_DIR);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        if (gbl_dump_dynamic_tables) {
+
+                /* Add all dynamically loaded tables in the dynamic directory */
+
+                status = osl_list_customized_tables(DYNAMIC_TABLE_DIR);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        gbl_table_list_initialized = TRUE;
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_list_bios_tables
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status; Table list is initialized if AE_OK.
+ *
+ * DESCRIPTION: Add ACPI tables to the table list from memory.
+ *
+ * NOTE:        This works on Linux as table customization does not modify the
+ *              addresses stored in RSDP/RSDT/XSDT/FADT.
+ *
+ *****************************************************************************/
+
+static acpi_status osl_list_bios_tables(void)
+{
+        struct acpi_table_header *mapped_table = NULL;
+        u8 *table_data;
+        u8 number_of_tables;
+        u8 item_size;
+        acpi_physical_address table_address = 0;
+        acpi_status status = AE_OK;
+        u32 i;
+
+        if (osl_can_use_xsdt()) {
+                item_size = sizeof(u64);
+                table_data =
+                    ACPI_CAST8(gbl_xsdt) + sizeof(struct acpi_table_header);
+                number_of_tables =
+                    (u8)((gbl_xsdt->header.length -
+                          sizeof(struct acpi_table_header))
+                         / item_size);
+        } else {                /* Use RSDT if XSDT is not available */
+
+                item_size = sizeof(u32);
+                table_data =
+                    ACPI_CAST8(gbl_rsdt) + sizeof(struct acpi_table_header);
+                number_of_tables =
+                    (u8)((gbl_rsdt->header.length -
+                          sizeof(struct acpi_table_header))
+                         / item_size);
+        }
+
+        /* Search RSDT/XSDT for the requested table */
+
+        for (i = 0; i < number_of_tables; ++i, table_data += item_size) {
+                if (osl_can_use_xsdt()) {
+                        table_address =
+                            (acpi_physical_address) (*ACPI_CAST64(table_data));
+                } else {
+                        table_address =
+                            (acpi_physical_address) (*ACPI_CAST32(table_data));
+                }
+
+                /* Skip NULL entries in RSDT/XSDT */
+
+                if (!table_address) {
+                        continue;
+                }
+
+                status = osl_map_table(table_address, NULL, &mapped_table);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                osl_add_table_to_list(mapped_table->signature, 0);
+                osl_unmap_table(mapped_table);
+        }
+
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_get_bios_table
+ *
+ * PARAMETERS:  signature       - ACPI Signature for common table. Must be
+ *                                a null terminated 4-character string.
+ *              instance        - Multiple table support for SSDT/UEFI (0...n)
+ *                                Must be 0 for other tables.
+ *              table           - Where a pointer to the table is returned
+ *              address         - Where the table physical address is returned
+ *
+ * RETURN:      Status; Table buffer and physical address returned if AE_OK.
+ *              AE_LIMIT: Instance is beyond valid limit
+ *              AE_NOT_FOUND: A table with the signature was not found
+ *
+ * DESCRIPTION: Get a BIOS provided ACPI table
+ *
+ * NOTE:        Assumes the input signature is uppercase.
+ *
+ *****************************************************************************/
+
+static acpi_status
+osl_get_bios_table(char *signature,
+                   u32 instance,
+                   struct acpi_table_header **table,
+                   acpi_physical_address * address)
+{
+        struct acpi_table_header *local_table = NULL;
+        struct acpi_table_header *mapped_table = NULL;
+        u8 *table_data;
+        u8 number_of_tables;
+        u8 item_size;
+        u32 current_instance = 0;
+        acpi_physical_address table_address = 0;
+        u32 table_length = 0;
+        acpi_status status = AE_OK;
+        u32 i;
+
+        /* Handle special tables whose addresses are not in RSDT/XSDT */
+
+        if (ACPI_COMPARE_NAME(signature, ACPI_RSDP_NAME) ||
+            ACPI_COMPARE_NAME(signature, ACPI_SIG_RSDT) ||
+            ACPI_COMPARE_NAME(signature, ACPI_SIG_XSDT) ||
+            ACPI_COMPARE_NAME(signature, ACPI_SIG_DSDT) ||
+            ACPI_COMPARE_NAME(signature, ACPI_SIG_FACS)) {
+                if (instance > 0) {
+                        return (AE_LIMIT);
+                }
+
+                /*
+                 * Get the appropriate address, either 32-bit or 64-bit. Be very
+                 * careful about the FADT length and validate table addresses.
+                 * Note: The 64-bit addresses have priority.
+                 */
+                if (ACPI_COMPARE_NAME(signature, ACPI_SIG_DSDT)) {
+                        if ((gbl_fadt->header.length >= MIN_FADT_FOR_XDSDT) &&
+                            gbl_fadt->Xdsdt) {
+                                table_address =
+                                    (acpi_physical_address) gbl_fadt->Xdsdt;
+                        } else
+                            if ((gbl_fadt->header.length >= MIN_FADT_FOR_DSDT)
+                                && gbl_fadt->dsdt) {
+                                table_address =
+                                    (acpi_physical_address) gbl_fadt->dsdt;
+                        }
+                } else if (ACPI_COMPARE_NAME(signature, ACPI_SIG_FACS)) {
+                        if ((gbl_fadt->header.length >= MIN_FADT_FOR_XFACS) &&
+                            gbl_fadt->Xfacs) {
+                                table_address =
+                                    (acpi_physical_address) gbl_fadt->Xfacs;
+                        } else
+                            if ((gbl_fadt->header.length >= MIN_FADT_FOR_FACS)
+                                && gbl_fadt->facs) {
+                                table_address =
+                                    (acpi_physical_address) gbl_fadt->facs;
+                        }
+                } else if (ACPI_COMPARE_NAME(signature, ACPI_SIG_XSDT)) {
+                        if (!gbl_revision) {
+                                return (AE_BAD_SIGNATURE);
+                        }
+                        table_address =
+                            (acpi_physical_address) gbl_rsdp.
+                            xsdt_physical_address;
+                } else if (ACPI_COMPARE_NAME(signature, ACPI_SIG_RSDT)) {
+                        table_address =
+                            (acpi_physical_address) gbl_rsdp.
+                            rsdt_physical_address;
+                } else {
+                        table_address =
+                            (acpi_physical_address) gbl_rsdp_address;
+                        signature = ACPI_SIG_RSDP;
+                }
+
+                /* Now we can get the requested special table */
+
+                status = osl_map_table(table_address, signature, &mapped_table);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                table_length = ap_get_table_length(mapped_table);
+        } else {                /* Case for a normal ACPI table */
+
+                if (osl_can_use_xsdt()) {
+                        item_size = sizeof(u64);
+                        table_data =
+                            ACPI_CAST8(gbl_xsdt) +
+                            sizeof(struct acpi_table_header);
+                        number_of_tables =
+                            (u8)((gbl_xsdt->header.length -
+                                  sizeof(struct acpi_table_header))
+                                 / item_size);
+                } else {        /* Use RSDT if XSDT is not available */
+
+                        item_size = sizeof(u32);
+                        table_data =
+                            ACPI_CAST8(gbl_rsdt) +
+                            sizeof(struct acpi_table_header);
+                        number_of_tables =
+                            (u8)((gbl_rsdt->header.length -
+                                  sizeof(struct acpi_table_header))
+                                 / item_size);
+                }
+
+                /* Search RSDT/XSDT for the requested table */
+
+                for (i = 0; i < number_of_tables; ++i, table_data += item_size) {
+                        if (osl_can_use_xsdt()) {
+                                table_address =
+                                    (acpi_physical_address) (*ACPI_CAST64
+                                                             (table_data));
+                        } else {
+                                table_address =
+                                    (acpi_physical_address) (*ACPI_CAST32
+                                                             (table_data));
+                        }
+
+                        /* Skip NULL entries in RSDT/XSDT */
+
+                        if (!table_address) {
+                                continue;
+                        }
+
+                        status =
+                            osl_map_table(table_address, NULL, &mapped_table);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+                        table_length = mapped_table->length;
+
+                        /* Does this table match the requested signature? */
+
+                        if (!ACPI_COMPARE_NAME
+                            (mapped_table->signature, signature)) {
+                                osl_unmap_table(mapped_table);
+                                mapped_table = NULL;
+                                continue;
+                        }
+
+                        /* Match table instance (for SSDT/UEFI tables) */
+
+                        if (current_instance != instance) {
+                                osl_unmap_table(mapped_table);
+                                mapped_table = NULL;
+                                current_instance++;
+                                continue;
+                        }
+
+                        break;
+                }
+        }
+
+        if (!mapped_table) {
+                return (AE_LIMIT);
+        }
+
+        if (table_length == 0) {
+                status = AE_BAD_HEADER;
+                goto exit;
+        }
+
+        /* Copy table to local buffer and return it */
+
+        local_table = calloc(1, table_length);
+        if (!local_table) {
+                status = AE_NO_MEMORY;
+                goto exit;
+        }
+
+        ACPI_MEMCPY(local_table, mapped_table, table_length);
+        *address = table_address;
+        *table = local_table;
+
+exit:
+        osl_unmap_table(mapped_table);
+        return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_list_customized_tables
+ *
+ * PARAMETERS:  directory           - Directory that contains the tables
+ *
+ * RETURN:      Status; Table list is initialized if AE_OK.
+ *
+ * DESCRIPTION: Add ACPI tables to the table list from a directory.
+ *
+ *****************************************************************************/
+
+static acpi_status osl_list_customized_tables(char *directory)
+{
+        void *table_dir;
+        u32 instance;
+        char temp_name[ACPI_NAME_SIZE];
+        char *filename;
+        acpi_status status = AE_OK;
+
+        /* Open the requested directory */
+
+        table_dir = acpi_os_open_directory(directory, "*", REQUEST_FILE_ONLY);
+        if (!table_dir) {
+                return (osl_get_last_status(AE_NOT_FOUND));
+        }
+
+        /* Examine all entries in this directory */
+
+        while ((filename = acpi_os_get_next_filename(table_dir))) {
+
+                /* Extract table name and instance number */
+
+                status =
+                    osl_table_name_from_file(filename, temp_name, &instance);
+
+                /* Ignore meaningless files */
+
+                if (ACPI_FAILURE(status)) {
+                        continue;
+                }
+
+                /* Add new info node to global table list */
+
+                status = osl_add_table_to_list(temp_name, instance);
+                if (ACPI_FAILURE(status)) {
+                        break;
+                }
+        }
+
+        acpi_os_close_directory(table_dir);
+        return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_map_table
+ *
+ * PARAMETERS:  address             - Address of the table in memory
+ *              signature           - Optional ACPI Signature for desired table.
+ *                                    Null terminated 4-character string.
+ *              table               - Where a pointer to the mapped table is
+ *                                    returned
+ *
+ * RETURN:      Status; Mapped table is returned if AE_OK.
+ *              AE_NOT_FOUND: A valid table was not found at the address
+ *
+ * DESCRIPTION: Map entire ACPI table into caller's address space.
+ *
+ *****************************************************************************/
+
+static acpi_status
+osl_map_table(acpi_size address,
+              char *signature, struct acpi_table_header **table)
+{
+        struct acpi_table_header *mapped_table;
+        u32 length;
+
+        if (!address) {
+                return (AE_BAD_ADDRESS);
+        }
+
+        /*
+         * Map the header so we can get the table length.
+         * Use sizeof (struct acpi_table_header) as:
+         * 1. it is bigger than 24 to include RSDP->Length
+         * 2. it is smaller than sizeof (struct acpi_table_rsdp)
+         */
+        mapped_table =
+            acpi_os_map_memory(address, sizeof(struct acpi_table_header));
+        if (!mapped_table) {
+                fprintf(stderr, "Could not map table header at 0x%8.8X%8.8X\n",
+                        ACPI_FORMAT_UINT64(address));
+                return (osl_get_last_status(AE_BAD_ADDRESS));
+        }
+
+        /* If specified, signature must match */
+
+        if (signature) {
+                if (ACPI_VALIDATE_RSDP_SIG(signature)) {
+                        if (!ACPI_VALIDATE_RSDP_SIG(mapped_table->signature)) {
+                                acpi_os_unmap_memory(mapped_table,
+                                                     sizeof(struct
+                                                            acpi_table_header));
+                                return (AE_BAD_SIGNATURE);
+                        }
+                } else
+                    if (!ACPI_COMPARE_NAME(signature, mapped_table->signature))
+                {
+                        acpi_os_unmap_memory(mapped_table,
+                                             sizeof(struct acpi_table_header));
+                        return (AE_BAD_SIGNATURE);
+                }
+        }
+
+        /* Map the entire table */
+
+        length = ap_get_table_length(mapped_table);
+        acpi_os_unmap_memory(mapped_table, sizeof(struct acpi_table_header));
+        if (length == 0) {
+                return (AE_BAD_HEADER);
+        }
+
+        mapped_table = acpi_os_map_memory(address, length);
+        if (!mapped_table) {
+                fprintf(stderr,
+                        "Could not map table at 0x%8.8X%8.8X length %8.8X\n",
+                        ACPI_FORMAT_UINT64(address), length);
+                return (osl_get_last_status(AE_INVALID_TABLE_LENGTH));
+        }
+
+        (void)ap_is_valid_checksum(mapped_table);
+
+        *table = mapped_table;
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_unmap_table
+ *
+ * PARAMETERS:  table               - A pointer to the mapped table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Unmap entire ACPI table.
+ *
+ *****************************************************************************/
+
+static void osl_unmap_table(struct acpi_table_header *table)
+{
+        if (table) {
+                acpi_os_unmap_memory(table, ap_get_table_length(table));
+        }
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_table_name_from_file
+ *
+ * PARAMETERS:  filename            - File that contains the desired table
+ *              signature           - Pointer to 4-character buffer to store
+ *                                    extracted table signature.
+ *              instance            - Pointer to integer to store extracted
+ *                                    table instance number.
+ *
+ * RETURN:      Status; Table name is extracted if AE_OK.
+ *
+ * DESCRIPTION: Extract table signature and instance number from a table file
+ *              name.
+ *
+ *****************************************************************************/
+
+static acpi_status
+osl_table_name_from_file(char *filename, char *signature, u32 *instance)
+{
+
+        /* Ignore meaningless files */
+
+        if (strlen(filename) < ACPI_NAME_SIZE) {
+                return (AE_BAD_SIGNATURE);
+        }
+
+        /* Extract instance number */
+
+        if (isdigit((int)filename[ACPI_NAME_SIZE])) {
+                sscanf(&filename[ACPI_NAME_SIZE], "%d", instance);
+        } else if (strlen(filename) != ACPI_NAME_SIZE) {
+                return (AE_BAD_SIGNATURE);
+        } else {
+                *instance = 0;
+        }
+
+        /* Extract signature */
+
+        ACPI_MOVE_NAME(signature, filename);
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_read_table_from_file
+ *
+ * PARAMETERS:  filename            - File that contains the desired table
+ *              file_offset         - Offset of the table in file
+ *              signature           - Optional ACPI Signature for desired table.
+ *                                    A null terminated 4-character string.
+ *              table               - Where a pointer to the table is returned
+ *
+ * RETURN:      Status; Table buffer is returned if AE_OK.
+ *
+ * DESCRIPTION: Read a ACPI table from a file.
+ *
+ *****************************************************************************/
+
+static acpi_status
+osl_read_table_from_file(char *filename,
+                         acpi_size file_offset,
+                         char *signature, struct acpi_table_header **table)
+{
+        FILE *table_file;
+        struct acpi_table_header header;
+        struct acpi_table_header *local_table = NULL;
+        u32 table_length;
+        s32 count;
+        acpi_status status = AE_OK;
+
+        /* Open the file */
+
+        table_file = fopen(filename, "rb");
+        if (table_file == NULL) {
+                fprintf(stderr, "Could not open table file: %s\n", filename);
+                return (osl_get_last_status(AE_NOT_FOUND));
+        }
+
+        fseek(table_file, file_offset, SEEK_SET);
+
+        /* Read the Table header to get the table length */
+
+        count = fread(&header, 1, sizeof(struct acpi_table_header), table_file);
+        if (count != sizeof(struct acpi_table_header)) {
+                fprintf(stderr, "Could not read table header: %s\n", filename);
+                status = AE_BAD_HEADER;
+                goto exit;
+        }
+
+        /* If signature is specified, it must match the table */
+
+        if (signature) {
+                if (ACPI_VALIDATE_RSDP_SIG(signature)) {
+                        if (!ACPI_VALIDATE_RSDP_SIG(header.signature)) {
+                                fprintf(stderr,
+                                        "Incorrect RSDP signature: found %8.8s\n",
+                                        header.signature);
+                                status = AE_BAD_SIGNATURE;
+                                goto exit;
+                        }
+                } else if (!ACPI_COMPARE_NAME(signature, header.signature)) {
+                        fprintf(stderr,
+                                "Incorrect signature: Expecting %4.4s, found %4.4s\n",
+                                signature, header.signature);
+                        status = AE_BAD_SIGNATURE;
+                        goto exit;
+                }
+        }
+
+        table_length = ap_get_table_length(&header);
+        if (table_length == 0) {
+                status = AE_BAD_HEADER;
+                goto exit;
+        }
+
+        /* Read the entire table into a local buffer */
+
+        local_table = calloc(1, table_length);
+        if (!local_table) {
+                fprintf(stderr,
+                        "%4.4s: Could not allocate buffer for table of length %X\n",
+                        header.signature, table_length);
+                status = AE_NO_MEMORY;
+                goto exit;
+        }
+
+        fseek(table_file, file_offset, SEEK_SET);
+
+        count = fread(local_table, 1, table_length, table_file);
+        if (count != table_length) {
+                fprintf(stderr, "%4.4s: Could not read table content\n",
+                        header.signature);
+                status = AE_INVALID_TABLE_LENGTH;
+                goto exit;
+        }
+
+        /* Validate checksum */
+
+        (void)ap_is_valid_checksum(local_table);
+
+exit:
+        fclose(table_file);
+        *table = local_table;
+        return (status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    osl_get_customized_table
+ *
+ * PARAMETERS:  pathname        - Directory to find Linux customized table
+ *              signature       - ACPI Signature for desired table. Must be
+ *                                a null terminated 4-character string.
+ *              instance        - Multiple table support for SSDT/UEFI (0...n)
+ *                                Must be 0 for other tables.
+ *              table           - Where a pointer to the table is returned
+ *              address         - Where the table physical address is returned
+ *
+ * RETURN:      Status; Table buffer is returned if AE_OK.
+ *              AE_LIMIT: Instance is beyond valid limit
+ *              AE_NOT_FOUND: A table with the signature was not found
+ *
+ * DESCRIPTION: Get an OS customized table.
+ *
+ *****************************************************************************/
+
+static acpi_status
+osl_get_customized_table(char *pathname,
+                         char *signature,
+                         u32 instance,
+                         struct acpi_table_header **table,
+                         acpi_physical_address * address)
+{
+        void *table_dir;
+        u32 current_instance = 0;
+        char temp_name[ACPI_NAME_SIZE];
+        char table_filename[PATH_MAX];
+        char *filename;
+        acpi_status status;
+
+        /* Open the directory for customized tables */
+
+        table_dir = acpi_os_open_directory(pathname, "*", REQUEST_FILE_ONLY);
+        if (!table_dir) {
+                return (osl_get_last_status(AE_NOT_FOUND));
+        }
+
+        /* Attempt to find the table in the directory */
+
+        while ((filename = acpi_os_get_next_filename(table_dir))) {
+
+                /* Ignore meaningless files */
+
+                if (!ACPI_COMPARE_NAME(filename, signature)) {
+                        continue;
+                }
+
+                /* Extract table name and instance number */
+
+                status =
+                    osl_table_name_from_file(filename, temp_name,
+                                             &current_instance);
+
+                /* Ignore meaningless files */
+
+                if (ACPI_FAILURE(status) || current_instance != instance) {
+                        continue;
+                }
+
+                /* Create the table pathname */
+
+                if (instance != 0) {
+                        sprintf(table_filename, "%s/%4.4s%d", pathname,
+                                temp_name, instance);
+                } else {
+                        sprintf(table_filename, "%s/%4.4s", pathname,
+                                temp_name);
+                }
+                break;
+        }
+
+        acpi_os_close_directory(table_dir);
+
+        if (!filename) {
+                return (AE_LIMIT);
+        }
+
+        /* There is no physical address saved for customized tables, use zero */
+
+        *address = 0;
+        status = osl_read_table_from_file(table_filename, 0, NULL, table);
+
+        return (status);
+}
diff --git a/tools/power/acpi/os_specific/service_layers/osunixdir.c b/tools/power/acpi/os_specific/service_layers/osunixdir.c
new file mode 100644
index 000000000000..733f9e490fc4
--- /dev/null
+++ b/tools/power/acpi/os_specific/service_layers/osunixdir.c
@@ -0,0 +1,204 @@
+/******************************************************************************
+ *
+ * Module Name: osunixdir - Unix directory access interfaces
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <fnmatch.h>
+#include <ctype.h>
+#include <sys/stat.h>
+
+/*
+ * Allocated structure returned from os_open_directory
+ */
+typedef struct external_find_info {
+        char *dir_pathname;
+        DIR *dir_ptr;
+        char temp_buffer[256];
+        char *wildcard_spec;
+        char requested_file_type;
+
+} external_find_info;
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_open_directory
+ *
+ * PARAMETERS:  dir_pathname        - Full pathname to the directory
+ *              wildcard_spec       - string of the form "*.c", etc.
+ *
+ * RETURN:      A directory "handle" to be used in subsequent search operations.
+ *              NULL returned on failure.
+ *
+ * DESCRIPTION: Open a directory in preparation for a wildcard search
+ *
+ ******************************************************************************/
+
+void *acpi_os_open_directory(char *dir_pathname,
+                             char *wildcard_spec, char requested_file_type)
+{
+        struct external_find_info *external_info;
+        DIR *dir;
+
+        /* Allocate the info struct that will be returned to the caller */
+
+        external_info = calloc(1, sizeof(struct external_find_info));
+        if (!external_info) {
+                return (NULL);
+        }
+
+        /* Get the directory stream */
+
+        dir = opendir(dir_pathname);
+        if (!dir) {
+                fprintf(stderr, "Cannot open directory - %s\n", dir_pathname);
+                free(external_info);
+                return (NULL);
+        }
+
+        /* Save the info in the return structure */
+
+        external_info->wildcard_spec = wildcard_spec;
+        external_info->requested_file_type = requested_file_type;
+        external_info->dir_pathname = dir_pathname;
+        external_info->dir_ptr = dir;
+        return (external_info);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_get_next_filename
+ *
+ * PARAMETERS:  dir_handle          - Created via acpi_os_open_directory
+ *
+ * RETURN:      Next filename matched. NULL if no more matches.
+ *
+ * DESCRIPTION: Get the next file in the directory that matches the wildcard
+ *              specification.
+ *
+ ******************************************************************************/
+
+char *acpi_os_get_next_filename(void *dir_handle)
+{
+        struct external_find_info *external_info = dir_handle;
+        struct dirent *dir_entry;
+        char *temp_str;
+        int str_len;
+        struct stat temp_stat;
+        int err;
+
+        while ((dir_entry = readdir(external_info->dir_ptr))) {
+                if (!fnmatch
+                    (external_info->wildcard_spec, dir_entry->d_name, 0)) {
+                        if (dir_entry->d_name[0] == '.') {
+                                continue;
+                        }
+
+                        str_len = strlen(dir_entry->d_name) +
+                            strlen(external_info->dir_pathname) + 2;
+
+                        temp_str = calloc(str_len, 1);
+                        if (!temp_str) {
+                                fprintf(stderr,
+                                        "Could not allocate buffer for temporary string\n");
+                                return (NULL);
+                        }
+
+                        strcpy(temp_str, external_info->dir_pathname);
+                        strcat(temp_str, "/");
+                        strcat(temp_str, dir_entry->d_name);
+
+                        err = stat(temp_str, &temp_stat);
+                        if (err == -1) {
+                                fprintf(stderr,
+                                        "Cannot stat file (should not happen) - %s\n",
+                                        temp_str);
+                                free(temp_str);
+                                return (NULL);
+                        }
+
+                        free(temp_str);
+
+                        if ((S_ISDIR(temp_stat.st_mode)
+                             && (external_info->requested_file_type ==
+                                 REQUEST_DIR_ONLY))
+                            || ((!S_ISDIR(temp_stat.st_mode)
+                                 && external_info->requested_file_type ==
+                                 REQUEST_FILE_ONLY))) {
+
+                                /* copy to a temp buffer because dir_entry struct is on the stack */
+
+                                strcpy(external_info->temp_buffer,
+                                       dir_entry->d_name);
+                                return (external_info->temp_buffer);
+                        }
+                }
+        }
+
+        return (NULL);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_close_directory
+ *
+ * PARAMETERS:  dir_handle          - Created via acpi_os_open_directory
+ *
+ * RETURN:      None.
+ *
+ * DESCRIPTION: Close the open directory and cleanup.
+ *
+ ******************************************************************************/
+
+void acpi_os_close_directory(void *dir_handle)
+{
+        struct external_find_info *external_info = dir_handle;
+
+        /* Close the directory and free allocations */
+
+        closedir(external_info->dir_ptr);
+        free(dir_handle);
+}
diff --git a/tools/power/acpi/os_specific/service_layers/osunixmap.c b/tools/power/acpi/os_specific/service_layers/osunixmap.c
new file mode 100644
index 000000000000..99b47b6194a3
--- /dev/null
+++ b/tools/power/acpi/os_specific/service_layers/osunixmap.c
@@ -0,0 +1,151 @@
+/******************************************************************************
+ *
+ * Module Name: osunixmap - Unix OSL for file mappings
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include "acpidump.h"
+#include <unistd.h>
+#include <sys/mman.h>
+#ifdef _free_BSD
+#include <sys/param.h>
+#endif
+
+#define _COMPONENT          ACPI_OS_SERVICES
+ACPI_MODULE_NAME("osunixmap")
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+#ifdef _free_BSD
+#define MMAP_FLAGS          MAP_SHARED
+#else
+#define MMAP_FLAGS          MAP_PRIVATE
+#endif
+#define SYSTEM_MEMORY       "/dev/mem"
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_get_page_size
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Page size of the platform.
+ *
+ * DESCRIPTION: Obtain page size of the platform.
+ *
+ ******************************************************************************/
+static acpi_size acpi_os_get_page_size(void)
+{
+
+#ifdef PAGE_SIZE
+        return PAGE_SIZE;
+#else
+        return sysconf(_SC_PAGESIZE);
+#endif
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os_map_memory
+ *
+ * PARAMETERS:  where               - Physical address of memory to be mapped
+ *              length              - How much memory to map
+ *
+ * RETURN:      Pointer to mapped memory. Null on error.
+ *
+ * DESCRIPTION: Map physical memory into local address space.
+ *
+ *****************************************************************************/
+
+void *acpi_os_map_memory(acpi_physical_address where, acpi_size length)
+{
+        u8 *mapped_memory;
+        acpi_physical_address offset;
+        acpi_size page_size;
+        int fd;
+
+        fd = open(SYSTEM_MEMORY, O_RDONLY | O_BINARY);
+        if (fd < 0) {
+                fprintf(stderr, "Cannot open %s\n", SYSTEM_MEMORY);
+                return (NULL);
+        }
+
+        /* Align the offset to use mmap */
+
+        page_size = acpi_os_get_page_size();
+        offset = where % page_size;
+
+        /* Map the table header to get the length of the full table */
+
+        mapped_memory = mmap(NULL, (length + offset), PROT_READ, MMAP_FLAGS,
+                             fd, (where - offset));
+        if (mapped_memory == MAP_FAILED) {
+                fprintf(stderr, "Cannot map %s\n", SYSTEM_MEMORY);
+                close(fd);
+                return (NULL);
+        }
+
+        close(fd);
+        return (ACPI_CAST8(mapped_memory + offset));
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os_unmap_memory
+ *
+ * PARAMETERS:  where               - Logical address of memory to be unmapped
+ *              length              - How much memory to unmap
+ *
+ * RETURN:      None.
+ *
+ * DESCRIPTION: Delete a previously created mapping. Where and Length must
+ *              correspond to a previous mapping exactly.
+ *
+ *****************************************************************************/
+
+void acpi_os_unmap_memory(void *where, acpi_size length)
+{
+        acpi_physical_address offset;
+        acpi_size page_size;
+
+        page_size = acpi_os_get_page_size();
+        offset = (acpi_physical_address) where % page_size;
+        munmap((u8 *)where - offset, (length + offset));
+}
diff --git a/tools/power/acpi/tools/acpidump/acpidump.c b/tools/power/acpi/tools/acpidump/acpidump.c
deleted file mode 100644
index a84553a0e0df..000000000000
--- a/tools/power/acpi/tools/acpidump/acpidump.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * (c) Alexey Starikovskiy, Intel, 2005-2006.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#ifdef DEFINE_ALTERNATE_TYPES
-/* hack to enable building old application with new headers -lenb */
-#define acpi_fadt_descriptor acpi_table_fadt
-#define acpi_rsdp_descriptor acpi_table_rsdp
-#define DSDT_SIG ACPI_SIG_DSDT
-#define FACS_SIG ACPI_SIG_FACS
-#define FADT_SIG ACPI_SIG_FADT
-#define xfirmware_ctrl Xfacs
-#define firmware_ctrl facs
-
-typedef int                             s32;
-typedef unsigned char                   u8;
-typedef unsigned short                  u16;
-typedef unsigned int                    u32;
-typedef unsigned long long              u64;
-typedef long long                       s64;
-#endif
-
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-
-#include <dirent.h>
-
-#include <acpi/acconfig.h>
-#include <acpi/platform/acenv.h>
-#include <acpi/actypes.h>
-#include <acpi/actbl.h>
-
-static inline u8 checksum(u8 * buffer, u32 length)
-{
-        u8 sum = 0, *i = buffer;
-        buffer += length;
-        for (; i < buffer; sum += *(i++));
-        return sum;
-}
-
-static unsigned long psz, addr, length;
-static int print, connect, skip;
-static u8 select_sig[4];
-
-static unsigned long read_efi_systab( void )
-{
-        char buffer[80];
-        unsigned long addr;
-        FILE *f = fopen("/sys/firmware/efi/systab", "r");
-        if (f) {
-                while (fgets(buffer, 80, f)) {
-                        if (sscanf(buffer, "ACPI20=0x%lx", &addr) == 1)
-                                return addr;
-                }
-                fclose(f);
-        }
-        return 0;
-}
-
-static u8 *acpi_map_memory(unsigned long where, unsigned length)
-{
-        unsigned long offset;
-        u8 *there;
-        int fd = open("/dev/mem", O_RDONLY);
-        if (fd < 0) {
-                fprintf(stderr, "acpi_os_map_memory: cannot open /dev/mem\n");
-                exit(1);
-        }
-        offset = where % psz;
-        there = mmap(NULL, length + offset, PROT_READ, MAP_PRIVATE,
-                         fd, where - offset);
-        close(fd);
-        if (there == MAP_FAILED) return 0;
-        return (there + offset);
-}
-
-static void acpi_unmap_memory(u8 * there, unsigned length)
-{
-        unsigned long offset = (unsigned long)there % psz;
-        munmap(there - offset, length + offset);
-}
-
-static struct acpi_table_header *acpi_map_table(unsigned long where, char *sig)
-{
-        unsigned size;
-        struct acpi_table_header *tbl = (struct acpi_table_header *)
-            acpi_map_memory(where, sizeof(struct acpi_table_header));
-        if (!tbl || (sig && memcmp(sig, tbl->signature, 4))) return 0;
-        size = tbl->length;
-        acpi_unmap_memory((u8 *) tbl, sizeof(struct acpi_table_header));
-        return (struct acpi_table_header *)acpi_map_memory(where, size);
-}
-
-static void acpi_unmap_table(struct acpi_table_header *tbl)
-{
-        acpi_unmap_memory((u8 *)tbl, tbl->length);
-}
-
-static struct acpi_rsdp_descriptor *acpi_scan_for_rsdp(u8 *begin, u32 length)
-{
-        struct acpi_rsdp_descriptor *rsdp;
-        u8 *i, *end = begin + length;
-        /* Search from given start address for the requested length */
-        for (i = begin; i < end; i += ACPI_RSDP_SCAN_STEP) {
-                /* The signature and checksum must both be correct */
-                if (memcmp((char *)i, "RSD PTR ", 8)) continue;
-                rsdp = (struct acpi_rsdp_descriptor *)i;
-                /* Signature matches, check the appropriate checksum */
-                if (!checksum((u8 *) rsdp, (rsdp->revision < 2) ?
-                              ACPI_RSDP_CHECKSUM_LENGTH :
-                              ACPI_RSDP_XCHECKSUM_LENGTH))
-                        /* Checksum valid, we have found a valid RSDP */
-                        return rsdp;
-        }
-        /* Searched entire block, no RSDP was found */
-        return 0;
-}
-
-/*
- * Output data
- */
-static void acpi_show_data(int fd, u8 * data, int size)
-{
-        char buffer[256];
-        int len;
-        int i, remain = size;
-        while (remain > 0) {
-                len = snprintf(buffer, 256, "  %04x:", size - remain);
-                for (i = 0; i < 16 && i < remain; i++) {
-                        len +=
-                            snprintf(&buffer[len], 256 - len, " %02x", data[i]);
-                }
-                for (; i < 16; i++) {
-                        len += snprintf(&buffer[len], 256 - len, "   ");
-                }
-                len += snprintf(&buffer[len], 256 - len, "  ");
-                for (i = 0; i < 16 && i < remain; i++) {
-                        buffer[len++] = (isprint(data[i])) ? data[i] : '.';
-                }
-                buffer[len++] = '\n';
-                write(fd, buffer, len);
-                data += 16;
-                remain -= 16;
-        }
-}
-
-/*
- * Output ACPI table
- */
-static void acpi_show_table(int fd, struct acpi_table_header *table, unsigned long addr)
-{
-        char buff[80];
-        int len = snprintf(buff, 80, "%.4s @ %p\n", table->signature, (void *)addr);
-        write(fd, buff, len);
-        acpi_show_data(fd, (u8 *) table, table->length);
-        buff[0] = '\n';
-        write(fd, buff, 1);
-}
-
-static void write_table(int fd, struct acpi_table_header *tbl, unsigned long addr)
-{
-        static int select_done = 0;
-        if (!select_sig[0]) {
-                if (print) {
-                        acpi_show_table(fd, tbl, addr);
-                } else {
-                        write(fd, tbl, tbl->length);
-                }
-        } else if (!select_done && !memcmp(select_sig, tbl->signature, 4)) {
-                if (skip > 0) {
-                        --skip;
-                        return;
-                }
-                if (print) {
-                        acpi_show_table(fd, tbl, addr);
-                } else {
-                        write(fd, tbl, tbl->length);
-                }
-                select_done = 1;
-        }
-}
-
-static void acpi_dump_FADT(int fd, struct acpi_table_header *tbl, unsigned long xaddr) {
-        struct acpi_fadt_descriptor x;
-        unsigned long addr;
-        size_t len = sizeof(struct acpi_fadt_descriptor);
-        if (len > tbl->length) len = tbl->length;
-        memcpy(&x, tbl, len);
-        x.header.length = len;
-        if (checksum((u8 *)tbl, len)) {
-                fprintf(stderr, "Wrong checksum for FADT!\n");
-        }
-        if (x.header.length >= 148 && x.Xdsdt) {
-                addr = (unsigned long)x.Xdsdt;
-                if (connect) {
-                        x.Xdsdt = lseek(fd, 0, SEEK_CUR);
-                }
-        } else if (x.header.length >= 44 && x.dsdt) {
-                addr = (unsigned long)x.dsdt;
-                if (connect) {
-                        x.dsdt = lseek(fd, 0, SEEK_CUR);
-                }
-        } else {
-                fprintf(stderr, "No DSDT in FADT!\n");
-                goto no_dsdt;
-        }
-        tbl = acpi_map_table(addr, DSDT_SIG);
-        if (!tbl) goto no_dsdt;
-        if (checksum((u8 *)tbl, tbl->length))
-                fprintf(stderr, "Wrong checksum for DSDT!\n");
-        write_table(fd, tbl, addr);
-        acpi_unmap_table(tbl);
-no_dsdt:
-        if (x.header.length >= 140 && x.xfirmware_ctrl) {
-                addr = (unsigned long)x.xfirmware_ctrl;
-                if (connect) {
-                        x.xfirmware_ctrl = lseek(fd, 0, SEEK_CUR);
-                }
-        } else if (x.header.length >= 40 && x.firmware_ctrl) {
-                addr = (unsigned long)x.firmware_ctrl;
-                if (connect) {
-                        x.firmware_ctrl = lseek(fd, 0, SEEK_CUR);
-                }
-        } else {
-                fprintf(stderr, "No FACS in FADT!\n");
-                goto no_facs;
-        }
-        tbl = acpi_map_table(addr, FACS_SIG);
-        if (!tbl) goto no_facs;
-        /* do not checksum FACS */
-        write_table(fd, tbl, addr);
-        acpi_unmap_table(tbl);
-no_facs:
-        write_table(fd, (struct acpi_table_header *)&x, xaddr);
-}
-
-static int acpi_dump_SDT(int fd, struct acpi_rsdp_descriptor *rsdp)
-{
-        struct acpi_table_header *sdt, *tbl = 0;
-        int xsdt = 1, i, num;
-        char *offset;
-        unsigned long addr;
-        if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {
-                tbl = acpi_map_table(rsdp->xsdt_physical_address, "XSDT");
-        }
-        if (!tbl && rsdp->rsdt_physical_address) {
-                xsdt = 0;
-                tbl = acpi_map_table(rsdp->rsdt_physical_address, "RSDT");
-        }
-        if (!tbl) return 0;
-        sdt = malloc(tbl->length);
-        memcpy(sdt, tbl, tbl->length);
-        acpi_unmap_table(tbl);
-        if (checksum((u8 *)sdt, sdt->length))
-                fprintf(stderr, "Wrong checksum for %s!\n", (xsdt)?"XSDT":"RSDT");
-        num = (sdt->length - sizeof(struct acpi_table_header))/((xsdt)?sizeof(u64):sizeof(u32));
-        offset = (char *)sdt + sizeof(struct acpi_table_header);
-        for (i = 0; i < num; ++i, offset += ((xsdt) ? sizeof(u64) : sizeof(u32))) {
-                addr = (xsdt) ? (unsigned long)(*(u64 *)offset):
-                                (unsigned long)(*(u32 *)offset);
-                if (!addr) continue;
-                tbl = acpi_map_table(addr, 0);
-                if (!tbl) continue;
-                if (!memcmp(tbl->signature, FADT_SIG, 4)) {
-                        acpi_dump_FADT(fd, tbl, addr);
-                } else {
-                        if (checksum((u8 *)tbl, tbl->length))
-                                fprintf(stderr, "Wrong checksum for generic table!\n");
-                        write_table(fd, tbl, addr);
-                }
-                acpi_unmap_table(tbl);
-                if (connect) {
-                        if (xsdt)
-                                (*(u64*)offset) = lseek(fd, 0, SEEK_CUR);
-                        else
-                                (*(u32*)offset) = lseek(fd, 0, SEEK_CUR);
-                }
-        }
-        if (xsdt) {
-                addr = (unsigned long)rsdp->xsdt_physical_address;
-                if (connect) {
-                        rsdp->xsdt_physical_address = lseek(fd, 0, SEEK_CUR);
-                }
-        } else {
-                addr = (unsigned long)rsdp->rsdt_physical_address;
-                if (connect) {
-                        rsdp->rsdt_physical_address = lseek(fd, 0, SEEK_CUR);
-                }
-        }
-        write_table(fd, sdt, addr);
-        free (sdt);
-        return 1;
-}
-
-#define DYNAMIC_SSDT    "/sys/firmware/acpi/tables/dynamic"
-
-static void acpi_dump_dynamic_SSDT(int fd)
-{
-        struct stat file_stat;
-        char filename[256], *ptr;
-        DIR *tabledir;
-        struct dirent *entry;
-        FILE *fp;
-        int count, readcount, length;
-        struct acpi_table_header table_header, *ptable;
-
-        if (stat(DYNAMIC_SSDT, &file_stat) == -1) {
-                /* The directory doesn't exist */
-                return;
-        }
-        tabledir = opendir(DYNAMIC_SSDT);
-        if(!tabledir){
-                /*can't open the directory */
-                return;
-         }
-
-        while ((entry = readdir(tabledir)) != 0){
-                /* skip the file of . /.. */
-                if (entry->d_name[0] == '.')
-                        continue;
-
-                sprintf(filename, "%s/%s", DYNAMIC_SSDT, entry->d_name);
-                fp = fopen(filename, "r");
-                if (fp == NULL) {
-                        fprintf(stderr, "Can't open the file of %s\n",
-                                                filename);
-                        continue;
-                }
-                /* Read the Table header to parse the table length */
-                count = fread(&table_header, 1, sizeof(struct acpi_table_header), fp);
-                if (count < sizeof(table_header)) {
-                        /* the length is lessn than ACPI table header. skip it */
-                        fclose(fp);
-                        continue;
-                }
-                length = table_header.length;
-                ptr = malloc(table_header.length);
-                fseek(fp, 0, SEEK_SET);
-                readcount = 0;
-                while(!feof(fp) && readcount < length) {
-                        count = fread(ptr + readcount, 1, 256, fp);
-                        readcount += count;
-                }
-                fclose(fp);
-                ptable = (struct acpi_table_header *) ptr;
-                if (checksum((u8 *) ptable, ptable->length))
-                        fprintf(stderr, "Wrong checksum "
-                                        "for dynamic SSDT table!\n");
-                write_table(fd, ptable, 0);
-                free(ptr);
-        }
-        closedir(tabledir);
-        return;
-}
-
-static void usage(const char *progname)
-{
-        puts("Usage:");
-        printf("%s [--addr 0x1234][--table DSDT][--output filename]"
-                "[--binary][--length 0x456][--help]\n", progname);
-        puts("\t--addr 0x1234 or -a 0x1234 -- look for tables at this physical address");
-        puts("\t--table DSDT or -t DSDT -- only dump table with DSDT signature");
-        puts("\t--output filename or -o filename -- redirect output from stdin to filename");
-        puts("\t--binary or -b -- dump data in binary form rather than in hex-dump format");
-        puts("\t--length 0x456 or -l 0x456 -- works only with --addr, dump physical memory"
-                "\n\t\tregion without trying to understand it's contents");
-        puts("\t--skip 2 or -s 2 -- skip 2 tables of the given name and output only 3rd one");
-        puts("\t--help or -h -- this help message");
-        exit(0);
-}
-
-static struct option long_options[] = {
-        {"addr", 1, 0, 0},
-        {"table", 1, 0, 0},
-        {"output", 1, 0, 0},
-        {"binary", 0, 0, 0},
-        {"length", 1, 0, 0},
-        {"skip", 1, 0, 0},
-        {"help", 0, 0, 0},
-        {0, 0, 0, 0}
-};
-int main(int argc, char **argv)
-{
-        int option_index, c, fd;
-        u8 *raw;
-        struct acpi_rsdp_descriptor rsdpx, *x = 0;
-        char *filename = 0;
-        char buff[80];
-        memset(select_sig, 0, 4);
-        print = 1;
-        connect = 0;
-        addr = length = 0;
-        skip = 0;
-        while (1) {
-                option_index = 0;
-                c = getopt_long(argc, argv, "a:t:o:bl:s:h",
-                                    long_options, &option_index);
-                if (c == -1)
-                        break;
-
-                switch (c) {
-                case 0:
-                        switch (option_index) {
-                        case 0:
-                                addr = strtoul(optarg, (char **)NULL, 16);
-                                break;
-                        case 1:
-                                memcpy(select_sig, optarg, 4);
-                                break;
-                        case 2:
-                                filename = optarg;
-                                break;
-                        case 3:
-                                print = 0;
-                                break;
-                        case 4:
-                                length = strtoul(optarg, (char **)NULL, 16);
-                                break;
-                        case 5:
-                                skip = strtoul(optarg, (char **)NULL, 10);
-                                break;
-                        case 6:
-                                usage(argv[0]);
-                                exit(0);
-                        }
-                        break;
-                case 'a':
-                        addr = strtoul(optarg, (char **)NULL, 16);
-                        break;
-                case 't':
-                        memcpy(select_sig, optarg, 4);
-                        break;
-                case 'o':
-                        filename = optarg;
-                        break;
-                case 'b':
-                        print = 0;
-                        break;
-                case 'l':
-                        length = strtoul(optarg, (char **)NULL, 16);
-                        break;
-                case 's':
-                        skip = strtoul(optarg, (char **)NULL, 10);
-                        break;
-                case 'h':
-                        usage(argv[0]);
-                        exit(0);
-                default:
-                        printf("Unknown option!\n");
-                        usage(argv[0]);
-                        exit(0);
-                }
-        }
-
-        fd = STDOUT_FILENO;
-        if (filename) {
-                fd = creat(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-                if (fd < 0)
-                        return fd;
-        }
-
-        if (!select_sig[0] && !print) {
-                connect = 1;
-        }
-
-        psz = sysconf(_SC_PAGESIZE);
-        if (length && addr) {
-                /* We know length and address, it means we just want a memory dump */
-                if (!(raw = acpi_map_memory(addr, length)))
-                        goto not_found;
-                write(fd, raw, length);
-                acpi_unmap_memory(raw, length);
-                close(fd);
-                return 0;
-        }
-
-        length = sizeof(struct acpi_rsdp_descriptor);
-        if (!addr) {
-                addr = read_efi_systab();
-                if (!addr) {
-                        addr = ACPI_HI_RSDP_WINDOW_BASE;
-                        length = ACPI_HI_RSDP_WINDOW_SIZE;
-                }
-        }
-
-        if (!(raw = acpi_map_memory(addr, length)) ||
-            !(x = acpi_scan_for_rsdp(raw, length)))
-                goto not_found;
-
-        /* Find RSDP and print all found tables */
-        memcpy(&rsdpx, x, sizeof(struct acpi_rsdp_descriptor));
-        acpi_unmap_memory(raw, length);
-        if (connect) {
-                lseek(fd, sizeof(struct acpi_rsdp_descriptor), SEEK_SET);
-        }
-        if (!acpi_dump_SDT(fd, &rsdpx))
-                goto not_found;
-        if (connect) {
-                lseek(fd, 0, SEEK_SET);
-                write(fd, x, (rsdpx.revision < 2) ?
-                        ACPI_RSDP_CHECKSUM_LENGTH : ACPI_RSDP_XCHECKSUM_LENGTH);
-        } else if (!select_sig[0] || !memcmp("RSD PTR ", select_sig, 4)) {
-                addr += (long)x - (long)raw;
-                length = snprintf(buff, 80, "RSD PTR @ %p\n", (void *)addr);
-                write(fd, buff, length);
-                acpi_show_data(fd, (u8 *) & rsdpx, (rsdpx.revision < 2) ?
-                                ACPI_RSDP_CHECKSUM_LENGTH : ACPI_RSDP_XCHECKSUM_LENGTH);
-                buff[0] = '\n';
-                write(fd, buff, 1);
-        }
-        acpi_dump_dynamic_SSDT(fd);
-        close(fd);
-        return 0;
-not_found:
-        close(fd);
-        fprintf(stderr, "ACPI tables were not found. If you know location "
-                "of RSD PTR table (from dmesg, etc), "
-                "supply it with either --addr or -a option\n");
-        return 1;
-}
diff --git a/tools/power/acpi/tools/acpidump/acpidump.h b/tools/power/acpi/tools/acpidump/acpidump.h
new file mode 100644
index 000000000000..46f519597fe5
--- /dev/null
+++ b/tools/power/acpi/tools/acpidump/acpidump.h
@@ -0,0 +1,130 @@
+/******************************************************************************
+ *
+ * Module Name: acpidump.h - Include file for acpi_dump utility
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/*
+ * Global variables. Defined in main.c only, externed in all other files
+ */
+#ifdef _DECLARE_GLOBALS
+#define EXTERN
+#define INIT_GLOBAL(a,b)        a=b
+#define DEFINE_ACPI_GLOBALS     1
+#else
+#define EXTERN                  extern
+#define INIT_GLOBAL(a,b)        a
+#endif
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "actables.h"
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+/* Globals */
+
+EXTERN u8 INIT_GLOBAL(gbl_summary_mode, FALSE);
+EXTERN u8 INIT_GLOBAL(gbl_verbose_mode, FALSE);
+EXTERN u8 INIT_GLOBAL(gbl_binary_mode, FALSE);
+EXTERN u8 INIT_GLOBAL(gbl_dump_customized_tables, FALSE);
+EXTERN u8 INIT_GLOBAL(gbl_do_not_dump_xsdt, FALSE);
+EXTERN FILE INIT_GLOBAL(*gbl_output_file, NULL);
+EXTERN char INIT_GLOBAL(*gbl_output_filename, NULL);
+EXTERN u64 INIT_GLOBAL(gbl_rsdp_base, 0);
+
+/* Globals required for use with ACPICA modules */
+
+#ifdef _DECLARE_GLOBALS
+u8 acpi_gbl_integer_byte_width = 8;
+#endif
+
+/* Action table used to defer requested options */
+
+struct ap_dump_action {
+        char *argument;
+        u32 to_be_done;
+};
+
+#define AP_MAX_ACTIONS              32
+
+#define AP_DUMP_ALL_TABLES          0
+#define AP_DUMP_TABLE_BY_ADDRESS    1
+#define AP_DUMP_TABLE_BY_NAME       2
+#define AP_DUMP_TABLE_BY_FILE       3
+
+#define AP_MAX_ACPI_FILES           256 /* Prevent infinite loops */
+
+/* Minimum FADT sizes for various table addresses */
+
+#define MIN_FADT_FOR_DSDT           (ACPI_FADT_OFFSET (dsdt) + sizeof (u32))
+#define MIN_FADT_FOR_FACS           (ACPI_FADT_OFFSET (facs) + sizeof (u32))
+#define MIN_FADT_FOR_XDSDT          (ACPI_FADT_OFFSET (Xdsdt) + sizeof (u64))
+#define MIN_FADT_FOR_XFACS          (ACPI_FADT_OFFSET (Xfacs) + sizeof (u64))
+
+/*
+ * apdump - Table get/dump routines
+ */
+int ap_dump_table_from_file(char *pathname);
+
+int ap_dump_table_by_name(char *signature);
+
+int ap_dump_table_by_address(char *ascii_address);
+
+int ap_dump_all_tables(void);
+
+u8 ap_is_valid_header(struct acpi_table_header *table);
+
+u8 ap_is_valid_checksum(struct acpi_table_header *table);
+
+u32 ap_get_table_length(struct acpi_table_header *table);
+
+/*
+ * apfiles - File I/O utilities
+ */
+int ap_open_output_file(char *pathname);
+
+int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance);
+
+struct acpi_table_header *ap_get_table_from_file(char *pathname,
+                                                 u32 *file_size);
diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c
new file mode 100644
index 000000000000..3cac12378366
--- /dev/null
+++ b/tools/power/acpi/tools/acpidump/apdump.c
@@ -0,0 +1,451 @@
+/******************************************************************************
+ *
+ * Module Name: apdump - Dump routines for ACPI tables (acpidump)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include "acpidump.h"
+
+/* Local prototypes */
+
+static int
+ap_dump_table_buffer(struct acpi_table_header *table,
+                     u32 instance, acpi_physical_address address);
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_is_valid_header
+ *
+ * PARAMETERS:  table               - Pointer to table to be validated
+ *
+ * RETURN:      TRUE if the header appears to be valid. FALSE otherwise
+ *
+ * DESCRIPTION: Check for a valid ACPI table header
+ *
+ ******************************************************************************/
+
+u8 ap_is_valid_header(struct acpi_table_header *table)
+{
+
+        if (!ACPI_VALIDATE_RSDP_SIG(table->signature)) {
+
+                /* Make sure signature is all ASCII and a valid ACPI name */
+
+                if (!acpi_ut_valid_acpi_name(table->signature)) {
+                        fprintf(stderr,
+                                "Table signature (0x%8.8X) is invalid\n",
+                                *(u32 *)table->signature);
+                        return (FALSE);
+                }
+
+                /* Check for minimum table length */
+
+                if (table->length < sizeof(struct acpi_table_header)) {
+                        fprintf(stderr, "Table length (0x%8.8X) is invalid\n",
+                                table->length);
+                        return (FALSE);
+                }
+        }
+
+        return (TRUE);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_is_valid_checksum
+ *
+ * PARAMETERS:  table               - Pointer to table to be validated
+ *
+ * RETURN:      TRUE if the checksum appears to be valid. FALSE otherwise.
+ *
+ * DESCRIPTION: Check for a valid ACPI table checksum.
+ *
+ ******************************************************************************/
+
+u8 ap_is_valid_checksum(struct acpi_table_header *table)
+{
+        acpi_status status;
+        struct acpi_table_rsdp *rsdp;
+
+        if (ACPI_VALIDATE_RSDP_SIG(table->signature)) {
+                /*
+                 * Checksum for RSDP.
+                 * Note: Other checksums are computed during the table dump.
+                 */
+                rsdp = ACPI_CAST_PTR(struct acpi_table_rsdp, table);
+                status = acpi_tb_validate_rsdp(rsdp);
+        } else {
+                status = acpi_tb_verify_checksum(table, table->length);
+        }
+
+        if (ACPI_FAILURE(status)) {
+                fprintf(stderr, "%4.4s: Warning: wrong checksum in table\n",
+                        table->signature);
+        }
+
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_get_table_length
+ *
+ * PARAMETERS:  table               - Pointer to the table
+ *
+ * RETURN:      Table length
+ *
+ * DESCRIPTION: Obtain table length according to table signature.
+ *
+ ******************************************************************************/
+
+u32 ap_get_table_length(struct acpi_table_header *table)
+{
+        struct acpi_table_rsdp *rsdp;
+
+        /* Check if table is valid */
+
+        if (!ap_is_valid_header(table)) {
+                return (0);
+        }
+
+        if (ACPI_VALIDATE_RSDP_SIG(table->signature)) {
+                rsdp = ACPI_CAST_PTR(struct acpi_table_rsdp, table);
+                return (rsdp->length);
+        }
+
+        /* Normal ACPI table */
+
+        return (table->length);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_dump_table_buffer
+ *
+ * PARAMETERS:  table               - ACPI table to be dumped
+ *              instance            - ACPI table instance no. to be dumped
+ *              address             - Physical address of the table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Dump an ACPI table in standard ASCII hex format, with a
+ *              header that is compatible with the acpi_xtract utility.
+ *
+ ******************************************************************************/
+
+static int
+ap_dump_table_buffer(struct acpi_table_header *table,
+                     u32 instance, acpi_physical_address address)
+{
+        u32 table_length;
+
+        table_length = ap_get_table_length(table);
+
+        /* Print only the header if requested */
+
+        if (gbl_summary_mode) {
+                acpi_tb_print_table_header(address, table);
+                return (0);
+        }
+
+        /* Dump to binary file if requested */
+
+        if (gbl_binary_mode) {
+                return (ap_write_to_binary_file(table, instance));
+        }
+
+        /*
+         * Dump the table with header for use with acpixtract utility.
+         * Note: simplest to just always emit a 64-bit address. acpi_xtract
+         * utility can handle this.
+         */
+        printf("%4.4s @ 0x%8.8X%8.8X\n", table->signature,
+               ACPI_FORMAT_UINT64(address));
+
+        acpi_ut_dump_buffer(ACPI_CAST_PTR(u8, table), table_length,
+                            DB_BYTE_DISPLAY, 0);
+        printf("\n");
+        return (0);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_dump_all_tables
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get all tables from the RSDT/XSDT (or at least all of the
+ *              tables that we can possibly get).
+ *
+ ******************************************************************************/
+
+int ap_dump_all_tables(void)
+{
+        struct acpi_table_header *table;
+        u32 instance = 0;
+        acpi_physical_address address;
+        acpi_status status;
+        int table_status;
+        u32 i;
+
+        /* Get and dump all available ACPI tables */
+
+        for (i = 0; i < AP_MAX_ACPI_FILES; i++) {
+                status =
+                    acpi_os_get_table_by_index(i, &table, &instance, &address);
+                if (ACPI_FAILURE(status)) {
+
+                        /* AE_LIMIT means that no more tables are available */
+
+                        if (status == AE_LIMIT) {
+                                return (0);
+                        } else if (i == 0) {
+                                fprintf(stderr,
+                                        "Could not get ACPI tables, %s\n",
+                                        acpi_format_exception(status));
+                                return (-1);
+                        } else {
+                                fprintf(stderr,
+                                        "Could not get ACPI table at index %u, %s\n",
+                                        i, acpi_format_exception(status));
+                                continue;
+                        }
+                }
+
+                table_status = ap_dump_table_buffer(table, instance, address);
+                free(table);
+
+                if (table_status) {
+                        break;
+                }
+        }
+
+        /* Something seriously bad happened if the loop terminates here */
+
+        return (-1);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_dump_table_by_address
+ *
+ * PARAMETERS:  ascii_address       - Address for requested ACPI table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get an ACPI table via a physical address and dump it.
+ *
+ ******************************************************************************/
+
+int ap_dump_table_by_address(char *ascii_address)
+{
+        acpi_physical_address address;
+        struct acpi_table_header *table;
+        acpi_status status;
+        int table_status;
+        u64 long_address;
+
+        /* Convert argument to an integer physical address */
+
+        status = acpi_ut_strtoul64(ascii_address, 0, &long_address);
+        if (ACPI_FAILURE(status)) {
+                fprintf(stderr, "%s: Could not convert to a physical address\n",
+                        ascii_address);
+                return (-1);
+        }
+
+        address = (acpi_physical_address) long_address;
+        status = acpi_os_get_table_by_address(address, &table);
+        if (ACPI_FAILURE(status)) {
+                fprintf(stderr, "Could not get table at 0x%8.8X%8.8X, %s\n",
+                        ACPI_FORMAT_UINT64(address),
+                        acpi_format_exception(status));
+                return (-1);
+        }
+
+        table_status = ap_dump_table_buffer(table, 0, address);
+        free(table);
+        return (table_status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_dump_table_by_name
+ *
+ * PARAMETERS:  signature           - Requested ACPI table signature
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get an ACPI table via a signature and dump it. Handles
+ *              multiple tables with the same signature (SSDTs).
+ *
+ ******************************************************************************/
+
+int ap_dump_table_by_name(char *signature)
+{
+        char local_signature[ACPI_NAME_SIZE + 1];
+        u32 instance;
+        struct acpi_table_header *table;
+        acpi_physical_address address;
+        acpi_status status;
+        int table_status;
+
+        if (strlen(signature) != ACPI_NAME_SIZE) {
+                fprintf(stderr,
+                        "Invalid table signature [%s]: must be exactly 4 characters\n",
+                        signature);
+                return (-1);
+        }
+
+        /* Table signatures are expected to be uppercase */
+
+        strcpy(local_signature, signature);
+        acpi_ut_strupr(local_signature);
+
+        /* To be friendly, handle tables whose signatures do not match the name */
+
+        if (ACPI_COMPARE_NAME(local_signature, "FADT")) {
+                strcpy(local_signature, ACPI_SIG_FADT);
+        } else if (ACPI_COMPARE_NAME(local_signature, "MADT")) {
+                strcpy(local_signature, ACPI_SIG_MADT);
+        }
+
+        /* Dump all instances of this signature (to handle multiple SSDTs) */
+
+        for (instance = 0; instance < AP_MAX_ACPI_FILES; instance++) {
+                status = acpi_os_get_table_by_name(local_signature, instance,
+                                                   &table, &address);
+                if (ACPI_FAILURE(status)) {
+
+                        /* AE_LIMIT means that no more tables are available */
+
+                        if (status == AE_LIMIT) {
+                                return (0);
+                        }
+
+                        fprintf(stderr,
+                                "Could not get ACPI table with signature [%s], %s\n",
+                                local_signature, acpi_format_exception(status));
+                        return (-1);
+                }
+
+                table_status = ap_dump_table_buffer(table, instance, address);
+                free(table);
+
+                if (table_status) {
+                        break;
+                }
+        }
+
+        /* Something seriously bad happened if the loop terminates here */
+
+        return (-1);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_dump_table_from_file
+ *
+ * PARAMETERS:  pathname            - File containing the binary ACPI table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Dump an ACPI table from a binary file
+ *
+ ******************************************************************************/
+
+int ap_dump_table_from_file(char *pathname)
+{
+        struct acpi_table_header *table;
+        u32 file_size = 0;
+        int table_status = -1;
+
+        /* Get the entire ACPI table from the file */
+
+        table = ap_get_table_from_file(pathname, &file_size);
+        if (!table) {
+                return (-1);
+        }
+
+        /* File must be at least as long as the table length */
+
+        if (table->length > file_size) {
+                fprintf(stderr,
+                        "Table length (0x%X) is too large for input file (0x%X) %s\n",
+                        table->length, file_size, pathname);
+                goto exit;
+        }
+
+        if (gbl_verbose_mode) {
+                fprintf(stderr,
+                        "Input file:  %s contains table [%4.4s], 0x%X (%u) bytes\n",
+                        pathname, table->signature, file_size, file_size);
+        }
+
+        table_status = ap_dump_table_buffer(table, 0, 0);
+
+exit:
+        free(table);
+        return (table_status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_os* print functions
+ *
+ * DESCRIPTION: Used for linkage with ACPICA modules
+ *
+ ******************************************************************************/
+
+void ACPI_INTERNAL_VAR_XFACE acpi_os_printf(const char *fmt, ...)
+{
+        va_list args;
+
+        va_start(args, fmt);
+        vfprintf(stdout, fmt, args);
+        va_end(args);
+}
+
+void acpi_os_vprintf(const char *fmt, va_list args)
+{
+        vfprintf(stdout, fmt, args);
+}
diff --git a/tools/power/acpi/tools/acpidump/apfiles.c b/tools/power/acpi/tools/acpidump/apfiles.c
new file mode 100644
index 000000000000..4488accc010b
--- /dev/null
+++ b/tools/power/acpi/tools/acpidump/apfiles.c
@@ -0,0 +1,228 @@
+/******************************************************************************
+ *
+ * Module Name: apfiles - File-related functions for acpidump utility
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include "acpidump.h"
+#include "acapps.h"
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_open_output_file
+ *
+ * PARAMETERS:  pathname            - Output filename
+ *
+ * RETURN:      Open file handle
+ *
+ * DESCRIPTION: Open a text output file for acpidump. Checks if file already
+ *              exists.
+ *
+ ******************************************************************************/
+
+int ap_open_output_file(char *pathname)
+{
+        struct stat stat_info;
+        FILE *file;
+
+        /* If file exists, prompt for overwrite */
+
+        if (!stat(pathname, &stat_info)) {
+                fprintf(stderr,
+                        "Target path already exists, overwrite? [y|n] ");
+
+                if (getchar() != 'y') {
+                        return (-1);
+                }
+        }
+
+        /* Point stdout to the file */
+
+        file = freopen(pathname, "w", stdout);
+        if (!file) {
+                perror("Could not open output file");
+                return (-1);
+        }
+
+        /* Save the file and path */
+
+        gbl_output_file = file;
+        gbl_output_filename = pathname;
+        return (0);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_write_to_binary_file
+ *
+ * PARAMETERS:  table               - ACPI table to be written
+ *              instance            - ACPI table instance no. to be written
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Write an ACPI table to a binary file. Builds the output
+ *              filename from the table signature.
+ *
+ ******************************************************************************/
+
+int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
+{
+        char filename[ACPI_NAME_SIZE + 16];
+        char instance_str[16];
+        FILE *file;
+        size_t actual;
+        u32 table_length;
+
+        /* Obtain table length */
+
+        table_length = ap_get_table_length(table);
+
+        /* Construct lower-case filename from the table local signature */
+
+        if (ACPI_VALIDATE_RSDP_SIG(table->signature)) {
+                ACPI_MOVE_NAME(filename, ACPI_RSDP_NAME);
+        } else {
+                ACPI_MOVE_NAME(filename, table->signature);
+        }
+        filename[0] = (char)ACPI_TOLOWER(filename[0]);
+        filename[1] = (char)ACPI_TOLOWER(filename[1]);
+        filename[2] = (char)ACPI_TOLOWER(filename[2]);
+        filename[3] = (char)ACPI_TOLOWER(filename[3]);
+        filename[ACPI_NAME_SIZE] = 0;
+
+        /* Handle multiple SSDts - create different filenames for each */
+
+        if (instance > 0) {
+                sprintf(instance_str, "%u", instance);
+                strcat(filename, instance_str);
+        }
+
+        strcat(filename, ACPI_TABLE_FILE_SUFFIX);
+
+        if (gbl_verbose_mode) {
+                fprintf(stderr,
+                        "Writing [%4.4s] to binary file: %s 0x%X (%u) bytes\n",
+                        table->signature, filename, table->length,
+                        table->length);
+        }
+
+        /* Open the file and dump the entire table in binary mode */
+
+        file = fopen(filename, "wb");
+        if (!file) {
+                perror("Could not open output file");
+                return (-1);
+        }
+
+        actual = fwrite(table, 1, table_length, file);
+        if (actual != table_length) {
+                perror("Error writing binary output file");
+                fclose(file);
+                return (-1);
+        }
+
+        fclose(file);
+        return (0);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_get_table_from_file
+ *
+ * PARAMETERS:  pathname            - File containing the binary ACPI table
+ *              out_file_size       - Where the file size is returned
+ *
+ * RETURN:      Buffer containing the ACPI table. NULL on error.
+ *
+ * DESCRIPTION: Open a file and read it entirely into a new buffer
+ *
+ ******************************************************************************/
+
+struct acpi_table_header *ap_get_table_from_file(char *pathname,
+                                                 u32 *out_file_size)
+{
+        struct acpi_table_header *buffer = NULL;
+        FILE *file;
+        u32 file_size;
+        size_t actual;
+
+        /* Must use binary mode */
+
+        file = fopen(pathname, "rb");
+        if (!file) {
+                perror("Could not open input file");
+                return (NULL);
+        }
+
+        /* Need file size to allocate a buffer */
+
+        file_size = cm_get_file_size(file);
+        if (file_size == ACPI_UINT32_MAX) {
+                fprintf(stderr,
+                        "Could not get input file size: %s\n", pathname);
+                goto cleanup;
+        }
+
+        /* Allocate a buffer for the entire file */
+
+        buffer = calloc(1, file_size);
+        if (!buffer) {
+                fprintf(stderr,
+                        "Could not allocate file buffer of size: %u\n",
+                        file_size);
+                goto cleanup;
+        }
+
+        /* Read the entire file */
+
+        actual = fread(buffer, 1, file_size, file);
+        if (actual != file_size) {
+                fprintf(stderr, "Could not read input file: %s\n", pathname);
+                free(buffer);
+                buffer = NULL;
+                goto cleanup;
+        }
+
+        *out_file_size = file_size;
+
+cleanup:
+        fclose(file);
+        return (buffer);
+}
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
new file mode 100644
index 000000000000..51e8d638db18
--- /dev/null
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -0,0 +1,351 @@
+/******************************************************************************
+ *
+ * Module Name: apmain - Main module for the acpidump utility
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#define _DECLARE_GLOBALS
+#include "acpidump.h"
+#include "acapps.h"
+
+/*
+ * acpidump - A portable utility for obtaining system ACPI tables and dumping
+ * them in an ASCII hex format suitable for binary extraction via acpixtract.
+ *
+ * Obtaining the system ACPI tables is an OS-specific operation.
+ *
+ * This utility can be ported to any host operating system by providing a
+ * module containing system-specific versions of these interfaces:
+ *
+ *      acpi_os_get_table_by_address
+ *      acpi_os_get_table_by_index
+ *      acpi_os_get_table_by_name
+ *
+ * See the ACPICA Reference Guide for the exact definitions of these
+ * interfaces. Also, see these ACPICA source code modules for example
+ * implementations:
+ *
+ *      source/os_specific/service_layers/oswintbl.c
+ *      source/os_specific/service_layers/oslinuxtbl.c
+ */
+
+/* Local prototypes */
+
+static void ap_display_usage(void);
+
+static int ap_do_options(int argc, char **argv);
+
+static void ap_insert_action(char *argument, u32 to_be_done);
+
+/* Table for deferred actions from command line options */
+
+struct ap_dump_action action_table[AP_MAX_ACTIONS];
+u32 current_action = 0;
+
+#define AP_UTILITY_NAME             "ACPI Binary Table Dump Utility"
+#define AP_SUPPORTED_OPTIONS        "?a:bcf:hn:o:r:svxz"
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_display_usage
+ *
+ * DESCRIPTION: Usage message for the acpi_dump utility
+ *
+ ******************************************************************************/
+
+static void ap_display_usage(void)
+{
+
+        ACPI_USAGE_HEADER("acpidump [options]");
+
+        ACPI_OPTION("-b", "Dump tables to binary files");
+        ACPI_OPTION("-c", "Dump customized tables");
+        ACPI_OPTION("-h -?", "This help message");
+        ACPI_OPTION("-o <File>", "Redirect output to file");
+        ACPI_OPTION("-r <Address>", "Dump tables from specified RSDP");
+        ACPI_OPTION("-s", "Print table summaries only");
+        ACPI_OPTION("-v", "Display version information");
+        ACPI_OPTION("-z", "Verbose mode");
+
+        printf("\nTable Options:\n");
+
+        ACPI_OPTION("-a <Address>", "Get table via a physical address");
+        ACPI_OPTION("-f <BinaryFile>", "Get table via a binary file");
+        ACPI_OPTION("-n <Signature>", "Get table via a name/signature");
+        ACPI_OPTION("-x", "Do not use but dump XSDT");
+        ACPI_OPTION("-x -x", "Do not use or dump XSDT");
+
+        printf("\n"
+               "Invocation without parameters dumps all available tables\n"
+               "Multiple mixed instances of -a, -f, and -n are supported\n\n");
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_insert_action
+ *
+ * PARAMETERS:  argument            - Pointer to the argument for this action
+ *              to_be_done          - What to do to process this action
+ *
+ * RETURN:      None. Exits program if action table becomes full.
+ *
+ * DESCRIPTION: Add an action item to the action table
+ *
+ ******************************************************************************/
+
+static void ap_insert_action(char *argument, u32 to_be_done)
+{
+
+        /* Insert action and check for table overflow */
+
+        action_table[current_action].argument = argument;
+        action_table[current_action].to_be_done = to_be_done;
+
+        current_action++;
+        if (current_action > AP_MAX_ACTIONS) {
+                fprintf(stderr, "Too many table options (max %u)\n",
+                        AP_MAX_ACTIONS);
+                exit(-1);
+        }
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    ap_do_options
+ *
+ * PARAMETERS:  argc/argv           - Standard argc/argv
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Command line option processing. The main actions for getting
+ *              and dumping tables are deferred via the action table.
+ *
+ *****************************************************************************/
+
+static int ap_do_options(int argc, char **argv)
+{
+        int j;
+        acpi_status status;
+
+        /* Command line options */
+
+        while ((j = acpi_getopt(argc, argv, AP_SUPPORTED_OPTIONS)) != EOF)
+                switch (j) {
+                        /*
+                         * Global options
+                         */
+                case 'b':       /* Dump all input tables to binary files */
+
+                        gbl_binary_mode = TRUE;
+                        continue;
+
+                case 'c':       /* Dump customized tables */
+
+                        gbl_dump_customized_tables = TRUE;
+                        continue;
+
+                case 'h':
+                case '?':
+
+                        ap_display_usage();
+                        exit(0);
+
+                case 'o':       /* Redirect output to a single file */
+
+                        if (ap_open_output_file(acpi_gbl_optarg)) {
+                                exit(-1);
+                        }
+                        continue;
+
+                case 'r':       /* Dump tables from specified RSDP */
+
+                        status =
+                            acpi_ut_strtoul64(acpi_gbl_optarg, 0,
+                                              &gbl_rsdp_base);
+                        if (ACPI_FAILURE(status)) {
+                                fprintf(stderr,
+                                        "%s: Could not convert to a physical address\n",
+                                        acpi_gbl_optarg);
+                                exit(-1);
+                        }
+                        continue;
+
+                case 's':       /* Print table summaries only */
+
+                        gbl_summary_mode = TRUE;
+                        continue;
+
+                case 'x':       /* Do not use XSDT */
+
+                        if (!acpi_gbl_do_not_use_xsdt) {
+                                acpi_gbl_do_not_use_xsdt = TRUE;
+                        } else {
+                                gbl_do_not_dump_xsdt = TRUE;
+                        }
+                        continue;
+
+                case 'v':       /* Revision/version */
+
+                        printf(ACPI_COMMON_SIGNON(AP_UTILITY_NAME));
+                        exit(0);
+
+                case 'z':       /* Verbose mode */
+
+                        gbl_verbose_mode = TRUE;
+                        fprintf(stderr, ACPI_COMMON_SIGNON(AP_UTILITY_NAME));
+                        continue;
+
+                        /*
+                         * Table options
+                         */
+                case 'a':       /* Get table by physical address */
+
+                        ap_insert_action(acpi_gbl_optarg,
+                                         AP_DUMP_TABLE_BY_ADDRESS);
+                        break;
+
+                case 'f':       /* Get table from a file */
+
+                        ap_insert_action(acpi_gbl_optarg,
+                                         AP_DUMP_TABLE_BY_FILE);
+                        break;
+
+                case 'n':       /* Get table by input name (signature) */
+
+                        ap_insert_action(acpi_gbl_optarg,
+                                         AP_DUMP_TABLE_BY_NAME);
+                        break;
+
+                default:
+
+                        ap_display_usage();
+                        exit(-1);
+                }
+
+        /* If there are no actions, this means "get/dump all tables" */
+
+        if (current_action == 0) {
+                ap_insert_action(NULL, AP_DUMP_ALL_TABLES);
+        }
+
+        return (0);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    main
+ *
+ * PARAMETERS:  argc/argv           - Standard argc/argv
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: C main function for acpidump utility
+ *
+ ******************************************************************************/
+
+int ACPI_SYSTEM_XFACE main(int argc, char *argv[])
+{
+        int status = 0;
+        struct ap_dump_action *action;
+        u32 file_size;
+        u32 i;
+
+        ACPI_DEBUG_INITIALIZE();        /* For debug version only */
+
+        /* Process command line options */
+
+        if (ap_do_options(argc, argv)) {
+                return (-1);
+        }
+
+        /* Get/dump ACPI table(s) as requested */
+
+        for (i = 0; i < current_action; i++) {
+                action = &action_table[i];
+                switch (action->to_be_done) {
+                case AP_DUMP_ALL_TABLES:
+
+                        status = ap_dump_all_tables();
+                        break;
+
+                case AP_DUMP_TABLE_BY_ADDRESS:
+
+                        status = ap_dump_table_by_address(action->argument);
+                        break;
+
+                case AP_DUMP_TABLE_BY_NAME:
+
+                        status = ap_dump_table_by_name(action->argument);
+                        break;
+
+                case AP_DUMP_TABLE_BY_FILE:
+
+                        status = ap_dump_table_from_file(action->argument);
+                        break;
+
+                default:
+
+                        fprintf(stderr,
+                                "Internal error, invalid action: 0x%X\n",
+                                action->to_be_done);
+                        return (-1);
+                }
+
+                if (status) {
+                        return (status);
+                }
+        }
+
+        if (gbl_output_file) {
+                if (gbl_verbose_mode) {
+
+                        /* Summary for the output file */
+
+                        file_size = cm_get_file_size(gbl_output_file);
+                        fprintf(stderr,
+                                "Output file %s contains 0x%X (%u) bytes\n\n",
+                                gbl_output_filename, file_size, file_size);
+                }
+
+                fclose(gbl_output_file);
+        }
+
+        return (status);
+}
diff --git a/tools/power/acpi/tools/ec/Makefile b/tools/power/acpi/tools/ec/Makefile
new file mode 100644
index 000000000000..b7b0b929bd32
--- /dev/null
+++ b/tools/power/acpi/tools/ec/Makefile
@@ -0,0 +1,22 @@
+ec_access: ec_access.o
+        $(ECHO) "  LD      " $@
+        $(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $< -o $@
+        $(QUIET) $(STRIPCMD) $@
+
+%.o: %.c
+        $(ECHO) "  CC      " $@
+        $(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
+
+all: ec_access
+
+install:
+        $(INSTALL) -d $(DESTDIR)${sbindir}
+        $(INSTALL_PROGRAM) ec_access $(DESTDIR)${sbindir}
+
+uninstall:
+        - rm -f $(DESTDIR)${sbindir}/ec_access
+
+clean:
+        -rm -f $(OUTPUT)ec_access
+
+.PHONY: all install uninstall
diff --git a/tools/power/acpi/tools/ec/ec_access.c b/tools/power/acpi/tools/ec/ec_access.c
new file mode 100644
index 000000000000..6b8aaed44f2c
--- /dev/null
+++ b/tools/power/acpi/tools/ec/ec_access.c
@@ -0,0 +1,238 @@
+/*
+ * ec_access.c
+ *
+ * Copyright (C) 2010 SUSE Linux Products GmbH
+ * Author:
+ *      Thomas Renninger <trenn@suse.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ */
+
+#include <fcntl.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <libgen.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
+#define EC_SPACE_SIZE 256
+#define SYSFS_PATH "/sys/kernel/debug/ec/ec0/io"
+
+/* TBD/Enhancements:
+   - Provide param for accessing different ECs (not supported by kernel yet)
+*/
+
+static int read_mode = -1;
+static int sleep_time;
+static int write_byte_offset = -1;
+static int read_byte_offset = -1;
+static uint8_t write_value = -1;
+
+void usage(char progname[], int exit_status)
+{
+        printf("Usage:\n");
+        printf("1) %s -r [-s sleep]\n", basename(progname));
+        printf("2) %s -b byte_offset\n", basename(progname));
+        printf("3) %s -w byte_offset -v value\n\n", basename(progname));
+
+        puts("\t-r [-s sleep]      : Dump EC registers");
+        puts("\t                     If sleep is given, sleep x seconds,");
+        puts("\t                     re-read EC registers and show changes");
+        puts("\t-b offset          : Read value at byte_offset (in hex)");
+        puts("\t-w offset -v value : Write value at byte_offset");
+        puts("\t-h                 : Print this help\n\n");
+        puts("Offsets and values are in hexadecimal number sytem.");
+        puts("The offset and value must be between 0 and 0xff.");
+        exit(exit_status);
+}
+
+void parse_opts(int argc, char *argv[])
+{
+        int c;
+
+        while ((c = getopt(argc, argv, "rs:b:w:v:h")) != -1) {
+
+                switch (c) {
+                case 'r':
+                        if (read_mode != -1)
+                                usage(argv[0], EXIT_FAILURE);
+                        read_mode = 1;
+                        break;
+                case 's':
+                        if (read_mode != -1 && read_mode != 1)
+                                usage(argv[0], EXIT_FAILURE);
+
+                        sleep_time = atoi(optarg);
+                        if (sleep_time <= 0) {
+                                sleep_time = 0;
+                                usage(argv[0], EXIT_FAILURE);
+                                printf("Bad sleep time: %s\n", optarg);
+                        }
+                        break;
+                case 'b':
+                        if (read_mode != -1)
+                                usage(argv[0], EXIT_FAILURE);
+                        read_mode = 1;
+                        read_byte_offset = strtoul(optarg, NULL, 16);
+                        break;
+                case 'w':
+                        if (read_mode != -1)
+                                usage(argv[0], EXIT_FAILURE);
+                        read_mode = 0;
+                        write_byte_offset = strtoul(optarg, NULL, 16);
+                        break;
+                case 'v':
+                        write_value = strtoul(optarg, NULL, 16);
+                        break;
+                case 'h':
+                        usage(argv[0], EXIT_SUCCESS);
+                default:
+                        fprintf(stderr, "Unknown option!\n");
+                        usage(argv[0], EXIT_FAILURE);
+                }
+        }
+        if (read_mode == 0) {
+                if (write_byte_offset < 0 ||
+                    write_byte_offset >= EC_SPACE_SIZE) {
+                        fprintf(stderr, "Wrong byte offset 0x%.2x, valid: "
+                                "[0-0x%.2x]\n",
+                                write_byte_offset, EC_SPACE_SIZE - 1);
+                        usage(argv[0], EXIT_FAILURE);
+                }
+                if (write_value < 0 ||
+                    write_value >= 255) {
+                        fprintf(stderr, "Wrong byte offset 0x%.2x, valid:"
+                                "[0-0xff]\n", write_byte_offset);
+                        usage(argv[0], EXIT_FAILURE);
+                }
+        }
+        if (read_mode == 1 && read_byte_offset != -1) {
+                if (read_byte_offset < -1 ||
+                    read_byte_offset >= EC_SPACE_SIZE) {
+                        fprintf(stderr, "Wrong byte offset 0x%.2x, valid: "
+                                "[0-0x%.2x]\n",
+                                read_byte_offset, EC_SPACE_SIZE - 1);
+                        usage(argv[0], EXIT_FAILURE);
+                }
+        }
+        /* Add additional parameter checks here */
+}
+
+void dump_ec(int fd)
+{
+        char buf[EC_SPACE_SIZE];
+        char buf2[EC_SPACE_SIZE];
+        int byte_off, bytes_read;
+
+        bytes_read = read(fd, buf, EC_SPACE_SIZE);
+
+        if (bytes_read == -1)
+                err(EXIT_FAILURE, "Could not read from %s\n", SYSFS_PATH);
+
+        if (bytes_read != EC_SPACE_SIZE)
+                fprintf(stderr, "Could only read %d bytes\n", bytes_read);
+
+        printf("     00  01  02  03  04  05  06  07  08  09  0A  0B  0C  0D  0E  0F");
+        for (byte_off = 0; byte_off < bytes_read; byte_off++) {
+                if ((byte_off % 16) == 0)
+                        printf("\n%.2X: ", byte_off);
+                printf(" %.2x ", (uint8_t)buf[byte_off]);
+        }
+        printf("\n");
+
+        if (!sleep_time)
+                return;
+
+        printf("\n");
+        lseek(fd, 0, SEEK_SET);
+        sleep(sleep_time);
+
+        bytes_read = read(fd, buf2, EC_SPACE_SIZE);
+
+        if (bytes_read == -1)
+                err(EXIT_FAILURE, "Could not read from %s\n", SYSFS_PATH);
+
+        if (bytes_read != EC_SPACE_SIZE)
+                fprintf(stderr, "Could only read %d bytes\n", bytes_read);
+
+        printf("     00  01  02  03  04  05  06  07  08  09  0A  0B  0C  0D  0E  0F");
+        for (byte_off = 0; byte_off < bytes_read; byte_off++) {
+                if ((byte_off % 16) == 0)
+                        printf("\n%.2X: ", byte_off);
+
+                if (buf[byte_off] == buf2[byte_off])
+                        printf(" %.2x ", (uint8_t)buf2[byte_off]);
+                else
+                        printf("*%.2x ", (uint8_t)buf2[byte_off]);
+        }
+        printf("\n");
+}
+
+void read_ec_val(int fd, int byte_offset)
+{
+        uint8_t buf;
+        int error;
+
+        error = lseek(fd, byte_offset, SEEK_SET);
+        if (error != byte_offset)
+                err(EXIT_FAILURE, "Cannot set offset to 0x%.2x", byte_offset);
+
+        error = read(fd, &buf, 1);
+        if (error != 1)
+                err(EXIT_FAILURE, "Could not read byte 0x%.2x from %s\n",
+                    byte_offset, SYSFS_PATH);
+        printf("0x%.2x\n", buf);
+        return;
+}
+
+void write_ec_val(int fd, int byte_offset, uint8_t value)
+{
+        int error;
+
+        error = lseek(fd, byte_offset, SEEK_SET);
+        if (error != byte_offset)
+                err(EXIT_FAILURE, "Cannot set offset to 0x%.2x", byte_offset);
+
+        error = write(fd, &value, 1);
+        if (error != 1)
+                err(EXIT_FAILURE, "Cannot write value 0x%.2x to offset 0x%.2x",
+                    value, byte_offset);
+}
+
+int main(int argc, char *argv[])
+{
+        int file_mode = O_RDONLY;
+        int fd;
+
+        parse_opts(argc, argv);
+
+        if (read_mode == 0)
+                file_mode = O_WRONLY;
+        else if (read_mode == 1)
+                file_mode = O_RDONLY;
+        else
+                usage(argv[0], EXIT_FAILURE);
+
+        fd = open(SYSFS_PATH, file_mode);
+        if (fd == -1)
+                err(EXIT_FAILURE, "%s", SYSFS_PATH);
+
+        if (read_mode)
+                if (read_byte_offset == -1)
+                        dump_ec(fd);
+                else if (read_byte_offset < 0 ||
+                         read_byte_offset >= EC_SPACE_SIZE)
+                        usage(argv[0], EXIT_FAILURE);
+                else
+                        read_ec_val(fd, read_byte_offset);
+        else
+                write_ec_val(fd, write_byte_offset, write_value);
+        close(fd);
+
+        exit(EXIT_SUCCESS);
+}
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index cbfec92af327..2e2ba2efa0d9 100644
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -62,7 +62,7 @@ LIB_MAJ=			0.0.0
 LIB_MIN=                        0
 
 PACKAGE =                       cpupower
-PACKAGE_BUGREPORT =             cpufreq@vger.kernel.org
+PACKAGE_BUGREPORT =             linux-pm@vger.kernel.org
 LANGUAGES =                     de fr it cs pt
 
 
@@ -274,6 +274,8 @@ install-man:
         $(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
         $(INSTALL_DATA) -D man/cpupower-frequency-set.1 $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
         $(INSTALL_DATA) -D man/cpupower-frequency-info.1 $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
+        $(INSTALL_DATA) -D man/cpupower-idle-set.1 $(DESTDIR)${mandir}/man1/cpupower-idle-set.1
+        $(INSTALL_DATA) -D man/cpupower-idle-info.1 $(DESTDIR)${mandir}/man1/cpupower-idle-info.1
         $(INSTALL_DATA) -D man/cpupower-set.1 $(DESTDIR)${mandir}/man1/cpupower-set.1
         $(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1
         $(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1
@@ -295,8 +297,12 @@ uninstall:
         - rm -f $(DESTDIR)${libdir}/libcpupower.*
         - rm -f $(DESTDIR)${includedir}/cpufreq.h
         - rm -f $(DESTDIR)${bindir}/utils/cpupower
-        - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1
-        - rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1
+        - rm -f $(DESTDIR)${mandir}/man1/cpupower.1
+        - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
+        - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
+        - rm -f $(DESTDIR)${mandir}/man1/cpupower-set.1
+        - rm -f $(DESTDIR)${mandir}/man1/cpupower-info.1
+        - rm -f $(DESTDIR)${mandir}/man1/cpupower-monitor.1
         - for HLANG in $(LANGUAGES); do \
                 rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \
           done;
diff --git a/tools/power/cpupower/README b/tools/power/cpupower/README
index fd9d4c0d6688..1c68f47663b2 100644
--- a/tools/power/cpupower/README
+++ b/tools/power/cpupower/README
@@ -1,6 +1,4 @@
-The cpufrequtils package (homepage: 
-http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html ) 
-consists of the following elements:
+The cpupower package consists of the following elements:
 
 requirements
 ------------
@@ -11,10 +9,10 @@ providing cpuid.h is needed.
 For both it's not explicitly checked for (yet).
 
 
-libcpufreq
+libcpupower
 ----------
 
-"libcpufreq" is a library which offers a unified access method for userspace
+"libcpupower" is a library which offers a unified access method for userspace
 tools and programs to the cpufreq core and drivers in the Linux kernel. This
 allows for code reduction in userspace tools, a clean implementation of
 the interaction to the cpufreq core, and support for both the sysfs and proc
@@ -28,22 +26,22 @@ make
 su
 make install
 
-should suffice on most systems. It builds default libcpufreq,
-cpufreq-set and cpufreq-info files and installs them in /usr/lib and
-/usr/bin, respectively. If you want to set up the paths differently and/or
-want to configure the package to your specific needs, you need to open
-"Makefile" with an editor of your choice and edit the block marked
-CONFIGURATION.
+should suffice on most systems. It builds libcpupower to put in
+/usr/lib; cpupower, cpufreq-bench_plot.sh to put in /usr/bin; and
+cpufreq-bench to put in /usr/sbin. If you want to set up the paths
+differently and/or want to configure the package to your specific
+needs, you need to open "Makefile" with an editor of your choice and
+edit the block marked CONFIGURATION.
 
 
 THANKS
 ------
 Many thanks to Mattia Dongili who wrote the autotoolization and
-libtoolization, the manpages and the italian language file for cpufrequtils;
+libtoolization, the manpages and the italian language file for cpupower;
 to Dave Jones for his feedback and his dump_psb tool; to Bruno Ducrot for his
 powernow-k8-decode and intel_gsic tools as well as the french language file;
 and to various others commenting on the previous (pre-)releases of 
-cpufrequtils.
+cpupower.
 
 
         Dominik Brodowski
diff --git a/tools/power/cpupower/ToDo b/tools/power/cpupower/ToDo
index 874b78b586ee..6e8b89f282e6 100644
--- a/tools/power/cpupower/ToDo
+++ b/tools/power/cpupower/ToDo
@@ -3,7 +3,6 @@ ToDos sorted by priority:
 - Use bitmask functions to parse CPU topology more robust
   (current implementation has issues on AMD)
 - Try to read out boost states and frequencies on Intel
-- Adjust README
 - Somewhere saw the ability to read power consumption of
   RAM from HW on Intel SandyBridge -> another monitor?
 - Add another c1e debug idle monitor
diff --git a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
index 0f10b81e3322..5224ee5b392d 100644
--- a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
+++ b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
@@ -18,7 +18,7 @@
  * 5.) if the third value, "diff_pmtmr", changes between 2. and 4., the
  *     TSC-based delay routine on the Linux kernel does not correctly
  *     handle the cpufreq transition. Please report this to
- *     cpufreq@vger.kernel.org
+ *     linux-pm@vger.kernel.org
  */
 
 #include <linux/kernel.h>
diff --git a/tools/power/cpupower/man/cpupower-frequency-info.1 b/tools/power/cpupower/man/cpupower-frequency-info.1
index 4a1918ea8f9c..9c85a382e355 100644
--- a/tools/power/cpupower/man/cpupower-frequency-info.1
+++ b/tools/power/cpupower/man/cpupower-frequency-info.1
@@ -50,6 +50,9 @@ Prints out information like provided by the /proc/cpufreq interface in 2.4. and
 \fB\-m\fR \fB\-\-human\fR
 human\-readable output for the \-f, \-w, \-s and \-y parameters.
 .TP  
+\fB\-n\fR \fB\-\-no-rounding\fR
+Output frequencies and latencies without rounding off values.
+.TP  
 .SH "REMARKS"
 .LP 
 By default only values of core zero are displayed. How to display settings of
diff --git a/tools/power/cpupower/man/cpupower-idle-set.1 b/tools/power/cpupower/man/cpupower-idle-set.1
index 6b1607272a5b..3e6799d7a79f 100644
--- a/tools/power/cpupower/man/cpupower-idle-set.1
+++ b/tools/power/cpupower/man/cpupower-idle-set.1
@@ -13,11 +13,17 @@ sleep states. This can be handy for power vs performance tuning.
 .SH "OPTIONS"
 .LP
 .TP
-\fB\-d\fR \fB\-\-disable\fR
+\fB\-d\fR \fB\-\-disable\fR <STATE_NO>
 Disable a specific processor sleep state.
 .TP
-\fB\-e\fR \fB\-\-enable\fR
+\fB\-e\fR \fB\-\-enable\fR <STATE_NO>
 Enable a specific processor sleep state.
+.TP
+\fB\-D\fR \fB\-\-disable-by-latency\fR <LATENCY>
+Disable all idle states with a equal or higher latency than <LATENCY>
+.TP
+\fB\-E\fR \fB\-\-enable-all\fR
+Enable all idle states if not enabled already.
 
 .SH "REMARKS"
 .LP
diff --git a/tools/power/cpupower/man/cpupower-info.1 b/tools/power/cpupower/man/cpupower-info.1
index 58e21196f17f..340bcd0be7de 100644
--- a/tools/power/cpupower/man/cpupower-info.1
+++ b/tools/power/cpupower/man/cpupower-info.1
@@ -3,7 +3,7 @@
 cpupower\-info \- Shows processor power related kernel or hardware configurations
 .SH SYNOPSIS
 .ft B
-.B cpupower info [ \-b ] [ \-s ] [ \-m ]
+.B cpupower info [ \-b ]
 
 .SH DESCRIPTION
 \fBcpupower info \fP shows kernel configurations or processor hardware
diff --git a/tools/power/cpupower/man/cpupower-set.1 b/tools/power/cpupower/man/cpupower-set.1
index 9dbd536518ab..2bcc696f4496 100644
--- a/tools/power/cpupower/man/cpupower-set.1
+++ b/tools/power/cpupower/man/cpupower-set.1
@@ -3,7 +3,7 @@
 cpupower\-set \- Set processor power related kernel or hardware configurations
 .SH SYNOPSIS
 .ft B
-.B cpupower set [ \-b VAL ] [ \-s VAL ] [ \-m VAL ]
+.B cpupower set [ \-b VAL ]
 
 
 .SH DESCRIPTION
@@ -55,35 +55,6 @@ Use \fBcpupower -c all info -b\fP to verify.
 
 This options needs the msr kernel driver (CONFIG_X86_MSR) loaded.
 .RE
-.PP
-\-\-sched\-mc,  \-m [ VAL ]
-.RE
-\-\-sched\-smt, \-s [ VAL ]
-.RS 4
-\-\-sched\-mc utilizes cores in one processor package/socket first before
-processes are scheduled to other processor packages/sockets.
-
-\-\-sched\-smt utilizes thread siblings of one processor core first before
-processes are scheduled to other cores.
-
-The impact on power consumption and performance (positiv or negativ) heavily
-depends on processor support for deep sleep states, frequency scaling and
-frequency boost modes and their dependencies between other thread siblings
-and processor cores.
-
-Taken over from kernel documentation:
-
-Adjust the kernel's multi-core scheduler support.
-
-Possible values are:
-.RS 2
-0 - No power saving load balance (default value)
-
-1 - Fill one thread/core/package first for long running threads
-
-2 - Also bias task wakeups to semi-idle cpu package for power
-savings
-.RE
 
 .SH "SEE ALSO"
 cpupower-info(1), cpupower-monitor(1), powertop(1)
diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c
index 28953c9a7bd5..b4b90a97662c 100644
--- a/tools/power/cpupower/utils/cpufreq-info.c
+++ b/tools/power/cpupower/utils/cpufreq-info.c
@@ -82,29 +82,42 @@ static void proc_cpufreq_output(void)
         }
 }
 
+static int no_rounding;
 static void print_speed(unsigned long speed)
 {
         unsigned long tmp;
 
-        if (speed > 1000000) {
-                tmp = speed % 10000;
-                if (tmp >= 5000)
-                        speed += 10000;
-                printf("%u.%02u GHz", ((unsigned int) speed/1000000),
-                        ((unsigned int) (speed%1000000)/10000));
-        } else if (speed > 100000) {
-                tmp = speed % 1000;
-                if (tmp >= 500)
-                        speed += 1000;
-                printf("%u MHz", ((unsigned int) speed / 1000));
-        } else if (speed > 1000) {
-                tmp = speed % 100;
-                if (tmp >= 50)
-                        speed += 100;
-                printf("%u.%01u MHz", ((unsigned int) speed/1000),
-                        ((unsigned int) (speed%1000)/100));
-        } else
-                printf("%lu kHz", speed);
+        if (no_rounding) {
+                if (speed > 1000000)
+                        printf("%u.%06u GHz", ((unsigned int) speed/1000000),
+                                ((unsigned int) speed%1000000));
+                else if (speed > 100000)
+                        printf("%u MHz", (unsigned int) speed);
+                else if (speed > 1000)
+                        printf("%u.%03u MHz", ((unsigned int) speed/1000),
+                                (unsigned int) (speed%1000));
+                else
+                        printf("%lu kHz", speed);
+        } else {
+                if (speed > 1000000) {
+                        tmp = speed%10000;
+                        if (tmp >= 5000)
+                                speed += 10000;
+                        printf("%u.%02u GHz", ((unsigned int) speed/1000000),
+                                ((unsigned int) (speed%1000000)/10000));
+                } else if (speed > 100000) {
+                        tmp = speed%1000;
+                        if (tmp >= 500)
+                                speed += 1000;
+                        printf("%u MHz", ((unsigned int) speed/1000));
+                } else if (speed > 1000) {
+                        tmp = speed%100;
+                        if (tmp >= 50)
+                                speed += 100;
+                        printf("%u.%01u MHz", ((unsigned int) speed/1000),
+                                ((unsigned int) (speed%1000)/100));
+                }
+        }
 
         return;
 }
@@ -113,26 +126,38 @@ static void print_duration(unsigned long duration)
 {
         unsigned long tmp;
 
-        if (duration > 1000000) {
-                tmp = duration % 10000;
-                if (tmp >= 5000)
-                        duration += 10000;
-                printf("%u.%02u ms", ((unsigned int) duration/1000000),
-                        ((unsigned int) (duration%1000000)/10000));
-        } else if (duration > 100000) {
-                tmp = duration % 1000;
-                if (tmp >= 500)
-                        duration += 1000;
-                printf("%u us", ((unsigned int) duration / 1000));
-        } else if (duration > 1000) {
-                tmp = duration % 100;
-                if (tmp >= 50)
-                        duration += 100;
-                printf("%u.%01u us", ((unsigned int) duration/1000),
-                        ((unsigned int) (duration%1000)/100));
-        } else
-                printf("%lu ns", duration);
-
+        if (no_rounding) {
+                if (duration > 1000000)
+                        printf("%u.%06u ms", ((unsigned int) duration/1000000),
+                                ((unsigned int) duration%1000000));
+                else if (duration > 100000)
+                        printf("%u us", ((unsigned int) duration/1000));
+                else if (duration > 1000)
+                        printf("%u.%03u us", ((unsigned int) duration/1000),
+                                ((unsigned int) duration%1000));
+                else
+                        printf("%lu ns", duration);
+        } else {
+                if (duration > 1000000) {
+                        tmp = duration%10000;
+                        if (tmp >= 5000)
+                                duration += 10000;
+                        printf("%u.%02u ms", ((unsigned int) duration/1000000),
+                                ((unsigned int) (duration%1000000)/10000));
+                } else if (duration > 100000) {
+                        tmp = duration%1000;
+                        if (tmp >= 500)
+                                duration += 1000;
+                        printf("%u us", ((unsigned int) duration / 1000));
+                } else if (duration > 1000) {
+                        tmp = duration%100;
+                        if (tmp >= 50)
+                                duration += 100;
+                        printf("%u.%01u us", ((unsigned int) duration/1000),
+                                ((unsigned int) (duration%1000)/100));
+                } else
+                        printf("%lu ns", duration);
+        }
         return;
 }
 
@@ -525,6 +550,7 @@ static struct option info_opts[] = {
         { .name = "latency",    .has_arg = no_argument,         .flag = NULL,   .val = 'y'},
         { .name = "proc",       .has_arg = no_argument,         .flag = NULL,   .val = 'o'},
         { .name = "human",      .has_arg = no_argument,         .flag = NULL,   .val = 'm'},
+        { .name = "no-rounding", .has_arg = no_argument,        .flag = NULL,   .val = 'n'},
         { },
 };
 
@@ -538,7 +564,8 @@ int cmd_freq_info(int argc, char **argv)
         int output_param = 0;
 
         do {
-                ret = getopt_long(argc, argv, "oefwldpgrasmyb", info_opts, NULL);
+                ret = getopt_long(argc, argv, "oefwldpgrasmybn", info_opts,
+                                  NULL);
                 switch (ret) {
                 case '?':
                         output_param = '?';
@@ -575,6 +602,9 @@ int cmd_freq_info(int argc, char **argv)
                         }
                         human = 1;
                         break;
+                case 'n':
+                        no_rounding = 1;
+                        break;
                 default:
                         fprintf(stderr, "invalid or unknown argument\n");
                         return EXIT_FAILURE;
diff --git a/tools/power/cpupower/utils/cpuidle-set.c b/tools/power/cpupower/utils/cpuidle-set.c
index c78141c5dfac..d45d8d775c02 100644
--- a/tools/power/cpupower/utils/cpuidle-set.c
+++ b/tools/power/cpupower/utils/cpuidle-set.c
@@ -13,8 +13,14 @@
 #include "helpers/sysfs.h"
 
 static struct option info_opts[] = {
-        { .name = "disable",    .has_arg = required_argument,   .flag = NULL,   .val = 'd'},
-        { .name = "enable",     .has_arg = required_argument,   .flag = NULL,   .val = 'e'},
+        { .name = "disable",
+          .has_arg = required_argument, .flag = NULL,   .val = 'd'},
+        { .name = "enable",
+          .has_arg = required_argument, .flag = NULL,   .val = 'e'},
+        { .name = "disable-by-latency",
+          .has_arg = required_argument, .flag = NULL,   .val = 'D'},
+        { .name = "enable-all",
+          .has_arg = no_argument,       .flag = NULL,   .val = 'E'},
         { },
 };
 
@@ -23,11 +29,13 @@ int cmd_idle_set(int argc, char **argv)
 {
         extern char *optarg;
         extern int optind, opterr, optopt;
-        int ret = 0, cont = 1, param = 0, idlestate = 0;
-        unsigned int cpu = 0;
+        int ret = 0, cont = 1, param = 0, disabled;
+        unsigned long long latency = 0, state_latency;
+        unsigned int cpu = 0, idlestate = 0, idlestates = 0;
+        char *endptr;
 
         do {
-                ret = getopt_long(argc, argv, "d:e:", info_opts, NULL);
+                ret = getopt_long(argc, argv, "d:e:ED:", info_opts, NULL);
                 if (ret == -1)
                         break;
                 switch (ret) {
@@ -53,6 +61,27 @@ int cmd_idle_set(int argc, char **argv)
                         param = ret;
                         idlestate = atoi(optarg);
                         break;
+                case 'D':
+                        if (param) {
+                                param = -1;
+                                cont = 0;
+                                break;
+                        }
+                        param = ret;
+                        latency = strtoull(optarg, &endptr, 10);
+                        if (*endptr != '\0') {
+                                printf(_("Bad latency value: %s\n"), optarg);
+                                exit(EXIT_FAILURE);
+                        }
+                        break;
+                case 'E':
+                        if (param) {
+                                param = -1;
+                                cont = 0;
+                                break;
+                        }
+                        param = ret;
+                        break;
                 case -1:
                         cont = 0;
                         break;
@@ -79,8 +108,14 @@ int cmd_idle_set(int argc, char **argv)
                 if (!bitmask_isbitset(cpus_chosen, cpu))
                         continue;
 
-                switch (param) {
+                if (sysfs_is_cpu_online(cpu) != 1)
+                        continue;
+
+                idlestates = sysfs_get_idlestate_count(cpu);
+                if (idlestates <= 0)
+                        continue;
 
+                switch (param) {
                 case 'd':
                         ret = sysfs_idlestate_disable(cpu, idlestate, 1);
                         if (ret == 0)
@@ -107,6 +142,34 @@ int cmd_idle_set(int argc, char **argv)
                 printf(_("Idlestate %u not enabled on CPU %u\n"),
                        idlestate, cpu);
                         break;
+                case 'D':
+                        for (idlestate = 0; idlestate < idlestates; idlestate++) {
+                                disabled = sysfs_is_idlestate_disabled
+                                        (cpu, idlestate);
+                                state_latency = sysfs_get_idlestate_latency
+                                        (cpu, idlestate);
+                                printf("CPU: %u - idlestate %u - state_latency: %llu - latency: %llu\n",
+                                       cpu, idlestate, state_latency, latency);
+                                if (disabled == 1 || latency > state_latency)
+                                        continue;
+                                ret = sysfs_idlestate_disable
+                                        (cpu, idlestate, 1);
+                                if (ret == 0)
+                printf(_("Idlestate %u disabled on CPU %u\n"), idlestate, cpu);
+                        }
+                        break;
+                case 'E':
+                        for (idlestate = 0; idlestate < idlestates; idlestate++) {
+                                disabled = sysfs_is_idlestate_disabled
+                                        (cpu, idlestate);
+                                if (disabled == 1) {
+                                        ret = sysfs_idlestate_disable
+                                                (cpu, idlestate, 0);
+                                        if (ret == 0)
+                printf(_("Idlestate %u enabled on CPU %u\n"), idlestate, cpu);
+                                }
+                        }
+                        break;
                 default:
                         /* Not reachable with proper args checking */
                         printf(_("Invalid or unknown argument\n"));
diff --git a/tools/power/cpupower/utils/cpupower-info.c b/tools/power/cpupower/utils/cpupower-info.c
index 3f68632c28c7..136d979e9586 100644
--- a/tools/power/cpupower/utils/cpupower-info.c
+++ b/tools/power/cpupower/utils/cpupower-info.c
@@ -18,8 +18,6 @@
 
 static struct option set_opts[] = {
         { .name = "perf-bias",  .has_arg = optional_argument,   .flag = NULL,   .val = 'b'},
-        { .name = "sched-mc",   .has_arg = optional_argument,   .flag = NULL,   .val = 'm'},
-        { .name = "sched-smt",  .has_arg = optional_argument,   .flag = NULL,   .val = 's'},
         { },
 };
 
@@ -37,8 +35,6 @@ int cmd_info(int argc, char **argv)
 
         union {
                 struct {
-                        int sched_mc:1;
-                        int sched_smt:1;
                         int perf_bias:1;
                 };
                 int params;
@@ -49,23 +45,13 @@ int cmd_info(int argc, char **argv)
         textdomain(PACKAGE);
 
         /* parameter parsing */
-        while ((ret = getopt_long(argc, argv, "msb", set_opts, NULL)) != -1) {
+        while ((ret = getopt_long(argc, argv, "b", set_opts, NULL)) != -1) {
                 switch (ret) {
                 case 'b':
                         if (params.perf_bias)
                                 print_wrong_arg_exit();
                         params.perf_bias = 1;
                         break;
-                case 'm':
-                        if (params.sched_mc)
-                                print_wrong_arg_exit();
-                        params.sched_mc = 1;
-                        break;
-                case 's':
-                        if (params.sched_smt)
-                                print_wrong_arg_exit();
-                        params.sched_smt = 1;
-                        break;
                 default:
                         print_wrong_arg_exit();
                 }
@@ -78,25 +64,6 @@ int cmd_info(int argc, char **argv)
         if (bitmask_isallclear(cpus_chosen))
                 bitmask_setbit(cpus_chosen, 0);
 
-        if (params.sched_mc) {
-                ret = sysfs_get_sched("mc");
-                printf(_("System's multi core scheduler setting: "));
-                if (ret < 0)
-                        /* if sysfs file is missing it's: errno == ENOENT */
-                        printf(_("not supported\n"));
-                else
-                        printf("%d\n", ret);
-        }
-        if (params.sched_smt) {
-                ret = sysfs_get_sched("smt");
-                printf(_("System's thread sibling scheduler setting: "));
-                if (ret < 0)
-                        /* if sysfs file is missing it's: errno == ENOENT */
-                        printf(_("not supported\n"));
-                else
-                        printf("%d\n", ret);
-        }
-
         /* Add more per cpu options here */
         if (!params.perf_bias)
                 return ret;
@@ -125,11 +92,12 @@ int cmd_info(int argc, char **argv)
                 if (params.perf_bias) {
                         ret = msr_intel_get_perf_bias(cpu);
                         if (ret < 0) {
-                                printf(_("Could not read perf-bias value\n"));
-                                break;
+                                fprintf(stderr,
+                        _("Could not read perf-bias value[%d]\n"), ret);
+                                exit(EXIT_FAILURE);
                         } else
                                 printf(_("perf-bias: %d\n"), ret);
                 }
         }
-        return ret;
+        return 0;
 }
diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
index bcf1d2f0b791..573c75f8e3f5 100644
--- a/tools/power/cpupower/utils/cpupower-set.c
+++ b/tools/power/cpupower/utils/cpupower-set.c
@@ -19,8 +19,6 @@
 
 static struct option set_opts[] = {
         { .name = "perf-bias",  .has_arg = required_argument,   .flag = NULL,   .val = 'b'},
-        { .name = "sched-mc",   .has_arg = required_argument,   .flag = NULL,   .val = 'm'},
-        { .name = "sched-smt",  .has_arg = required_argument,   .flag = NULL,   .val = 's'},
         { },
 };
 
@@ -38,13 +36,11 @@ int cmd_set(int argc, char **argv)
 
         union {
                 struct {
-                        int sched_mc:1;
-                        int sched_smt:1;
                         int perf_bias:1;
                 };
                 int params;
         } params;
-        int sched_mc = 0, sched_smt = 0, perf_bias = 0;
+        int perf_bias = 0;
         int ret = 0;
 
         setlocale(LC_ALL, "");
@@ -52,7 +48,7 @@ int cmd_set(int argc, char **argv)
 
         params.params = 0;
         /* parameter parsing */
-        while ((ret = getopt_long(argc, argv, "m:s:b:",
+        while ((ret = getopt_long(argc, argv, "b:",
                                                 set_opts, NULL)) != -1) {
                 switch (ret) {
                 case 'b':
@@ -66,28 +62,6 @@ int cmd_set(int argc, char **argv)
                         }
                         params.perf_bias = 1;
                         break;
-                case 'm':
-                        if (params.sched_mc)
-                                print_wrong_arg_exit();
-                        sched_mc = atoi(optarg);
-                        if (sched_mc < 0 || sched_mc > 2) {
-                                printf(_("--sched-mc param out "
-                                         "of range [0-%d]\n"), 2);
-                                print_wrong_arg_exit();
-                        }
-                        params.sched_mc = 1;
-                        break;
-                case 's':
-                        if (params.sched_smt)
-                                print_wrong_arg_exit();
-                        sched_smt = atoi(optarg);
-                        if (sched_smt < 0 || sched_smt > 2) {
-                                printf(_("--sched-smt param out "
-                                         "of range [0-%d]\n"), 2);
-                                print_wrong_arg_exit();
-                        }
-                        params.sched_smt = 1;
-                        break;
                 default:
                         print_wrong_arg_exit();
                 }
@@ -96,19 +70,6 @@ int cmd_set(int argc, char **argv)
         if (!params.params)
                 print_wrong_arg_exit();
 
-        if (params.sched_mc) {
-                ret = sysfs_set_sched("mc", sched_mc);
-                if (ret)
-                        fprintf(stderr, _("Error setting sched-mc %s\n"),
-                                (ret == -ENODEV) ? "not supported" : "");
-        }
-        if (params.sched_smt) {
-                ret = sysfs_set_sched("smt", sched_smt);
-                if (ret)
-                        fprintf(stderr, _("Error setting sched-smt %s\n"),
-                                (ret == -ENODEV) ? "not supported" : "");
-        }
-
         /* Default is: set all CPUs */
         if (bitmask_isallclear(cpus_chosen))
                 bitmask_setall(cpus_chosen);
diff --git a/tools/power/cpupower/utils/cpupower.c b/tools/power/cpupower/utils/cpupower.c
index 7efc570ffbaa..7cdcf88659c7 100644
--- a/tools/power/cpupower/utils/cpupower.c
+++ b/tools/power/cpupower/utils/cpupower.c
@@ -12,6 +12,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
 
 #include "builtin.h"
 #include "helpers/helpers.h"
@@ -169,6 +172,8 @@ int main(int argc, const char *argv[])
 {
         const char *cmd;
         unsigned int i, ret;
+        struct stat statbuf;
+        struct utsname uts;
 
         cpus_chosen = bitmask_alloc(sysconf(_SC_NPROCESSORS_CONF));
 
@@ -195,6 +200,15 @@ int main(int argc, const char *argv[])
 
         get_cpu_info(0, &cpupower_cpu_info);
         run_as_root = !getuid();
+        if (run_as_root) {
+                ret = uname(&uts);
+                if (!ret && !strcmp(uts.machine, "x86_64") &&
+                    stat("/dev/cpu/0/msr", &statbuf) != 0) {
+                        if (system("modprobe msr") == -1)
+        fprintf(stderr, _("MSR access not available.\n"));
+                }
+        }
+                
 
         for (i = 0; i < ARRAY_SIZE(commands); i++) {
                 struct cmd_struct *p = commands + i;
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 7c9d8e71eb9e..d0396af99fa0 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1971,13 +1971,13 @@ int set_temperature_target(struct thread_data *t, struct core_data *c, struct pk
         if (get_msr(0, MSR_IA32_TEMPERATURE_TARGET, &msr))
                 goto guess;
 
-        target_c_local = (msr >> 16) & 0x7F;
+        target_c_local = (msr >> 16) & 0xFF;
 
         if (verbose)
                 fprintf(stderr, "cpu%d: MSR_IA32_TEMPERATURE_TARGET: 0x%08llx (%d C)\n",
                         cpu, msr, target_c_local);
 
-        if (target_c_local < 85 || target_c_local > 127)
+        if (!target_c_local)
                 goto guess;
 
         tcc_activation_temp = target_c_local;