Commit 2421f381 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



A selection of s390x patches:
- cleanups, fixes and improvements
- program check loop detection (useful with the corresponding kernel
  patch)
- wire up virtio-crypto for ccw
- and finally support many virtqueues for virtio-ccw

# gpg: Signature made Fri 24 Feb 2017 09:19:19 GMT
# 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-20170224:
  s390x/css: handle format-0 TIC CCW correctly
  s390x/arch_dump: pass cpuid into notes sections
  s390x/arch_dump: use proper note name and note size
  virtio-ccw: support VIRTIO_QUEUE_MAX virtqueues
  s390x: bump ADAPTER_ROUTES_MAX_GSI
  virtio-ccw: check flic->adapter_routes_max_batch
  s390x: add property adapter_routes_max_batch
  virtio-ccw: Check the number of vqs in CCW_CMD_SET_IND
  virtio-ccw: add virtio-crypto-ccw device
  virtio-ccw: handle virtio 1 only devices
  s390x/flic: fail migration on source already
  s390x/kvm: detect some program check loops
  s390x/s390-virtio: get rid of DPRINTF

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f62ab6bb 9f94f84c

hw/intc/s390_flic.c

+28 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include "migration/qemu-file.h"

#include "hw/s390x/s390_flic.h"

#include "trace.h"

#include "hw/qdev.h"

#include "qapi/error.h"



S390FLICState *s390_get_flic(void)

{
@@ -85,6 +87,30 @@ static void qemu_s390_flic_class_init(ObjectClass *oc, void *data) 
    fsc->clear_io_irq = qemu_s390_clear_io_flic;

}



static Property s390_flic_common_properties[] = {

    DEFINE_PROP_UINT32("adapter_routes_max_batch", S390FLICState,

                       adapter_routes_max_batch, ADAPTER_ROUTES_MAX_GSI),

    DEFINE_PROP_END_OF_LIST(),

};



static void s390_flic_common_realize(DeviceState *dev, Error **errp)

{

    uint32_t max_batch = S390_FLIC_COMMON(dev)->adapter_routes_max_batch;



    if (max_batch > ADAPTER_ROUTES_MAX_GSI) {

        error_setg(errp, "flic adapter_routes_max_batch too big"

                   "%d (%d allowed)", max_batch, ADAPTER_ROUTES_MAX_GSI);

    }

}



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

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->props = s390_flic_common_properties;

    dc->realize = s390_flic_common_realize;

}



static const TypeInfo qemu_s390_flic_info = {

    .name          = TYPE_QEMU_S390_FLIC,

    .parent        = TYPE_S390_FLIC_COMMON,
@@ -92,10 +118,12 @@ static const TypeInfo qemu_s390_flic_info = { 
    .class_init    = qemu_s390_flic_class_init,

};





static const TypeInfo s390_flic_common_info = {

    .name          = TYPE_S390_FLIC_COMMON,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(S390FLICState),

    .class_init    = s390_flic_class_init,

    .class_size    = sizeof(S390FLICStateClass),

};

hw/intc/s390_flic_kvm.c

+4 −2
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size, 
    int len = FLIC_SAVE_INITIAL_SIZE;

    void *buf;

    int count;

    int r = 0;



    flic_disable_wait_pfault((struct KVMS390FLICState *) opaque);
@@ -303,7 +304,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size, 
         * migration state */

        error_report("flic: couldn't allocate memory");

        qemu_put_be64(f, FLIC_FAILED);

        return 0;

        return -ENOMEM;

    }



    count = __get_all_irqs(flic, &buf, len);
@@ -314,6 +315,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size, 
         * target system to fail when attempting to load irqs from the

         * migration state */

        qemu_put_be64(f, FLIC_FAILED);

        r = count;

    } else {

        qemu_put_be64(f, count);

        qemu_put_buffer(f, (uint8_t *) buf,
@@ -321,7 +323,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size, 
    }

    g_free(buf);



    return 0;

    return r;

}



/**

hw/s390x/css.c

+9 −6
Original line number Diff line number Diff line
@@ -368,13 +368,16 @@ static CCW1 copy_ccw_from_guest(hwaddr addr, bool fmt1) 
        ret.cda = be32_to_cpu(tmp1.cda);

    } else {

        cpu_physical_memory_read(addr, &tmp0, sizeof(tmp0));

        if ((tmp0.cmd_code & 0x0f) == CCW_CMD_TIC) {

            ret.cmd_code = CCW_CMD_TIC;

            ret.flags = 0;

            ret.count = 0;

        } else {

            ret.cmd_code = tmp0.cmd_code;

            ret.flags = tmp0.flags;

            ret.count = be16_to_cpu(tmp0.count);

        ret.cda = be16_to_cpu(tmp0.cda1) | (tmp0.cda0 << 16);

        if ((ret.cmd_code & 0x0f) == CCW_CMD_TIC) {

            ret.cmd_code &= 0x0f;

        }

        ret.cda = be16_to_cpu(tmp0.cda1) | (tmp0.cda0 << 16);

    }

    return ret;

}

hw/s390x/s390-virtio-ccw.c

+7 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int virtio_ccw_hcall_notify(const uint64_t *args) 
    if (!sch || !css_subch_visible(sch)) {

        return -EINVAL;

    }

    if (queue >= VIRTIO_CCW_QUEUE_MAX) {

    if (queue >= VIRTIO_QUEUE_MAX) {

        return -EINVAL;

    }

    virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
@@ -336,7 +336,12 @@ static const TypeInfo ccw_machine_info = { 
    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_2_8 \

        HW_COMPAT_2_8

        HW_COMPAT_2_8 \

        {\

            .driver   = TYPE_S390_FLIC_COMMON,\

            .property = "adapter_routes_max_batch",\

            .value    = "64",\

        },



#define CCW_COMPAT_2_7 \

        HW_COMPAT_2_7

hw/s390x/s390-virtio.c

+0 −10
Original line number Diff line number Diff line
@@ -44,16 +44,6 @@ 
#include "hw/s390x/ipl.h"

#include "cpu.h"



//#define DEBUG_S390



#ifdef DEBUG_S390

#define DPRINTF(fmt, ...) \

    do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)

#else

#define DPRINTF(fmt, ...) \

    do { } while (0)

#endif



#define MAX_BLK_DEVS                    10



#define S390_TOD_CLOCK_VALUE_MISSING    0x00