Commit 28e942f8 authored by Cornelia Huck's avatar Cornelia Huck Committed by Alexander Graf
Browse files

s390: Add a hypercall registration interface. 



Allow virtio machines to register for different diag500 function
codes and convert s390-virtio to use it.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent d5627ce8

hw/s390-virtio.c

+48 −42
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


#include "hw/s390-virtio-bus.h"

#include "hw/s390x/sclp.h"

#include "hw/s390-virtio.h"



//#define DEBUG_S390
@@ -47,10 +48,6 @@ 
    do { } while (0)

#endif



#define KVM_S390_VIRTIO_NOTIFY          0

#define KVM_S390_VIRTIO_RESET           1

#define KVM_S390_VIRTIO_SET_STATUS      2



#define MAX_BLK_DEVS                    10



static VirtIOS390Bus *s390_bus;
@@ -65,16 +62,13 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) 
    return ipi_states[cpu_addr];

}



int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall)

static int s390_virtio_hcall_notify(const uint64_t *args)

{

    uint64_t mem = args[0];

    int r = 0, i;



    dprintf("KVM hypercall: %ld\n", hypercall);

    switch (hypercall) {

    case KVM_S390_VIRTIO_NOTIFY:

    if (mem > ram_size) {

            VirtIOS390Device *dev = s390_virtio_bus_find_vring(s390_bus,

                                                               mem, &i);

        VirtIOS390Device *dev = s390_virtio_bus_find_vring(s390_bus, mem, &i);

        if (dev) {

            virtio_queue_notify(dev->vdev, i);

        } else {
@@ -83,9 +77,12 @@ int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall) 
    } else {

        /* Early printk */

    }

        break;

    case KVM_S390_VIRTIO_RESET:

    return r;

}



static int s390_virtio_hcall_reset(const uint64_t *args)

{

    uint64_t mem = args[0];

    VirtIOS390Device *dev;



    dev = s390_virtio_bus_find_mem(s390_bus, mem);
@@ -93,10 +90,14 @@ int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall) 
    stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS, 0);

    s390_virtio_device_sync(dev);

    s390_virtio_reset_idx(dev);

        break;



    return 0;

}

    case KVM_S390_VIRTIO_SET_STATUS:



static int s390_virtio_hcall_set_status(const uint64_t *args)

{

    uint64_t mem = args[0];

    int r = 0;

    VirtIOS390Device *dev;



    dev = s390_virtio_bus_find_mem(s390_bus, mem);
@@ -105,14 +106,17 @@ int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall) 
    } else {

        r = -EINVAL;

    }

        break;

    }

    default:

        r = -EINVAL;

        break;

    return r;

}



    return r;

static void s390_virtio_register_hcalls(void)

{

    s390_register_virtio_hypercall(KVM_S390_VIRTIO_NOTIFY,

                                   s390_virtio_hcall_notify);

    s390_register_virtio_hypercall(KVM_S390_VIRTIO_RESET,

                                   s390_virtio_hcall_reset);

    s390_register_virtio_hypercall(KVM_S390_VIRTIO_SET_STATUS,

                                   s390_virtio_hcall_set_status);

}



/*
@@ -182,6 +186,9 @@ static void s390_init(QEMUMachineInitArgs *args) 
    qdev_prop_set_string(dev, "cmdline", args->kernel_cmdline);

    qdev_init_nofail(dev);



    /* register hypercalls */

    s390_virtio_register_hcalls();



    /* allocate RAM */

    memory_region_init_ram(ram, "s390.ram", my_ram_size);

    vmstate_register_ram_global(ram);
@@ -265,4 +272,3 @@ static void s390_machine_init(void) 
}



machine_init(s390_machine_init);

hw/s390-virtio.h

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

 * Virtio interfaces for s390

 *

 * Copyright 2012 IBM Corp.

 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 *

 * 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.

 */



#ifndef HW_S390_VIRTIO_H

#define HW_S390_VIRTIO_H 1



#define KVM_S390_VIRTIO_NOTIFY          0

#define KVM_S390_VIRTIO_RESET           1

#define KVM_S390_VIRTIO_SET_STATUS      2



typedef int (*s390_virtio_fn)(const uint64_t *args);

void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);



#endif

hw/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
obj-y = s390-virtio-bus.o s390-virtio.o



obj-y := $(addprefix ../,$(obj-y))

obj-y += s390-virtio-hcall.o

obj-y += sclp.o

obj-y += event-facility.o

obj-y += sclpquiesce.o sclpconsole.o

hw/s390x/s390-virtio-hcall.c

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

 * Support for virtio hypercalls on s390

 *

 * Copyright 2012 IBM Corp.

 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 *

 * 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 "hw/s390-virtio.h"



#define MAX_DIAG_SUBCODES 255



static s390_virtio_fn s390_diag500_table[MAX_DIAG_SUBCODES];



void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn)

{

    assert(code < MAX_DIAG_SUBCODES);

    assert(!s390_diag500_table[code]);



    s390_diag500_table[code] = fn;

}



int s390_virtio_hypercall(CPUS390XState *env)

{

    s390_virtio_fn fn = s390_diag500_table[env->regs[1]];



    if (!fn) {

        return -EINVAL;

    }



    return fn(&env->regs[2]);

}

target-s390x/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong address, int rw 
void s390x_tod_timer(void *opaque);

void s390x_cpu_timer(void *opaque);



int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall);

int s390_virtio_hypercall(CPUS390XState *env);



#ifdef CONFIG_KVM

void kvm_s390_interrupt(S390CPU *cpu, int type, uint32_t code);