Commit 11b0079c authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: switch to new SIGP handling code 



This effectively enables experimental SMP support. Floating interrupts are
still a mess, so allow it but print a big warning. There also seems
to be a problem with CPU hotplug (after the main loop started).

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-27-david@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
[CH: changed insn-data.def as pointed out by Richard]
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent b376a554

hw/s390x/s390-virtio-ccw.c

+1 −3
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ static void s390_init_cpus(MachineState *machine) 
    int i;



    if (tcg_enabled() && max_cpus > 1) {

        error_report("Number of SMP CPUs requested (%d) exceeds max CPUs "

                     "supported by TCG (1) on s390x", max_cpus);

        exit(1);

        error_report("WARNING: SMP support on s390x is experimental!");

    }



    /* initialize possible_cpus */

target/s390x/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ DEF_HELPER_FLAGS_3(sske, TCG_CALL_NO_RWG, void, env, i64, i64) 
DEF_HELPER_FLAGS_2(rrbe, TCG_CALL_NO_RWG, i32, env, i64)

DEF_HELPER_4(mvcs, i32, env, i64, i64, i64)

DEF_HELPER_4(mvcp, i32, env, i64, i64, i64)

DEF_HELPER_4(sigp, i32, env, i64, i32, i64)

DEF_HELPER_4(sigp, i32, env, i64, i32, i32)

DEF_HELPER_FLAGS_2(sacf, TCG_CALL_NO_WG, void, env, i64)

DEF_HELPER_FLAGS_4(idte, TCG_CALL_NO_RWG, void, env, i64, i64, i32)

DEF_HELPER_FLAGS_4(ipte, TCG_CALL_NO_RWG, void, env, i64, i64, i32)

target/s390x/insn-data.def

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ 
/* SET SYSTEM MASK */

    C(0x8000, SSM,     S,     Z,   0, m2_8u, 0, 0, ssm, 0)

/* SIGNAL PROCESSOR */

    C(0xae00, SIGP,    RS_a,  Z,   r3_o, a2, 0, 0, sigp, 0)

    C(0xae00, SIGP,    RS_a,  Z,   0, a2, 0, 0, sigp, 0)

/* STORE CLOCK */

    C(0xb205, STCK,    S,     Z,   la2, 0, new, m1_64, stck, 0)

    C(0xb27c, STCKF,   S,     SCF, la2, 0, new, m1_64, stck, 0)

target/s390x/misc_helper.c

+6 −36
Original line number Diff line number Diff line
@@ -319,44 +319,14 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, 
}



uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,

                      uint64_t cpu_addr)

                      uint32_t r3)

{

    int cc = SIGP_CC_ORDER_CODE_ACCEPTED;

    int cc;



    HELPER_LOG("%s: %016" PRIx64 " %08x %016" PRIx64 "\n",

               __func__, order_code, r1, cpu_addr);



    /* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register"

       as parameter (input). Status (output) is always R1. */



    switch (order_code & SIGP_ORDER_MASK) {

    case SIGP_SET_ARCH:

        /* switch arch */

        break;

    case SIGP_SENSE:

        /* enumerate CPU status */

        if (cpu_addr) {

            /* XXX implement when SMP comes */

            return 3;

        }

        env->regs[r1] &= 0xffffffff00000000ULL;

        cc = 1;

        break;

#if !defined(CONFIG_USER_ONLY)

    case SIGP_RESTART:

        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

        cpu_loop_exit(CPU(s390_env_get_cpu(env)));

        break;

    case SIGP_STOP:

        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

        cpu_loop_exit(CPU(s390_env_get_cpu(env)));

        break;

#endif

    default:

        /* unknown sigp */

        fprintf(stderr, "XXX unknown sigp: 0x%" PRIx64 "\n", order_code);

        cc = SIGP_CC_NOT_OPERATIONAL;

    }

    /* TODO: needed to inject interrupts  - push further down */

    qemu_mutex_lock_iothread();

    cc = handle_sigp(env, order_code & SIGP_ORDER_MASK, r1, r3);

    qemu_mutex_unlock_iothread();



    return cc;

}

target/s390x/translate.c

+3 −2
Original line number Diff line number Diff line
@@ -3710,11 +3710,12 @@ static ExitStatus op_servc(DisasContext *s, DisasOps *o) 
static ExitStatus op_sigp(DisasContext *s, DisasOps *o)

{

    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));

    TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));

    check_privileged(s);

    potential_page_fault(s);

    gen_helper_sigp(cc_op, cpu_env, o->in2, r1, o->in1);

    gen_helper_sigp(cc_op, cpu_env, o->in2, r1, r3);

    set_cc_static(s);

    tcg_temp_free_i32(r1);

    tcg_temp_free_i32(r3);

    return NO_EXIT;

}

#endif