From patchwork Tue Sep 28 15:46:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 215162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8SFkBxI004420 for ; Tue, 28 Sep 2010 15:46:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115Ab0I1PqK (ORCPT ); Tue, 28 Sep 2010 11:46:10 -0400 Received: from adelie.canonical.com ([91.189.90.139]:47940 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753724Ab0I1PqJ (ORCPT ); Tue, 28 Sep 2010 11:46:09 -0400 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1P0cNY-0004KK-Te; Tue, 28 Sep 2010 16:46:04 +0100 Received: from cpc7-craw6-2-0-cust128.croy.cable.virginmedia.com ([94.172.219.129] helo=[192.168.1.11]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P0cNY-00057j-Nt; Tue, 28 Sep 2010 16:46:04 +0100 Subject: Re: [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume From: Colin Ian King To: Randy Dunlap Cc: Len Brown , linux-acpi@vger.kernel.org In-Reply-To: <20100928083121.f76e8991.rdunlap@xenotime.net> References: <1285671624-7826-1-git-send-email-colin.king@canonical.com> <1285671624-7826-2-git-send-email-colin.king@canonical.com> <20100928083121.f76e8991.rdunlap@xenotime.net> Date: Tue, 28 Sep 2010 16:46:02 +0100 Message-ID: <1285688763.2072.6.camel@lenovo> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 28 Sep 2010 15:46:11 +0000 (UTC) From 871dccf769ad7be6625bb10a0d58408bf90e6c51 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Mon, 2 Aug 2010 15:14:43 +0000 Subject: [PATCH] acpi: clear PCIEXP_WAKE_STS on resume Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of the ACPI spec concerning PCIEXP_WAKE_STS points out in in the final note field in table 4-11 that if this bit is set to 1 and the system is put into a sleeping state then the system will not automatically wake. This bit gets set by hardware to indicate that the system woke up due to a PCI Express wakeup event, so clear it during acpi_hw_clear_acpi_status() calls to enable subsequent resumes to work. BugLink: http://bugs.launchpad.net/bugs/613381 Signed-off-by: Colin Ian King --- drivers/acpi/acpica/aclocal.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 147a7e6..f26db38 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -853,6 +853,7 @@ struct acpi_bit_register_info { ACPI_BITMASK_POWER_BUTTON_STATUS | \ ACPI_BITMASK_SLEEP_BUTTON_STATUS | \ ACPI_BITMASK_RT_CLOCK_STATUS | \ + ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \ ACPI_BITMASK_WAKE_STATUS) #define ACPI_BITMASK_TIMER_ENABLE 0x0001 -- 1.7.0.4