Commit 2b97f88c authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'agraf/s390-for-upstream' into staging 

* agraf/s390-for-upstream:
  s390: provide interface for service interrupt/introduce interrupt.c
  s390: Fix error handling and condition code of service call
parents 0d16fdd7 000a1a38

target-s390x/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-y += translate.o op_helper.o helper.o cpu.o

obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o

obj-$(CONFIG_SOFTMMU) += machine.o

obj-$(CONFIG_KVM) += kvm.o

target-s390x/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -320,6 +320,9 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); 
void s390_add_running_cpu(CPUS390XState *env);

unsigned s390_del_running_cpu(CPUS390XState *env);



/* service interrupts are floating therefore we must not pass an cpustate */

void s390_sclp_extint(uint32_t parm);



/* from s390-virtio-bus */

extern const target_phys_addr_t virtio_size;

target-s390x/interrupt.c

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * QEMU S/390 Interrupt support

 *

 * Copyright IBM, Corp. 2012

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or (at your

 * option) any later version.  See the COPYING file in the top-level directory.

 */



#include "cpu.h"

#include "kvm.h"



#if !defined(CONFIG_USER_ONLY)

/* service interrupts are floating therefore we must not pass an cpustate */

void s390_sclp_extint(uint32_t parm)

{

    S390CPU *dummy_cpu = s390_cpu_addr2state(0);

    CPUS390XState *env = &dummy_cpu->env;



    if (kvm_enabled()) {

#ifdef CONFIG_KVM

        kvm_s390_interrupt_internal(env, KVM_S390_INT_SERVICE, parm, 0, 1);

#endif

    } else {

        env->psw.addr += 4;

        cpu_inject_ext(env, EXT_SERVICE, parm, 0);

    }

}

#endif

target-s390x/kvm.c

+3 −2
Original line number Diff line number Diff line
@@ -273,9 +273,10 @@ static int kvm_sclp_service_call(CPUS390XState *env, struct kvm_run *run, 
    code = env->regs[(ipbh0 & 0xf0) >> 4];



    r = sclp_service_call(env, sccb, code);

    if (r) {

        setcc(env, 3);

    if (r < 0) {

        enter_pgmcheck(env, -r);

    }

    setcc(env, r);



    return 0;

}

target-s390x/op_helper.c

+19 −24
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
 */



#include "cpu.h"

#include "memory.h"

#include "cputlb.h"

#include "dyngen-exec.h"

#include "host-utils.h"

#include "helper.h"
@@ -2360,12 +2362,9 @@ static void program_interrupt(CPUS390XState *env, uint32_t code, int ilc) 
    }

}



static void ext_interrupt(CPUS390XState *env, int type, uint32_t param,

                          uint64_t param64)

{

    cpu_inject_ext(env, type, param, param64);

}



/*

 * ret < 0 indicates program check, ret = 0,1,2,3 -> cc

 */

int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code)

{

    int r = 0;
@@ -2375,10 +2374,12 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code) 
    printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);

#endif



    /* basic checks */

    if (!memory_region_is_ram(phys_page_find(sccb >> TARGET_PAGE_BITS)->mr)) {

        return -PGM_ADDRESSING;

    }

    if (sccb & ~0x7ffffff8ul) {

        fprintf(stderr, "KVM: invalid sccb address 0x%x\n", sccb);

        r = -1;

        goto out;

        return -PGM_SPECIFICATION;

    }



    switch(code) {
@@ -2391,37 +2392,31 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code) 
            stb_phys(sccb + SCP_INCREMENT, 1 << shift);

            stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);



            if (kvm_enabled()) {

#ifdef CONFIG_KVM

                kvm_s390_interrupt_internal(env, KVM_S390_INT_SERVICE,

                                            sccb & ~3, 0, 1);

#endif

            } else {

                env->psw.addr += 4;

                ext_interrupt(env, EXT_SERVICE, sccb & ~3, 0);

            }

            s390_sclp_extint(sccb & ~3);

            break;

        default:

#ifdef DEBUG_HELPER

            printf("KVM: invalid sclp call 0x%x / 0x%" PRIx64 "x\n", sccb, code);

#endif

            r = -1;

            r = 3;

            break;

    }



out:

    return r;

}



/* SCLP service call */

uint32_t HELPER(servc)(uint32_t r1, uint64_t r2)

{

    if (sclp_service_call(env, r1, r2)) {

        return 3;

    }

    int r;



    r = sclp_service_call(env, r1, r2);

    if (r < 0) {

        program_interrupt(env, -r, 4);

        return 0;

    }

    return r;

}



/* DIAG */

uint64_t HELPER(diag)(uint32_t num, uint64_t mem, uint64_t code)