Messages in this thread Patch in this message | | | Date | Wed, 19 Mar 2008 02:45:12 +0300 | From | Alexey Starikovskiy <> | Subject | Re: suspend slow in 2.6.25-rc6 (was Re: Suspend and hibernation patchset against -rc6) |
| |
Pavel Machek wrote: > On Tue 2008-03-18 10:31:28, Linus Torvalds wrote: >> >> On Tue, 18 Mar 2008, Pavel Machek wrote: >>> On Tue 2008-03-18 14:06:42, Pavel Machek wrote: >>>> Confirmed, suspend slowness is in 2.6.25-rc6, too. It takes 15 seconds >>>> to suspend/resume, while 2.6.24 takes 9. Thinkpad x60. >>> IIRC 2.6.25-rc5 was "fast". >> Can you bisect it? There's only 343 commits between -rc5 and -rc6, so it >> should not take too long to check which commit it is. Even if it should >> take 9 reboots to bisect it entirely, going just five or six will likely >> narrow it down sufficiently that we can probably guess fairly well what >> it's about. > > Slowdown is fixed by this patch: I think only this part is relevant here. But yes, I agree that the whole patch should be reverted. > @@ -230,7 +227,6 @@ static int acpi_ec_wait(struct acpi_ec * > while (time_before(jiffies, delay)) { > if (acpi_ec_check_status(ec, event)) > goto end; > - msleep(5); > } > } > pr_err(PREFIX "acpi_ec_wait timeout," Thanks, Alex. ACPI: EC: Revert storm handler patch
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Patch have caused several new troubles, so just revert it for now.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> ---
drivers/acpi/ec.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index e7e197e..7222a18 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -129,7 +129,6 @@ 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; @@ -182,8 +181,6 @@ 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; @@ -230,7 +227,6 @@ 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," @@ -533,13 +529,6 @@ 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); | |