From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Bob Moore <robert.moore@intel.com>,
Lin Ming <ming.m.lin@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 32/76] ACPICA: Add table-driven dispatch for sleep/wake functions
Date: Fri, 30 Mar 2012 06:13:35 -0400 [thread overview]
Message-ID: <72a8887a356076dfa39bd6691c52446f90a50480.1333101989.git.len.brown@intel.com> (raw)
In-Reply-To: <1333102459-23750-1-git-send-email-lenb@kernel.org>
In-Reply-To: <09f98a825a821f7a3f1b162f9ed023f37213a63b.1333101989.git.len.brown@intel.com>
From: Bob Moore <robert.moore@intel.com>
Simplifies the code, especially the compile-time
ACPI_REDUCED_HARDWARE option.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/acpica/acmacros.h | 6 ++
drivers/acpi/acpica/hwxfsleep.c | 136 +++++++++++++++++++++++----------------
include/acpi/actypes.h | 9 +++
3 files changed, 97 insertions(+), 54 deletions(-)
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index ef338a9..f119f47 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -516,6 +516,12 @@
#endif /* ACPI_DEBUG_OUTPUT */
+#if (!ACPI_REDUCED_HARDWARE)
+#define ACPI_HW_OPTIONAL_FUNCTION(addr) addr
+#else
+#define ACPI_HW_OPTIONAL_FUNCTION(addr) NULL
+#endif
+
/*
* Some code only gets executed when the debugger is built in.
* Note that this is entirely independent of whether the
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index ff20558..b711f97 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -48,6 +48,34 @@
#define _COMPONENT ACPI_HARDWARE
ACPI_MODULE_NAME("hwxfsleep")
+/* Local prototypes */
+static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
+
+/*
+ * Dispatch table used to efficiently branch to the various sleep
+ * functions.
+ */
+#define ACPI_SLEEP_FUNCTION 0
+#define ACPI_WAKE_PREP_FUNCTION 1
+#define ACPI_WAKE_FUNCTION 2
+
+/* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
+
+static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
+ {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
+ acpi_hw_extended_sleep},
+ {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
+ acpi_hw_extended_wake_prep},
+ {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
+};
+
+/*
+ * These functions are removed for the ACPI_REDUCED_HARDWARE case:
+ * acpi_set_firmware_waking_vector
+ * acpi_set_firmware_waking_vector64
+ * acpi_enter_sleep_state_s4bios
+ */
+
#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
@@ -61,6 +89,7 @@ ACPI_MODULE_NAME("hwxfsleep")
* DESCRIPTION: Sets the 32-bit firmware_waking_vector field of the FACS
*
******************************************************************************/
+
acpi_status acpi_set_firmware_waking_vector(u32 physical_address)
{
ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
@@ -193,18 +222,65 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)
#endif /* !ACPI_REDUCED_HARDWARE */
/*******************************************************************************
*
+ * FUNCTION: acpi_hw_sleep_dispatch
+ *
+ * PARAMETERS: sleep_state - Which sleep state to enter/exit
+ * function_id - Sleep, wake_prep, or Wake
+ *
+ * RETURN: Status from the invoked sleep handling function.
+ *
+ * DESCRIPTION: Dispatch a sleep/wake request to the appropriate handling
+ * function.
+ *
+ ******************************************************************************/
+static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id)
+{
+ acpi_status status;
+ struct acpi_sleep_functions *sleep_functions =
+ &acpi_sleep_dispatch[function_id];
+
+#if (!ACPI_REDUCED_HARDWARE)
+
+ /*
+ * If the Hardware Reduced flag is set (from the FADT), we must
+ * use the extended sleep registers
+ */
+ if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) {
+ status = sleep_functions->extended_function(sleep_state);
+ } else {
+ /* Legacy sleep */
+
+ status = sleep_functions->legacy_function(sleep_state);
+ }
+
+ return (status);
+
+#else
+ /*
+ * For the case where reduced-hardware-only code is being generated,
+ * we know that only the extended sleep registers are available
+ */
+ status = sleep_functions->extended_function(sleep_state);
+ return (status);
+
+#endif /* !ACPI_REDUCED_HARDWARE */
+}
+
+/*******************************************************************************
+ *
* FUNCTION: acpi_enter_sleep_state_prep
*
* PARAMETERS: sleep_state - Which sleep state to enter
*
* RETURN: Status
*
- * DESCRIPTION: Prepare to enter a system sleep state (see ACPI 2.0 spec p 231)
+ * DESCRIPTION: Prepare to enter a system sleep state.
* This function must execute with interrupts enabled.
* We break sleeping into 2 stages so that OSPM can handle
* various OS-specific tasks between the two steps.
*
******************************************************************************/
+
acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
{
acpi_status status;
@@ -291,23 +367,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
acpi_gbl_sleep_type_a, acpi_gbl_sleep_type_b));
return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
}
-#if (!ACPI_REDUCED_HARDWARE)
-
- /* If Hardware Reduced flag is set, must use the extended sleep registers */
-
- if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) {
- status = acpi_hw_extended_sleep(sleep_state);
- } else {
- /* Legacy sleep */
-
- status = acpi_hw_legacy_sleep(sleep_state);
- }
-
-#else
- status = acpi_hw_extended_sleep(sleep_state);
-
-#endif /* !ACPI_REDUCED_HARDWARE */
+ status = acpi_hw_sleep_dispatch(sleep_state, ACPI_SLEEP_FUNCTION);
return_ACPI_STATUS(status);
}
@@ -330,26 +391,9 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
{
acpi_status status;
- ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
-
-
-#if (!ACPI_REDUCED_HARDWARE)
-
- /* If Hardware Reduced flag is set, must use the extended sleep registers */
-
- if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) {
- status = acpi_hw_extended_wake_prep(sleep_state);
- } else {
- /* Legacy sleep */
-
- status = acpi_hw_legacy_wake_prep(sleep_state);
- }
-#else
- status = acpi_hw_extended_wake_prep(sleep_state);
-
-#endif /* !ACPI_REDUCED_HARDWARE */
-
+ ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
+ status = acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_PREP_FUNCTION);
return_ACPI_STATUS(status);
}
@@ -359,7 +403,7 @@ ACPI_EXPORT_SYMBOL(acpi_leave_sleep_state_prep)
*
* FUNCTION: acpi_leave_sleep_state
*
- * PARAMETERS: sleep_state - Which sleep state we just exited
+ * PARAMETERS: sleep_state - Which sleep state we are exiting
*
* RETURN: Status
*
@@ -374,23 +418,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
-#if (!ACPI_REDUCED_HARDWARE)
-
- /* If Hardware Reduced flag is set, must use the extended sleep registers */
-
- if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) {
- status = acpi_hw_extended_wake(sleep_state);
- } else {
- /* Legacy sleep */
-
- status = acpi_hw_legacy_wake(sleep_state);
- }
-
-#else
- status = acpi_hw_extended_wake(sleep_state);
-
-#endif /* !ACPI_REDUCED_HARDWARE */
-
+ status = acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_FUNCTION);
return_ACPI_STATUS(status);
}
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 48c4d5f..3496158 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -788,6 +788,15 @@ typedef u8 acpi_adr_space_type;
#define ACPI_ENABLE_EVENT 1
#define ACPI_DISABLE_EVENT 0
+/* Sleep function dispatch */
+
+typedef acpi_status(*ACPI_SLEEP_FUNCTION) (u8 sleep_state);
+
+struct acpi_sleep_functions {
+ ACPI_SLEEP_FUNCTION legacy_function;
+ ACPI_SLEEP_FUNCTION extended_function;
+};
+
/*
* External ACPI object definition
*/
--
1.7.10.rc2.19.gfae9d
next prev parent reply other threads:[~2012-03-30 12:21 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-30 10:13 ACPI & Power Management patches for Linux-3.4 Len Brown
2012-03-30 10:13 ` [PATCH 01/76] x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep Len Brown
2012-03-30 10:13 ` [PATCH 02/76] tboot: Add return values for tboot_sleep Len Brown
2012-03-30 10:13 ` [PATCH 03/76] ACPI: ignore FADT reset-reg-sup flag Len Brown
2012-03-30 10:13 ` [PATCH 04/76] ACPICA: Fix regression in FADT revision checks Len Brown
2012-03-30 13:14 ` Josh Boyer
2012-04-03 19:58 ` [3.0.y, 3.2.y, 3.3.y] " Jonathan Nieder
2012-04-03 20:15 ` Josh Boyer
2012-04-04 18:58 ` Greg Kroah-Hartman
2012-03-30 10:13 ` [PATCH 05/76] cpuidle: Add common time keeping and irq enabling Len Brown
2012-03-30 10:13 ` [PATCH 06/76] ARM: at91: Consolidate time keeping and irq enable Len Brown
2012-03-30 10:13 ` [PATCH 07/76] ARM: kirkwood: " Len Brown
2012-03-30 10:13 ` [PATCH 08/76] ARM: davinci: " Len Brown
2012-03-30 10:13 ` [PATCH 09/76] ARM: omap: Consolidate OMAP3 " Len Brown
2012-03-30 10:13 ` [PATCH 10/76] ARM: omap: Consolidate OMAP4 " Len Brown
2012-03-30 10:13 ` [PATCH 11/76] ARM: shmobile: Consolidate " Len Brown
2012-03-30 10:13 ` [PATCH 12/76] SH: " Len Brown
2012-03-30 10:13 ` [PATCH 13/76] drivers/thermal/thermal_sys.c: fix build warning Len Brown
2012-03-30 10:13 ` [PATCH 14/76] thermal_sys: remove unnecessary line continuations Len Brown
2012-03-30 10:13 ` [PATCH 15/76] thermal_sys: remove obfuscating used-once macros Len Brown
2012-03-30 10:13 ` [PATCH 16/76] thermal_sys: kernel style cleanups Len Brown
2012-03-30 10:13 ` [PATCH 17/76] thermal_sys: convert printks to pr_<level> Len Brown
2012-03-30 13:41 ` [linux-pm] " Eduardo Valentin
2012-03-30 19:08 ` Joe Perches
2012-04-01 19:13 ` Eduardo Valentin
2012-03-30 10:13 ` [PATCH 18/76] thermal: add support for thermal sensor present on SPEAr13xx machines Len Brown
2012-03-30 10:13 ` [PATCH 19/76] thermal/spear_thermal: replace readl/writel with lighter _relaxed variants Len Brown
2012-03-30 10:13 ` [PATCH 20/76] thermal: spear13xx: checking for NULL instead of IS_ERR() Len Brown
2012-03-30 10:13 ` [PATCH 21/76] thermal: Fix for setting the thermal zone mode to enable/disable Len Brown
2012-03-30 10:13 ` [PATCH 22/76] ARM: davinci: Fix for cpuidle consolidation changes Len Brown
2012-03-30 10:13 ` [PATCH 23/76] ACPICA: Update _REV return value to 5 Len Brown
2012-03-30 10:13 ` [PATCH 24/76] ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers Len Brown
2012-03-30 10:13 ` [PATCH 25/76] ACPICA: Move ACPI timer prototypes to public acpixf file Len Brown
2012-03-30 10:13 ` [PATCH 26/76] ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware Len Brown
2012-03-30 10:13 ` [PATCH 27/76] ACPICA: Expand OSL memory read/write interfaces to 64 bits Len Brown
2012-03-30 10:13 ` [PATCH 28/76] ACPICA: ACPI 5: Update debug output for new notify values Len Brown
2012-03-30 10:13 ` [PATCH 29/76] ACPICA: Add acpi_os_physical_table_override interface Len Brown
2012-03-30 10:13 ` [PATCH 30/76] ACPICA: Distill multiple sleep method functions to a single function Len Brown
2012-03-30 10:13 ` [PATCH 31/76] ACPICA: Split sleep/wake functions into two files Len Brown
2012-03-30 10:13 ` Len Brown [this message]
2012-03-30 10:13 ` [PATCH 33/76] ACPICA: Update to version 20120215 Len Brown
2012-03-30 10:13 ` [PATCH 34/76] ACPICA: Clarify METHOD_NAME* defines for full-pathname cases Len Brown
2012-03-30 10:13 ` [PATCH 35/76] ACPICA: Change exception code for invalid pathname in acpi_evaluate_object Len Brown
2012-03-30 10:13 ` [PATCH 36/76] ACPICA: Debugger: Add missing object info to namespace dump Len Brown
2012-03-30 10:13 ` [PATCH 37/76] ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS Len Brown
2012-03-30 10:13 ` [PATCH 38/76] ACPI: Move module parameter gts and bfs to sleep.c Len Brown
2012-03-30 10:13 ` [PATCH 39/76] tools turbostat: add summary option Len Brown
2012-03-30 10:13 ` [PATCH 40/76] tools turbostat: reduce measurement overhead due to IPIs Len Brown
2012-03-30 10:13 ` [PATCH 41/76] tools turbostat: harden against cpu online/offline Len Brown
2012-03-30 10:13 ` [PATCH 42/76] ACPI: ec: Do request_region outside WARN() Len Brown
2012-03-30 10:13 ` [PATCH 43/76] ACPI: Make ACPI interrupt threaded Len Brown
2012-03-30 10:13 ` [PATCH 44/76] ACPICA: Object repair code: Support to add Package wrappers Len Brown
2012-03-30 10:13 ` [PATCH 45/76] ACPICA: Update to version 20120320 Len Brown
2012-03-30 10:13 ` [PATCH 46/76] ACPI: Introduce ACPI D3_COLD state support Len Brown
2012-04-01 6:53 ` [linux-pm] " Rafael J. Wysocki
2012-03-30 10:13 ` [PATCH 47/76] ACPI: Add interface to register/unregister device to/from power resources Len Brown
2012-03-30 10:13 ` [PATCH 48/76] cpuidle: add a sysfs entry to disable specific C state for debug purpose Len Brown
2012-03-30 10:13 ` [PATCH 49/76] cpuidle: use the driver's state_count as default Len Brown
2012-03-30 10:13 ` [PATCH 50/76] cpuidle: remove useless array definition in cpuidle_structure Len Brown
2012-03-30 10:13 ` [PATCH 51/76] cpuidle: remove unused 'governor_data' field Len Brown
2012-03-30 10:13 ` [PATCH 52/76] ACPI, PCI: Move acpi_dev_run_wake() to ACPI core Len Brown
2012-03-30 10:13 ` [PATCH 53/76] ACPI: Evaluate thermal trip points before reading temperature Len Brown
2012-03-30 10:13 ` [PATCH 54/76] ACPI: Ensure thermal limits match CPU frequencies Len Brown
2012-03-30 10:13 ` [PATCH 55/76] ACPI / PM: print physical addresses consistently with other parts of kernel Len Brown
2012-03-30 10:13 ` [PATCH 56/76] ACPI: Add CPU hotplug support for processor device objects Len Brown
2012-03-30 10:14 ` [PATCH 57/76] ACPI / Video: blacklist some samsung laptops Len Brown
2012-03-30 12:07 ` Corentin Chary
2012-03-30 12:16 ` Len Brown
2012-03-30 10:14 ` [PATCH 58/76] idle, x86: Allow off-lined CPU to enter deeper C states Len Brown
2012-04-02 16:13 ` Tony Luck
2012-04-02 17:25 ` Tony Luck
2012-04-02 17:45 ` Konrad Rzeszutek Wilk
2012-04-02 17:56 ` Boris Ostrovsky
2012-04-02 18:02 ` Tony Luck
2012-04-02 18:10 ` Boris Ostrovsky
2012-03-30 10:14 ` [PATCH 59/76] cpuidle: power_usage should be declared signed integer Len Brown
2012-03-30 10:14 ` [PATCH 60/76] ACPI, APEI, Fix ERST header length check Len Brown
2012-03-30 10:14 ` [PATCH 61/76] ACPI, APEI, EINJ, limit the range of einj_param Len Brown
2012-03-30 10:14 ` [PATCH 62/76] ACPI, APEI, EINJ, new parameter to control trigger action Len Brown
2012-03-30 10:14 ` [PATCH 63/76] Update documentation for parameter *notrigger* in einj.txt Len Brown
2012-03-30 10:14 ` [PATCH 64/76] ACPI, APEI: Fix incorrect APEI register bit width check and usage Len Brown
2012-03-30 10:14 ` [PATCH 65/76] ACPI: processor_driver: add missing kfree Len Brown
2012-03-30 10:14 ` [PATCH 66/76] ACPI: Fix use-after-free in acpi_map_lsapic Len Brown
2012-03-30 10:14 ` [PATCH 67/76] PNPACPI: Fix device ref leaking in acpi_pnp_match Len Brown
2012-03-30 10:14 ` [PATCH 68/76] ACPI: consistently use should_use_kmap() Len Brown
2012-03-30 10:14 ` [PATCH 69/76] ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed() Len Brown
2012-03-30 10:14 ` [PATCH 70/76] ACPI: Clean redundant codes in scan.c Len Brown
2012-03-30 10:14 ` [PATCH 71/76] CPER failed to handle generic error records with multiple sections Len Brown
2012-03-30 10:14 ` [PATCH 72/76] ACPI: Fix logic for removing mappings in 'acpi_unmap' Len Brown
2012-03-30 10:14 ` [PATCH 73/76] ACPI: export acpi_kobj Len Brown
2012-03-30 10:14 ` [PATCH 74/76] ACPI: Add support for exposing BGRT data Len Brown
2012-03-30 10:14 ` [PATCH 75/76] Disable MCP limit exceeded messages from Intel IPS driver Len Brown
2012-03-30 10:14 ` [PATCH 76/76] ACPI throttling: fix endian bug in acpi_read_throttling_status() Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=72a8887a356076dfa39bd6691c52446f90a50480.1333101989.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=ming.m.lin@intel.com \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®