diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-10-17 19:16:53 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-01-07 17:24:29 +0400 |
| commit | f4f643882d9dc4676411d1f5fcf9393aa745570b (patch) | |
| tree | 11af6c3e2aed7a73ab88b33fab4f8231634fb5b2 /target | |
| parent | 3cff81733da62eaea2252e638ea47849cf284ceb (diff) | |
| download | qemu-f4f643882d9dc4676411d1f5fcf9393aa745570b.zip qemu-f4f643882d9dc4676411d1f5fcf9393aa745570b.tar.gz qemu-f4f643882d9dc4676411d1f5fcf9393aa745570b.tar.bz2 | |
cris: improve passing PIC interrupt vector to the CPU
Instead of accessing cpu interrupt vector directly from PIC, send the
vector value over the qemu_irq.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/cris/cpu.c | 8 | ||||
| -rw-r--r-- | target/cris/cpu.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/target/cris/cpu.c b/target/cris/cpu.c index 7adfd6c..6a857f5 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -147,6 +147,14 @@ static void cris_cpu_set_irq(void *opaque, int irq, int level) CPUState *cs = CPU(cpu); int type = irq == CRIS_CPU_IRQ ? CPU_INTERRUPT_HARD : CPU_INTERRUPT_NMI; + if (irq == CRIS_CPU_IRQ) { + /* + * The PIC passes us the vector for the IRQ as the value it sends + * over the qemu_irq line + */ + cpu->env.interrupt_vector = level; + } + if (level) { cpu_interrupt(cs, type); } else { diff --git a/target/cris/cpu.h b/target/cris/cpu.h index aba0a66..a7c2a8e 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -34,6 +34,7 @@ #define CPU_INTERRUPT_NMI CPU_INTERRUPT_TGT_EXT_3 /* CRUS CPU device objects interrupt lines. */ +/* PIC passes the vector for the IRQ as the value of it sends over qemu_irq */ #define CRIS_CPU_IRQ 0 #define CRIS_CPU_NMI 1 |