From patchwork Sat Mar 24 19:24:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Davidsaver X-Patchwork-Id: 890532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f5MPnJRd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 407sPz5gRZz9s1q for ; Sun, 25 Mar 2018 07:26:46 +1100 (AEDT) Received: from localhost ([::1]:47897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezpkP-0001zU-Ec for incoming@patchwork.ozlabs.org; Sat, 24 Mar 2018 16:26:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezpiu-0001aX-JH for qemu-devel@nongnu.org; Sat, 24 Mar 2018 16:26:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezphq-0003Kf-J6 for qemu-devel@nongnu.org; Sat, 24 Mar 2018 16:25:08 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ezomq-0005j6-7m for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:25:08 -0400 Received: by mail-pf0-x242.google.com with SMTP id u86so211550pfd.2 for ; Sat, 24 Mar 2018 12:25:08 -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:in-reply-to:references; bh=1k5rTzGPwWdRPy3bbkwT0H2zsDdAS8XuRFc2bwRqLK0=; b=f5MPnJRdkS2JkLTspPwZBMEueD9YhmccrDScE7230zoTH+xCu+vprlYwRTTyS2f9QW 4GhfIYU8g+riH83y8TZ4EFhPLX8LmfkbeHFPr8jMxAH3PvvOWe5bR1GBWzhkaIjA3eiF r9QKFqPqvQkoWm1ixwpy9SJqo2FPF8GIh3fh3c5esiF4XhGEFbAq7jWqB83ycUXB+gMB kBd1foRoNAhcovHlMGK2KspisIOHKIiCF2+lb05FUKfaXXkbzrGkQ9uZNj/Vc+dFUyEa CLuew4QB9EkuAT4zJtMDu3t2Fr2G8Eyyuw6Owm07s8yYJYNT1j3stZXt9qzwlruHgFDk xZMA== 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:in-reply-to :references; bh=1k5rTzGPwWdRPy3bbkwT0H2zsDdAS8XuRFc2bwRqLK0=; b=GrlYtT9U0Qk62op8vJy+mW94/xImSmlO3RSUUtjmgXWA1ymKYLJNBnzVHFyt3bUzoV ATFYonEOb7k3FJOhyRgbylxg1gWrNxOXucKSbmHdj3GyZiQGXOgYR4zvXrq0M0rZZre8 tbKhcsn/7B07IYzsSti+E4qcPDPd+ag+PkdmN5IaBvxww/5ZLbSdYMmzOLItqmZ34fzH rB5A/M0dgU/zf2Cvqva7QAk757yJ2Go0lNqOz9nD0nsjiPUc08NfF/6HLEzOMwXcusU4 /bV+cTMKlIHCmTCldUUeppyywg0lX6PSzc2CeDu04ZJFe4GIUhra0VzqpHjFWE5NBHxk 3G2w== X-Gm-Message-State: AElRT7EZmfXNiQvNBK3kfRuivYmjF1lBZUVpNFNjS0zbfti9khmxHFP7 +fk5lf3+6uUgxpyuJqEARec= X-Google-Smtp-Source: AG47ELt1CFIajczNqPH5cXU0shd2rOSjpWJXZNe16fesvmVLB96vJE+Xxku7dDBBbgeKp6d4vwo4Jw== X-Received: by 10.101.66.11 with SMTP id c11mr3610761pgq.80.1521919507114; Sat, 24 Mar 2018 12:25:07 -0700 (PDT) Received: from localhost.localdomain (c-73-158-53-43.hsd1.ca.comcast.net. [73.158.53.43]) by smtp.gmail.com with ESMTPSA id o2sm13353501pgq.87.2018.03.24.12.25.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 12:25:06 -0700 (PDT) From: Michael Davidsaver To: Peter Maydell , Thomas Huth Date: Sat, 24 Mar 2018 12:24:42 -0700 Message-Id: <20180324192455.12254-2-mdavidsaver@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180324192455.12254-1-mdavidsaver@gmail.com> References: <20180324192455.12254-1-mdavidsaver@gmail.com> 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 01/14] tests: more thorough tests of ds1338 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: Antoine Mathys , Michael Davidsaver , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Test current time and set+get round trip. Separate current time test from set/get tests to avoid test order issues. Signed-off-by: Michael Davidsaver --- tests/Makefile.include | 4 ++ tests/ds-rtc-common.h | 67 +++++++++++++++++++++++++ tests/ds-rtc-current-test.c | 59 ++++++++++++++++++++++ tests/ds-rtc-set-test.c | 117 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 247 insertions(+) create mode 100644 tests/ds-rtc-common.h create mode 100644 tests/ds-rtc-current-test.c create mode 100644 tests/ds-rtc-set-test.c diff --git a/tests/Makefile.include b/tests/Makefile.include index eb218a9539..d256095c88 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -372,6 +372,8 @@ check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF) check-qtest-arm-y = tests/tmp105-test$(EXESUF) check-qtest-arm-y += tests/ds1338-test$(EXESUF) +check-qtest-arm-y += tests/ds-rtc-current-test$(EXESUF) +check-qtest-arm-y += tests/ds-rtc-set-test$(EXESUF) check-qtest-arm-y += tests/m25p80-test$(EXESUF) gcov-files-arm-y += hw/misc/tmp105.c check-qtest-arm-y += tests/virtio-blk-test$(EXESUF) @@ -771,6 +773,8 @@ tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \ tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y) tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y) tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y) +tests/ds-rtc-current-test$(EXESUF): tests/ds-rtc-current-test.o $(libqos-imx-obj-y) +tests/ds-rtc-set-test$(EXESUF): tests/ds-rtc-set-test.o $(libqos-imx-obj-y) tests/m25p80-test$(EXESUF): tests/m25p80-test.o tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y) tests/q35-test$(EXESUF): tests/q35-test.o $(libqos-pc-obj-y) diff --git a/tests/ds-rtc-common.h b/tests/ds-rtc-common.h new file mode 100644 index 0000000000..c8e6c2bc5b --- /dev/null +++ b/tests/ds-rtc-common.h @@ -0,0 +1,67 @@ +/* Common code for testing of Dallas/Maxim I2C bus RTC devices + * + * Copyright (c) 2018 Michael Davidsaver + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the LICENSE file in the top-level directory. + */ +#ifndef DSRTCCOMMON_H +#define DSRTCCOMMON_H + +#include "qemu/osdep.h" +#include "qemu/cutils.h" +#include "libqos/i2c.h" + +#define IMX25_I2C_0_BASE 0x43F80000 +#define DS1338_ADDR 0x68 + +static I2CAdapter *i2c; +static uint8_t addr; +static bool use_century; + +/* input buffer must have at least 7 elements */ +static inline time_t rtc_parse(const uint8_t *buf) +{ + struct tm parts; + + parts.tm_sec = from_bcd(buf[0]); + parts.tm_min = from_bcd(buf[1]); + if (buf[2] & 0x40) { + /* 12 hour */ + /* HOUR register is 1-12. */ + parts.tm_hour = from_bcd(buf[2] & 0x1f); + g_assert_cmpuint(parts.tm_hour, >=, 1); + g_assert_cmpuint(parts.tm_hour, <=, 12); + parts.tm_hour %= 12u; /* wrap 12 -> 0 */ + if (buf[2] & 0x20) { + parts.tm_hour += 12u; + } + } else { + /* 24 hour */ + parts.tm_hour = from_bcd(buf[2] & 0x3f); + } + parts.tm_wday = from_bcd(buf[3]); + parts.tm_mday = from_bcd(buf[4]); + parts.tm_mon = from_bcd((buf[5] & 0x1f) - 1u); + parts.tm_year = from_bcd(buf[6]); + if (!use_century || (buf[5] & 0x80)) { + parts.tm_year += 100u; + } + + return mktimegm(&parts); +} + +static time_t rtc_gettime(void) +{ + uint8_t buf[7]; + + /* zero address pointer */ + buf[0] = 0; + i2c_send(i2c, addr, buf, 1); + /* read back current time registers */ + i2c_recv(i2c, addr, buf, 7); + + return rtc_parse(buf); +} + +#endif /* DSRTCCOMMON_H */ diff --git a/tests/ds-rtc-current-test.c b/tests/ds-rtc-current-test.c new file mode 100644 index 0000000000..6acbbed9a6 --- /dev/null +++ b/tests/ds-rtc-current-test.c @@ -0,0 +1,59 @@ +/* Testing of Dallas/Maxim I2C bus RTC devices + * + * Copyright (c) 2018 Michael Davidsaver + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the LICENSE file in the top-level directory. + */ +#include + +#include "qemu/osdep.h" +#include "qemu/bcd.h" +#include "qemu/cutils.h" +#include "libqtest.h" +#include "libqos/libqos.h" +#include "libqos/i2c.h" + +#include "ds-rtc-common.h" + +/* read back and compare with current system time */ +static +void test_rtc_current(void) +{ + time_t expected, actual; + /* relax test to limit false positives when host may be overloaded. + * Allow larger delta when running "-m quick" + */ + time_t max_delta = g_test_slow() ? 1 : 30; + + actual = time(NULL); + /* new second may start here */ + expected = rtc_gettime(); + g_assert_cmpuint(expected, <=, actual + max_delta); + g_assert_cmpuint(expected, >=, actual); +} + +int main(int argc, char *argv[]) +{ + int ret; + const char *arch = qtest_get_arch(); + QTestState *s = NULL; + + g_test_init(&argc, &argv, NULL); + + if (strcmp(arch, "arm") == 0) { + s = qtest_start("-machine imx25-pdk"); + i2c = imx_i2c_create(s, IMX25_I2C_0_BASE); + addr = DS1338_ADDR; + use_century = false; + + } + + qtest_add_func("/ds-rtc-i2c/current", test_rtc_current); + + ret = g_test_run(); + + qtest_end(); + + return ret; +} diff --git a/tests/ds-rtc-set-test.c b/tests/ds-rtc-set-test.c new file mode 100644 index 0000000000..35e1a36281 --- /dev/null +++ b/tests/ds-rtc-set-test.c @@ -0,0 +1,117 @@ +/* Testing of Dallas/Maxim I2C bus RTC devices + * + * Copyright (c) 2018 Michael Davidsaver + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the LICENSE file in the top-level directory. + */ +#include + +#include "qemu/osdep.h" +#include "qemu/bcd.h" +#include "qemu/cutils.h" +#include "qemu/timer.h" +#include "libqtest.h" +#include "libqos/libqos.h" +#include "libqos/i2c.h" + +#include "ds-rtc-common.h" + +static uint8_t test_time_24_12am[8] = { + 0, /* address */ + /* Wed, 22 Nov 2017 00:30:53 +0000 */ + 0x53, + 0x30, + 0x00, /* 12 AM in 24 hour mode */ + 0x03, /* monday is our day 1 */ + 0x22, + 0x11 | 0x80, + 0x17, +}; + +static uint8_t test_time_24_6am[8] = { + 0, /* address */ + /* Wed, 22 Nov 2017 06:30:53 +0000 */ + 0x53, + 0x30, + 0x06, /* 6 AM in 24 hour mode */ + 0x03, /* monday is our day 1 */ + 0x22, + 0x11 | 0x80, + 0x17, +}; + +static uint8_t test_time_24_12pm[8] = { + 0, /* address */ + /* Wed, 22 Nov 2017 12:30:53 +0000 */ + 0x53, + 0x30, + 0x12, /* 12 PM in 24 hour mode */ + 0x03, /* monday is our day 1 */ + 0x22, + 0x11 | 0x80, + 0x17, +}; + +static uint8_t test_time_24_6pm[8] = { + 0, /* address */ + /* Wed, 22 Nov 2017 18:30:53 +0000 */ + 0x53, + 0x30, + 0x18, /* 6 PM in 24 hour mode */ + 0x03, /* monday is our day 1 */ + 0x22, + 0x11 | 0x80, + 0x17, +}; + +/* write in and read back known time */ +static +void test_rtc_set(const void *raw) +{ + /* relax test to limit false positives when host may be overloaded. + * Allow larger delta when running "-m quick" + */ + time_t max_delta = g_test_slow() ? 1 : 30; + + const uint8_t *testtime = raw; + time_t expected, actual; + + /* skip address pointer and parse remainder */ + expected = rtc_parse(&testtime[1]); + + i2c_send(i2c, addr, testtime, 8); + /* host may start new second here */ + actual = rtc_gettime(); + + g_assert_cmpuint(expected, <=, actual); + g_assert_cmpuint(expected + max_delta, >=, actual); +} + +int main(int argc, char *argv[]) +{ + int ret; + const char *arch = qtest_get_arch(); + QTestState *s = NULL; + + g_test_init(&argc, &argv, NULL); + + if (strcmp(arch, "arm") == 0) { + s = qtest_start("-display none -machine imx25-pdk"); + i2c = imx_i2c_create(s, IMX25_I2C_0_BASE); + addr = DS1338_ADDR; + use_century = false; + + } + + qtest_add_data_func("/ds-rtc-i2c/set24_12am", test_time_24_12am, test_rtc_set); + qtest_add_data_func("/ds-rtc-i2c/set24_6am", test_time_24_6am, test_rtc_set); + qtest_add_data_func("/ds-rtc-i2c/set24_12pm", test_time_24_12pm, test_rtc_set); + qtest_add_data_func("/ds-rtc-i2c/set24_6pm", test_time_24_6pm, test_rtc_set); + + ret = g_test_run(); + + qtest_end(); + + return ret; +}