[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/30] target/arm: wrap psci call with tcg_enabled
From: |
Peter Maydell |
Subject: |
[PULL 22/30] target/arm: wrap psci call with tcg_enabled |
Date: |
Thu, 16 Feb 2023 17:11:15 +0000 |
From: Claudio Fontana <cfontana@suse.de>
for "all" builds (tcg + kvm), we want to avoid doing
the psci check if tcg is built-in, but not enabled.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 509e674b0f0..2d38c3ed7aa 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -22,6 +22,7 @@
#include "hw/irq.h"
#include "sysemu/cpu-timers.h"
#include "sysemu/kvm.h"
+#include "sysemu/tcg.h"
#include "qapi/qapi-commands-machine-target.h"
#include "qapi/error.h"
#include "qemu/guest-random.h"
@@ -11063,7 +11064,7 @@ void arm_cpu_do_interrupt(CPUState *cs)
env->exception.syndrome);
}
- if (arm_is_psci_call(cpu, cs->exception_index)) {
+ if (tcg_enabled() && arm_is_psci_call(cpu, cs->exception_index)) {
arm_handle_psci_call(cpu);
qemu_log_mask(CPU_LOG_INT, "...handled as PSCI call\n");
return;
--
2.34.1
- [PULL 14/30] hw/arm: Add missing XLNX_ZYNQMP_ARM -> USB_DWC3 Kconfig dependency, (continued)
- [PULL 14/30] hw/arm: Add missing XLNX_ZYNQMP_ARM -> USB_DWC3 Kconfig dependency, Peter Maydell, 2023/02/16
- [PULL 12/30] tests/avocado: retire the Aarch64 TCG tests from boot_linux.py, Peter Maydell, 2023/02/16
- [PULL 15/30] arm/virt: don't try to spell out the accelerator, Peter Maydell, 2023/02/16
- [PULL 13/30] hw/arm/smmuv3: Add GBPA register, Peter Maydell, 2023/02/16
- [PULL 16/30] MAINTAINERS: Add myself to maintainers and remove Havard, Peter Maydell, 2023/02/16
- [PULL 18/30] hw/arm: Attach PSPI module to NPCM7XX SoC, Peter Maydell, 2023/02/16
- [PULL 17/30] hw/ssi: Add Nuvoton PSPI Module, Peter Maydell, 2023/02/16
- [PULL 19/30] hw/arm/smmu-common: Support 64-bit addresses, Peter Maydell, 2023/02/16
- [PULL 20/30] hw/arm/smmu-common: Fix TTB1 handling, Peter Maydell, 2023/02/16
- [PULL 21/30] target/arm: rename handle_semihosting to tcg_handle_semihosting, Peter Maydell, 2023/02/16
- [PULL 22/30] target/arm: wrap psci call with tcg_enabled,
Peter Maydell <=
- [PULL 23/30] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Peter Maydell, 2023/02/16
- [PULL 25/30] target/arm: Move cpregs code out of cpu.h, Peter Maydell, 2023/02/16
- [PULL 26/30] tests/avocado: Skip tests that require a missing accelerator, Peter Maydell, 2023/02/16
- [PULL 28/30] target/arm: Use "max" as default cpu for the virt machine with KVM, Peter Maydell, 2023/02/16
- [PULL 24/30] target/arm: Move PC alignment check, Peter Maydell, 2023/02/16
- [PULL 27/30] tests/avocado: Tag TCG tests with accel:tcg, Peter Maydell, 2023/02/16
- [PULL 29/30] tests/qtest: arm-cpu-features: Match tests to required accelerators, Peter Maydell, 2023/02/16
- [PULL 30/30] tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG, Peter Maydell, 2023/02/16
- Re: [PULL 00/30] target-arm queue, Peter Maydell, 2023/02/20