From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 06/11] hpet: ignore high bits of comparator in 32-bit mode
Date: Tue, 23 Jul 2024 16:15:24 +0200 [thread overview]
Message-ID: <20240723141529.551737-7-pbonzini@redhat.com> (raw)
In-Reply-To: <20240723141529.551737-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/timer/hpet.c | 4 ++++
hw/timer/trace-events | 1 +
2 files changed, 5 insertions(+)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 58073df02b5..bbb1e5f0897 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -585,6 +585,10 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
}
break;
case HPET_TN_CMP + 4: // comparator register high order
+ if (timer->config & HPET_TN_32BIT) {
+ trace_hpet_ram_write_invalid_tn_cmp();
+ break;
+ }
trace_hpet_ram_write_tn_cmp(4);
if (!timer_is_periodic(timer)
|| (timer->config & HPET_TN_SETVAL)) {
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index de769f4b716..a5fafbc6796 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -111,6 +111,7 @@ hpet_ram_write_timer_id(uint64_t timer_id) "hpet_ram_writel timer_id = 0x%" PRIx
hpet_ram_write_tn_cfg(void) "hpet_ram_writel HPET_TN_CFG"
hpet_ram_write_invalid_tn_cfg(uint8_t reg_off) "invalid HPET_TN_CFG + %" PRIu8 " write"
hpet_ram_write_tn_cmp(uint8_t reg_off) "hpet_ram_writel HPET_TN_CMP + %" PRIu8
+hpet_ram_write_invalid_tn_cmp(void) "invalid HPET_TN_CMP + 4 write"
hpet_ram_write_invalid(void) "invalid hpet_ram_writel"
hpet_ram_write_counter_write_while_enabled(void) "Writing counter while HPET enabled!"
hpet_ram_write_counter_written(uint8_t reg_off, uint64_t value, uint64_t counter) "HPET counter + %" PRIu8 "written. crt = 0x%" PRIx64 " -> 0x%" PRIx64
--
2.45.2
next prev parent reply other threads:[~2024-07-23 14:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 14:15 [PULL 00/11] target/i386, HPET changes for QEMU 9.1 soft freeze Paolo Bonzini
2024-07-23 14:15 ` [PULL 01/11] target/i386: do not crash if microvm guest uses SGX CPUID leaves Paolo Bonzini
2024-07-23 14:15 ` [PULL 02/11] qio: add support for SO_PEERCRED for socket channel Paolo Bonzini
2024-07-23 14:15 ` [PULL 03/11] tools: build qemu-vmsr-helper Paolo Bonzini
2024-07-25 10:28 ` Peter Maydell
2024-07-25 10:30 ` Paolo Bonzini
2024-07-23 14:15 ` [PULL 04/11] Add support for RAPL MSRs in KVM/Qemu Paolo Bonzini
2024-07-25 10:25 ` Peter Maydell
2024-07-23 14:15 ` [PULL 05/11] hpet: fix and cleanup persistence of interrupt status Paolo Bonzini
2025-03-19 15:28 ` Fiona Ebner
2025-03-19 15:30 ` Paolo Bonzini
2025-03-19 15:47 ` Fiona Ebner
2025-03-19 15:51 ` Paolo Bonzini
2025-03-19 15:56 ` Fiona Ebner
2024-07-23 14:15 ` Paolo Bonzini [this message]
2024-07-23 14:15 ` [PULL 07/11] hpet: remove unnecessary variable "index" Paolo Bonzini
2024-07-23 14:15 ` [PULL 08/11] hpet: place read-only bits directly in "new_val" Paolo Bonzini
2024-07-23 14:15 ` [PULL 09/11] hpet: accept 64-bit reads and writes Paolo Bonzini
2024-07-23 14:15 ` [PULL 10/11] hpet: store full 64-bit target value of the counter Paolo Bonzini
2024-07-23 14:15 ` [PULL 11/11] hpet: avoid timer storms on periodic timers Paolo Bonzini
2024-07-24 2:58 ` [PULL 00/11] target/i386, HPET changes for QEMU 9.1 soft freeze Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240723141529.551737-7-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).