[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/9] spapr: prevent hdec timer being set up under virtual hypervi
From: |
Nicholas Piggin |
Subject: |
[PATCH 2/9] spapr: prevent hdec timer being set up under virtual hypervisor |
Date: |
Tue, 15 Feb 2022 13:16:35 +1000 |
The spapr virtual hypervisor does not require the hdecr timer.
Remove it.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
hw/ppc/ppc.c | 2 +-
hw/ppc/spapr_cpu_core.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index ba7fa0f3b5..c6dfc5975f 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -1072,7 +1072,7 @@ clk_setup_cb cpu_ppc_tb_init (CPUPPCState *env, uint32_t
freq)
}
/* Create new timer */
tb_env->decr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &cpu_ppc_decr_cb,
cpu);
- if (env->has_hv_mode) {
+ if (env->has_hv_mode && !cpu->vhyp) {
tb_env->hdecr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
&cpu_ppc_hdecr_cb,
cpu);
} else {
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index a781e97f8d..ed84713960 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -261,12 +261,12 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu,
SpaprMachineState *spapr,
return false;
}
- /* Set time-base frequency to 512 MHz */
- cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
-
cpu_ppc_set_vhyp(cpu, PPC_VIRTUAL_HYPERVISOR(spapr));
kvmppc_set_papr(cpu);
+ /* Set time-base frequency to 512 MHz. vhyp must be set first. */
+ cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
+
if (spapr_irq_cpu_intc_create(spapr, cpu, errp) < 0) {
qdev_unrealize(DEVICE(cpu));
return false;
--
2.23.0
- [PATCH 0/9] ppc: nested KVM HV for spapr virtual hypervisor, Nicholas Piggin, 2022/02/14
- [PATCH 1/9] target/ppc: raise HV interrupts for partition table entry problems, Nicholas Piggin, 2022/02/14
- [PATCH 2/9] spapr: prevent hdec timer being set up under virtual hypervisor,
Nicholas Piggin <=
- [PATCH 3/9] ppc: allow the hdecr timer to be created/destroyed, Nicholas Piggin, 2022/02/14
- [PATCH 4/9] target/ppc: add vhyp addressing mode helper for radix MMU, Nicholas Piggin, 2022/02/14
- [PATCH 5/9] target/ppc: make vhyp get_pate method take lpid and return success, Nicholas Piggin, 2022/02/14
- [PATCH 6/9] target/ppc: add helper for books vhyp hypercall handler, Nicholas Piggin, 2022/02/14