From: guangrong.xiao@gmail.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, yunfangtai@tencent.com, Xiao Guangrong <xiaoguangrong@tencent.com> Subject: [PATCH 1/5] mc146818rtc: update periodic timer only if it is needed Date: Wed, 12 Apr 2017 17:51:07 +0800 [thread overview] Message-ID: <20170412095111.11728-2-xiaoguangrong@tencent.com> (raw) In-Reply-To: <20170412095111.11728-1-xiaoguangrong@tencent.com> From: Xiao Guangrong <xiaoguangrong@tencent.com> Currently, the timer is updated whenever RegA or RegB is written even if the periodic timer related configuration is not changed This patch optimizes it slightly to make the update happen only if its period or enable-status is changed, also later patches are depend on this optimization Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> --- hw/timer/mc146818rtc.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 4165450..749e206 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -387,10 +387,25 @@ static void rtc_update_timer(void *opaque) check_update_timer(s); } +static bool rtc_periodic_timer_updated_by_regA(RTCState *s, uint64_t data) +{ + uint8_t orig = s->cmos_data[RTC_REG_A]; + + return (orig & 0x0f) != (data & 0x0f); +} + +static bool rtc_periodic_timer_updated_by_regB(RTCState *s, uint64_t data) +{ + uint8_t orig = s->cmos_data[RTC_REG_B]; + + return (orig & REG_B_PIE) != (data & REG_B_PIE); +} + static void cmos_ioport_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { RTCState *s = opaque; + bool update_periodic_timer; if ((addr & 1) == 0) { s->cmos_index = data & 0x7f; @@ -423,6 +438,8 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, } break; case RTC_REG_A: + update_periodic_timer = rtc_periodic_timer_updated_by_regA(s, data); + if ((data & 0x60) == 0x60) { if (rtc_running(s)) { rtc_update_time(s); @@ -445,10 +462,16 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, /* UIP bit is read only */ s->cmos_data[RTC_REG_A] = (data & ~REG_A_UIP) | (s->cmos_data[RTC_REG_A] & REG_A_UIP); - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + + if (update_periodic_timer) { + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + } + check_update_timer(s); break; case RTC_REG_B: + update_periodic_timer = rtc_periodic_timer_updated_by_regB(s, data); + if (data & REG_B_SET) { /* update cmos to when the rtc was stopping */ if (rtc_running(s)) { @@ -475,7 +498,11 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, qemu_irq_lower(s->irq); } s->cmos_data[RTC_REG_B] = data; - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + + if (update_periodic_timer) { + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + } + check_update_timer(s); break; case RTC_REG_C: -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: guangrong.xiao@gmail.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, yunfangtai@tencent.com, Xiao Guangrong <xiaoguangrong@tencent.com> Subject: [Qemu-devel] [PATCH 1/5] mc146818rtc: update periodic timer only if it is needed Date: Wed, 12 Apr 2017 17:51:07 +0800 [thread overview] Message-ID: <20170412095111.11728-2-xiaoguangrong@tencent.com> (raw) In-Reply-To: <20170412095111.11728-1-xiaoguangrong@tencent.com> From: Xiao Guangrong <xiaoguangrong@tencent.com> Currently, the timer is updated whenever RegA or RegB is written even if the periodic timer related configuration is not changed This patch optimizes it slightly to make the update happen only if its period or enable-status is changed, also later patches are depend on this optimization Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> --- hw/timer/mc146818rtc.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 4165450..749e206 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -387,10 +387,25 @@ static void rtc_update_timer(void *opaque) check_update_timer(s); } +static bool rtc_periodic_timer_updated_by_regA(RTCState *s, uint64_t data) +{ + uint8_t orig = s->cmos_data[RTC_REG_A]; + + return (orig & 0x0f) != (data & 0x0f); +} + +static bool rtc_periodic_timer_updated_by_regB(RTCState *s, uint64_t data) +{ + uint8_t orig = s->cmos_data[RTC_REG_B]; + + return (orig & REG_B_PIE) != (data & REG_B_PIE); +} + static void cmos_ioport_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { RTCState *s = opaque; + bool update_periodic_timer; if ((addr & 1) == 0) { s->cmos_index = data & 0x7f; @@ -423,6 +438,8 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, } break; case RTC_REG_A: + update_periodic_timer = rtc_periodic_timer_updated_by_regA(s, data); + if ((data & 0x60) == 0x60) { if (rtc_running(s)) { rtc_update_time(s); @@ -445,10 +462,16 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, /* UIP bit is read only */ s->cmos_data[RTC_REG_A] = (data & ~REG_A_UIP) | (s->cmos_data[RTC_REG_A] & REG_A_UIP); - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + + if (update_periodic_timer) { + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + } + check_update_timer(s); break; case RTC_REG_B: + update_periodic_timer = rtc_periodic_timer_updated_by_regB(s, data); + if (data & REG_B_SET) { /* update cmos to when the rtc was stopping */ if (rtc_running(s)) { @@ -475,7 +498,11 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, qemu_irq_lower(s->irq); } s->cmos_data[RTC_REG_B] = data; - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + + if (update_periodic_timer) { + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + } + check_update_timer(s); break; case RTC_REG_C: -- 2.9.3
next prev parent reply other threads:[~2017-04-12 9:51 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-12 9:51 [PATCH 0/5] mc146818rtc: fix Windows VM clock faster guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-04-12 9:51 ` guangrong.xiao [this message] 2017-04-12 9:51 ` [Qemu-devel] [PATCH 1/5] mc146818rtc: update periodic timer only if it is needed guangrong.xiao 2017-05-03 15:42 ` Paolo Bonzini 2017-05-03 15:42 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 3:27 ` Xiao Guangrong 2017-05-04 3:27 ` [Qemu-devel] " Xiao Guangrong 2017-04-12 9:51 ` [PATCH 2/5] mc146818rtc: fix clock lost after scaling coalesced irq guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-05-03 15:15 ` Paolo Bonzini 2017-05-03 15:15 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 2:51 ` Xiao Guangrong 2017-05-04 2:51 ` [Qemu-devel] " Xiao Guangrong 2017-04-12 9:51 ` [PATCH 3/5] mc146818rtc: properly count the time for the next interrupt guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-05-03 15:32 ` Paolo Bonzini 2017-05-03 15:32 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 2:54 ` Xiao Guangrong 2017-05-04 2:54 ` [Qemu-devel] " Xiao Guangrong 2017-05-04 12:02 ` Paolo Bonzini 2017-05-04 12:02 ` [Qemu-devel] " Paolo Bonzini 2017-04-12 9:51 ` [PATCH 4/5] mc146818rtc: move x86 specific code out of periodic_timer_update guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-05-03 15:39 ` Paolo Bonzini 2017-05-03 15:39 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 3:25 ` Xiao Guangrong 2017-05-04 3:25 ` [Qemu-devel] " Xiao Guangrong 2017-05-04 7:08 ` Paolo Bonzini 2017-05-04 7:08 ` [Qemu-devel] " Paolo Bonzini 2017-04-12 9:51 ` [PATCH 5/5] mc146818rtc: embrace all x86 specific code guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-04-13 6:37 ` [PATCH 0/5] mc146818rtc: fix Windows VM clock faster Paolo Bonzini 2017-04-13 6:37 ` [Qemu-devel] " Paolo Bonzini 2017-04-13 8:39 ` Xiao Guangrong 2017-04-13 8:39 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 8:52 ` Xiao Guangrong 2017-04-13 8:52 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 9:05 ` 答复: " Zhanghailiang 2017-04-13 9:05 ` [Qemu-devel] " Zhanghailiang 2017-04-13 9:18 ` Xiao Guangrong 2017-04-13 9:18 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 9:29 ` Hailiang Zhang 2017-04-13 9:29 ` [Qemu-devel] " Hailiang Zhang 2017-04-13 9:35 ` Xiao Guangrong 2017-04-13 9:35 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 9:38 ` Hailiang Zhang 2017-04-13 9:38 ` [Qemu-devel] " Hailiang Zhang 2017-04-19 2:02 ` Xiao Guangrong 2017-04-19 2:02 ` [Qemu-devel] " Xiao Guangrong 2017-04-19 10:41 ` Hailiang Zhang 2017-04-19 10:41 ` [Qemu-devel] " Hailiang Zhang 2017-04-19 11:13 ` Xiao Guangrong 2017-04-19 11:13 ` [Qemu-devel] " Xiao Guangrong 2017-04-19 16:44 ` Paolo Bonzini 2017-04-19 16:44 ` [Qemu-devel] " Paolo Bonzini 2017-04-14 5:09 ` Paolo Bonzini 2017-04-14 5:09 ` [Qemu-devel] " Paolo Bonzini 2017-04-14 6:07 ` Xiao Guangrong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170412095111.11728-2-xiaoguangrong@tencent.com \ --to=guangrong.xiao@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=xiaoguangrong@tencent.com \ --cc=yunfangtai@tencent.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.