diff options
| -rw-r--r-- | hw/s390x/css.c | 4 | ||||
| -rw-r--r-- | target-s390x/cpu.h | 2 | ||||
| -rw-r--r-- | target-s390x/helper.c | 5 | ||||
| -rw-r--r-- | target-s390x/ioinst.h | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 3244201fc7..85f6f22a7f 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -87,7 +87,7 @@ static void css_inject_io_interrupt(SubchDev *sch) css_build_subchannel_id(sch), sch->schid, sch->curr_status.pmcw.intparm, - (0x80 >> isc) << 24); + isc << 27); } void css_conditional_io_interrupt(SubchDev *sch) @@ -111,7 +111,7 @@ void css_conditional_io_interrupt(SubchDev *sch) css_build_subchannel_id(sch), sch->schid, sch->curr_status.pmcw.intparm, - (0x80 >> isc) << 24); + isc << 27); } } diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 01e59b99f0..fa8dfe0737 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1001,7 +1001,7 @@ static inline void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id, uint32_t io_int_parm, uint32_t io_int_word) { CPUS390XState *env = &cpu->env; - int isc = ffs(io_int_word << 2) - 1; + int isc = IO_INT_WORD_ISC(io_int_word); if (env->io_index[isc] == MAX_IO_QUEUE - 1) { /* ugh - can't queue anymore. Let's drop. */ diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 9f9088b040..76268317a3 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -628,6 +628,8 @@ static void do_io_interrupt(CPUS390XState *env) } for (isc = 0; isc < ARRAY_SIZE(env->io_index); isc++) { + uint64_t isc_bits; + if (env->io_index[isc] < 0) { continue; } @@ -637,7 +639,8 @@ static void do_io_interrupt(CPUS390XState *env) } q = &env->io_queue[env->io_index[isc]][isc]; - if (!(env->cregs[6] & q->word)) { + isc_bits = ISC_TO_ISC_BITS(IO_INT_WORD_ISC(q->word)); + if (!(env->cregs[6] & isc_bits)) { disable = 0; continue; } diff --git a/target-s390x/ioinst.h b/target-s390x/ioinst.h index d5a43f4a71..7bed2910dc 100644 --- a/target-s390x/ioinst.h +++ b/target-s390x/ioinst.h @@ -209,6 +209,9 @@ typedef struct IOIntCode { #define IOINST_SCHID_SSID(_schid) ((_schid & 0x00060000) >> 17) #define IOINST_SCHID_NR(_schid) (_schid & 0x0000ffff) +#define IO_INT_WORD_ISC(_int_word) ((_int_word & 0x38000000) >> 24) +#define ISC_TO_ISC_BITS(_isc) ((0x80 >> _isc) << 24) + int ioinst_disassemble_sch_ident(uint32_t value, int *m, int *cssid, int *ssid, int *schid); int ioinst_handle_xsch(CPUS390XState *env, uint64_t reg1); |