From patchwork Sat May 16 02:34:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 24223 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 n4G2Ya1L004394 for ; Sat, 16 May 2009 02:34:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755334AbZEPCee (ORCPT ); Fri, 15 May 2009 22:34:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755404AbZEPCed (ORCPT ); Fri, 15 May 2009 22:34:33 -0400 Received: from vms173017pub.verizon.net ([206.46.173.17]:39936 "EHLO vms173017pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755334AbZEPCed (ORCPT ); Fri, 15 May 2009 22:34:33 -0400 Received: from localhost.localdomain ([96.237.168.40]) by vms173017.mailsrvcs.net (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) with ESMTPA id <0KJP00C6BTT6FDQ7@vms173017.mailsrvcs.net>; Fri, 15 May 2009 21:34:23 -0500 (CDT) Received: from localhost.localdomain (d975xbx2 [127.0.0.1]) by localhost.localdomain (8.14.2/8.14.2) with ESMTP id n4G2YHSR031025; Fri, 15 May 2009 22:34:17 -0400 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.2/8.14.2/Submit) with ESMTP id n4G2YGfh031020; Fri, 15 May 2009 22:34:16 -0400 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Fri, 15 May 2009 22:34:15 -0400 (EDT) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: Bob Copeland Cc: "Rafael J. Wysocki" , Lin Ming , Bjorn Helgaas , yakui_zhao , "linux-kernel@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "Moore, Robert" Subject: [PATCH] ACPI: resume: re-enable SCI-enable workaround In-reply-to: Message-id: References: <20090507105821.GA5864@hash.localnet> <1242192968.14626.40.camel@minggr.sh.intel.com> <200905131015.45635.rjw@sisk.pl> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Lin Ming The BIOS bug workaround mistakenly got disabled when we followed the ACPI specification more closely by ignoring OS updates to that bit. (The BIOS is supposed to update SCI_EN, not the OS) http://bugzilla.kernel.org/show_bug.cgi?id=13289 Signed-off-by: Lin Ming Signed-off-by: Len Brown --- as-applied. thanks, -Len drivers/acpi/acpica/aclocal.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 772ee5c..2ec394a 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -787,7 +787,12 @@ struct acpi_bit_register_info { /* For control registers, both ignored and reserved bits must be preserved */ -#define ACPI_PM1_CONTROL_IGNORED_BITS 0x0201 /* Bits 9, 0(SCI_EN) */ +/* + * The ACPI spec says to ignore PM1_CTL.SCI_EN (bit 0) + * but we need to be able to write ACPI_BITREG_SCI_ENABLE directly + * as a BIOS workaround on some machines. + */ +#define ACPI_PM1_CONTROL_IGNORED_BITS 0x0200 /* Bits 9 */ #define ACPI_PM1_CONTROL_RESERVED_BITS 0xC1F8 /* Bits 14-15, 3-8 */ #define ACPI_PM1_CONTROL_PRESERVED_BITS \ (ACPI_PM1_CONTROL_IGNORED_BITS | ACPI_PM1_CONTROL_RESERVED_BITS)