diff options
| author | David Hildenbrand <david@redhat.com> | 2018-01-29 13:56:09 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2018-02-09 09:37:13 +0100 |
| commit | 520db63f3a50c6a5564dd2ce21912cfe011900a9 (patch) | |
| tree | a481e5e9417cd0af4ad526f703c4f12b7b432157 /target/s390x/interrupt.c | |
| parent | b03d9970c49d8f09f6e86130b320a91888667689 (diff) | |
s390x/tcg: simplify machine check handling
We currently only support CRW machine checks. This is a preparation for
real floating interrupt support.
Get rid of the queue and handle it via the bit INTERRUPT_MCHK. We don't
rename it for now, as it will be soon gone (when moving crw machine checks
into the flic).
Please note that this is the same way also KVM handles it: only one
instance of a machine check can be pending at a time. So no need for a
queue.
While at it, make sure we try to deliver only if env->cregs[14]
actually indicates that CRWs are accepted.
Drop two unused defines on the way (we already have PSW_MASK_...).
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180129125623.21729-5-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x/interrupt.c')
| -rw-r--r-- | target/s390x/interrupt.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 39c026b8b5..380222b394 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -162,16 +162,6 @@ static void cpu_inject_crw_mchk(S390CPU *cpu) { CPUS390XState *env = &cpu->env; - if (env->mchk_index == MAX_MCHK_QUEUE - 1) { - /* ugh - can't queue anymore. Let's drop. */ - return; - } - - env->mchk_index++; - assert(env->mchk_index < MAX_MCHK_QUEUE); - - env->mchk_queue[env->mchk_index].type = 1; - env->pending_int |= INTERRUPT_MCHK; cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD); } @@ -225,7 +215,13 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu) return false; } - return env->pending_int & INTERRUPT_MCHK; + /* for now we only support channel report machine checks (floating) */ + if ((env->pending_int & INTERRUPT_MCHK) && + (env->cregs[14] & CR14_CHANNEL_REPORT_SC)) { + return true; + } + + return false; } bool s390_cpu_has_ext_int(S390CPU *cpu) |