[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/8] mos6522: update counters when timer interrupts are off
From: |
David Gibson |
Subject: |
[PULL 7/8] mos6522: update counters when timer interrupts are off |
Date: |
Tue, 26 Nov 2019 17:01:50 +1100 |
From: Laurent Vivier <address@hidden>
Even if the interrupts are off, counters must be updated because
they are running anyway and kernel can try to read them
(it's the case with g3beige kernel).
Reported-by: Andrew Randrianasulu <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/misc/mos6522.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index aa3bfe1afd..cecf0be59e 100644
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -113,6 +113,10 @@ static int64_t get_next_irq_time(MOS6522State *s,
MOS6522Timer *ti,
int64_t d, next_time;
unsigned int counter;
+ if (ti->frequency == 0) {
+ return INT64_MAX;
+ }
+
/* current counter value */
d = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time,
ti->frequency, NANOSECONDS_PER_SECOND);
@@ -149,10 +153,10 @@ static void mos6522_timer1_update(MOS6522State *s,
MOS6522Timer *ti,
if (!ti->timer) {
return;
}
+ ti->next_irq_time = get_next_irq_time(s, ti, current_time);
if ((s->ier & T1_INT) == 0 || (s->acr & T1MODE) != T1MODE_CONT) {
timer_del(ti->timer);
} else {
- ti->next_irq_time = get_next_irq_time(s, ti, current_time);
timer_mod(ti->timer, ti->next_irq_time);
}
}
@@ -163,10 +167,10 @@ static void mos6522_timer2_update(MOS6522State *s,
MOS6522Timer *ti,
if (!ti->timer) {
return;
}
+ ti->next_irq_time = get_next_irq_time(s, ti, current_time);
if ((s->ier & T2_INT) == 0) {
timer_del(ti->timer);
} else {
- ti->next_irq_time = get_next_irq_time(s, ti, current_time);
timer_mod(ti->timer, ti->next_irq_time);
}
}
--
2.23.0
- [PULL 0/8] ppc-for-4.2 queue 20191126, David Gibson, 2019/11/26
- [PULL 8/8] ppc/spapr_events: fix potential NULL pointer dereference in rtas_event_log_dequeue, David Gibson, 2019/11/26
- [PULL 7/8] mos6522: update counters when timer interrupts are off,
David Gibson <=
- [PULL 1/8] pseries: fix migration-test and pxe-test, David Gibson, 2019/11/26
- [PULL 4/8] vfio/pci: Respond to KVM irqchip change notifier, David Gibson, 2019/11/26
- [PULL 5/8] spapr: Handle irq backend changes with VFIO PCI devices, David Gibson, 2019/11/26
- [PULL 6/8] spapr: Work around spurious warnings from vfio INTx initialization, David Gibson, 2019/11/26
- [PULL 3/8] vfio/pci: Split vfio_intx_update(), David Gibson, 2019/11/26
- [PULL 2/8] kvm: Introduce KVM irqchip change notifier, David Gibson, 2019/11/26
- Re: [PULL 0/8] ppc-for-4.2 queue 20191126, Peter Maydell, 2019/11/26