From patchwork Fri Jul 10 16:37:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 35062 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6AGVcE5017708 for ; Fri, 10 Jul 2009 16:31:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbZGJQbh (ORCPT ); Fri, 10 Jul 2009 12:31:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752108AbZGJQbh (ORCPT ); Fri, 10 Jul 2009 12:31:37 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:39234 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbZGJQbg (ORCPT ); Fri, 10 Jul 2009 12:31:36 -0400 Received: by fg-out-1718.google.com with SMTP id e21so281847fga.17 for ; Fri, 10 Jul 2009 09:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; bh=LZF2gN0KwUhtpmYS9YOtpiK/pYS5ID6ZMN0XD5xuP+s=; b=TARg15S/zhR8LQIdfv6LMeJeQBFV1tiodjC1ExpIPhdn6yZdBjBWrzPGv5j3gt7/IK 8uoU37EzHZvb0ZnOdyn6qH7B9wEKYRQVvfFa1P6B/5nlPKu2qN19mlwvXiV8qW0LE2XE pW29OiC3aAJeYBGYyHnJT3k5CumjJ0zepWMAM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding :content-disposition:message-id; b=mFKPiXK/gBjwyNGTq6KAcELh5hHjhGjzMvOeuY3Ezw2Vp1Rt1nuc+TRfcFP8kmGazG g/46j+cW74eNbehZGBwwYv+ZR2/QdyYbMQB4RprWKx6Spd02HmuMIEJrGclSw/2/Kndm ia65VeKCvyLDAw1PoprpDDlrDFkglQemGsjKY= Received: by 10.103.179.1 with SMTP id g1mr1184620mup.57.1247243493702; Fri, 10 Jul 2009 09:31:33 -0700 (PDT) Received: from localhost.localdomain (chello089077034197.chello.pl [89.77.34.197]) by mx.google.com with ESMTPS id i7sm6795721mue.48.2009.07.10.09.31.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 10 Jul 2009 09:31:32 -0700 (PDT) From: Bartlomiej Zolnierkiewicz To: "Rafael J. Wysocki" Subject: Re: [BISECTED] HP G7000 battery disappears after suspend Date: Fri, 10 Jul 2009 18:37:26 +0200 User-Agent: KMail/1.11.4 (Linux/2.6.31-rc2-next-20090708-03666-gb620e95-dirty; KDE/4.2.4; i686; ; ) Cc: Alan Jenkins , Len Brown , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Pavel Machek References: <61b223ba0907081216q3813c8f0n677bcce8b24ae52c@mail.gmail.com> <61b223ba0907090619ld35b51eqe3ace5aad7fde821@mail.gmail.com> <200907092211.31250.rjw@sisk.pl> In-Reply-To: <200907092211.31250.rjw@sisk.pl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200907101837.29026.bzolnier@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Thursday 09 July 2009 22:11:30 Rafael J. Wysocki wrote: > On Thursday 09 July 2009, Alan Jenkins wrote: > > 2009/7/8 Bartlomiej Zolnierkiewicz : > > > On Wednesday 08 July 2009 21:41:17 Rafael J. Wysocki wrote: > > >> On Wednesday 08 July 2009, Alan Jenkins wrote: > > >> > Hi, > > >> > > > >> > I've borrowed this laptop for a few days. Linux works pretty well, > > >> > but I found a problem on newer kernels. After suspend it claims the > > >> > battery has been removed. E.g. /proc/acpi/battery/BAT0/state claims > > >> > the battery is not present (but it is). > > >> > > > >> > I've attached acpidump and dmidecode output at > > >> > . I still have > > >> > access to the laptop for further tests, but only until Friday. > > >> > > > >> > I bisected it to the commit below. Manually reverting the patch fixes > > >> > the problem (in both 2.6.30 and 2.6.31-rc2). > > >> > > >> Well, the commit below can't be reverted, because that would cause the boxes > > >> it fixed to stop working. > > >> > > >> Now, the only case this patch can make any difference is when the BIOS doesn't > > >> set SCI_EN before returning control the the kernel, which quite evidently is a > > >> BIOS bug. The fact that the battery doesn't work with this patch applied means > > >> that the BIOS not only doesn't set SCI_EN, but also expects it to remain unset, > > >> which is insane. > > >> > > >> IMO this is a "won't fix", sorry. > > > > > > Lets be pragmatic here.. > > > > > > Besides this is a regression and we are already handling some such insane > > > systems in STR case. Moreover sending SMI ACPI_ENABLE command may result in > > > some things happening behind our back and not only setting of SCI_EN bit.. > > > > > > PS Looking at the set_sci_en_on_resume quirk history it seems that if we are > > > lucky we may may fix another issue (screaming IRQ one) at the same time :) > > > > > > Alan, could you try this patch? > > > > > > --- > > > debug patch (needs to have both CONFIG_SUSPEND=y & CONFIG_HIBERNATION=y) > > > > > > drivers/acpi/sleep.c | 13 ++++++++++++- > > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > > > Index: b/drivers/acpi/sleep.c > > > =================================================================== > > > --- a/drivers/acpi/sleep.c > > > +++ b/drivers/acpi/sleep.c > > > @@ -383,6 +383,14 @@ static struct dmi_system_id __initdata a > > > }, > > > }, > > > { > > > + .callback = init_set_sci_en_on_resume, > > > + .ident = "Hewlett-Packard HP G7000 Notebook PC", > > > + .matches = { > > > + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > > > + DMI_MATCH(DMI_PRODUCT_NAME, "HP G7000 Notebook PC"), > > > + }, > > > + }, > > > + { > > > .callback = init_old_suspend_ordering, > > > .ident = "Panasonic CF51-2L", > > > .matches = { > > > > Thanks for coding this up for me in full. It works, the battery now > > survives, and it does indeed remove the IRQ warning. > > Great, thanks for testing, Bart, thanks for the patch! > > Len, can you add the Bart's patch to your 2.6.31 queue, please? Here is the final patch version: From: Bartlomiej Zolnierkiewicz Subject: [PATCH] acpi: HP G7000 Notebook needs a SCI_EN resume quirk This fixes regression (battery "vanishing" on resume) introduced by commit d0c71fe7ebc180f1b7bc7da1d39a07fc19eec768 ("ACPI Suspend: Enable ACPI during resume if SCI_EN is not set") and also the issue with the "screaming" IRQ 9. Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=13745 Reported-and-tested-by: Alan Jenkins Acked-by: Rafael J. Wysocki Cc: stable@kernel.org Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/acpi/sleep.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/acpi/sleep.c =================================================================== --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -383,6 +383,14 @@ static struct dmi_system_id __initdata a }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard HP G7000 Notebook PC", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP G7000 Notebook PC"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = {