summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/hwacpi.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2013-03-08 09:22:14 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-12 00:45:04 +0100
commitc39660b232c5e4aee3cded5a02d28e71ca447fb8 (patch)
tree6b7cee9e3520270c28eb1d347eb127d0130ed303 /drivers/acpi/acpica/hwacpi.c
parentf1778eb1ab3e3ef90826b6b6b0ad7fbafa46308b (diff)
downloadblackbird-op-linux-c39660b232c5e4aee3cded5a02d28e71ca447fb8.tar.gz
blackbird-op-linux-c39660b232c5e4aee3cded5a02d28e71ca447fb8.zip
ACPICA: Update for ACPI 5 hardware-reduced feature
Ensure that AcpiEnable and AcpiDisable work properly when the hardware-reduced flag is set in the FADT. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/hwacpi.c')
-rw-r--r--drivers/acpi/acpica/hwacpi.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index deb3f61e2bd1..9b02a9f5b04a 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -66,6 +66,12 @@ acpi_status acpi_hw_set_mode(u32 mode)
ACPI_FUNCTION_TRACE(hw_set_mode);
+ /* If the Hardware Reduced flag is set, machine is always in acpi mode */
+
+ if (acpi_gbl_reduced_hardware) {
+ return_ACPI_STATUS(AE_OK);
+ }
+
/*
* ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
* system does not support mode transition.
@@ -146,6 +152,12 @@ u32 acpi_hw_get_mode(void)
ACPI_FUNCTION_TRACE(hw_get_mode);
+ /* If the Hardware Reduced flag is set, machine is always in acpi mode */
+
+ if (acpi_gbl_reduced_hardware) {
+ return_VALUE(ACPI_SYS_MODE_ACPI);
+ }
+
/*
* ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
* system does not support mode transition.
OpenPOWER on IntegriCloud