diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-28 22:36:43 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | 9dec238826361c9d7f60d26b88fd224512355c6e (patch) | |
| tree | 34c0e689f7cbc6189d3479ccfc6c34dc5dbf159c /target/s390x/excp_helper.c | |
| parent | 8417f904bad50021b432dfea12613345d9fb1f68 (diff) | |
| download | qemu-9dec238826361c9d7f60d26b88fd224512355c6e.zip qemu-9dec238826361c9d7f60d26b88fd224512355c6e.tar.gz qemu-9dec238826361c9d7f60d26b88fd224512355c6e.tar.bz2 | |
s390x/tcg: take care of external interrupt subclasses
We can now let go of INTERRUPT_EXT. When cr0 changes, we have to
revalidate if we now have a pending external interrupt, just like
when the PSW (or SYSTEM MASK only) changes.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-6-david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x/excp_helper.c')
| -rw-r--r-- | target/s390x/excp_helper.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 050d5a6..11a85a6 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -249,7 +249,8 @@ static void do_ext_interrupt(CPUS390XState *env) lowcore = cpu_map_lowcore(env); - if (env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) { + if ((env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) && + (env->cregs[0] & CR0_EMERGENCY_SIGNAL_SC)) { lowcore->ext_int_code = cpu_to_be16(EXT_EMERGENCY); cpu_addr = find_first_bit(env->emergency_signals, S390_MAX_CPUS); g_assert(cpu_addr < S390_MAX_CPUS); @@ -258,19 +259,23 @@ static void do_ext_interrupt(CPUS390XState *env) if (bitmap_empty(env->emergency_signals, max_cpus)) { env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL; } - } else if (env->pending_int & INTERRUPT_EXTERNAL_CALL) { + } else if ((env->pending_int & INTERRUPT_EXTERNAL_CALL) && + (env->cregs[0] & CR0_EXTERNAL_CALL_SC)) { lowcore->ext_int_code = cpu_to_be16(EXT_EXTERNAL_CALL); lowcore->cpu_addr = cpu_to_be16(env->external_call_addr); env->pending_int &= ~INTERRUPT_EXTERNAL_CALL; - } else if (env->pending_int & INTERRUPT_EXT_CLOCK_COMPARATOR) { + } else if ((env->pending_int & INTERRUPT_EXT_CLOCK_COMPARATOR) && + (env->cregs[0] & CR0_CKC_SC)) { lowcore->ext_int_code = cpu_to_be16(EXT_CLOCK_COMP); lowcore->cpu_addr = 0; env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR; - } else if (env->pending_int & INTERRUPT_EXT_CPU_TIMER) { + } else if ((env->pending_int & INTERRUPT_EXT_CPU_TIMER) && + (env->cregs[0] & CR0_CPU_TIMER_SC)) { lowcore->ext_int_code = cpu_to_be16(EXT_CPU_TIMER); lowcore->cpu_addr = 0; env->pending_int &= ~INTERRUPT_EXT_CPU_TIMER; - } else if (env->pending_int & INTERRUPT_EXT_SERVICE) { + } else if ((env->pending_int & INTERRUPT_EXT_SERVICE) && + (env->cregs[0] & CR0_SERVICE_SC)) { /* * FIXME: floating IRQs should be considered by all CPUs and * shuld not get cleared by CPU reset. |