* [LTP] [PATCH V2 1/3] lib: add tst_rtctime* for rtc test
2021-01-11 8:37 [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case gengcixi
@ 2021-01-11 8:37 ` gengcixi
2021-01-11 8:37 ` [LTP] [PATCH V2 2/3] lib: implement rtc_clock_save and rtc_clock_restore function gengcixi
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: gengcixi @ 2021-01-11 8:37 UTC (permalink / raw)
To: ltp
From: Cixi Geng <cixi.geng1@unisoc.com>
Add:
get rtc time and set rtc time;
Implemented a function that covert rtc time to time_t
this will be used in tst_rtc_save and tst_rtc_restore
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Cixi Geng <cixi.geng1@unisoc.com>
---
include/tst_rtctime.h | 15 ++++
lib/tst_rtctime.c | 159 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 174 insertions(+)
create mode 100644 include/tst_rtctime.h
create mode 100644 lib/tst_rtctime.c
diff --git a/include/tst_rtctime.h b/include/tst_rtctime.h
new file mode 100644
index 000000000..416a83a57
--- /dev/null
+++ b/include/tst_rtctime.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2020 Unisoc Inc.
+ */
+
+#ifndef TST_RTCTIME
+#define TST_RTCTIME
+
+#include <linux/rtc.h>
+
+int tst_rtc_gettime(char *rtc_dev, struct rtc_time *rtc_tm);
+
+int tst_rtc_settime(char *rtc_dev, struct rtc_time *rtc_tm);
+
+#endif /* TST_RTCTIME */
diff --git a/lib/tst_rtctime.c b/lib/tst_rtctime.c
new file mode 100644
index 000000000..1ea4891cc
--- /dev/null
+++ b/lib/tst_rtctime.c
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 Unisoc Communications Inc.
+ *
+ * Filename : tst_rtctime.c
+ * Abstract : This file is a implementation for rtc set read,covert to tm functions
+ */
+
+#include <linux/rtc.h>
+#include <stdbool.h>
+#include <limits.h>
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
+#include "tst_rtctime.h"
+
+#define LEAPS_THRU_END_OF(y) ((y) / 4 - (y) / 100 + (y) / 400)
+
+static const unsigned char rtc_days_in_month[] = {
+ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+};
+
+static inline bool is_leap_year(unsigned int year)
+{
+ return (!(year % 4) && (year % 100)) || !(year % 400);
+}
+
+static long long tst_mktime(const unsigned int year0, const unsigned int mon0,
+ const unsigned int day, const unsigned int hour,
+ const unsigned int min, const unsigned int sec)
+{
+ unsigned int mon = mon0, year = year0;
+
+ /* 1..12 -> 11,12,1..10 */
+ mon -= 2;
+ if (0 >= (int) (mon)) {
+ mon += 12; /* Puts Feb last since it has leap day */
+ year -= 1;
+ }
+
+ return ((((long long)
+ (year/4 - year/100 + year/400 + 367*mon/12 + day) +
+ year*365 - 719499
+ )*24 + hour /* now have hours - midnight tomorrow handled here */
+ )*60 + min /* now have minutes */
+ )*60 + sec; /* finally seconds */
+}
+
+/*
+ * The number of days in the month.
+ */
+static int rtc_month_days(unsigned int month, unsigned int year)
+{
+ return rtc_days_in_month[month] + (is_leap_year(year) && month == 1);
+}
+
+/*
+ * tst_rtc_time_to_tm - Converts time_t to rtc_time.
+ * Convert seconds since 01-01-1970 00:00:00 to Gregorian date.
+ */
+void tst_rtc_time_to_tm(long long time, struct rtc_time *tm)
+{
+ unsigned int month, year, secs;
+ int days;
+
+ /* time must be positive */
+ days = time / 86400;
+ secs = time % 86400;
+
+ /* day of the week, 1970-01-01 was a Thursday */
+ tm->tm_wday = (days + 4) % 7;
+
+ year = 1970 + days / 365;
+ days -= (year - 1970) * 365
+ + LEAPS_THRU_END_OF(year - 1)
+ - LEAPS_THRU_END_OF(1970 - 1);
+ while (days < 0) {
+ year -= 1;
+ days += 365 + is_leap_year(year);
+ }
+ tm->tm_year = year - 1900;
+ tm->tm_yday = days + 1;
+
+ for (month = 0; month < 11; month++) {
+ int newdays;
+
+ newdays = days - rtc_month_days(month, year);
+ if (newdays < 0)
+ break;
+ days = newdays;
+ }
+ tm->tm_mon = month;
+ tm->tm_mday = days + 1;
+
+ tm->tm_hour = secs / 3600;
+ secs -= tm->tm_hour * 3600;
+ tm->tm_min = secs / 60;
+ tm->tm_sec = secs - tm->tm_min * 60;
+
+ tm->tm_isdst = 0;
+}
+
+/*
+ * tst_rtc_tm_to_time - Converts rtc_time to time_t.
+ * Convert Gregorian date to seconds since 01-01-1970 00:00:00.
+ */
+long long tst_rtc_tm_to_time(struct rtc_time *tm)
+{
+ return tst_mktime(((unsigned int)tm->tm_year + 1900), tm->tm_mon + 1,
+ tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
+}
+
+static int rtc_supported_by_kernel(const char *rtc_dev)
+{
+ int exists = access(rtc_dev, F_OK);
+
+ if (exists < 0)
+ tst_brk(TCONF, "RTC device %s not available", rtc_dev);
+ return 0;
+}
+
+static int tst_rtc_ioctl(char *rtc_dev, unsigned long request, struct rtc_time *rtc_tm)
+{
+ int ret;
+ int rtc_fd = -1;
+
+ rtc_fd = SAFE_OPEN(rtc_dev, O_RDONLY);
+
+ ret = ioctl(rtc_fd, request, rtc_tm);
+
+ if (ret != 0)
+ return -1;
+
+ if (rtc_fd > 0)
+ SAFE_CLOSE(rtc_fd);
+
+ return 0;
+}
+
+int tst_rtc_gettime(char *rtc_dev, struct rtc_time *rtc_tm)
+{
+ int ret;
+
+ ret = tst_rtc_ioctl(rtc_dev, RTC_RD_TIME, rtc_tm);
+
+ if (ret != 0)
+ return -1;
+ return 0;
+}
+
+int tst_rtc_settime(char *rtc_dev, struct rtc_time *rtc_tm)
+{
+ int ret;
+
+ ret = tst_rtc_ioctl(rtc_dev, RTC_SET_TIME, rtc_tm);
+
+ if (ret != 0)
+ return -1;
+ return 0;
+}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [LTP] [PATCH V2 2/3] lib: implement rtc_clock_save and rtc_clock_restore function
2021-01-11 8:37 [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case gengcixi
2021-01-11 8:37 ` [LTP] [PATCH V2 1/3] lib: add tst_rtctime* for rtc test gengcixi
@ 2021-01-11 8:37 ` gengcixi
2021-01-11 8:37 ` [LTP] [PATCH V2 3/3] device-drivers/rtc: add verify rtc set time case gengcixi
2021-01-25 10:48 ` [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case Cyril Hrubis
3 siblings, 0 replies; 5+ messages in thread
From: gengcixi @ 2021-01-11 8:37 UTC (permalink / raw)
To: ltp
From: Cixi Geng <cixi.geng1@unisoc.com>
* Reading the RTC in the setup as well as timestamping with monotonic
timer
* Getting a second monotonic timestamp in the cleanup
* Setting the RTC to the value taken in setup plus the difference in
the monotonic timer timestamps
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Cixi Geng <cixi.geng1@unisoc.com>
---
include/tst_wallclock.h | 4 ++++
lib/tst_wallclock.c | 44 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/include/tst_wallclock.h b/include/tst_wallclock.h
index 7d6723a7a..56d30f02e 100644
--- a/include/tst_wallclock.h
+++ b/include/tst_wallclock.h
@@ -12,4 +12,8 @@ void tst_wallclock_save(void);
void tst_wallclock_restore(void);
+void tst_rtc_clock_save(char *rtc_dev);
+
+void tst_rtc_clock_restore(char *rtc_dev);
+
#endif /* TST_WALLCLK_H__ */
diff --git a/lib/tst_wallclock.c b/lib/tst_wallclock.c
index 282d6ada3..c1a640338 100644
--- a/lib/tst_wallclock.c
+++ b/lib/tst_wallclock.c
@@ -11,11 +11,14 @@
#include "tst_test.h"
#include "tst_timer.h"
#include "tst_clocks.h"
+#include "tst_rtctime.h"
#include "tst_wallclock.h"
#include "lapi/posix_clocks.h"
static struct timespec real_begin, mono_begin;
+static struct rtc_time rtc_begin;
+
static int clock_saved;
void tst_wallclock_save(void)
@@ -58,3 +61,44 @@ void tst_wallclock_restore(void)
if (tst_clock_settime(CLOCK_REALTIME, &adjust))
tst_brk(TBROK | TERRNO, "tst_clock_settime() realtime failed");
}
+
+void tst_rtc_clock_save(char *rtc_dev)
+{
+ /* save initial monotonic time to restore it when needed */
+ if (tst_rtc_gettime(rtc_dev, &rtc_begin))
+ tst_brk(TBROK | TERRNO, "tst_rtc_gettime() realtime failed");
+
+ if (tst_clock_gettime(CLOCK_MONOTONIC_RAW, &mono_begin))
+ tst_brk(TBROK | TERRNO, "tst_clock_gettime() monotonic failed");
+
+ clock_saved = 1;
+}
+
+void tst_rtc_clock_restore(char *rtc_dev)
+{
+ static struct timespec mono_end, elapsed;
+ static struct timespec rtc_begin_tm, rtc_adjust;
+ static struct rtc_time rtc_restore;
+
+ if (!clock_saved)
+ return;
+
+ clock_saved = 0;
+
+ if (tst_clock_gettime(CLOCK_MONOTONIC_RAW, &mono_end))
+ tst_brk(TBROK | TERRNO, "tst_clock_gettime() monotonic failed");
+
+ elapsed = tst_timespec_diff(mono_end, mono_begin);
+
+ rtc_begin_tm.tv_nsec = 0;
+
+ rtc_begin_tm.tv_sec = tst_rtc_tm_to_time(&rtc_begin);
+
+ rtc_adjust = tst_timespec_add(rtc_begin_tm, elapsed);
+
+ tst_rtc_time_to_tm(rtc_adjust.tv_sec, &rtc_restore);
+
+ /* restore realtime clock based on monotonic delta */
+ if (tst_rtc_settime(rtc_dev, &rtc_restore))
+ tst_brk(TBROK | TERRNO, "tst_rtc_settime() realtime failed");
+}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [LTP] [PATCH V2 3/3] device-drivers/rtc: add verify rtc set time case
2021-01-11 8:37 [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case gengcixi
2021-01-11 8:37 ` [LTP] [PATCH V2 1/3] lib: add tst_rtctime* for rtc test gengcixi
2021-01-11 8:37 ` [LTP] [PATCH V2 2/3] lib: implement rtc_clock_save and rtc_clock_restore function gengcixi
@ 2021-01-11 8:37 ` gengcixi
2021-01-25 10:48 ` [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case Cyril Hrubis
3 siblings, 0 replies; 5+ messages in thread
From: gengcixi @ 2021-01-11 8:37 UTC (permalink / raw)
To: ltp
From: Cixi Geng <cixi.geng1@unisoc.com>
Test for the Real Time Clock driver.
* Veirify that,
* 1) set a RTC time
* 2) read the RTC time after set RTC time at once
* 3) compare the set time and the read is identical
Signed-off-by: Cixi Geng <cixi.geng1@unisoc.com>
---
runtest/kernel_misc | 1 +
.../kernel/device-drivers/rtc/.gitignore | 1 +
testcases/kernel/device-drivers/rtc/rtc02.c | 111 ++++++++++++++++++
3 files changed, 113 insertions(+)
create mode 100644 testcases/kernel/device-drivers/rtc/rtc02.c
diff --git a/runtest/kernel_misc b/runtest/kernel_misc
index 7937c7bbf..abb75ebaf 100644
--- a/runtest/kernel_misc
+++ b/runtest/kernel_misc
@@ -1,6 +1,7 @@
kmsg01 kmsg01
fw_load fw_load
rtc01 rtc01
+rtc02 rtc02
block_dev block_dev
tpci tpci
tbio tbio
diff --git a/testcases/kernel/device-drivers/rtc/.gitignore b/testcases/kernel/device-drivers/rtc/.gitignore
index 8412fe679..0c0161eba 100644
--- a/testcases/kernel/device-drivers/rtc/.gitignore
+++ b/testcases/kernel/device-drivers/rtc/.gitignore
@@ -1 +1,2 @@
/rtc01
+/rtc02
diff --git a/testcases/kernel/device-drivers/rtc/rtc02.c b/testcases/kernel/device-drivers/rtc/rtc02.c
new file mode 100644
index 000000000..a4c758fcd
--- /dev/null
+++ b/testcases/kernel/device-drivers/rtc/rtc02.c
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 Unisoc Communications Inc.
+ */
+
+/*\
+ * [DESCRIPTION]
+ *
+ * test rtc devices set time functioin
+ *
+ * The steps:
+ *
+ * - save rtc time and set a RTC time
+ * - read the RTC time after set RTC time at once
+ * - compare the set time and the read is identical
+ * - in the cleanup function, restore rtc time.
+ *
+\*/
+
+#include <stdio.h>
+#include "tst_rtctime.h"
+#include "tst_wallclock.h"
+#include "tst_test.h"
+
+static char *rtc_dev = "/dev/rtc";
+
+static char *rtctime_to_str(struct rtc_time *tm)
+{
+ static char rtctime_buf[20];
+
+ sprintf(rtctime_buf, "%04d-%02d-%02d %02d:%02d:%02d",
+ tm->tm_year + 1900,
+ tm->tm_mon + 1,
+ tm->tm_mday,
+ tm->tm_hour,
+ tm->tm_min,
+ tm->tm_sec);
+ return rtctime_buf;
+}
+
+static int rtc_tm_cmp(struct rtc_time *set_tm, struct rtc_time *read_tm)
+{
+ return !((set_tm->tm_sec == read_tm->tm_sec)
+ && (set_tm->tm_min == read_tm->tm_min)
+ && (set_tm->tm_hour == read_tm->tm_hour)
+ && (set_tm->tm_mday == read_tm->tm_mday)
+ && (set_tm->tm_mon == read_tm->tm_mon)
+ && (set_tm->tm_year == read_tm->tm_year));
+}
+
+static void set_rtc_test(void)
+{
+ struct rtc_time read_tm;
+ int ret;
+
+ struct rtc_time set_tm = {
+ .tm_sec = 30,
+ .tm_min = 23,
+ .tm_hour = 13,
+ .tm_mday = 9,
+ .tm_mon = 9,
+ .tm_year = 120,
+ };
+
+ /* set rtc to 2020.10.9 13:23:30 */
+ tst_res(TINFO, "To set RTC date/time is: %s", rtctime_to_str(&set_tm));
+
+ ret = tst_rtc_settime(rtc_dev, &set_tm);
+ if (ret != 0) {
+ tst_res(TFAIL | TERRNO, "RTC_SET_TIME failed");
+ return;
+ }
+
+ /* Read current RTC Time */
+ ret = tst_rtc_gettime(rtc_dev, &read_tm);
+ if (ret != 0) {
+ tst_res(TFAIL | TERRNO, "RTC_RD_TIME failed");
+ return;
+ }
+ tst_res(TINFO, "read RTC date/time is: %s", rtctime_to_str(&read_tm));
+
+ if (rtc_tm_cmp(&set_tm, &read_tm)) {
+ tst_res(TFAIL | TERRNO, "RTC SET TEST Failed");
+ return;
+ }
+ tst_res(TPASS, "The read RTC time is consistent with set time");
+
+}
+
+static void rtc_setup(void)
+{
+ int exists = access(rtc_dev, F_OK);
+
+ if (exists < 0)
+ tst_brk(TCONF, "RTC device %s not available", rtc_dev);
+
+ tst_rtc_clock_save(rtc_dev);
+}
+
+static void rtc_cleanup(void)
+{
+ tst_rtc_clock_restore(rtc_dev);
+}
+
+static struct tst_test test = {
+ .setup = rtc_setup,
+ .test_all = set_rtc_test,
+ .cleanup = rtc_cleanup,
+ /* tests needs to run with UID=0 */
+ .needs_root = 1,
+};
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case
2021-01-11 8:37 [LTP] [PATCH V2 0/3] add rtctime libs and rtc02 case gengcixi
` (2 preceding siblings ...)
2021-01-11 8:37 ` [LTP] [PATCH V2 3/3] device-drivers/rtc: add verify rtc set time case gengcixi
@ 2021-01-25 10:48 ` Cyril Hrubis
3 siblings, 0 replies; 5+ messages in thread
From: Cyril Hrubis @ 2021-01-25 10:48 UTC (permalink / raw)
To: ltp
Hi!
I've fixed a few problems in the patchset and pushed, thanks.
Mostly minor changes such as constifying the rtc_dev string pointer and
a few typo fixes, but also added missing function prototypes to the rtc_time.h
> 1. keep tst_rtc_gettime and tst_rtc_settime no change to "static
> inline"(V1) for some compile warning and referring to
> tst_clock_gettime in tst_clocks.h
This was due to missing include to sys/ioctl.h which declares the _IO()
macro used to define RTC_RD_TIME and RTC_SET_TIME
> 2. in .h, use identifiers format "/* XXX /*" rather than "// XXX"
> for kernel checkpatch "WARNING" as follow:
I guess that we may as well switch to the kernel format then.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 5+ messages in thread