From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752511AbYCRKWz (ORCPT ); Tue, 18 Mar 2008 06:22:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751541AbYCRKWp (ORCPT ); Tue, 18 Mar 2008 06:22:45 -0400 Received: from charybdis-ext.suse.de ([195.135.221.2]:33351 "EHLO emea5-mh.id5.novell.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751078AbYCRKWo (ORCPT ); Tue, 18 Mar 2008 06:22:44 -0400 Message-ID: <47DF97EE.3080402@suse.de> Date: Tue, 18 Mar 2008 13:22:38 +0300 From: Alexey Starikovskiy User-Agent: Thunderbird 2.0.0.12 (X11/20080227) MIME-Version: 1.0 To: Guillaume Chazarain CC: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, lenb@kernel.org Subject: Re: ACPI regression in 2.6.25-rc6 (function keys stop working) References: <3d8471ca0803171713q31b87939y557f6408543ac881@mail.gmail.com> In-Reply-To: <3d8471ca0803171713q31b87939y557f6408543ac881@mail.gmail.com> Content-Type: multipart/mixed; boundary="------------060906060409040606060807" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------060906060409040606060807 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, Please provide 'cat /proc/interrupts'. Could you try if such patch works? Thanks, Alex. Guillaume Chazarain wrote: > Hi, > > There is an ACPI regression in 2.6.25-rc6, which causes the ACPI keys > to stop working on my laptop, an Asus V6VA. git bisect identified the > appended commit as guilty, and reverting it indeed fixes the problem > for me. Attached are my .config, a good dmesg and a bad one. The diff > between both dmesg reveals this interesting hunk: > > @@ -121,8 +121,9 @@ > ACPI: (supports S0 S1 S3 S4 S5) > ACPI: Using IOAPIC for interrupt routing > ACPI: EC: non-query interrupt received, switching to interrupt mode > +ACPI: EC: GPE storm detected, disabling EC GPE > ACPI: EC: GPE = 0x1c, I/O: command/status = 0x66, data = 0x62 > -ACPI: EC: driver started in interrupt mode > +ACPI: EC: driver started in poll mode > ACPI: PCI Root Bridge [PCI0] (0000:00) > pci 0000:00:1f.0: Enabled ICH6/i801 SMBus device > pci 0000:00:1f.0: quirk: region 0800-087f claimed by ICH6 ACPI/GPIO/TCO > > > Thanks. > > > commit 2c81ce4c9c37b910210f2640c28e98a0c398dc26 > Author: Alexey Starikovskiy > Date: Tue Mar 11 13:30:00 2008 -0400 > > ACPI: EC: Handle IRQ storm on Acer laptops > > On some Acer systems, the HW fails to clear the GPE source, > causing an interrupt storm. > > So in EC interrupt mode, we count how many interrupts we > receive when waiting. If we get more than 5, we give > up on interrupt mode and revert to polling mode. > > Also, for polling mode to work on Acers, we need > to insert a delay. > > Signed-off-by: Alexey Starikovskiy > Signed-off-by: Len Brown > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > index caf873c..2c77359 100644 > --- a/drivers/acpi/ec.c > +++ b/drivers/acpi/ec.c > @@ -129,6 +129,7 @@ static struct acpi_ec { > struct mutex lock; > wait_queue_head_t wait; > struct list_head list; > + atomic_t irq_count; > u8 handlers_installed; > } *boot_ec, *first_ec; > > @@ -181,6 +182,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum > ec_event event, int force_poll) > { > int ret = 0; > > + atomic_set(&ec->irq_count, 0); > + > if (unlikely(event == ACPI_EC_EVENT_OBF_1 && > test_bit(EC_FLAGS_NO_OBF1_GPE, &ec->flags))) > force_poll = 1; > @@ -227,6 +230,7 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum > ec_event event, int force_poll) > while (time_before(jiffies, delay)) { > if (acpi_ec_check_status(ec, event)) > goto end; > + msleep(5); > } > } > pr_err(PREFIX "acpi_ec_wait timeout," > @@ -529,6 +533,13 @@ static u32 acpi_ec_gpe_handler(void *data) > struct acpi_ec *ec = data; > > pr_debug(PREFIX "~~~> interrupt\n"); > + atomic_inc(&ec->irq_count); > + if (atomic_read(&ec->irq_count) > 5) { > + pr_err(PREFIX "GPE storm detected, disabling EC GPE\n"); > + acpi_disable_gpe(NULL, ec->gpe, ACPI_ISR); > + clear_bit(EC_FLAGS_GPE_MODE, &ec->flags); > + return ACPI_INTERRUPT_HANDLED; > + } > clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags); > if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) > wake_up(&ec->wait); > > --------------060906060409040606060807 Content-Type: text/x-patch; name="dont_disable_ec_gpe_completely_at_storm.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="dont_disable_ec_gpe_completely_at_storm.patch" ACPI: EC: Don't disable EC GPE completely at detected storm From: Alexey Starikovskiy Signed-off-by: Alexey Starikovskiy --- drivers/acpi/ec.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index e7e197e..461acd1 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -527,17 +527,30 @@ static void acpi_ec_gpe_query(void *ec_cxt) mutex_unlock(&ec->lock); } +static void acpi_ec_enable_gpe(void *context) +{ + struct acpi_ec *ec = context; + acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR); + atomic_set(&ec->irq_count, 0); + set_bit(EC_FLAGS_GPE_MODE, &ec->flags); +} + static u32 acpi_ec_gpe_handler(void *data) { acpi_status status = AE_OK; struct acpi_ec *ec = data; + static bool gpe_storm = 0; pr_debug(PREFIX "~~~> interrupt\n"); atomic_inc(&ec->irq_count); - if (atomic_read(&ec->irq_count) > 5) { - pr_err(PREFIX "GPE storm detected, disabling EC GPE\n"); + if (atomic_read(&ec->irq_count) > 2) { + if (!gpe_storm) { + pr_err(PREFIX "GPE storm detected, throttle EC GPE\n"); + gpe_storm = 1; + } acpi_disable_gpe(NULL, ec->gpe, ACPI_ISR); clear_bit(EC_FLAGS_GPE_MODE, &ec->flags); + acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_enable_gpe, ec); return ACPI_INTERRUPT_HANDLED; } clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags); --------------060906060409040606060807--