[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 2/3] xlnx-zynqmp-rtc: Add basic time support
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v1 2/3] xlnx-zynqmp-rtc: Add basic time support |
Date: |
Tue, 9 Jan 2018 10:50:54 -0800 |
Allow the guest to determine the time set from the QEMU command line.
Signed-off-by: Alistair Francis <address@hidden>
---
hw/timer/xlnx-zynqmp-rtc.c | 24 ++++++++++++++++++++++++
include/hw/timer/xlnx-zynqmp-rtc.h | 2 ++
2 files changed, 26 insertions(+)
diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/timer/xlnx-zynqmp-rtc.c
index 40533220fc..eed17805ac 100644
--- a/hw/timer/xlnx-zynqmp-rtc.c
+++ b/hw/timer/xlnx-zynqmp-rtc.c
@@ -29,6 +29,7 @@
#include "hw/register.h"
#include "qemu/bitops.h"
#include "qemu/log.h"
+#include "hw/ptimer.h"
#include "hw/timer/xlnx-zynqmp-rtc.h"
#ifndef XLNX_ZYNQMP_RTC_ERR_DEBUG
@@ -55,6 +56,13 @@ static void addr_error_int_update_irq(XlnxZynqMPRTC *s)
qemu_set_irq(s->irq_addr_error_int, pending);
}
+static uint64_t current_time_postr(RegisterInfo *reg, uint64_t val64)
+{
+ XlnxZynqMPRTC *s = XLNX_ZYNQMP_RTC(reg->opaque);
+
+ return mktime(&s->current_tm);
+}
+
static void rtc_int_status_postw(RegisterInfo *reg, uint64_t val64)
{
XlnxZynqMPRTC *s = XLNX_ZYNQMP_RTC(reg->opaque);
@@ -111,11 +119,13 @@ static const RegisterAccessInfo rtc_regs_info[] = {
{ .name = "SET_TIME_WRITE", .addr = A_SET_TIME_WRITE,
},{ .name = "SET_TIME_READ", .addr = A_SET_TIME_READ,
.ro = 0xffffffff,
+ .post_read = current_time_postr,
},{ .name = "CALIB_WRITE", .addr = A_CALIB_WRITE,
},{ .name = "CALIB_READ", .addr = A_CALIB_READ,
.ro = 0x1fffff,
},{ .name = "CURRENT_TIME", .addr = A_CURRENT_TIME,
.ro = 0xffffffff,
+ .post_read = current_time_postr,
},{ .name = "CURRENT_TICK", .addr = A_CURRENT_TICK,
.ro = 0xffff,
},{ .name = "ALARM", .addr = A_ALARM,
@@ -155,6 +165,13 @@ static void rtc_reset(DeviceState *dev)
register_reset(&s->regs_info[i]);
}
+ qemu_get_timedate(&s->current_tm, 0);
+
+ DB_PRINT("Get time from host: %d-%d-%d %2d:%02d:%02d\n",
+ s->current_tm.tm_year, s->current_tm.tm_mon,
+ s->current_tm.tm_mday, s->current_tm.tm_hour,
+ s->current_tm.tm_min, s->current_tm.tm_sec);
+
rtc_int_update_irq(s);
addr_error_int_update_irq(s);
}
@@ -203,6 +220,13 @@ static const VMStateDescription vmstate_rtc = {
.minimum_version_id = 1,
.fields = (VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPRTC, XLNX_ZYNQMP_RTC_R_MAX),
+ VMSTATE_INT32(current_tm.tm_sec, XlnxZynqMPRTC),
+ VMSTATE_INT32(current_tm.tm_min, XlnxZynqMPRTC),
+ VMSTATE_INT32(current_tm.tm_hour, XlnxZynqMPRTC),
+ VMSTATE_INT32(current_tm.tm_wday, XlnxZynqMPRTC),
+ VMSTATE_INT32(current_tm.tm_mday, XlnxZynqMPRTC),
+ VMSTATE_INT32(current_tm.tm_mon, XlnxZynqMPRTC),
+ VMSTATE_INT32(current_tm.tm_year, XlnxZynqMPRTC),
VMSTATE_END_OF_LIST(),
}
};
diff --git a/include/hw/timer/xlnx-zynqmp-rtc.h
b/include/hw/timer/xlnx-zynqmp-rtc.h
index 87649836cc..51a49094ad 100644
--- a/include/hw/timer/xlnx-zynqmp-rtc.h
+++ b/include/hw/timer/xlnx-zynqmp-rtc.h
@@ -79,6 +79,8 @@ typedef struct XlnxZynqMPRTC {
qemu_irq irq_rtc_int;
qemu_irq irq_addr_error_int;
+ struct tm current_tm;
+
uint32_t regs[XLNX_ZYNQMP_RTC_R_MAX];
RegisterInfo regs_info[XLNX_ZYNQMP_RTC_R_MAX];
} XlnxZynqMPRTC;
--
2.14.1