Skip to content

Commit

Permalink
ACPICA: Update for ACPI 5 hardware-reduced feature
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Mar 11, 2013
1 parent f1778eb commit c39660b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/acpi/acpica/evxfevnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ acpi_status acpi_enable(void)
return_ACPI_STATUS(AE_NO_ACPI_TABLES);
}

/* If the Hardware Reduced flag is set, machine is always in acpi mode */

if (acpi_gbl_reduced_hardware) {
return_ACPI_STATUS(AE_OK);
}

/* Check current mode */

if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
Expand Down Expand Up @@ -126,6 +132,12 @@ acpi_status acpi_disable(void)

ACPI_FUNCTION_TRACE(acpi_disable);

/* If the Hardware Reduced flag is set, machine is always in acpi mode */

if (acpi_gbl_reduced_hardware) {
return_ACPI_STATUS(AE_OK);
}

if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) {
ACPI_DEBUG_PRINT((ACPI_DB_INIT,
"System is already in legacy (non-ACPI) mode\n"));
Expand Down
12 changes: 12 additions & 0 deletions drivers/acpi/acpica/hwacpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit c39660b

Please sign in to comment.