From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Simon Burge" <simonb@NetBSD.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 01/16] target/mips: Fix cycle counter timing calculations
Date: Mon, 7 Mar 2022 11:11:52 +0100 [thread overview]
Message-ID: <20220307101207.90369-2-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220307101207.90369-1-philippe.mathieu.daude@gmail.com>
From: Simon Burge <simonb@NetBSD.org>
The cp0_count_ns value is calculated from the CP0_COUNT_RATE_DEFAULT
constant in target/mips/cpu.c. The cycle counter resolution is defined
per-CPU in target/mips/cpu-defs.c.inc; use this value for calculating
cp0_count_ns. Fixings timing problems on guest OSs for the 20Kc CPU
which has a CCRes of 1.
Signed-off-by: Simon Burge <simonb@NetBSD.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211213135125.18378-1-simonb@NetBSD.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/cpu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 4aae23934b..0766e25693 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -440,8 +440,9 @@ static void mips_cp0_period_set(MIPSCPU *cpu)
{
CPUMIPSState *env = &cpu->env;
+ /* env->CCRes isn't initialised this early, use env->cpu_model->CCRes. */
env->cp0_count_ns = clock_ticks_to_ns(MIPS_CPU(cpu)->clock,
- cpu->cp0_count_rate);
+ env->cpu_model->CCRes);
assert(env->cp0_count_ns);
}
--
2.34.1
next prev parent reply other threads:[~2022-03-07 10:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 10:11 [PULL 00/16] MIPS patches for 2022-03-07 Philippe Mathieu-Daudé
2022-03-07 10:11 ` Philippe Mathieu-Daudé [this message]
2022-03-07 10:11 ` [PULL 02/16] target/mips: Remove duplicated MIPSCPU::cp0_count_rate Philippe Mathieu-Daudé
2022-03-07 10:11 ` [PULL 03/16] hw/mips/gt64xxx_pci: Fix PCI IRQ levels to be preserved during migration Philippe Mathieu-Daudé
2022-03-07 10:11 ` [PULL 04/16] malta: Move PCI interrupt handling from gt64xxx_pci to piix4 Philippe Mathieu-Daudé
2022-03-07 10:11 ` [PULL 05/16] hw/isa/piix4: Resolve redundant i8259[] attribute Philippe Mathieu-Daudé
2022-03-07 10:11 ` [PULL 06/16] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq() Philippe Mathieu-Daudé
2022-03-07 10:11 ` [PULL 07/16] hw/isa/piix4: Resolve global instance variable Philippe Mathieu-Daudé
2022-03-07 10:11 ` [PULL 08/16] hw/isa/piix4: Replace some magic IRQ constants Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 09/16] hw/mips/gt64xxx_pci: Resolve gt64120_register() Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 10/16] hw/rtc/mc146818rtc: QOM'ify IRQ number Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 11/16] hw/rtc/m48t59-isa: " Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 12/16] hw/input/pckbd: QOM'ify IRQ numbers Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 13/16] hw/isa/isa-bus: Remove isabus_dev_print() Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 14/16] isa: Drop unused attributes from ISADevice Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 15/16] isa: Inline and remove one-line isa_init_irq() Philippe Mathieu-Daudé
2022-03-07 11:29 ` Bernhard Beschow
2022-03-07 13:39 ` Philippe Mathieu-Daudé
2022-03-07 10:12 ` [PULL 16/16] tests/avocado/linux_ssh_mips_malta.py: add missing accel (tcg) tag Philippe Mathieu-Daudé
2022-03-07 11:42 ` [PULL 00/16] MIPS patches for 2022-03-07 Philippe Mathieu-Daudé
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=20220307101207.90369-2-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=simonb@NetBSD.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).