[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v9 15/50] target/arm: add temporary stub for arm_rebuild_hflags
From: |
Claudio Fontana |
Subject: |
[RFC v9 15/50] target/arm: add temporary stub for arm_rebuild_hflags |
Date: |
Wed, 17 Mar 2021 19:29:38 +0100 |
this should go away once the configuration and hw/arm is clean
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
hw/arm/boot.c | 5 ++++-
target/arm/arm-powerctl.c | 8 +++++---
target/arm/kvm/helper-stubs.c | 6 ++++++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index e56c42ac22..1fb56a846f 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -27,6 +27,7 @@
#include "qemu/option.h"
#include "exec/address-spaces.h"
#include "qemu/units.h"
+#include "sysemu/tcg.h"
/* Kernel boot protocol is specified in the kernel docs
* Documentation/arm/Booting and Documentation/arm64/booting.txt
@@ -797,7 +798,9 @@ static void do_cpu_reset(void *opaque)
info->secondary_cpu_reset_hook(cpu, info);
}
}
- arm_rebuild_hflags(env);
+ if (tcg_enabled()) {
+ arm_rebuild_hflags(env);
+ }
}
}
diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c
index b75f813b40..a00624876c 100644
--- a/target/arm/arm-powerctl.c
+++ b/target/arm/arm-powerctl.c
@@ -15,6 +15,7 @@
#include "arm-powerctl.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
+#include "sysemu/tcg.h"
#ifndef DEBUG_ARM_POWERCTL
#define DEBUG_ARM_POWERCTL 0
@@ -127,9 +128,10 @@ static void arm_set_cpu_on_async_work(CPUState
*target_cpu_state,
target_cpu->env.regs[0] = info->context_id;
}
- /* CP15 update requires rebuilding hflags */
- arm_rebuild_hflags(&target_cpu->env);
-
+ if (tcg_enabled()) {
+ /* CP15 update requires rebuilding hflags */
+ arm_rebuild_hflags(&target_cpu->env);
+ }
/* Start the new CPU at the requested address */
cpu_set_pc(target_cpu_state, info->entry);
diff --git a/target/arm/kvm/helper-stubs.c b/target/arm/kvm/helper-stubs.c
index 8e952c91fa..a646da7acc 100644
--- a/target/arm/kvm/helper-stubs.c
+++ b/target/arm/kvm/helper-stubs.c
@@ -25,3 +25,9 @@ void write_v7m_exception(CPUARMState *env, uint32_t new_exc)
{
g_assert_not_reached();
}
+
+/* XXX this is used all over in hw/arm, needs Philippe's work to remove */
+void arm_rebuild_hflags(CPUARMState *env)
+{
+ g_assert_not_reached();
+}
--
2.26.2
- [RFC v9 07/50] target/arm: move physical address translation to cpu-mmu, (continued)
- [RFC v9 07/50] target/arm: move physical address translation to cpu-mmu, Claudio Fontana, 2021/03/17
- [RFC v9 05/50] target/arm: only build psci for TCG, Claudio Fontana, 2021/03/17
- [RFC v9 10/50] target/arm: cpregs: fix style (mostly just comments), Claudio Fontana, 2021/03/17
- [RFC v9 01/50] target/arm: move translate modules to tcg/, Claudio Fontana, 2021/03/17
- [RFC v9 12/50] target/arm: only perform TCG cpu and machine inits if TCG enabled, Claudio Fontana, 2021/03/17
- [RFC v9 06/50] target/arm: split off cpu-sysemu.c, Claudio Fontana, 2021/03/17
- [RFC v9 11/50] target/arm: move cpu definitions to common cpu module, Claudio Fontana, 2021/03/17
- [RFC v9 16/50] target/arm: split vfp state setting from tcg helpers, Claudio Fontana, 2021/03/17
- [RFC v9 19/50] target/arm: move arm_sctlr away from tcg helpers, Claudio Fontana, 2021/03/17
- [RFC v9 08/50] target/arm: cpu-mmu: fix comment style, Claudio Fontana, 2021/03/17
- [RFC v9 15/50] target/arm: add temporary stub for arm_rebuild_hflags,
Claudio Fontana <=
- [RFC v9 14/50] target/arm: move cpsr_read, cpsr_write to cpu_common, Claudio Fontana, 2021/03/17
- [RFC v9 17/50] target/arm: move arm_mmu_idx* to cpu-mmu, Claudio Fontana, 2021/03/17
- [RFC v9 20/50] target/arm: move arm_cpu_list to common_cpu, Claudio Fontana, 2021/03/17
- [RFC v9 13/50] target/arm: kvm: add stubs for some helpers, Claudio Fontana, 2021/03/17
- [RFC v9 18/50] target/arm: move sve_zcr_len_for_el to common_cpu, Claudio Fontana, 2021/03/17
- [RFC v9 21/50] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Claudio Fontana, 2021/03/17
- [RFC v9 27/50] target/arm: remove kvm include file for PSCI and arm-powerctl, Claudio Fontana, 2021/03/17
- [RFC v9 32/50] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/03/17
- [RFC v9 35/50] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/03/17
- [RFC v9 38/50] target/arm: move kvm cpu properties setting to kvm-cpu, Claudio Fontana, 2021/03/17