| From c0ff17720ec5f42205b3d2ca03a18da0a8272976 Mon Sep 17 00:00:00 2001 |
| From: Alexey Starikovskiy <astarikovskiy@suse.de> |
| Date: Thu, 16 Oct 2008 02:02:33 +0400 |
| Subject: ACPI: EC: Check for IBF=0 periodically if not in GPE mode |
| |
| From: Alexey Starikovskiy <astarikovskiy@suse.de> |
| |
| commit c0ff17720ec5f42205b3d2ca03a18da0a8272976 upstream. |
| |
| Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> |
| Tested-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/acpi/ec.c | 15 +++++++++++++-- |
| 1 file changed, 13 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/acpi/ec.c |
| +++ b/drivers/acpi/ec.c |
| @@ -298,6 +298,18 @@ static int ec_check_ibf0(struct acpi_ec |
| return (status & ACPI_EC_FLAG_IBF) == 0; |
| } |
| |
| +static int ec_wait_ibf0(struct acpi_ec *ec) |
| +{ |
| + unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY); |
| + /* interrupt wait manually if GPE mode is not active */ |
| + unsigned long timeout = test_bit(EC_FLAGS_GPE_MODE, &ec->flags) ? |
| + msecs_to_jiffies(ACPI_EC_DELAY) : msecs_to_jiffies(1); |
| + while (time_before(jiffies, delay)) |
| + if (wait_event_timeout(ec->wait, ec_check_ibf0(ec), timeout)) |
| + return 0; |
| + return -ETIME; |
| +} |
| + |
| static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t, |
| int force_poll) |
| { |
| @@ -315,8 +327,7 @@ static int acpi_ec_transaction(struct ac |
| goto unlock; |
| } |
| } |
| - if (!wait_event_timeout(ec->wait, ec_check_ibf0(ec), |
| - msecs_to_jiffies(ACPI_EC_DELAY))) { |
| + if (ec_wait_ibf0(ec)) { |
| pr_err(PREFIX "input buffer is not empty, " |
| "aborting transaction\n"); |
| status = -ETIME; |
