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

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



s390x changes for 2.12:
- Lots of tcg improvements: ccw hotplug is now working and we can run
  a Linux kernel built for z12 under tcg
- zPCI improvements to get virtio-pci working
- get rid of the cssid restrictions for virtual and non-virtual channel
  devices
- we now support 8TB+ systems
- 2.12 compat machine
- fixes and cleanups

# gpg: Signature made Fri 15 Dec 2017 10:57:01 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20171215-v2: (46 commits)
  s390-ccw-virtio: allow for systems larger that 7.999TB
  s390x: change the QEMU cpu model to a stripped down z12
  s390x/tcg: we already implement the Set-Program-Parameter facility
  s390x/tcg: implement extract-CPU-time facility
  s390x/tcg: Implement SIGNAL ADAPTER instruction
  s390x/tcg: Implement STORE CHANNEL PATH STATUS
  s390x/tcg: wire up SET CHANNEL MONITOR
  s390x/tcg: wire up SET ADDRESS LIMIT
  s390x/tcg: implement Interlocked-Access Facility 2
  s390x/tcg: ASI/ASGI/ALSI/ALSGI are atomic with Interlocked-acccess facility 1
  s390x/tcg: wire up STORE CHANNEL REPORT WORD
  s390x/tcg: indicate value of TODPR in STCKE
  s390x/tcg: implement SET CLOCK PROGRAMMABLE FIELD
  s390x/tcg: fix and cleanup mcck injection
  s390x/kvm: factor out build_channel_report_mcic() into cpu.h
  s390x/css: attach css bridge
  s390x: deprecate s390-squash-mcss machine prop
  s390x/css: unrestrict cssids
  s390x/pci: search for subregion inside the BARs
  s390x/pci: move the memory region write from pcistg
  ...

# Conflicts:
#	include/hw/compat.h

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 96a62988 bb223055

hw/s390x/3270-ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp) 
    SubchDev *sch;

    Error *err = NULL;



    sch = css_create_sch(cdev->devno, true, cbus->squash_mcss, errp);

    sch = css_create_sch(cdev->devno, cbus->squash_mcss, errp);

    if (!sch) {

        return;

    }

hw/s390x/css-bridge.c

+13 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ VirtualCssBus *virtual_css_bus_init(void) 


    /* Create bridge device */

    dev = qdev_create(NULL, TYPE_VIRTUAL_CSS_BRIDGE);

    object_property_add_child(qdev_get_machine(), TYPE_VIRTUAL_CSS_BRIDGE,

                              OBJECT(dev), NULL);

    qdev_init_nofail(dev);



    /* Create bus on bridge device */
@@ -123,6 +125,11 @@ static Property virtual_css_bridge_properties[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static bool prop_get_true(Object *obj, Error **errp)

{

    return true;

}



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

{

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
@@ -131,6 +138,12 @@ static void virtual_css_bridge_class_init(ObjectClass *klass, void *data) 
    hc->unplug = ccw_device_unplug;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

    dc->props = virtual_css_bridge_properties;

    object_class_property_add_bool(klass, "cssid-unrestricted",

                                   prop_get_true, NULL, NULL);

    object_class_property_set_description(klass, "cssid-unrestricted",

            "A css device can use any cssid, regardless whether virtual"

            " or not (read only, always true)",

            NULL);

}



static const TypeInfo virtual_css_bridge_info = {

hw/s390x/css.c

+4 −30
Original line number Diff line number Diff line
@@ -1723,12 +1723,6 @@ void css_undo_stcrw(CRW *crw) 
    QTAILQ_INSERT_HEAD(&channel_subsys.pending_crws, crw_cont, sibling);

}



int css_do_tpi(IOIntCode *int_code, int lowcore)

{

    /* No pending interrupts for !KVM. */

    return 0;

 }



int css_collect_chp_desc(int m, uint8_t cssid, uint8_t f_chpid, uint8_t l_chpid,

                         int rfmt, void *buf)

{
@@ -2370,21 +2364,11 @@ const PropertyInfo css_devid_ro_propinfo = { 
    .get = get_css_devid,

};



SubchDev *css_create_sch(CssDevId bus_id, bool is_virtual, bool squash_mcss,

                         Error **errp)

SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp)

{

    uint16_t schid = 0;

    SubchDev *sch;



    if (bus_id.valid) {

        if (is_virtual != (bus_id.cssid == VIRTUAL_CSSID)) {

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

                       bus_id.cssid,

                       (is_virtual ? "virtual" : "non-virtual"));

            return NULL;

        }

    }



    if (bus_id.valid) {

        if (squash_mcss) {

            bus_id.cssid = channel_subsys.default_cssid;
@@ -2396,19 +2380,8 @@ SubchDev *css_create_sch(CssDevId bus_id, bool is_virtual, bool squash_mcss, 
                                           bus_id.devid, &schid, errp)) {

            return NULL;

        }

    } else if (squash_mcss || is_virtual) {

        bus_id.cssid = channel_subsys.default_cssid;



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

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

            return NULL;

        }

    } else {

        for (bus_id.cssid = 0; bus_id.cssid < MAX_CSSID; ++bus_id.cssid) {

            if (bus_id.cssid == VIRTUAL_CSSID) {

                continue;

            }



        for (bus_id.cssid = channel_subsys.default_cssid;;) {

            if (!channel_subsys.css[bus_id.cssid]) {

                css_create_css_image(bus_id.cssid, false);

            }
@@ -2418,7 +2391,8 @@ SubchDev *css_create_sch(CssDevId bus_id, bool is_virtual, bool squash_mcss, 
                                                NULL)) {

                break;

            }

            if (bus_id.cssid == MAX_CSSID) {

            bus_id.cssid = (bus_id.cssid + 1) % MAX_CSSID;

            if (bus_id.cssid == channel_subsys.default_cssid) {

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

                return NULL;

            }

hw/s390x/s390-ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp) 
        goto out_err_propagate;

    }



    sch = css_create_sch(ccw_dev->devno, false, cbus->squash_mcss, &err);

    sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, &err);

    if (!sch) {

        goto out_mdevid_free;

    }

hw/s390x/s390-pci-bus.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ struct S390PCIBusDevice { 
    uint64_t fmb_addr;

    uint8_t isc;

    uint16_t noi;

    uint16_t maxstbl;

    uint8_t sum;

    S390MsixInfo msix;

    AdapterRoutes routes;