Commit 6a253de3 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: implement TEST PENDING INTERRUPTION 



Use s390_cpu_virt_mem_write() so we can actually revert what we did
(re-inject the dequeued IO interrupt).

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180129125623.21729-10-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent b194e447

target/s390x/helper.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ DEF_HELPER_4(schm, void, env, i64, i64, i64) 
DEF_HELPER_3(ssch, void, env, i64, i64)

DEF_HELPER_2(stcrw, void, env, i64)

DEF_HELPER_3(stsch, void, env, i64, i64)

DEF_HELPER_2(tpi, i32, env, i64)

DEF_HELPER_3(tsch, void, env, i64, i64)

DEF_HELPER_2(chsc, void, env, i64)

#endif

target/s390x/insn-data.def

+1 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ 
    C(0xb233, SSCH,    S,     Z,   0, insn, 0, 0, ssch, 0)

    C(0xb239, STCRW,   S,     Z,   0, insn, 0, 0, stcrw, 0)

    C(0xb234, STSCH,   S,     Z,   0, insn, 0, 0, stsch, 0)

    C(0xb236, TPI ,    S,     Z,   la2, 0, 0, 0, tpi, 0)

    C(0xb235, TSCH,    S,     Z,   0, insn, 0, 0, tsch, 0)

    /* ??? Not listed in PoO ninth edition, but there's a linux driver that

       uses it: "A CHSC subchannel is usually present on LPAR only."  */

target/s390x/misc_helper.c

+54 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "hw/s390x/ebcdic.h"

#include "hw/s390x/s390-virtio-hcall.h"

#include "hw/s390x/sclp.h"

#include "hw/s390x/s390_flic.h"

#endif



/* #define DEBUG_HELPER */
@@ -429,6 +430,59 @@ void HELPER(stsch)(CPUS390XState *env, uint64_t r1, uint64_t inst) 
    qemu_mutex_unlock_iothread();

}



uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr)

{

    const uintptr_t ra = GETPC();

    S390CPU *cpu = s390_env_get_cpu(env);

    QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic());

    QEMUS390FlicIO *io = NULL;

    LowCore *lowcore;



    if (addr & 0x3) {

        s390_program_interrupt(env, PGM_SPECIFICATION, 4, ra);

    }



    qemu_mutex_lock_iothread();

    io = qemu_s390_flic_dequeue_io(flic, env->cregs[6]);

    if (!io) {

        qemu_mutex_unlock_iothread();

        return 0;

    }



    if (addr) {

        struct {

            uint16_t id;

            uint16_t nr;

            uint32_t parm;

        } intc = {

            .id = cpu_to_be16(io->id),

            .nr = cpu_to_be16(io->nr),

            .parm = cpu_to_be32(io->parm),

        };



        if (s390_cpu_virt_mem_write(cpu, addr, 0, &intc, sizeof(intc))) {

            /* writing failed, reinject and properly clean up */

            s390_io_interrupt(io->id, io->nr, io->parm, io->word);

            qemu_mutex_unlock_iothread();

            g_free(io);

            s390_cpu_virt_mem_handle_exc(cpu, ra);

            return 0;

        }

    } else {

        /* no protection applies */

        lowcore = cpu_map_lowcore(env);

        lowcore->subchannel_id = cpu_to_be16(io->id);

        lowcore->subchannel_nr = cpu_to_be16(io->nr);

        lowcore->io_int_parm = cpu_to_be32(io->parm);

        lowcore->io_int_word = cpu_to_be32(io->word);

        cpu_unmap_lowcore(lowcore);

    }



    g_free(io);

    qemu_mutex_unlock_iothread();

    return 1;

}



void HELPER(tsch)(CPUS390XState *env, uint64_t r1, uint64_t inst)

{

    S390CPU *cpu = s390_env_get_cpu(env);

target/s390x/translate.c

+8 −0
Original line number Diff line number Diff line
@@ -4199,6 +4199,14 @@ static ExitStatus op_stcrw(DisasContext *s, DisasOps *o) 
    return NO_EXIT;

}



static ExitStatus op_tpi(DisasContext *s, DisasOps *o)

{

    check_privileged(s);

    gen_helper_tpi(cc_op, cpu_env, o->addr1);

    set_cc_static(s);

    return NO_EXIT;

}



static ExitStatus op_tsch(DisasContext *s, DisasOps *o)

{

    check_privileged(s);