Patchwork [v3,6/6] suspend: make rtc alarm wakeup the guest.

login
register
mail settings
Submitter Gerd Hoffmann
Date Feb. 8, 2012, 11 a.m.
Message ID <1328698819-31269-7-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/140121/
State New
Headers show

Comments

Gerd Hoffmann - Feb. 8, 2012, 11 a.m.
Add a 'wakeup' property to the mc146818rtc.  It is on by default.
When enabled the rtc will wake up the guest when the alarm fires.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/mc146818rtc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
Gleb Natapov - Feb. 9, 2012, 8:56 a.m.
On Wed, Feb 08, 2012 at 12:00:19PM +0100, Gerd Hoffmann wrote:
> Add a 'wakeup' property to the mc146818rtc.  It is on by default.
> When enabled the rtc will wake up the guest when the alarm fires.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/mc146818rtc.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
> index 314ed52..3b912c6 100644
> --- a/hw/mc146818rtc.c
> +++ b/hw/mc146818rtc.c
> @@ -86,6 +86,7 @@ typedef struct RTCState {
>      uint8_t cmos_index;
>      struct tm current_tm;
>      int32_t base_year;
> +    uint32_t wakeup;
>      qemu_irq irq;
>      qemu_irq sqw_irq;
>      int it_shift;
> @@ -437,6 +438,9 @@ static void rtc_update_second2(void *opaque)
>  
>          s->cmos_data[RTC_REG_C] |= REG_C_AF;
>          if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
> +            if (s->wakeup) {
> +                qemu_system_wakeup_request();
> +            }
RTC should do wakeup only if RTC_EN bit is set pm1en.


>              qemu_irq_raise(s->irq);
>              s->cmos_data[RTC_REG_C] |= REG_C_IRQF;
>          }
> @@ -725,6 +729,7 @@ static Property mc146818rtc_properties[] = {
>      DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),
>      DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState,
>                                 lost_tick_policy, LOST_TICK_DISCARD),
> +    DEFINE_PROP_UINT32("wakeup",   RTCState, wakeup,    1),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>  
> -- 
> 1.7.1
> 
> 

--
			Gleb.
Gerd Hoffmann - Feb. 9, 2012, noon
On 02/09/12 09:56, Gleb Natapov wrote:
> On Wed, Feb 08, 2012 at 12:00:19PM +0100, Gerd Hoffmann wrote:
>> Add a 'wakeup' property to the mc146818rtc.  It is on by default.
>> When enabled the rtc will wake up the guest when the alarm fires.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> ---
>>  hw/mc146818rtc.c |    5 +++++
>>  1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
>> index 314ed52..3b912c6 100644
>> --- a/hw/mc146818rtc.c
>> +++ b/hw/mc146818rtc.c
>> @@ -86,6 +86,7 @@ typedef struct RTCState {
>>      uint8_t cmos_index;
>>      struct tm current_tm;
>>      int32_t base_year;
>> +    uint32_t wakeup;
>>      qemu_irq irq;
>>      qemu_irq sqw_irq;
>>      int it_shift;
>> @@ -437,6 +438,9 @@ static void rtc_update_second2(void *opaque)
>>  
>>          s->cmos_data[RTC_REG_C] |= REG_C_AF;
>>          if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
>> +            if (s->wakeup) {
>> +                qemu_system_wakeup_request();
>> +            }
> RTC should do wakeup only if RTC_EN bit is set pm1en.

--verbose please.  Which register, which bit?  There is no RTC_EN in
hw/mc146818rtc.* ...

Is this enable bit specifically for wakeup from suspend?

thanks,
  Gerd
Gleb Natapov - Feb. 9, 2012, 12:24 p.m.
On Thu, Feb 09, 2012 at 01:00:47PM +0100, Gerd Hoffmann wrote:
> On 02/09/12 09:56, Gleb Natapov wrote:
> > On Wed, Feb 08, 2012 at 12:00:19PM +0100, Gerd Hoffmann wrote:
> >> Add a 'wakeup' property to the mc146818rtc.  It is on by default.
> >> When enabled the rtc will wake up the guest when the alarm fires.
> >>
> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> >> ---
> >>  hw/mc146818rtc.c |    5 +++++
> >>  1 files changed, 5 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
> >> index 314ed52..3b912c6 100644
> >> --- a/hw/mc146818rtc.c
> >> +++ b/hw/mc146818rtc.c
> >> @@ -86,6 +86,7 @@ typedef struct RTCState {
> >>      uint8_t cmos_index;
> >>      struct tm current_tm;
> >>      int32_t base_year;
> >> +    uint32_t wakeup;
> >>      qemu_irq irq;
> >>      qemu_irq sqw_irq;
> >>      int it_shift;
> >> @@ -437,6 +438,9 @@ static void rtc_update_second2(void *opaque)
> >>  
> >>          s->cmos_data[RTC_REG_C] |= REG_C_AF;
> >>          if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
> >> +            if (s->wakeup) {
> >> +                qemu_system_wakeup_request();
> >> +            }
> > RTC should do wakeup only if RTC_EN bit is set pm1en.
> 
> --verbose please.  Which register, which bit?  There is no RTC_EN in
> hw/mc146818rtc.* ...
> 

Entering --verbose mode.

Here we are on ACPI territory, not RTC :) RTC just provides one input
into ACPI wakeup machinery (Figure 4-11 in ACPI spec version 4). I am
talking about ACPI_BITMASK_RT_CLOCK_ENABLE from hw/acpi.h. It is called
RTC_EN in ACPI spec (man, we should rename them back!). Spec says that
RTC alarm can wakeup the system only if RTC_EN is set in PM1x_EN
register. This way OSPM can control which events can do wakeup.
Notice that for power button wakeup BWRBTN_EN is ignored.

> Is this enable bit specifically for wakeup from suspend?
> 
No, RTC alarm can be configured to generate SCI interrupt while system
is running.

--
			Gleb.

Patch

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 314ed52..3b912c6 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -86,6 +86,7 @@  typedef struct RTCState {
     uint8_t cmos_index;
     struct tm current_tm;
     int32_t base_year;
+    uint32_t wakeup;
     qemu_irq irq;
     qemu_irq sqw_irq;
     int it_shift;
@@ -437,6 +438,9 @@  static void rtc_update_second2(void *opaque)
 
         s->cmos_data[RTC_REG_C] |= REG_C_AF;
         if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
+            if (s->wakeup) {
+                qemu_system_wakeup_request();
+            }
             qemu_irq_raise(s->irq);
             s->cmos_data[RTC_REG_C] |= REG_C_IRQF;
         }
@@ -725,6 +729,7 @@  static Property mc146818rtc_properties[] = {
     DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),
     DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState,
                                lost_tick_policy, LOST_TICK_DISCARD),
+    DEFINE_PROP_UINT32("wakeup",   RTCState, wakeup,    1),
     DEFINE_PROP_END_OF_LIST(),
 };