Skip to content

Commit

Permalink
target/xtensa: hold BQL for interrupt processing
Browse files Browse the repository at this point in the history
Make sure we have the BQL held when processing interrupts.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
  • Loading branch information
stsquad committed Mar 9, 2017
1 parent 278f5e9 commit 47e2088
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions target/xtensa/helper.c
Expand Up @@ -217,6 +217,7 @@ static void handle_interrupt(CPUXtensaState *env)
}
}

/* Called from cpu_handle_interrupt with BQL held */
void xtensa_cpu_do_interrupt(CPUState *cs)
{
XtensaCPU *cpu = XTENSA_CPU(cs);
Expand Down
7 changes: 7 additions & 0 deletions target/xtensa/op_helper.c
Expand Up @@ -26,6 +26,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
Expand Down Expand Up @@ -381,7 +382,11 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel)
env->pc = pc;
env->sregs[PS] = (env->sregs[PS] & ~PS_INTLEVEL) |
(intlevel << PS_INTLEVEL_SHIFT);

qemu_mutex_lock_iothread();
check_interrupts(env);
qemu_mutex_unlock_iothread();

if (env->pending_irq_level) {
cpu_loop_exit(CPU(xtensa_env_get_cpu(env)));
return;
Expand Down Expand Up @@ -426,7 +431,9 @@ void HELPER(update_ccompare)(CPUXtensaState *env, uint32_t i)

void HELPER(check_interrupts)(CPUXtensaState *env)
{
qemu_mutex_lock_iothread();
check_interrupts(env);
qemu_mutex_unlock_iothread();
}

void HELPER(itlb_hit_test)(CPUXtensaState *env, uint32_t vaddr)
Expand Down

0 comments on commit 47e2088

Please sign in to comment.