From nobody Thu May 8 16:51:35 2025
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.zohomail.com;
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;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1519989099942532.1467399057581;
Fri, 2 Mar 2018 03:11:39 -0800 (PST)
Received: from localhost ([::1]:34079 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eribD-0006nP-1c
for importer@patchew.org; Fri, 02 Mar 2018 06:11:39 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43255)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1eriWT-0002kq-Qv
for qemu-devel@nongnu.org; Fri, 02 Mar 2018 06:06:47 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1eriWS-0004kV-D7
for qemu-devel@nongnu.org; Fri, 02 Mar 2018 06:06:45 -0500
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46746)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1eriWS-0004jE-40
for qemu-devel@nongnu.org; Fri, 02 Mar 2018 06:06:44 -0500
Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89)
(envelope-from <pm215@archaic.org.uk>) id 1eriWQ-0001Ij-Hd
for qemu-devel@nongnu.org; Fri, 02 Mar 2018 11:06:42 +0000
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Fri, 2 Mar 2018 11:06:03 +0000
Message-Id: <20180302110640.28004-3-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.16.2
In-Reply-To: <20180302110640.28004-1-peter.maydell@linaro.org>
References: <20180302110640.28004-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2001:8b0:1d0::2
Subject: [Qemu-devel] [PULL 02/39] xlnx-zynqmp-rtc: Add basic time support
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
From: Alistair Francis <alistair.francis@xilinx.com>
Allow the guest to determine the time set from the QEMU command line.
This includes adding a trace event to debug the new time.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/hw/timer/xlnx-zynqmp-rtc.h | 2 ++
hw/timer/xlnx-zynqmp-rtc.c | 58 ++++++++++++++++++++++++++++++++++=
++++
hw/timer/trace-events | 3 ++
3 files changed, 63 insertions(+)
diff --git a/include/hw/timer/xlnx-zynqmp-rtc.h b/include/hw/timer/xlnx-zyn=
qmp-rtc.h
index 87649836cc..5ba4d8bc4a 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;
=20
+ uint32_t tick_offset;
+
uint32_t regs[XLNX_ZYNQMP_RTC_R_MAX];
RegisterInfo regs_info[XLNX_ZYNQMP_RTC_R_MAX];
} XlnxZynqMPRTC;
diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/timer/xlnx-zynqmp-rtc.c
index 707f145027..c98dc3d94e 100644
--- a/hw/timer/xlnx-zynqmp-rtc.c
+++ b/hw/timer/xlnx-zynqmp-rtc.c
@@ -29,6 +29,10 @@
#include "hw/register.h"
#include "qemu/bitops.h"
#include "qemu/log.h"
+#include "hw/ptimer.h"
+#include "qemu/cutils.h"
+#include "sysemu/sysemu.h"
+#include "trace.h"
#include "hw/timer/xlnx-zynqmp-rtc.h"
=20
#ifndef XLNX_ZYNQMP_RTC_ERR_DEBUG
@@ -47,6 +51,19 @@ static void addr_error_int_update_irq(XlnxZynqMPRTC *s)
qemu_set_irq(s->irq_addr_error_int, pending);
}
=20
+static uint32_t rtc_get_count(XlnxZynqMPRTC *s)
+{
+ int64_t now =3D qemu_clock_get_ns(rtc_clock);
+ return s->tick_offset + now / NANOSECONDS_PER_SECOND;
+}
+
+static uint64_t current_time_postr(RegisterInfo *reg, uint64_t val64)
+{
+ XlnxZynqMPRTC *s =3D XLNX_ZYNQMP_RTC(reg->opaque);
+
+ return rtc_get_count(s);
+}
+
static void rtc_int_status_postw(RegisterInfo *reg, uint64_t val64)
{
XlnxZynqMPRTC *s =3D XLNX_ZYNQMP_RTC(reg->opaque);
@@ -97,13 +114,17 @@ static uint64_t addr_error_int_dis_prew(RegisterInfo *=
reg, uint64_t val64)
=20
static const RegisterAccessInfo rtc_regs_info[] =3D {
{ .name =3D "SET_TIME_WRITE", .addr =3D A_SET_TIME_WRITE,
+ .unimp =3D MAKE_64BIT_MASK(0, 32),
},{ .name =3D "SET_TIME_READ", .addr =3D A_SET_TIME_READ,
.ro =3D 0xffffffff,
+ .post_read =3D current_time_postr,
},{ .name =3D "CALIB_WRITE", .addr =3D A_CALIB_WRITE,
+ .unimp =3D MAKE_64BIT_MASK(0, 32),
},{ .name =3D "CALIB_READ", .addr =3D A_CALIB_READ,
.ro =3D 0x1fffff,
},{ .name =3D "CURRENT_TIME", .addr =3D A_CURRENT_TIME,
.ro =3D 0xffffffff,
+ .post_read =3D current_time_postr,
},{ .name =3D "CURRENT_TICK", .addr =3D A_CURRENT_TICK,
.ro =3D 0xffff,
},{ .name =3D "ALARM", .addr =3D A_ALARM,
@@ -162,6 +183,7 @@ static void rtc_init(Object *obj)
XlnxZynqMPRTC *s =3D XLNX_ZYNQMP_RTC(obj);
SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj);
RegisterInfoArray *reg_array;
+ struct tm current_tm;
=20
memory_region_init(&s->iomem, obj, TYPE_XLNX_ZYNQMP_RTC,
XLNX_ZYNQMP_RTC_R_MAX * 4);
@@ -178,14 +200,50 @@ static void rtc_init(Object *obj)
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->irq_rtc_int);
sysbus_init_irq(sbd, &s->irq_addr_error_int);
+
+ qemu_get_timedate(¤t_tm, 0);
+ s->tick_offset =3D mktimegm(¤t_tm) -
+ qemu_clock_get_ns(rtc_clock) / NANOSECONDS_PER_SECOND;
+
+ trace_xlnx_zynqmp_rtc_gettime(current_tm.tm_year, current_tm.tm_mon,
+ current_tm.tm_mday, current_tm.tm_hour,
+ current_tm.tm_min, current_tm.tm_sec);
+}
+
+static int rtc_pre_save(void *opaque)
+{
+ XlnxZynqMPRTC *s =3D opaque;
+ int64_t now =3D qemu_clock_get_ns(rtc_clock) / NANOSECONDS_PER_SECOND;
+
+ /* Add the time at migration */
+ s->tick_offset =3D s->tick_offset + now;
+
+ return 0;
+}
+
+static int rtc_post_load(void *opaque, int version_id)
+{
+ XlnxZynqMPRTC *s =3D opaque;
+ int64_t now =3D qemu_clock_get_ns(rtc_clock) / NANOSECONDS_PER_SECOND;
+
+ /* Subtract the time after migration. This combined with the pre_save
+ * action results in us having subtracted the time that the guest was
+ * stopped to the offset.
+ */
+ s->tick_offset =3D s->tick_offset - now;
+
+ return 0;
}
=20
static const VMStateDescription vmstate_rtc =3D {
.name =3D TYPE_XLNX_ZYNQMP_RTC,
.version_id =3D 1,
.minimum_version_id =3D 1,
+ .pre_save =3D rtc_pre_save,
+ .post_load =3D rtc_post_load,
.fields =3D (VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPRTC, XLNX_ZYNQMP_RTC_R_MAX),
+ VMSTATE_UINT32(tick_offset, XlnxZynqMPRTC),
VMSTATE_END_OF_LIST(),
}
};
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index 640722b5d1..e6e042fddb 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -60,3 +60,6 @@ systick_write(uint64_t addr, uint32_t value, unsigned siz=
e) "systick write addr
cmsdk_apb_timer_read(uint64_t offset, uint64_t data, unsigned size) "CMSDK=
APB timer read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
cmsdk_apb_timer_write(uint64_t offset, uint64_t data, unsigned size) "CMSD=
K APB timer write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
cmsdk_apb_timer_reset(void) "CMSDK APB timer: reset"
+
+# hw/timer/xlnx-zynqmp-rtc.c
+xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, i=
nt sec) "Get time from host: %d-%d-%d %2d:%02d:%02d"
--=20
2.16.2