Commit f1ef5578 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160711' into staging 



Last round of s390x patches for 2.7:
- A large update of the s390x PCI code, bringing it in line with
  the architecture
- Fixes and improvements in the ipl (boot) code
- Refactoring in the css code

# gpg: Signature made Mon 11 Jul 2016 09:04:51 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20160711: (25 commits)
  s390x/pci: make hot-unplug handler smoother
  s390x/pci: replace fid with idx in msg data of msix
  s390x/pci: fix stpcifc_service_call
  s390x/pci: refactor list_pci
  s390x/pci: refactor s390_pci_find_dev_by_idx
  s390x/pci: add checkings in CLP_SET_PCI_FN
  s390x/pci: enable zpci hot-plug/hot-unplug
  s390x/pci: enable uid-checking
  s390x/pci: introduce S390PCIBusDevice qdev
  s390x/pci: introduce S390PCIIOMMU
  s390x/pci: introduce S390PCIBus
  s390x/pci: enforce zPCI state checking
  s390x/pci: refactor s390_pci_find_dev_by_fh
  s390x/pci: unify FH_ macros
  s390x/pci: write fid in CLP_QUERY_PCI_FN
  s390x/pci: acceleration for getting S390pciState
  s390x/pci: fix failures of dma map/unmap
  s390x/css: Unplug handler of virtual css bridge
  s390x/css: Factor out virtual css bridge and bus
  s390x/css: use define for "virtual-css-bridge" literal
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7de2cc8f 93d16d81

hw/s390x/Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ obj-y += ipl.o 
obj-y += css.o

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

obj-y += virtio-ccw.o

obj-y += css-bridge.o

obj-y += ccw-device.o

obj-y += s390-pci-bus.o s390-pci-inst.o

obj-y += s390-skeys.o

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

hw/s390x/ccw-device.c

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

 * Common device infrastructure for devices in the virtual css

 *

 * Copyright 2016 IBM Corp.

 * Author(s): Jing Liu <liujbjl@linux.vnet.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 "qemu/osdep.h"

#include "ccw-device.h"



static const TypeInfo ccw_device_info = {

    .name = TYPE_CCW_DEVICE,

    .parent = TYPE_DEVICE,

    .instance_size = sizeof(CcwDevice),

    .class_size = sizeof(CCWDeviceClass),

    .abstract = true,

};



static void ccw_device_register(void)

{

    type_register_static(&ccw_device_info);

}



type_init(ccw_device_register)

hw/s390x/ccw-device.h

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

 * Common device infrastructure for devices in the virtual css

 *

 * Copyright 2016 IBM Corp.

 * Author(s): Jing Liu <liujbjl@linux.vnet.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_S390X_CCW_DEVICE_H

#define HW_S390X_CCW_DEVICE_H

#include "qom/object.h"

#include "hw/qdev-core.h"

#include "hw/s390x/css.h"



typedef struct CcwDevice {

    DeviceState parent_obj;

    SubchDev *sch;

    /* <cssid>.<ssid>.<device number> */

    CssDevId bus_id;

} CcwDevice;



typedef struct CCWDeviceClass {

    DeviceClass parent_class;

    void (*unplug)(HotplugHandler *, DeviceState *, Error **);

} CCWDeviceClass;



static inline CcwDevice *to_ccw_dev_fast(DeviceState *d)

{

    return container_of(d, CcwDevice, parent_obj);

}



#define TYPE_CCW_DEVICE "ccw-device"



#define CCW_DEVICE(obj) OBJECT_CHECK(CcwDevice, (obj), TYPE_CCW_DEVICE)

#define CCW_DEVICE_GET_CLASS(obj) \

    OBJECT_GET_CLASS(CCWDeviceClass, (obj), TYPE_CCW_DEVICE)

#define CCW_DEVICE_CLASS(klass) \

    OBJECT_CLASS_CHECK(CCWDeviceClass, (klass), TYPE_CCW_DEVICE)



#endif

hw/s390x/css-bridge.c

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

 * css bridge implementation

 *

 * Copyright 2012,2016 IBM Corp.

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

 *            Pierre Morel <pmorel@linux.vnet.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 "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/hotplug.h"

#include "hw/sysbus.h"

#include "qemu/bitops.h"

#include "hw/s390x/css.h"

#include "ccw-device.h"

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



/*

 * Invoke device-specific unplug handler, disable the subchannel

 * (including sending a channel report to the guest) and remove the

 * device from the virtual css bus.

 */

static void ccw_device_unplug(HotplugHandler *hotplug_dev,

                              DeviceState *dev, Error **errp)

{

    CcwDevice *ccw_dev = CCW_DEVICE(dev);

    CCWDeviceClass *k = CCW_DEVICE_GET_CLASS(ccw_dev);

    SubchDev *sch = ccw_dev->sch;

    Error *err = NULL;



    if (k->unplug) {

        k->unplug(hotplug_dev, dev, &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

    }



    /*

     * We should arrive here only for device_del, since we don't support

     * direct hot(un)plug of channels.

     */

    assert(sch != NULL);

    /* Subchannel is now disabled and no longer valid. */

    sch->curr_status.pmcw.flags &= ~(PMCW_FLAGS_MASK_ENA |

                                     PMCW_FLAGS_MASK_DNV);



    css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, 1, 0);



    object_unparent(OBJECT(dev));

}



static void virtual_css_bus_reset(BusState *qbus)

{

    /* This should actually be modelled via the generic css */

    css_reset();

}



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

{

    BusClass *k = BUS_CLASS(klass);



    k->reset = virtual_css_bus_reset;

}



static const TypeInfo virtual_css_bus_info = {

    .name = TYPE_VIRTUAL_CSS_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(VirtualCssBus),

    .class_init = virtual_css_bus_class_init,

};



VirtualCssBus *virtual_css_bus_init(void)

{

    VirtualCssBus *cbus;

    BusState *bus;

    DeviceState *dev;



    /* Create bridge device */

    dev = qdev_create(NULL, TYPE_VIRTUAL_CSS_BRIDGE);

    qdev_init_nofail(dev);



    /* Create bus on bridge device */

    bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");

    cbus = VIRTUAL_CSS_BUS(bus);



    /* Enable hotplugging */

    qbus_set_hotplug_handler(bus, dev, &error_abort);



    return cbus;

 }



/***************** Virtual-css Bus Bridge Device ********************/



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

{

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    hc->unplug = ccw_device_unplug;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

}



static const TypeInfo virtual_css_bridge_info = {

    .name          = TYPE_VIRTUAL_CSS_BRIDGE,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysBusDevice),

    .class_init    = virtual_css_bridge_class_init,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_HOTPLUG_HANDLER },

        { }

    }

};



static void virtual_css_register(void)

{

    type_register_static(&virtual_css_bridge_info);

    type_register_static(&virtual_css_bus_info);

}



type_init(virtual_css_register)

hw/s390x/css.c

+143 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,116 @@ SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid, uint16_t schid) 
    return channel_subsys.css[real_cssid]->sch_set[ssid]->sch[schid];

}



/**

 * Return free device number in subchannel set.

 *

 * Return index of the first free device number in the subchannel set

 * identified by @p cssid and @p ssid, beginning the search at @p

 * start and wrapping around at MAX_DEVNO. Return a value exceeding

 * MAX_SCHID if there are no free device numbers in the subchannel

 * set.

 */

static uint32_t css_find_free_devno(uint8_t cssid, uint8_t ssid,

                                    uint16_t start)

{

    uint32_t round;



    for (round = 0; round <= MAX_DEVNO; round++) {

        uint16_t devno = (start + round) % MAX_DEVNO;



        if (!css_devno_used(cssid, ssid, devno)) {

            return devno;

        }

    }

    return MAX_DEVNO + 1;

}



/**

 * Return first free subchannel (id) in subchannel set.

 *

 * Return index of the first free subchannel in the subchannel set

 * identified by @p cssid and @p ssid, if there is any. Return a value

 * exceeding MAX_SCHID if there are no free subchannels in the

 * subchannel set.

 */

static uint32_t css_find_free_subch(uint8_t cssid, uint8_t ssid)

{

    uint32_t schid;



    for (schid = 0; schid <= MAX_SCHID; schid++) {

        if (!css_find_subch(1, cssid, ssid, schid)) {

            return schid;

        }

    }

    return MAX_SCHID + 1;

}



/**

 * Return first free subchannel (id) in subchannel set for a device number

 *

 * Verify the device number @p devno is not used yet in the subchannel

 * set identified by @p cssid and @p ssid. Set @p schid to the index

 * of the first free subchannel in the subchannel set, if there is

 * any. Return true if everything succeeded and false otherwise.

 */

static bool css_find_free_subch_for_devno(uint8_t cssid, uint8_t ssid,

                                          uint16_t devno, uint16_t *schid,

                                          Error **errp)

{

    uint32_t free_schid;



    assert(schid);

    if (css_devno_used(cssid, ssid, devno)) {

        error_setg(errp, "Device %x.%x.%04x already exists",

                   cssid, ssid, devno);

        return false;

    }

    free_schid = css_find_free_subch(cssid, ssid);

    if (free_schid > MAX_SCHID) {

        error_setg(errp, "No free subchannel found for %x.%x.%04x",

                   cssid, ssid, devno);

        return false;

    }

    *schid = free_schid;

    return true;

}



/**

 * Return first free subchannel (id) and device number

 *

 * Locate the first free subchannel and first free device number in

 * any of the subchannel sets of the channel subsystem identified by

 * @p cssid. Return false if no free subchannel / device number could

 * be found. Otherwise set @p ssid, @p devno and @p schid to identify

 * the available subchannel and device number and return true.

 *

 * May modify @p ssid, @p devno and / or @p schid even if no free

 * subchannel / device number could be found.

 */

static bool css_find_free_subch_and_devno(uint8_t cssid, uint8_t *ssid,

                                          uint16_t *devno, uint16_t *schid,

                                          Error **errp)

{

    uint32_t free_schid, free_devno;



    assert(ssid && devno && schid);

    for (*ssid = 0; *ssid <= MAX_SSID; (*ssid)++) {

        free_schid = css_find_free_subch(cssid, *ssid);

        if (free_schid > MAX_SCHID) {

            continue;

        }

        free_devno = css_find_free_devno(cssid, *ssid, free_schid);

        if (free_devno > MAX_DEVNO) {

            continue;

        }

        *schid = free_schid;

        *devno = free_devno;

        return true;

    }

    error_setg(errp, "Virtual channel subsystem is full!");

    return false;

}



bool css_subch_visible(SubchDev *sch)

{

    if (sch->ssid > channel_subsys.max_ssid) {
@@ -1762,3 +1872,36 @@ PropertyInfo css_devid_propinfo = { 
    .get = get_css_devid,

    .set = set_css_devid,

};



SubchDev *css_create_virtual_sch(CssDevId bus_id, Error **errp)

{

    uint16_t schid = 0;

    SubchDev *sch;



    if (bus_id.valid) {

        /* Enforce use of virtual cssid. */

        if (bus_id.cssid != VIRTUAL_CSSID) {

            error_setg(errp, "cssid %hhx not valid for virtual devices",

                       bus_id.cssid);

            return NULL;

        }

        if (!css_find_free_subch_for_devno(bus_id.cssid, bus_id.ssid,

                                           bus_id.devid, &schid, errp)) {

            return NULL;

        }

    } else {

        bus_id.cssid = VIRTUAL_CSSID;

        if (!css_find_free_subch_and_devno(bus_id.cssid, &bus_id.ssid,

                                           &bus_id.devid, &schid, errp)) {

            return NULL;

        }

    }



    sch = g_malloc0(sizeof(*sch));

    sch->cssid = bus_id.cssid;

    sch->ssid = bus_id.ssid;

    sch->devno = bus_id.devid;

    sch->schid = schid;

    css_subch_assign(sch->cssid, sch->ssid, schid, sch->devno, sch);

    return sch;

}