Commit 31e49ac1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Hopefully last big batch of s390x patches, including:
- bugfixes for LE host and for pci translation
- MAINTAINERS update
- hugetlbfs enablement (kernel patches pending)
- boot from El Torito iso images on virtio-blk
  (boot from scsi pending)
- cleanup in the ipl device code

There's also a helper function for resetting busless devices in the
qdev core in there.

# gpg: Signature made Wed 11 Nov 2015 17:49:58 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20151111:
  s390: deprecate the non-ccw machine in 2.5
  s390x/ipl: switch error reporting to error_setg
  s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE
  qdev: provide qdev_reset_all_fn()
  pc-bios/s390-ccw: rebuild image
  pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround
  pc-bios/s390-ccw: El Torito s390x boot entry check
  pc-bios/s390-ccw: ISO-9660 El Torito boot implementation
  pc-bios/s390-ccw: Always adjust virtio sector count
  s390x/kvm: don't enable CMMA when hugetlbfs will be used
  s390x: switch to memory_region_allocate_system_memory
  MAINTAINERS: update virtio-ccw/s390 git tree
  MAINTAINERS: update s390 file patterns
  s390x/pci : fix up s390 pci iommu translation function
  s390x/css: sense data endianness

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2869653f 3c4c694c

MAINTAINERS

+12 −8
Original line number Diff line number Diff line
@@ -237,9 +237,14 @@ M: Cornelia Huck <cornelia.huck@de.ibm.com> 
M: Alexander Graf <agraf@suse.de>

S: Maintained

F: target-s390x/kvm.c

F: target-s390x/ioinst.[ch]

F: target-s390x/machine.c

F: hw/intc/s390_flic.c

F: hw/intc/s390_flic_kvm.c

F: include/hw/s390x/s390_flic.h

F: gdb-xml/s390*.xml

T: git git://github.com/cohuck/qemu.git s390-next

T: git git://github.com/borntraeger/qemu.git s390-next



X86

M: Paolo Bonzini <pbonzini@redhat.com>
@@ -637,15 +642,13 @@ M: Christian Borntraeger <borntraeger@de.ibm.com> 
M: Alexander Graf <agraf@suse.de>

S: Supported

F: hw/char/sclp*.[hc]

F: hw/s390x/s390-virtio-ccw.c

F: hw/s390x/css.[hc]

F: hw/s390x/sclp*.[hc]

F: hw/s390x/ipl*.[hc]

F: hw/s390x/*pci*.[hc]

F: hw/s390x/s390-skeys*.c

F: hw/s390x/

X: hw/s390x/s390-virtio-bus.[ch]

F: include/hw/s390x/

F: pc-bios/s390-ccw/

T: git git://github.com/cohuck/qemu virtio-ccw-upstr

F: hw/watchdog/wdt_diag288.c

T: git git://github.com/cohuck/qemu.git s390-next

T: git git://github.com/borntraeger/qemu.git s390-next



UniCore32 Machines

-------------
@@ -872,7 +875,8 @@ M: Cornelia Huck <cornelia.huck@de.ibm.com> 
M: Christian Borntraeger <borntraeger@de.ibm.com>

S: Supported

F: hw/s390x/virtio-ccw.[hc]

T: git git://github.com/cohuck/qemu virtio-ccw-upstr

T: git git://github.com/cohuck/qemu.git s390-next

T: git git://github.com/borntraeger/qemu.git s390-next



virtio-input

M: Gerd Hoffmann <kraxel@redhat.com>

hw/core/qdev.c

+5 −0
Original line number Diff line number Diff line
@@ -325,6 +325,11 @@ void qdev_reset_all(DeviceState *dev) 
    qdev_walk_children(dev, NULL, NULL, qdev_reset_one, qbus_reset_one, NULL);

}



void qdev_reset_all_fn(void *opaque)

{

    qdev_reset_all(DEVICE(opaque));

}



void qbus_reset_all(BusState *bus)

{

    qbus_walk_children(bus, NULL, NULL, qdev_reset_one, qbus_reset_one, NULL);

hw/s390x/css.c

+6 −0
Original line number Diff line number Diff line
@@ -892,8 +892,14 @@ int css_do_tsch_get_irb(SubchDev *sch, IRB *target_irb, int *irb_len) 
        /* If a unit check is pending, copy sense data. */

        if ((s->dstat & SCSW_DSTAT_UNIT_CHECK) &&

            (p->chars & PMCW_CHARS_MASK_CSENSE)) {

            int i;



            irb.scsw.flags |= SCSW_FLAGS_MASK_ESWF | SCSW_FLAGS_MASK_ECTL;

            /* Attention: sense_data is already BE! */

            memcpy(irb.ecw, sch->sense_data, sizeof(sch->sense_data));

            for (i = 0; i < ARRAY_SIZE(irb.ecw); i++) {

                irb.ecw[i] = be32_to_cpu(irb.ecw[i]);

            }

            irb.esw[1] = 0x01000000 | (sizeof(sch->sense_data) << 8);

        }

    }

hw/s390x/ipl.c

+16 −52
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "cpu.h"

#include "elf.h"

#include "hw/loader.h"

#include "hw/sysbus.h"

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

#include "hw/s390x/css.h"

#include "ipl.h"
@@ -29,44 +28,6 @@ 
#define ZIPL_IMAGE_START                0x009000UL

#define IPL_PSW_MASK                    (PSW_MASK_32 | PSW_MASK_64)



#define TYPE_S390_IPL "s390-ipl"

#define S390_IPL(obj) \

    OBJECT_CHECK(S390IPLState, (obj), TYPE_S390_IPL)

#if 0

#define S390_IPL_CLASS(klass) \

    OBJECT_CLASS_CHECK(S390IPLState, (klass), TYPE_S390_IPL)

#define S390_IPL_GET_CLASS(obj) \

    OBJECT_GET_CLASS(S390IPLState, (obj), TYPE_S390_IPL)

#endif



typedef struct S390IPLClass {

    /*< private >*/

    SysBusDeviceClass parent_class;

    /*< public >*/



    void (*parent_reset) (SysBusDevice *dev);

} S390IPLClass;



typedef struct S390IPLState {

    /*< private >*/

    SysBusDevice parent_obj;

    uint64_t start_addr;

    uint64_t bios_start_addr;

    bool enforce_bios;

    IplParameterBlock iplb;

    bool iplb_valid;

    bool reipl_requested;



    /*< public >*/

    char *kernel;

    char *initrd;

    char *cmdline;

    char *firmware;

    uint8_t cssid;

    uint8_t ssid;

    uint16_t devno;

} S390IPLState;



static const VMStateDescription vmstate_iplb = {

    .name = "ipl/iplb",

    .version_id = 0,
@@ -110,11 +71,12 @@ static uint64_t bios_translate_addr(void *opaque, uint64_t srcaddr) 
    return srcaddr + dstaddr;

}



static int s390_ipl_init(SysBusDevice *dev)

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

{

    S390IPLState *ipl = S390_IPL(dev);

    uint64_t pentry = KERN_IMAGE_START;

    int kernel_size;

    Error *l_err = NULL;



    int bios_size;

    char *bios_filename;
@@ -132,7 +94,8 @@ static int s390_ipl_init(SysBusDevice *dev) 


        bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

        if (bios_filename == NULL) {

            hw_error("could not find stage1 bootloader\n");

            error_setg(&l_err, "could not find stage1 bootloader\n");

            goto error;

        }



        bios_size = load_elf(bios_filename, bios_translate_addr, &fwbase,
@@ -150,7 +113,8 @@ static int s390_ipl_init(SysBusDevice *dev) 
        g_free(bios_filename);



        if (bios_size == -1) {

            hw_error("could not load bootloader '%s'\n", bios_name);

            error_setg(&l_err, "could not load bootloader '%s'\n", bios_name);

            goto error;

        }



        /* default boot target is the bios */
@@ -164,8 +128,8 @@ static int s390_ipl_init(SysBusDevice *dev) 
            kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);

        }

        if (kernel_size < 0) {

            fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);

            return -1;

            error_setg(&l_err, "could not load kernel '%s'\n", ipl->kernel);

            goto error;

        }

        /*

         * Is it a Linux kernel (starting at 0x10000)? If yes, we fill in the
@@ -192,9 +156,8 @@ static int s390_ipl_init(SysBusDevice *dev) 
            initrd_size = load_image_targphys(ipl->initrd, initrd_offset,

                                              ram_size - initrd_offset);

            if (initrd_size == -1) {

                fprintf(stderr, "qemu: could not load initrd '%s'\n",

                        ipl->initrd);

                exit(1);

                error_setg(&l_err, "could not load initrd '%s'\n", ipl->initrd);

                goto error;

            }



            /*
@@ -205,7 +168,9 @@ static int s390_ipl_init(SysBusDevice *dev) 
            stq_p(rom_ptr(INITRD_PARM_SIZE), initrd_size);

        }

    }

    return 0;

    qemu_register_reset(qdev_reset_all_fn, dev);

error:

    error_propagate(errp, l_err);

}



static Property s390_ipl_properties[] = {
@@ -308,9 +273,8 @@ static void s390_ipl_reset(DeviceState *dev) 
static void s390_ipl_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = s390_ipl_init;

    dc->realize = s390_ipl_realize;

    dc->props = s390_ipl_properties;

    dc->reset = s390_ipl_reset;

    dc->vmsd = &vmstate_ipl;
@@ -319,8 +283,8 @@ static void s390_ipl_class_init(ObjectClass *klass, void *data) 


static const TypeInfo s390_ipl_info = {

    .class_init = s390_ipl_class_init,

    .parent = TYPE_SYS_BUS_DEVICE,

    .name  = "s390-ipl",

    .parent = TYPE_DEVICE,

    .name  = TYPE_S390_IPL,

    .instance_size  = sizeof(S390IPLState),

};

hw/s390x/ipl.h

+25 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#ifndef HW_S390_IPL_H

#define HW_S390_IPL_H



#include "hw/qdev.h"

#include "cpu.h"



typedef struct IplParameterBlock {
@@ -25,4 +26,28 @@ void s390_ipl_prepare_cpu(S390CPU *cpu); 
IplParameterBlock *s390_ipl_get_iplb(void);

void s390_reipl_request(void);



#define TYPE_S390_IPL "s390-ipl"

#define S390_IPL(obj) OBJECT_CHECK(S390IPLState, (obj), TYPE_S390_IPL)



struct S390IPLState {

    /*< private >*/

    DeviceState parent_obj;

    uint64_t start_addr;

    uint64_t bios_start_addr;

    bool enforce_bios;

    IplParameterBlock iplb;

    bool iplb_valid;

    bool reipl_requested;



    /*< public >*/

    char *kernel;

    char *initrd;

    char *cmdline;

    char *firmware;

    uint8_t cssid;

    uint8_t ssid;

    uint16_t devno;

};

typedef struct S390IPLState S390IPLState;



#endif