Re: [PATCH, v3] x86/HVM: RTC periodic timer emulation adjustments

[Keir Fraser <keir.xen@gmail.com>]

On 31/08/2012 17:01, "Jan Beulich" <JBeulich@suse.com> wrote:

> - don't call rtc_timer_update() on REG_A writes when the value didn't
>   change (doing the call always was reported to cause wall clock time
>   lagging with the JVM running on Windows)
> - don't call rtc_timer_update() on REG_B writes when RTC_PIE didn't
>   change
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

One comment below in-line.

> ---
> v3: Break out just this change from the previously submitted much
>     larger patch. The rest of that one is now planned to go in only
>     after 4.2.
> 
> --- a/xen/arch/x86/hvm/rtc.c
> +++ b/xen/arch/x86/hvm/rtc.c
> @@ -365,6 +365,7 @@ static int rtc_ioport_write(void *opaque
>  {
>      RTCState *s = opaque;
>      struct domain *d = vrtc_domain(s);
> +    uint32_t orig;
>  
>      spin_lock(&s->lock);
>  
> @@ -382,6 +383,7 @@ static int rtc_ioport_write(void *opaque
>          return 0;
>      }
>  
> +    orig = s->hw.cmos_data[s->hw.cmos_index];
>      switch ( s->hw.cmos_index )
>      {
>      case RTC_SECONDS_ALARM:
> @@ -405,9 +407,9 @@ static int rtc_ioport_write(void *opaque
>          break;
>      case RTC_REG_A:
>          /* UIP bit is read only */
> -        s->hw.cmos_data[RTC_REG_A] = (data & ~RTC_UIP) |
> -            (s->hw.cmos_data[RTC_REG_A] & RTC_UIP);
> -        rtc_timer_update(s);
> +        s->hw.cmos_data[RTC_REG_A] = (data & ~RTC_UIP) | (orig & RTC_UIP);
> +        if ( (data ^ orig) & (RTC_RATE_SELECT | RTC_DIV_CTL) )

Please change to 'if ( (data ^ orig) & ~RTC_UIP )'. It is shorter and
matches the style of the immediately preceding line.

Once you make this change:
Acked-by: Keir Fraser <keir@xen.org>

 -- Keir

> +            rtc_timer_update(s);
>          break;
>      case RTC_REG_B:
>          if ( data & RTC_SET )
> @@ -436,7 +438,8 @@ static int rtc_ioport_write(void *opaque
>                  hvm_isa_irq_assert(d, RTC_IRQ);
>              }
>          s->hw.cmos_data[RTC_REG_B] = data;
> -        rtc_timer_update(s);
> +        if ( (data ^ orig) & RTC_PIE )
> +            rtc_timer_update(s);
>          check_update_timer(s);
>          alarm_timer_update(s);
>          break;
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel