motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390: Keep I/O interrupts enabled for all iscs.

Browse source 
do_io_interrupt() would stop scanning further iscs if it found
an I/O interrupt it could inject. This might cause the pending
interrupt indication for I/O interrupts to be reset although there
might be queued I/O interrupts for subsequent iscs.

Fix this by reordering the logic: Inject the I/O interrupt immediately
and continue searching all iscs for queued interrupts.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Cornelia Huck 2013-02-07 02:20:50 +00:00 • committed by Anthony Liguori
parent 760794f784
commit bd9a8d852c
1 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
target-s390x/helper.c
View file

@ -617,7 +617,6 @@ static void do_ext_interrupt(CPUS390XState *env)
static void do_io_interrupt(CPUS390XState *env) static void do_io_interrupt(CPUS390XState *env)
{ {
uint64_t mask = 0, addr = 0;
LowCore *lowcore; LowCore *lowcore;
IOIntQueue *q; IOIntQueue *q;
uint8_t isc; uint8_t isc;
@ -642,36 +641,39 @@ static void do_io_interrupt(CPUS390XState *env)
disable = 0; disable = 0;
continue; continue;
} }
found = 1; if (!found) {
lowcore = cpu_map_lowcore(env); uint64_t mask, addr;
lowcore->subchannel_id = cpu_to_be16(q->id); found = 1;
lowcore->subchannel_nr = cpu_to_be16(q->nr); lowcore = cpu_map_lowcore(env);
lowcore->io_int_parm = cpu_to_be32(q->parm);
lowcore->io_int_word = cpu_to_be32(q->word);
lowcore->io_old_psw.mask = cpu_to_be64(get_psw_mask(env));
lowcore->io_old_psw.addr = cpu_to_be64(env->psw.addr);
mask = be64_to_cpu(lowcore->io_new_psw.mask);
addr = be64_to_cpu(lowcore->io_new_psw.addr);
cpu_unmap_lowcore(lowcore); lowcore->subchannel_id = cpu_to_be16(q->id);
lowcore->subchannel_nr = cpu_to_be16(q->nr);
lowcore->io_int_parm = cpu_to_be32(q->parm);
lowcore->io_int_word = cpu_to_be32(q->word);
lowcore->io_old_psw.mask = cpu_to_be64(get_psw_mask(env));
lowcore->io_old_psw.addr = cpu_to_be64(env->psw.addr);
mask = be64_to_cpu(lowcore->io_new_psw.mask);
addr = be64_to_cpu(lowcore->io_new_psw.addr);
env->io_index[isc]--; cpu_unmap_lowcore(lowcore);
env->io_index[isc]--;
DPRINTF("%s: %" PRIx64 " %" PRIx64 "\n", __func__,
env->psw.mask, env->psw.addr);
load_psw(env, mask, addr);
}
if (env->io_index[isc] >= 0) { if (env->io_index[isc] >= 0) {
disable = 0; disable = 0;
} }
break; continue;
} }
if (disable) { if (disable) {
env->pending_int &= ~INTERRUPT_IO; env->pending_int &= ~INTERRUPT_IO;
} }
if (found) {
DPRINTF("%s: %" PRIx64 " %" PRIx64 "\n", __func__,
env->psw.mask, env->psw.addr);
load_psw(env, mask, addr);
}
} }
static void do_mchk_interrupt(CPUS390XState *env) static void do_mchk_interrupt(CPUS390XState *env)