ACPICA: Add manifest constants for bit register values
Add and deploy constants for the PM status/enable/control registers. 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>
This commit is contained in:
parent
2affa28605
commit
768aaaf196
|
@ -183,7 +183,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
|
|||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Install the fixed event handlers and enable the fixed events.
|
||||
* DESCRIPTION: Install the fixed event handlers and disable all fixed events.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
|
@ -200,12 +200,13 @@ static acpi_status acpi_ev_fixed_event_initialize(void)
|
|||
acpi_gbl_fixed_event_handlers[i].handler = NULL;
|
||||
acpi_gbl_fixed_event_handlers[i].context = NULL;
|
||||
|
||||
/* Enable the fixed event */
|
||||
/* Disable the fixed event */
|
||||
|
||||
if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) {
|
||||
status =
|
||||
acpi_write_bit_register(acpi_gbl_fixed_event_info
|
||||
[i].enable_register_id, 0);
|
||||
[i].enable_register_id,
|
||||
ACPI_DISABLE_EVENT);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return (status);
|
||||
}
|
||||
|
@ -289,7 +290,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
|
|||
/* Clear the status bit */
|
||||
|
||||
(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
|
||||
status_register_id, 1);
|
||||
status_register_id, ACPI_CLEAR_STATUS);
|
||||
|
||||
/*
|
||||
* Make sure we've got a handler. If not, report an error. The event is
|
||||
|
@ -297,7 +298,8 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
|
|||
*/
|
||||
if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
|
||||
(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
|
||||
enable_register_id, 0);
|
||||
enable_register_id,
|
||||
ACPI_DISABLE_EVENT);
|
||||
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"No installed handler for fixed event [%08X]",
|
||||
|
|
|
@ -535,7 +535,8 @@ acpi_status acpi_ev_release_global_lock(void)
|
|||
if (pending) {
|
||||
status =
|
||||
acpi_write_bit_register
|
||||
(ACPI_BITREG_GLOBAL_LOCK_RELEASE, 1);
|
||||
(ACPI_BITREG_GLOBAL_LOCK_RELEASE,
|
||||
ACPI_ENABLE_EVENT);
|
||||
}
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
|
||||
|
|
|
@ -173,7 +173,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
|
|||
*/
|
||||
status =
|
||||
acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
|
||||
enable_register_id, 1);
|
||||
enable_register_id, ACPI_ENABLE_EVENT);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
@ -355,7 +355,7 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
|
|||
*/
|
||||
status =
|
||||
acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
|
||||
enable_register_id, 0);
|
||||
enable_register_id, ACPI_DISABLE_EVENT);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
@ -408,7 +408,7 @@ acpi_status acpi_clear_event(u32 event)
|
|||
*/
|
||||
status =
|
||||
acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
|
||||
status_register_id, 1);
|
||||
status_register_id, ACPI_CLEAR_STATUS);
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
|
|
@ -250,7 +250,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
|
|||
|
||||
/* Clear wake status */
|
||||
|
||||
status = acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);
|
||||
status =
|
||||
acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, ACPI_CLEAR_STATUS);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
@ -399,7 +400,10 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
|
|||
|
||||
ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);
|
||||
|
||||
status = acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);
|
||||
/* Clear the wake status bit (PM1) */
|
||||
|
||||
status =
|
||||
acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, ACPI_CLEAR_STATUS);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
@ -601,11 +605,13 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
|
|||
|
||||
(void)
|
||||
acpi_write_bit_register(acpi_gbl_fixed_event_info
|
||||
[ACPI_EVENT_POWER_BUTTON].enable_register_id, 1);
|
||||
[ACPI_EVENT_POWER_BUTTON].
|
||||
enable_register_id, ACPI_ENABLE_EVENT);
|
||||
|
||||
(void)
|
||||
acpi_write_bit_register(acpi_gbl_fixed_event_info
|
||||
[ACPI_EVENT_POWER_BUTTON].status_register_id, 1);
|
||||
[ACPI_EVENT_POWER_BUTTON].
|
||||
status_register_id, ACPI_CLEAR_STATUS);
|
||||
|
||||
arg.integer.value = ACPI_SST_WORKING;
|
||||
status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
|
||||
|
|
|
@ -787,6 +787,15 @@ typedef u8 acpi_adr_space_type;
|
|||
#define ACPI_BITREG_MAX 0x13
|
||||
#define ACPI_NUM_BITREG ACPI_BITREG_MAX + 1
|
||||
|
||||
/* Status register values. A 1 clears a status bit. 0 = no effect */
|
||||
|
||||
#define ACPI_CLEAR_STATUS 1
|
||||
|
||||
/* Enable and Control register values */
|
||||
|
||||
#define ACPI_ENABLE_EVENT 1
|
||||
#define ACPI_DISABLE_EVENT 0
|
||||
|
||||
/*
|
||||
* External ACPI object definition
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue