aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2007-02-02 11:48:19 -0500
committerLen Brown <len.brown@intel.com>2007-02-02 21:14:22 -0500
commitc5a7156959e89b32260ad6072bbf5077bcdfbeee (patch)
treea1baa9c45a3aa33e9858a9a1df6ad78805cc694d /include/acpi
parentfdffb72d23172c91af56983f303d1986994df522 (diff)
ACPICA: Disable all wake GPEs after first one recieved
Change for GPE support: when a wake GPE is received, now all wake GPEs are immediately disabled to prevent the waking GPE from firing again, and to prevent other wake GPEs from interrupting the wake process. Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acglobal.h68
-rw-r--r--include/acpi/actypes.h6
2 files changed, 34 insertions, 40 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index 715c4812fe71..b74cd9b670b5 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -58,41 +58,6 @@
58#define ACPI_INIT_GLOBAL(a,b) a 58#define ACPI_INIT_GLOBAL(a,b) a
59#endif 59#endif
60 60
61/*
62 * Keep local copies of these FADT-based registers. NOTE: These globals
63 * are first in this file for alignment reasons on 64-bit systems.
64 */
65ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_enable;
66ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_enable;
67
68/*****************************************************************************
69 *
70 * Debug support
71 *
72 ****************************************************************************/
73
74/* Runtime configuration of debug print levels */
75
76extern u32 acpi_dbg_level;
77extern u32 acpi_dbg_layer;
78
79/* Procedure nesting level for debug output */
80
81extern u32 acpi_gbl_nesting_level;
82
83/* Event counters */
84
85ACPI_EXTERN u32 acpi_gpe_count;
86
87/* Support for dynamic control method tracing mechanism */
88
89ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
90ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
91ACPI_EXTERN acpi_name acpi_gbl_trace_method_name;
92ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
93ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
94ACPI_EXTERN u32 acpi_gbl_trace_flags;
95
96/***************************************************************************** 61/*****************************************************************************
97 * 62 *
98 * Runtime configuration (static defaults that can be overriden at runtime) 63 * Runtime configuration (static defaults that can be overriden at runtime)
@@ -139,6 +104,34 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);
139 104
140/***************************************************************************** 105/*****************************************************************************
141 * 106 *
107 * Debug support
108 *
109 ****************************************************************************/
110
111/* Runtime configuration of debug print levels */
112
113extern u32 acpi_dbg_level;
114extern u32 acpi_dbg_layer;
115
116/* Procedure nesting level for debug output */
117
118extern u32 acpi_gbl_nesting_level;
119
120/* Event counters */
121
122ACPI_EXTERN u32 acpi_gpe_count;
123
124/* Support for dynamic control method tracing mechanism */
125
126ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
127ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
128ACPI_EXTERN acpi_name acpi_gbl_trace_method_name;
129ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
130ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
131ACPI_EXTERN u32 acpi_gbl_trace_flags;
132
133/*****************************************************************************
134 *
142 * ACPI Table globals 135 * ACPI Table globals
143 * 136 *
144 ****************************************************************************/ 137 ****************************************************************************/
@@ -154,6 +147,11 @@ ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
154#define acpi_fadt acpi_gbl_FADT 147#define acpi_fadt acpi_gbl_FADT
155extern acpi_native_uint acpi_gbl_permanent_mmap; 148extern acpi_native_uint acpi_gbl_permanent_mmap;
156 149
150/* These addresses are calculated from FADT address values */
151
152ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_enable;
153ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_enable;
154
157/* 155/*
158 * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is 156 * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is
159 * determined by the revision of the DSDT: If the DSDT revision is less than 157 * determined by the revision of the DSDT: If the DSDT revision is less than
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index b0cdee69ff5d..fe9eb0ea32e4 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -592,7 +592,7 @@ typedef u32 acpi_event_status;
592 * | | | +--- Type of dispatch -- to method, handler, or none 592 * | | | +--- Type of dispatch -- to method, handler, or none
593 * | | +--- Enabled for runtime? 593 * | | +--- Enabled for runtime?
594 * | +--- Enabled for wake? 594 * | +--- Enabled for wake?
595 * +--- System state when GPE ocurred (running/waking) 595 * +--- Unused
596 */ 596 */
597#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01 597#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
598#define ACPI_GPE_LEVEL_TRIGGERED (u8) 0x01 598#define ACPI_GPE_LEVEL_TRIGGERED (u8) 0x01
@@ -618,10 +618,6 @@ typedef u32 acpi_event_status;
618 618
619#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */ 619#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
620 620
621#define ACPI_GPE_SYSTEM_MASK (u8) 0x80
622#define ACPI_GPE_SYSTEM_RUNNING (u8) 0x80
623#define ACPI_GPE_SYSTEM_WAKING (u8) 0x00
624
625/* 621/*
626 * Flags for GPE and Lock interfaces 622 * Flags for GPE and Lock interfaces
627 */ 623 */