[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 29/56] arm: convert to cpu_interrupt_request
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [RFC v3 29/56] arm: convert to cpu_interrupt_request |
Date: |
Thu, 18 Oct 2018 21:05:58 -0400 |
Cc: Peter Maydell <address@hidden>
Cc: address@hidden
Signed-off-by: Emilio G. Cota <address@hidden>
---
target/arm/cpu.c | 2 +-
target/arm/helper.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 9c5cda8eb7..7330c2dae1 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -49,7 +49,7 @@ static bool arm_cpu_has_work(CPUState *cs)
ARMCPU *cpu = ARM_CPU(cs);
return (cpu->power_state != PSCI_OFF)
- && cs->interrupt_request &
+ && cpu_interrupt_request(cs) &
(CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD
| CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ
| CPU_INTERRUPT_EXITTB);
diff --git a/target/arm/helper.c b/target/arm/helper.c
index c83f7c1109..85e0b9645e 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1295,12 +1295,14 @@ static uint64_t isr_read(CPUARMState *env, const
ARMCPRegInfo *ri)
CPUState *cs = ENV_GET_CPU(env);
uint64_t ret = 0;
- if (cs->interrupt_request & CPU_INTERRUPT_HARD) {
+ cpu_mutex_lock(cs);
+ if (cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD) {
ret |= CPSR_I;
}
- if (cs->interrupt_request & CPU_INTERRUPT_FIQ) {
+ if (cpu_interrupt_request(cs) & CPU_INTERRUPT_FIQ) {
ret |= CPSR_F;
}
+ cpu_mutex_unlock(cs);
/* External aborts are not possible in QEMU so A bit is always clear */
return ret;
}
@@ -8579,10 +8581,7 @@ void arm_cpu_do_interrupt(CPUState *cs)
return;
}
- /* Hooks may change global state so BQL should be held, also the
- * BQL needs to be held for any modification of
- * cs->interrupt_request.
- */
+ /* Hooks may change global state so BQL should be held */
g_assert(qemu_mutex_iothread_locked());
arm_call_pre_el_change_hook(cpu);
@@ -8597,7 +8596,7 @@ void arm_cpu_do_interrupt(CPUState *cs)
arm_call_el_change_hook(cpu);
if (!kvm_enabled()) {
- cs->interrupt_request |= CPU_INTERRUPT_EXITTB;
+ cpu_interrupt_request_or(cs, CPU_INTERRUPT_EXITTB);
}
}
--
2.17.1
- Re: [Qemu-devel] [RFC v3 48/56] ppc: acquire the BQL in cpu_has_work, (continued)
[Qemu-devel] [RFC v3 50/56] s390: acquire the BQL in cpu_has_work, Emilio G. Cota, 2018/10/18
[Qemu-devel] [RFC v3 39/56] s390x: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/18
[Qemu-devel] [RFC v3 27/56] s390x: use cpu_reset_interrupt, Emilio G. Cota, 2018/10/18
[Qemu-devel] [RFC v3 55/56] cpu: add async_run_on_cpu_no_bql, Emilio G. Cota, 2018/10/18
[Qemu-devel] [RFC v3 56/56] cputlb: queue async flush jobs without the BQL, Emilio G. Cota, 2018/10/18
[Qemu-devel] [RFC v3 29/56] arm: convert to cpu_interrupt_request,
Emilio G. Cota <=
[Qemu-devel] [RFC v3 54/56] cpu: protect most CPU state with cpu->lock, Emilio G. Cota, 2018/10/18
[Qemu-devel] [RFC v3 53/56] xtensa: acquire the BQL in cpu_has_work, Emilio G. Cota, 2018/10/18
Re: [Qemu-devel] [RFC v3 0/56] per-CPU locks, Paolo Bonzini, 2018/10/19