| Message ID | 20181025144644.15464-36-cota@braap.org |
|---|---|
| State | New |
| Headers | show |
| Series | [RFC,v4,01/71] cpu: convert queued work to a QSIMPLEQ | expand |
Emilio G. Cota <cota@braap.org> writes: > Cc: Peter Maydell <peter.maydell@linaro.org> This will need to catch-up in the next re-base as there is a merge conflict. > Cc: qemu-arm@nongnu.org > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Emilio G. Cota <cota@braap.org> > --- > target/arm/cpu.c | 2 +- > target/arm/helper.c | 12 +++++------- > 2 files changed, 6 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..454954a56c 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -1294,11 +1294,12 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) > { > CPUState *cs = ENV_GET_CPU(env); > uint64_t ret = 0; > + uint32_t interrupt_request = cpu_interrupt_request(cs); > > - if (cs->interrupt_request & CPU_INTERRUPT_HARD) { > + if (interrupt_request & CPU_INTERRUPT_HARD) { > ret |= CPSR_I; > } > - if (cs->interrupt_request & CPU_INTERRUPT_FIQ) { > + if (interrupt_request & CPU_INTERRUPT_FIQ) { > ret |= CPSR_F; > } > /* External aborts are not possible in QEMU so A bit is always clear */ > @@ -8579,10 +8580,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 +8595,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); > } > } -- Alex Bennée
On Fri, Oct 26, 2018 at 14:39:21 +0100, Alex Bennée wrote: > > Emilio G. Cota <cota@braap.org> writes: > > > Cc: Peter Maydell <peter.maydell@linaro.org> > > This will need to catch-up in the next re-base as there is a merge conflict. Yep, this series is so long that I decided to keep the same baseline as in v3, so that I could just git diff the two branches to track the delta. I'll rebase on master in the next iteration. Thanks, Emilio
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..454954a56c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1294,11 +1294,12 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) { CPUState *cs = ENV_GET_CPU(env); uint64_t ret = 0; + uint32_t interrupt_request = cpu_interrupt_request(cs); - if (cs->interrupt_request & CPU_INTERRUPT_HARD) { + if (interrupt_request & CPU_INTERRUPT_HARD) { ret |= CPSR_I; } - if (cs->interrupt_request & CPU_INTERRUPT_FIQ) { + if (interrupt_request & CPU_INTERRUPT_FIQ) { ret |= CPSR_F; } /* External aborts are not possible in QEMU so A bit is always clear */ @@ -8579,10 +8580,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 +8595,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); } }