From faea09e7b91033ad9ebb49298d3b9a91544a0e0e Mon Sep 17 00:00:00 2001 From: Len Brown Date: Fri, 26 Mar 2004 09:31:19 -0500 Subject: [PATCH] [ACPI] Linux specific updates from ACPICA 20040326 "acpi_wake_gpes_always_on" boot flag for old GPE behaviour --- drivers/acpi/ec.c | 4 ++-- drivers/acpi/osl.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ee6419591a6f7..d1d509f2735d0 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -719,7 +719,7 @@ acpi_ec_start ( * Install GPE handler */ status = acpi_install_gpe_handler(NULL, ec->gpe_bit, - ACPI_EVENT_EDGE_TRIGGERED, &acpi_ec_gpe_handler, ec); + ACPI_GPE_EDGE_TRIGGERED, &acpi_ec_gpe_handler, ec); if (ACPI_FAILURE(status)) { return_VALUE(-ENODEV); } @@ -803,7 +803,7 @@ acpi_ec_ecdt_probe (void) * Install GPE handler */ status = acpi_install_gpe_handler(NULL, ec_ecdt->gpe_bit, - ACPI_EVENT_EDGE_TRIGGERED, &acpi_ec_gpe_handler, + ACPI_GPE_EDGE_TRIGGERED, &acpi_ec_gpe_handler, ec_ecdt); if (ACPI_FAILURE(status)) { goto error; diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 6ec770c0be88c..0e0d1bafc17a5 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1048,3 +1048,24 @@ acpi_serialize_setup(char *str) __setup("acpi_serialize", acpi_serialize_setup); +/* + * Wake and Run-Time GPES are expected to be separate. + * We disable wake-GPEs at run-time to prevent spurious + * interrupts. + * + * However, if a system exists that shares Wake and + * Run-time events on the same GPE this flag is available + * to tell Linux to keep the wake-time GPEs enabled at run-time. + */ +int __init +acpi_wake_gpes_always_on_setup(char *str) +{ + printk(KERN_INFO PREFIX "wake GPEs not disabled\n"); + + acpi_gbl_leave_wake_gpes_disabled = FALSE; + + return 1; +} + +__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); + -- 2.53.0