aboutsummaryrefslogtreecommitdiff
path: root/hw/rtc/ls7a_rtc.c
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-07-04 16:37:13 +0530
committerRichard Henderson <richard.henderson@linaro.org>2022-07-04 16:37:13 +0530
commit1437479e5ee1a49ccd84cad9e7b010fb2ee9d805 (patch)
tree8ecd8a33779470649e7a3697d78d0b4d4f7ae810 /hw/rtc/ls7a_rtc.c
parentdfe2382f0641f537fdd33399d579215077c8f68c (diff)
parenteb1e9ff8bba91674b4321f2b075c55aa8d9948cc (diff)
downloadqemu-1437479e5ee1a49ccd84cad9e7b010fb2ee9d805.zip
qemu-1437479e5ee1a49ccd84cad9e7b010fb2ee9d805.tar.gz
qemu-1437479e5ee1a49ccd84cad9e7b010fb2ee9d805.tar.bz2
Merge tag 'pull-la-20220704' of https://gitlab.com/rth7680/qemu into staging
LoongArch patch queue: Support linux-user. Fixes for CSR BADV. Fix ASRT{LE,GT} exception. Fixes for LS7A RTC. Fix for interrupt vector spacing. # -----BEGIN PGP SIGNATURE----- # # iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmLCs4gdHHJpY2hhcmQu # aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV89IQgAsgGM117dgDlI48wP # zRVRE9rmK9EE/YR8b4rejh5iFlH0kZTELWAaXmjxWSv9uyXwsApNdnxnthUH1CRD # RbT8AOIUphH6MBMb2joy+zFyBkGBnJQbSxJWN0jDT/ie67I/O0qOIemXU9tETssn # OLNCn+GuNFLiS8EytczkZHDmQjjt00PGZLsnCm+ZY+/ejNci0FV0NItBo6iWxDdj # 8MPJU8pDkXyi+djJpExPc0hTxJ2qmH0FZtpjKwWnU8dbLSRD9IfYhFK5Tsh1oxYJ # 9Er9ZS0RI2CqK3o2k7keYsJHMaIZbNZKhcoA3XiGs15T9YHe1Rc9FeYDasrQw4wQ # 60FwkA== # =i2CR # -----END PGP SIGNATURE----- # gpg: Signature made Mon 04 Jul 2022 03:01:52 PM +0530 # gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F # gpg: issuer "richard.henderson@linaro.org" # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [ultimate] * tag 'pull-la-20220704' of https://gitlab.com/rth7680/qemu: (23 commits) target/loongarch: Add lock when writing timer clear reg target/loongarch: Fix the meaning of ECFG reg's VS field hw/rtc/ls7a_rtc: Fix 'calculate' spelling errors hw/rtc/ls7a_rtc: Use tm struct pointer as arguments in toy_time_to_val() hw/rtc/ls7a_rtc: Fix rtc enable and disable function hw/rtc/ls7a_rtc: Add reset function hw/rtc/ls7a_rtc: Remove unimplemented device in realized function hw/rtc/ls7a_rtc: Fix timer call back function hw/rtc/ls7a_rtc: Fix uninitialied bugs and toymatch writing function hw/intc/loongarch_pch_msi: Fix msi vector convertion target/loongarch: Update README default-configs: Add loongarch linux-user support target/loongarch: Adjust functions and structure to support user-mode target/loongarch: remove unused include hw/loader.h target/loongarch: Fix helper_asrtle_d/asrtgt_d raise wrong exception target/loongarch: Fix missing update CSR_BADV target/loongarch: remove badaddr from CPULoongArch scripts: add loongarch64 binfmt config linux-user: Add LoongArch cpu_loop support linux-user: Add LoongArch syscall support ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/rtc/ls7a_rtc.c')
-rw-r--r--hw/rtc/ls7a_rtc.c131
1 files changed, 53 insertions, 78 deletions
diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c
index fe67103..e8b7570 100644
--- a/hw/rtc/ls7a_rtc.c
+++ b/hw/rtc/ls7a_rtc.c
@@ -72,9 +72,6 @@ struct LS7ARtcState {
*/
int64_t offset_toy;
int64_t offset_rtc;
- uint64_t save_toy_mon;
- uint64_t save_toy_year;
- uint64_t save_rtc;
int64_t data;
int tidx;
uint32_t toymatch[3];
@@ -128,28 +125,21 @@ static inline void toy_val_to_time_year(uint64_t toy_year, struct tm *tm)
}
/* parse struct tm to toy value */
-static inline uint64_t toy_time_to_val_mon(struct tm tm)
+static inline uint64_t toy_time_to_val_mon(struct tm *tm)
{
uint64_t val = 0;
- val = FIELD_DP32(val, TOY, MON, tm.tm_mon + 1);
- val = FIELD_DP32(val, TOY, DAY, tm.tm_mday);
- val = FIELD_DP32(val, TOY, HOUR, tm.tm_hour);
- val = FIELD_DP32(val, TOY, MIN, tm.tm_min);
- val = FIELD_DP32(val, TOY, SEC, tm.tm_sec);
+ val = FIELD_DP32(val, TOY, MON, tm->tm_mon + 1);
+ val = FIELD_DP32(val, TOY, DAY, tm->tm_mday);
+ val = FIELD_DP32(val, TOY, HOUR, tm->tm_hour);
+ val = FIELD_DP32(val, TOY, MIN, tm->tm_min);
+ val = FIELD_DP32(val, TOY, SEC, tm->tm_sec);
return val;
}
-static inline uint64_t toy_time_to_val_year(struct tm tm)
-{
- uint64_t year;
-
- year = tm.tm_year;
- return year;
-}
-
-static inline void toymatch_val_to_time(uint64_t val, struct tm *tm)
+static inline void toymatch_val_to_time(LS7ARtcState *s, uint64_t val, struct tm *tm)
{
+ qemu_get_timedate(tm, s->offset_toy);
tm->tm_sec = FIELD_EX32(val, TOY_MATCH, SEC);
tm->tm_min = FIELD_EX32(val, TOY_MATCH, MIN);
tm->tm_hour = FIELD_EX32(val, TOY_MATCH, HOUR);
@@ -158,17 +148,18 @@ static inline void toymatch_val_to_time(uint64_t val, struct tm *tm)
tm->tm_year += (FIELD_EX32(val, TOY_MATCH, YEAR) - (tm->tm_year & 0x3f));
}
-static void toymatch_write(LS7ARtcState *s, struct tm *tm, uint64_t val, int num)
+static void toymatch_write(LS7ARtcState *s, uint64_t val, int num)
{
int64_t now, expire_time;
+ struct tm tm = {};
/* it do not support write when toy disabled */
if (toy_enabled(s)) {
s->toymatch[num] = val;
- /* caculate expire time */
+ /* calculate expire time */
now = qemu_clock_get_ms(rtc_clock);
- toymatch_val_to_time(val, tm);
- expire_time = now + (qemu_timedate_diff(tm) - s->offset_toy) * 1000;
+ toymatch_val_to_time(s, val, &tm);
+ expire_time = now + (qemu_timedate_diff(&tm) - s->offset_toy) * 1000;
timer_mod(s->toy_timer[num], expire_time);
}
}
@@ -180,7 +171,7 @@ static void rtcmatch_write(LS7ARtcState *s, uint64_t val, int num)
/* it do not support write when toy disabled */
if (rtc_enabled(s)) {
s->rtcmatch[num] = val;
- /* caculate expire time */
+ /* calculate expire time */
expire_ns = ticks_to_ns(val) - ticks_to_ns(s->offset_rtc);
timer_mod_ns(s->rtc_timer[num], expire_ns);
}
@@ -189,16 +180,8 @@ static void rtcmatch_write(LS7ARtcState *s, uint64_t val, int num)
static void ls7a_toy_stop(LS7ARtcState *s)
{
int i;
- struct tm tm;
- /*
- * save time when disabled toy,
- * because toy time not add counters.
- */
- qemu_get_timedate(&tm, s->offset_toy);
- s->save_toy_mon = toy_time_to_val_mon(tm);
- s->save_toy_year = toy_time_to_val_year(tm);
- /* delete timers, and when re-enabled, recaculate expire time */
+ /* delete timers, and when re-enabled, recalculate expire time */
for (i = 0; i < TIMER_NUMS; i++) {
timer_del(s->toy_timer[i]);
}
@@ -207,13 +190,8 @@ static void ls7a_toy_stop(LS7ARtcState *s)
static void ls7a_rtc_stop(LS7ARtcState *s)
{
int i;
- uint64_t time;
-
- /* save rtc time */
- time = ls7a_rtc_ticks() + s->offset_rtc;
- s->save_rtc = time;
- /* delete timers, and when re-enabled, recaculate expire time */
+ /* delete timers, and when re-enabled, recalculate expire time */
for (i = 0; i < TIMER_NUMS; i++) {
timer_del(s->rtc_timer[i]);
}
@@ -223,20 +201,13 @@ static void ls7a_toy_start(LS7ARtcState *s)
{
int i;
uint64_t expire_time, now;
- struct tm tm;
- /*
- * need to recaculate toy offset
- * and expire time when enable it.
- */
- toy_val_to_time_mon(s->save_toy_mon, &tm);
- toy_val_to_time_year(s->save_toy_year, &tm);
+ struct tm tm = {};
- s->offset_toy = qemu_timedate_diff(&tm);
now = qemu_clock_get_ms(rtc_clock);
- /* recaculate expire time and enable timer */
+ /* recalculate expire time and enable timer */
for (i = 0; i < TIMER_NUMS; i++) {
- toymatch_val_to_time(s->toymatch[i], &tm);
+ toymatch_val_to_time(s, s->toymatch[i], &tm);
expire_time = now + (qemu_timedate_diff(&tm) - s->offset_toy) * 1000;
timer_mod(s->toy_timer[i], expire_time);
}
@@ -245,16 +216,9 @@ static void ls7a_toy_start(LS7ARtcState *s)
static void ls7a_rtc_start(LS7ARtcState *s)
{
int i;
- uint64_t expire_time, now;
-
- /*
- * need to recaculate rtc offset
- * and expire time when enable it.
- */
- now = ls7a_rtc_ticks();
- s->offset_rtc = s->save_rtc - now;
+ uint64_t expire_time;
- /* recaculate expire time and enable timer */
+ /* recalculate expire time and enable timer */
for (i = 0; i < TIMER_NUMS; i++) {
expire_time = ticks_to_ns(s->rtcmatch[i]) - ticks_to_ns(s->offset_rtc);
timer_mod_ns(s->rtc_timer[i], expire_time);
@@ -269,23 +233,21 @@ static uint64_t ls7a_rtc_read(void *opaque, hwaddr addr, unsigned size)
switch (addr) {
case SYS_TOYREAD0:
- /* if toy disabled, read save toy time */
if (toy_enabled(s)) {
qemu_get_timedate(&tm, s->offset_toy);
- val = toy_time_to_val_mon(tm);
+ val = toy_time_to_val_mon(&tm);
} else {
- /* read save mon val */
- val = s->save_toy_mon;
+ /* return 0 when toy disabled */
+ val = 0;
}
break;
case SYS_TOYREAD1:
- /* if toy disabled, read save toy time */
if (toy_enabled(s)) {
qemu_get_timedate(&tm, s->offset_toy);
val = tm.tm_year;
} else {
- /* read save year val */
- val = s->save_toy_year;
+ /* return 0 when toy disabled */
+ val = 0;
}
break;
case SYS_TOYMATCH0:
@@ -301,11 +263,11 @@ static uint64_t ls7a_rtc_read(void *opaque, hwaddr addr, unsigned size)
val = s->cntrctl;
break;
case SYS_RTCREAD0:
- /* if rtc disabled, read save rtc time */
if (rtc_enabled(s)) {
val = ls7a_rtc_ticks() + s->offset_rtc;
} else {
- val = s->save_rtc;
+ /* return 0 when rtc disabled */
+ val = 0;
}
break;
case SYS_RTCMATCH0:
@@ -352,13 +314,13 @@ static void ls7a_rtc_write(void *opaque, hwaddr addr,
}
break;
case SYS_TOYMATCH0:
- toymatch_write(s, &tm, val, 0);
+ toymatch_write(s, val, 0);
break;
case SYS_TOYMATCH1:
- toymatch_write(s, &tm, val, 1);
+ toymatch_write(s, val, 1);
break;
case SYS_TOYMATCH2:
- toymatch_write(s, &tm, val, 2);
+ toymatch_write(s, val, 2);
break;
case SYS_RTCCTRL:
/* get old ctrl */
@@ -423,7 +385,7 @@ static void toy_timer_cb(void *opaque)
LS7ARtcState *s = opaque;
if (toy_enabled(s)) {
- qemu_irq_pulse(s->irq);
+ qemu_irq_raise(s->irq);
}
}
@@ -432,7 +394,7 @@ static void rtc_timer_cb(void *opaque)
LS7ARtcState *s = opaque;
if (rtc_enabled(s)) {
- qemu_irq_pulse(s->irq);
+ qemu_irq_raise(s->irq);
}
}
@@ -455,11 +417,26 @@ static void ls7a_rtc_realize(DeviceState *dev, Error **errp)
}
d->offset_toy = 0;
d->offset_rtc = 0;
- d->save_toy_mon = 0;
- d->save_toy_year = 0;
- d->save_rtc = 0;
- create_unimplemented_device("mmio fallback 1", 0x10013ffc, 0x4);
+}
+
+/* delete timer and clear reg when reset */
+static void ls7a_rtc_reset(DeviceState *dev)
+{
+ int i;
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ LS7ARtcState *d = LS7A_RTC(sbd);
+ for (i = 0; i < TIMER_NUMS; i++) {
+ if (toy_enabled(d)) {
+ timer_del(d->toy_timer[i]);
+ }
+ if (rtc_enabled(d)) {
+ timer_del(d->rtc_timer[i]);
+ }
+ d->toymatch[i] = 0;
+ d->rtcmatch[i] = 0;
+ }
+ d->cntrctl = 0;
}
static int ls7a_rtc_pre_save(void *opaque)
@@ -495,9 +472,6 @@ static const VMStateDescription vmstate_ls7a_rtc = {
.fields = (VMStateField[]) {
VMSTATE_INT64(offset_toy, LS7ARtcState),
VMSTATE_INT64(offset_rtc, LS7ARtcState),
- VMSTATE_UINT64(save_toy_mon, LS7ARtcState),
- VMSTATE_UINT64(save_toy_year, LS7ARtcState),
- VMSTATE_UINT64(save_rtc, LS7ARtcState),
VMSTATE_UINT32_ARRAY(toymatch, LS7ARtcState, TIMER_NUMS),
VMSTATE_UINT32_ARRAY(rtcmatch, LS7ARtcState, TIMER_NUMS),
VMSTATE_UINT32(cntrctl, LS7ARtcState),
@@ -510,6 +484,7 @@ static void ls7a_rtc_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->vmsd = &vmstate_ls7a_rtc;
dc->realize = ls7a_rtc_realize;
+ dc->reset = ls7a_rtc_reset;
dc->desc = "ls7a rtc";
}