From patchwork Tue Jul 17 12:30:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 171412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1DE742C0091 for ; Tue, 17 Jul 2012 22:31:31 +1000 (EST) Received: from localhost ([::1]:38450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sr6w5-0001uU-0y for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 08:31:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sr6vh-0001i3-Tz for qemu-devel@nongnu.org; Tue, 17 Jul 2012 08:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sr6vY-0007mP-CK for qemu-devel@nongnu.org; Tue, 17 Jul 2012 08:31:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sr6vY-0007lY-3j for qemu-devel@nongnu.org; Tue, 17 Jul 2012 08:30:56 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6HCUslp012625 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Jul 2012 08:30:54 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6HCUr7K022072; Tue, 17 Jul 2012 08:30:54 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id CFEB440CD6; Tue, 17 Jul 2012 14:30:52 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org, seabios@seabios.org Date: Tue, 17 Jul 2012 14:30:49 +0200 Message-Id: <1342528252-11470-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1342528252-11470-1-git-send-email-kraxel@redhat.com> References: <1342528252-11470-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [rfc patch qemu 1/4] wakeup: add acpi gpe wakeup reasons X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allocate four acpi gpe bits (0x08 -> 0x0b) for s3 wakeup configuration and notification. Signed-off-by: Gerd Hoffmann --- hw/acpi.c | 26 ++++++++++++++++++++++++++ sysemu.h | 4 ++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index effc7ec..208c4af 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -262,6 +262,22 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) ar->pm1.evt.sts |= (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_TIMER_STATUS); break; + case QEMU_WAKEUP_REASON_GPE_8: + ar->pm1.evt.sts |= ACPI_BITMASK_WAKE_STATUS; + ar->gpe.sts[1] |= (1 << 0); + break; + case QEMU_WAKEUP_REASON_GPE_9: + ar->pm1.evt.sts |= ACPI_BITMASK_WAKE_STATUS; + ar->gpe.sts[1] |= (1 << 1); + break; + case QEMU_WAKEUP_REASON_GPE_a: + ar->pm1.evt.sts |= ACPI_BITMASK_WAKE_STATUS; + ar->gpe.sts[1] |= (1 << 2); + break; + case QEMU_WAKEUP_REASON_GPE_b: + ar->pm1.evt.sts |= ACPI_BITMASK_WAKE_STATUS; + ar->gpe.sts[1] |= (1 << 3); + break; case QEMU_WAKEUP_REASON_OTHER: default: /* ACPI_BITMASK_WAKE_STATUS should be set on resume. @@ -426,6 +442,10 @@ void acpi_gpe_reset(ACPIREGS *ar) { memset(ar->gpe.sts, 0, ar->gpe.len / 2); memset(ar->gpe.en, 0, ar->gpe.len / 2); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_8, 0); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_9, 0); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_a, 0); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_b, 0); } static uint8_t *acpi_gpe_ioport_get_ptr(ACPIREGS *ar, uint32_t addr) @@ -455,6 +475,12 @@ void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val) } else if (addr < ar->gpe.len) { /* GPE_EN */ *cur = val; + if (addr == ar->gpe.len / 2 + 1) { + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_8, val & (1 << 0)); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_9, val & (1 << 1)); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_a, val & (1 << 2)); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_GPE_b, val & (1 << 3)); + } } else { abort(); } diff --git a/sysemu.h b/sysemu.h index 6540c79..8cd3443 100644 --- a/sysemu.h +++ b/sysemu.h @@ -42,6 +42,10 @@ typedef enum WakeupReason { QEMU_WAKEUP_REASON_OTHER = 0, QEMU_WAKEUP_REASON_RTC, QEMU_WAKEUP_REASON_PMTIMER, + QEMU_WAKEUP_REASON_GPE_8, + QEMU_WAKEUP_REASON_GPE_9, + QEMU_WAKEUP_REASON_GPE_a, + QEMU_WAKEUP_REASON_GPE_b, } WakeupReason; void qemu_system_reset_request(void);