Commit a51b3153 authored by Tony Krowiak's avatar Tony Krowiak Committed by Cornelia Huck
Browse files

s390x/ap: base Adjunct Processor (AP) object model 



Introduces the base object model for virtualizing AP devices.

Signed-off-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Tested-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20181010170309.12045-5-akrowiak@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 1d7db85b

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,18 @@ F: include/hw/s390x/s390-ccw.h 
T: git git://github.com/cohuck/qemu.git s390-next

L: qemu-s390x@nongnu.org



vfio-ap

M: Christian Borntraeger <borntraeger@de.ibm.com>

M: Tony Krowiak <akrowiak@linux.ibm.com>

M: Halil Pasic <pasic@linux.ibm.com>

M: Pierre Morel <pmorel@linux.ibm.com>

S: Supported

F: hw/s390x/ap-device.c

F: hw/s390x/ap-bridge.c

F: include/hw/s390x/ap-device.h

F: include/hw/s390x/ap-bridge.h

L: qemu-s390x@nongnu.org



vhost

M: Michael S. Tsirkin <mst@redhat.com>

S: Supported

hw/s390x/Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -31,3 +31,5 @@ obj-$(CONFIG_TCG) += tod-qemu.o 
obj-$(CONFIG_KVM) += s390-skeys-kvm.o

obj-$(CONFIG_KVM) += s390-stattrib-kvm.o

obj-y += s390-ccw.o

obj-y += ap-device.o

obj-y += ap-bridge.o

hw/s390x/ap-bridge.c

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

 * ap bridge

 *

 * Copyright 2018 IBM Corp.

 *

 * 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 "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/sysbus.h"

#include "qemu/bitops.h"

#include "hw/s390x/ap-bridge.h"

#include "cpu.h"



static char *ap_bus_get_dev_path(DeviceState *dev)

{

    /* at most one */

    return g_strdup_printf("/1");

}



static void ap_bus_class_init(ObjectClass *oc, void *data)

{

    BusClass *k = BUS_CLASS(oc);



    k->get_dev_path = ap_bus_get_dev_path;

    /* More than one ap device does not make sense */

    k->max_dev = 1;

}



static const TypeInfo ap_bus_info = {

    .name = TYPE_AP_BUS,

    .parent = TYPE_BUS,

    .instance_size = 0,

    .class_init = ap_bus_class_init,

};



void s390_init_ap(void)

{

    DeviceState *dev;



    /* If no AP instructions then no need for AP bridge */

    if (!s390_has_feat(S390_FEAT_AP)) {

        return;

    }



    /* Create bridge device */

    dev = qdev_create(NULL, TYPE_AP_BRIDGE);

    object_property_add_child(qdev_get_machine(), TYPE_AP_BRIDGE,

                              OBJECT(dev), NULL);

    qdev_init_nofail(dev);



    /* Create bus on bridge device */

    qbus_create(TYPE_AP_BUS, dev, TYPE_AP_BUS);

 }



static void ap_bridge_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

}



static const TypeInfo ap_bridge_info = {

    .name          = TYPE_AP_BRIDGE,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = 0,

    .class_init    = ap_bridge_class_init,

};



static void ap_register(void)

{

    type_register_static(&ap_bridge_info);

    type_register_static(&ap_bus_info);

}



type_init(ap_register)

hw/s390x/ap-device.c

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

 * Adjunct Processor (AP) matrix device

 *

 * Copyright 2018 IBM Corp.

 *

 * 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 "qemu/osdep.h"

#include "qemu/module.h"

#include "qapi/error.h"

#include "hw/qdev.h"

#include "hw/s390x/ap-device.h"



static void ap_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->desc = "AP device class";

    dc->hotpluggable = false;

}



static const TypeInfo ap_device_info = {

    .name = AP_DEVICE_TYPE,

    .parent = TYPE_DEVICE,

    .instance_size = sizeof(APDevice),

    .class_size = sizeof(DeviceClass),

    .class_init = ap_class_init,

    .abstract = true,

};



static void ap_device_register(void)

{

    type_register_static(&ap_device_info);

}



type_init(ap_device_register)

hw/s390x/s390-virtio-ccw.c

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "ipl.h"

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

#include "hw/s390x/css-bridge.h"

#include "hw/s390x/ap-bridge.h"

#include "migration/register.h"

#include "cpu_models.h"

#include "hw/nmi.h"
@@ -263,6 +264,9 @@ static void ccw_init(MachineState *machine) 
    /* init the SIGP facility */

    s390_init_sigp();



    /* create AP bridge and bus(es) */

    s390_init_ap();



    /* get a BUS */

    css_bus = virtual_css_bus_init();

    s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,