From nobody Sat Apr 27 18:24:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495853658836640.3955975789821; Fri, 26 May 2017 19:54:18 -0700 (PDT) Received: from localhost ([::1]:39248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dERrs-00055H-EG for importer@patchew.org; Fri, 26 May 2017 22:54:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dERr2-0004oV-Jt for qemu-devel@nongnu.org; Fri, 26 May 2017 22:53:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dERqx-0004lX-PQ for qemu-devel@nongnu.org; Fri, 26 May 2017 22:53:24 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:33187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dERqx-0004jf-GV for qemu-devel@nongnu.org; Fri, 26 May 2017 22:53:19 -0400 Received: by mail-pf0-x242.google.com with SMTP id f27so6120617pfe.0 for ; Fri, 26 May 2017 19:53:19 -0700 (PDT) Received: from eric.tencent.com ([203.205.141.35]) by smtp.gmail.com with ESMTPSA id t198sm4024678pgc.33.2017.05.26.19.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 May 2017 19:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=a+BHgPQAqf3D4r3sfIuipLWoYnUssoovW4InYvhPuRI=; b=mcRwy5cioIHGhhDT7VAJVS0JFfmZPOOchyNqdiw7xiGrHE3HZ9SGm2y3zt4yL5EPbd 2JWg9pcyS/YAXdtTxTL1hT8zMqtBWqqymOTJ/lNabBVADwhRu6e3I9GERd3WytXwzVNd I9Qrx8W0SH0dK62WtYSCoF/eLyIu8zdtXRNHkBmx/NcRIf01R98AQYWStEdVw6Ekx4nK 7E7HTZiwjipkUVxzs3gjR0oKHE3Q2G8acK30V94BsjuMO94Bv/jVkAAHNyvTER0OO8wR 6033AyoCzYY7U/YauzRrl5qmYJ6k1KISRGFVMRqWs7p5Zsv7ky4YckN6pJcB4C2DMsF8 zj3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a+BHgPQAqf3D4r3sfIuipLWoYnUssoovW4InYvhPuRI=; b=mi83sek3relDVBnSRoJBHndtPq31cg5X8KeGemup/gpjBDlKJCGvylOUxBJPCzBnEM BXZAGNQNwVscWLtMbELzatka5A8OXnEw9amYIZ5EVxg6TFZdC0VZJf9r7/95FtKqJxHo 2mT/ChDie5pZaZQKBT0FpuacoInNuqIP0TqaHYSqwPee4zuJBakpzv9l9PgY9RHYyV/D iPwxAZ3xvGWrhX1zwgrKeFJHT/N9SfC4YnGf481MSQDqZ6kQNVESFUbsK44DqoN9YbZe iIBgRMzsp2Q58I0f2/07gQTQO/fhS81Q9gIFbwmYYNqWjB0Vu4RpBVviJflCXJMW1Y7y HCzQ== X-Gm-Message-State: AODbwcAFNIsNfq/GJJfjaZdCVKuXkd9FV2a4WihwVD8DPIHGuteUZTh3 fvf6ITSQF4lCnQ== X-Received: by 10.84.238.203 with SMTP id l11mr61381899pln.17.1495853598145; Fri, 26 May 2017 19:53:18 -0700 (PDT) From: guangrong.xiao@gmail.com X-Google-Original-From: xiaoguangrong@tencent.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Date: Sat, 27 May 2017 10:53:01 +0800 Message-Id: <20170527025301.23499-1-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.9.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v2] [PATCH] qtest: add rtc periodic timer test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiao Guangrong , qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Xiao Guangrong It tests the accuracy of rtc periodic timer which is recently improved & fixed by: mc146818rtc: precisely count the clock for periodic timer (commit id has not been decided yet) Changelog in v2: integrate it with rtc-test by using clock_step_next() to inquire the time in QEMU instead of real time (thanks to Paolo's suggestion) Signed-off-by: Xiao Guangrong --- hw/timer/mc146818rtc.c | 15 +++---------- include/hw/timer/mc146818rtc.h | 19 ++++++++++++++++ tests/rtc-test.c | 49 ++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 6d0a610..0aba66c 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -120,7 +120,7 @@ static void rtc_coalesced_timer_update(RTCState *s) /* divide each RTC interval to 2 - 8 smaller intervals */ int c =3D MIN(s->irq_coalesced, 7) + 1;=20 int64_t next_clock =3D qemu_clock_get_ns(rtc_clock) + - muldiv64(s->period / c, NANOSECONDS_PER_SECOND, RTC_CLOCK_RATE= ); + periodic_clock_to_ns(s->period / c); timer_mod(s->coalesced_timer, next_clock); } } @@ -178,16 +178,8 @@ static uint32_t rtc_periodic_clock_ticks(RTCState *s) } =20 period_code =3D s->cmos_data[RTC_REG_A] & 0x0f; - if (!period_code) { - return 0; - } - - if (period_code <=3D 2) { - period_code +=3D 7; - } =20 - /* period in 32 Khz cycles */ - return 1 << (period_code - 1); + return periodic_period_to_clock(period_code); } =20 /* @@ -266,8 +258,7 @@ periodic_timer_update(RTCState *s, int64_t current_time= , uint32_t old_period) assert(lost_clock >=3D 0 && lost_clock <=3D period); =20 next_irq_clock =3D cur_clock + period - lost_clock; - s->next_periodic_time =3D muldiv64(next_irq_clock, NANOSECONDS_PER= _SECOND, - RTC_CLOCK_RATE) + 1; + s->next_periodic_time =3D periodic_clock_to_ns(next_irq_clock) + 1; timer_mod(s->periodic_timer, s->next_periodic_time); } else { s->irq_coalesced =3D 0; diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 7c8e64b..f23e734 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -10,4 +10,23 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq= intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); =20 +static inline uint32_t periodic_period_to_clock(int period_code) +{ + if (!period_code) { + return 0; + } + + if (period_code <=3D 2) { + period_code +=3D 7; + } + /* period in 32 Khz cycles */ + return 1 << (period_code - 1); +} + +#define RTC_CLOCK_RATE 32768 + +static inline int64_t periodic_clock_to_ns(int64_t clocks) +{ + return muldiv64(clocks, NANOSECONDS_PER_SECOND, RTC_CLOCK_RATE); +} #endif /* MC146818RTC_H */ diff --git a/tests/rtc-test.c b/tests/rtc-test.c index a086efd..0500686 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" =20 #include "libqtest.h" +#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc_regs.h" =20 static uint8_t base =3D 0x70; @@ -542,6 +543,52 @@ static void register_b_set_flag(void) g_assert_cmpint(cmos_read(RTC_CENTURY), =3D=3D, 0x20); } =20 +#define RTC_PERIOD_CODE1 13 /* 8 Hz */ +#define RTC_PERIOD_CODE2 15 /* 2 Hz */ + +#define RTC_PERIOD_TEST_NR 50 + +static uint64_t wait_periodic_interrupt(uint64_t real_time) +{ + while (!get_irq(RTC_ISA_IRQ)) { + real_time =3D clock_step_next(); + } + + g_assert((cmos_read(RTC_REG_C) & REG_C_PF) !=3D 0); + return real_time; +} + +static void periodic_timer(void) +{ + int i; + uint64_t period_clocks, period_time, start_time, real_time; + + /* disable all interrupts. */ + cmos_write(RTC_REG_B, cmos_read(RTC_REG_B) & + ~(REG_B_PIE | REG_B_AIE | REG_B_UIE)); + cmos_write(RTC_REG_A, RTC_PERIOD_CODE1); + /* enable periodic interrupt after properly configure the period. */ + cmos_write(RTC_REG_B, cmos_read(RTC_REG_B) | REG_B_PIE); + + start_time =3D real_time =3D clock_step_next(); + + for (i =3D 0; i < RTC_PERIOD_TEST_NR; i++) { + cmos_write(RTC_REG_A, RTC_PERIOD_CODE1); + real_time =3D wait_periodic_interrupt(real_time); + cmos_write(RTC_REG_A, RTC_PERIOD_CODE2); + real_time =3D wait_periodic_interrupt(real_time); + } + + period_clocks =3D periodic_period_to_clock(RTC_PERIOD_CODE1) + + periodic_period_to_clock(RTC_PERIOD_CODE2); + period_clocks *=3D RTC_PERIOD_TEST_NR; + period_time =3D periodic_clock_to_ns(period_clocks); + + real_time -=3D start_time; + g_assert_cmpint(ABS((int64_t)(real_time - period_time)), <=3D, + NANOSECONDS_PER_SECOND * 0.5); +} + int main(int argc, char **argv) { QTestState *s =3D NULL; @@ -564,6 +611,8 @@ int main(int argc, char **argv) qtest_add_func("/rtc/set-year/1980", set_year_1980); qtest_add_func("/rtc/misc/register_b_set_flag", register_b_set_flag); qtest_add_func("/rtc/misc/fuzz-registers", fuzz_registers); + qtest_add_func("/rtc/periodic/interrupt", periodic_timer); + ret =3D g_test_run(); =20 if (s) { --=20 2.9.4