From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9Wjo-0004K3-WA for qemu-devel@nongnu.org; Thu, 06 Sep 2012 03:43:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9Wjh-0007lZ-TM for qemu-devel@nongnu.org; Thu, 06 Sep 2012 03:42:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9Wjh-0007l2-Kl for qemu-devel@nongnu.org; Thu, 06 Sep 2012 03:42:49 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q867gmQt011398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 6 Sep 2012 03:42:49 -0400 From: Gerd Hoffmann Date: Thu, 6 Sep 2012 09:42:44 +0200 Message-Id: <1346917367-24691-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1346917367-24691-1-git-send-email-kraxel@redhat.com> References: <1346917367-24691-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] wakeup: add acpi gpe wakeup reasons List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 f7950be..4d6bc71 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -263,6 +263,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. @@ -428,6 +444,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) @@ -457,6 +477,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 65552ac..af04941 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); -- 1.7.1