From patchwork Thu Feb 9 17:05:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 140417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8222CB6F99 for ; Fri, 10 Feb 2012 04:59:25 +1100 (EST) Received: from localhost ([::1]:52338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXSK-00085k-Cd for incoming@patchwork.ozlabs.org; Thu, 09 Feb 2012 12:06:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXRa-0005zw-5x for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:06:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvXRT-0003ct-5B for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:06:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXRS-0003cW-NH for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:05:55 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q19H5sCv024702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 9 Feb 2012 12:05:54 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q19H5nnO005988; Thu, 9 Feb 2012 12:05:51 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 2990241567; Thu, 9 Feb 2012 18:05:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 9 Feb 2012 18:05:43 +0100 Message-Id: <1328807143-29499-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1328807143-29499-1-git-send-email-kraxel@redhat.com> References: <1328807143-29499-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , gleb@redhat.com Subject: [Qemu-devel] [PATCH v4 11/11] suspend: pmtimer s3 wakeup 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 --- hw/acpi.c | 8 ++++++++ sysemu.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index c05dde6..5d521e5 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -258,6 +258,10 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) ar->pm1.evt.sts |= (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_RT_CLOCK_STATUS); break; + case QEMU_WAKEUP_REASON_PMTIMER: + ar->pm1.evt.sts |= + (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_TIMER_STATUS); + break; case QEMU_WAKEUP_REASON_OTHER: default: /* ACPI_BITMASK_WAKE_STATUS should be set on resume. @@ -293,6 +297,8 @@ void acpi_pm1_evt_write_en(ACPIREGS *ar, uint16_t val) ar->pm1.evt.en = val; qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_RTC, val & ACPI_BITMASK_RT_CLOCK_ENABLE); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_PMTIMER, + val & ACPI_BITMASK_TIMER_ENABLE); } void acpi_pm1_evt_power_down(ACPIREGS *ar) @@ -308,6 +314,7 @@ void acpi_pm1_evt_reset(ACPIREGS *ar) ar->pm1.evt.sts = 0; ar->pm1.evt.en = 0; qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_RTC, 0); + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_PMTIMER, 0); } /* ACPI PM_TMR */ @@ -340,6 +347,7 @@ uint32_t acpi_pm_tmr_get(ACPIREGS *ar) static void acpi_pm_tmr_timer(void *opaque) { ACPIREGS *ar = opaque; + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER); ar->tmr.update_sci(ar); } diff --git a/sysemu.h b/sysemu.h index 781bdaf..98118cc 100644 --- a/sysemu.h +++ b/sysemu.h @@ -41,6 +41,7 @@ void vm_stop_force_state(RunState state); typedef enum WakeupReason { QEMU_WAKEUP_REASON_OTHER = 0, QEMU_WAKEUP_REASON_RTC, + QEMU_WAKEUP_REASON_PMTIMER, } WakeupReason; void qemu_system_reset_request(void);