3.13-stable patches

added patches:
	acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch

diff --git a/queue-3.13/acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch b/queue-3.13/acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch
new file mode 100644 (file)
index 0000000..a0cf401
--- /dev/null
+++ b/queue-3.13/acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch
@@ -0,0 +1,110 @@
+From a4e90bed511220ff601d064c9e5d583e91308f65 Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Thu, 13 Mar 2014 22:11:39 +0100
+Subject: ACPI / sleep: Add extra checks for HW Reduced ACPI mode sleep states
+
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+
+commit a4e90bed511220ff601d064c9e5d583e91308f65 upstream.
+
+If the HW Reduced ACPI mode bit is set in the FADT, ACPICA uses
+the optional sleep control and sleep status registers for making
+the system enter sleep states (including S5), so it is not possible
+to use system sleep states or power it off using ACPI if the HW
+Reduced ACPI mode bit is set and those registers are not available.
+
+For this reason, add a new function, acpi_sleep_state_supported(),
+checking if the HW Reduced ACPI mode bit is set and whether or not
+system sleep states are usable in that case in addition to checking
+the return value of acpi_get_sleep_type_data() and make the ACPI
+sleep setup routines use that function to check the availability of
+system sleep states.
+
+Among other things, this prevents the kernel from attempting to
+use ACPI for powering off HW Reduced ACPI systems without the sleep
+control and sleep status registers, because ACPI power off doesn't
+have a chance to work on them.  That allows alternative power off
+mechanisms that may actually work to be used on those systems.  The
+affected machines include Dell Venue 8 Pro, Asus T100TA, Haswell
+Desktop SDP and Ivy Bridge EP Demo depot.
+
+References: https://bugzilla.kernel.org/show_bug.cgi?id=70931
+Reported-by: Adam Williamson <awilliam@redhat.com>
+Tested-by: Aubrey Li <aubrey.li@linux.intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/sleep.c |   32 +++++++++++++++-----------------
+ 1 file changed, 15 insertions(+), 17 deletions(-)
+
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -75,6 +75,17 @@ static int acpi_sleep_prepare(u32 acpi_s
+       return 0;
+ }
+ 
++static bool acpi_sleep_state_supported(u8 sleep_state)
++{
++      acpi_status status;
++      u8 type_a, type_b;
++
++      status = acpi_get_sleep_type_data(sleep_state, &type_a, &type_b);
++      return ACPI_SUCCESS(status) && (!acpi_gbl_reduced_hardware
++              || (acpi_gbl_FADT.sleep_control.address
++                      && acpi_gbl_FADT.sleep_status.address));
++}
++
+ #ifdef CONFIG_ACPI_SLEEP
+ static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+ 
+@@ -608,15 +619,9 @@ static void acpi_sleep_suspend_setup(voi
+ {
+       int i;
+ 
+-      for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) {
+-              acpi_status status;
+-              u8 type_a, type_b;
+-
+-              status = acpi_get_sleep_type_data(i, &type_a, &type_b);
+-              if (ACPI_SUCCESS(status)) {
++      for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++)
++              if (acpi_sleep_state_supported(i))
+                       sleep_states[i] = 1;
+-              }
+-      }
+ 
+       suspend_set_ops(old_suspend_ordering ?
+               &acpi_suspend_ops_old : &acpi_suspend_ops);
+@@ -747,11 +752,7 @@ static const struct platform_hibernation
+ 
+ static void acpi_sleep_hibernate_setup(void)
+ {
+-      acpi_status status;
+-      u8 type_a, type_b;
+-
+-      status = acpi_get_sleep_type_data(ACPI_STATE_S4, &type_a, &type_b);
+-      if (ACPI_FAILURE(status))
++      if (!acpi_sleep_state_supported(ACPI_STATE_S4))
+               return;
+ 
+       hibernation_set_ops(old_suspend_ordering ?
+@@ -800,8 +801,6 @@ static void acpi_power_off(void)
+ 
+ int __init acpi_sleep_init(void)
+ {
+-      acpi_status status;
+-      u8 type_a, type_b;
+       char supported[ACPI_S_STATE_COUNT * 3 + 1];
+       char *pos = supported;
+       int i;
+@@ -816,8 +815,7 @@ int __init acpi_sleep_init(void)
+       acpi_sleep_suspend_setup();
+       acpi_sleep_hibernate_setup();
+ 
+-      status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
+-      if (ACPI_SUCCESS(status)) {
++      if (acpi_sleep_state_supported(ACPI_STATE_S5)) {
+               sleep_states[ACPI_STATE_S5] = 1;
+               pm_power_off_prepare = acpi_power_off_prepare;
+               pm_power_off = acpi_power_off;

diff --git a/queue-3.13/series b/queue-3.13/series
index ca05b393d56fdabac0d1413267811d6dab473997..263a8c4cc7ac8e0c794581603e96656268962dc3 100644 (file)
--- a/queue-3.13/series
+++ b/queue-3.13/series
@@ -87,3 +87,4 @@ nfs-fix-a-delegation-callback-race.patch
 nfsv4-nfs4_stateid_is_current-should-return-true-for-an-invalid-stateid.patch
 cpufreq-use-cpufreq_cpu_get-to-avoid-cpufreq_get-race-conditions.patch
 cpufreq-skip-current-frequency-initialization-for-setpolicy-drivers.patch
+acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch