Commit 10e1b759 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160111' into staging 



ppc patch queue 2016-01-11

Biggest content is a thorough cleanups of spapr machine type handling.
Also contains several other minor cleanups, bugfixes and extensions.

# gpg: Signature made Mon 11 Jan 2016 04:34:38 GMT using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.6-20160111:
  hw/ppc/spapr: fix spapr->kvm_type leak
  spapr vio: fix to incomplete QOMify
  hw/ppc/spapr: Use XHCI as host controller for new spapr machines
  pseries: Add pseries-2.6 machine type
  pseries: Improve setting of default machine version
  pseries: Restructure class_options functions
  pseries: DEFINE_SPAPR_MACHINE
  pseries: Use SET_MACHINE_COMPAT
  Move SET_MACHINE_COMPAT macro to boards.h
  pseries: Remove versions from mc->desc
  pseries: Remove redundant calls to spapr_machine_initfn()
  pseries: Rearrange versioned machine type code
  pseries: Remove redundant setting of mc->name for pseries-2.5 machine
  spapr: Add /system-id
  target-ppc: Define kvmppc_read_int_dt()
  hw/ppc/spapr_rtc: Remove bad class_size value

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d21ccd7b 87bbdd9c

hw/ppc/spapr.c

+141 −121
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base, 
                          qemu_uuid[14], qemu_uuid[15]);



    _FDT((fdt_property_string(fdt, "vm,uuid", buf)));

    if (qemu_uuid_set) {

        _FDT((fdt_property_string(fdt, "system-id", buf)));

    }

    g_free(buf);



    if (qemu_get_vm_name()) {
@@ -1914,7 +1917,11 @@ static void ppc_spapr_init(MachineState *machine) 
    }



    if (machine->usb) {

        if (smc->use_ohci_by_default) {

            pci_create_simple(phb->bus, -1, "pci-ohci");

        } else {

            pci_create_simple(phb->bus, -1, "nec-usb-xhci");

        }



        if (spapr->has_graphics) {

            USBBus *usb_bus = usb_bus_find(-1);
@@ -2101,6 +2108,13 @@ static void spapr_machine_initfn(Object *obj) 
                                    NULL);

}



static void spapr_machine_finalizefn(Object *obj)

{

    sPAPRMachineState *spapr = SPAPR_MACHINE(obj);



    g_free(spapr->kvm_type);

}



static void ppc_cpu_do_nmi_on_cpu(void *arg)

{

    CPUState *cs = arg;
@@ -2262,6 +2276,13 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    NMIClass *nc = NMI_CLASS(oc);

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);



    mc->desc = "pSeries Logical Partition (PAPR compliant)";



    /*

     * We set up the default / latest behaviour here.  The class_init

     * functions for the specific versioned machine types can override

     * these details for backwards compatibility

     */

    mc->init = ppc_spapr_init;

    mc->reset = ppc_spapr_reset;

    mc->block_default_type = IF_SCSI;
@@ -2277,7 +2298,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    hc->unplug = spapr_machine_device_unplug;

    mc->cpu_index_to_socket_id = spapr_cpu_index_to_socket_id;



    smc->dr_lmb_enabled = false;

    smc->dr_lmb_enabled = true;

    fwc->get_dev_path = spapr_get_fw_dev_path;

    nc->nmi_monitor_handler = spapr_nmi;

}
@@ -2288,6 +2309,7 @@ static const TypeInfo spapr_machine_info = { 
    .abstract      = true,

    .instance_size = sizeof(sPAPRMachineState),

    .instance_init = spapr_machine_initfn,

    .instance_finalize = spapr_machine_finalizefn,

    .class_size    = sizeof(sPAPRMachineClass),

    .class_init    = spapr_machine_class_init,

    .interfaces = (InterfaceInfo[]) {
@@ -2298,166 +2320,164 @@ static const TypeInfo spapr_machine_info = { 
    },

};



#define SPAPR_COMPAT_2_4 \

        HW_COMPAT_2_4



#define SPAPR_COMPAT_2_3 \

        SPAPR_COMPAT_2_4 \

        HW_COMPAT_2_3 \

#define DEFINE_SPAPR_MACHINE(suffix, verstr, latest)                 \

    static void spapr_machine_##suffix##_class_init(ObjectClass *oc, \

                                                    void *data)      \

    {                                                                \

            .driver   = "spapr-pci-host-bridge",\

            .property = "dynamic-reconfiguration",\

            .value    = "off",\

        },



#define SPAPR_COMPAT_2_2 \

        SPAPR_COMPAT_2_3 \

        HW_COMPAT_2_2 \

        MachineClass *mc = MACHINE_CLASS(oc);                        \

        spapr_machine_##suffix##_class_options(mc);                  \

        if (latest) {                                                \

            mc->alias = "pseries";                                   \

            mc->is_default = 1;                                      \

        }                                                            \

    }                                                                \

    static void spapr_machine_##suffix##_instance_init(Object *obj)  \

    {                                                                \

            .driver   = TYPE_SPAPR_PCI_HOST_BRIDGE,\

            .property = "mem_win_size",\

            .value    = "0x20000000",\

        },



#define SPAPR_COMPAT_2_1 \

        SPAPR_COMPAT_2_2 \

        HW_COMPAT_2_1

        MachineState *machine = MACHINE(obj);                        \

        spapr_machine_##suffix##_instance_options(machine);          \

    }                                                                \

    static const TypeInfo spapr_machine_##suffix##_info = {          \

        .name = MACHINE_TYPE_NAME("pseries-" verstr),                \

        .parent = TYPE_SPAPR_MACHINE,                                \

        .class_init = spapr_machine_##suffix##_class_init,           \

        .instance_init = spapr_machine_##suffix##_instance_init,     \

    };                                                               \

    static void spapr_machine_register_##suffix(void)                \

    {                                                                \

        type_register(&spapr_machine_##suffix##_info);               \

    }                                                                \

    machine_init(spapr_machine_register_##suffix)



static void spapr_compat_2_3(Object *obj)

/*

 * pseries-2.6

 */

static void spapr_machine_2_6_instance_options(MachineState *machine)

{

    savevm_skip_section_footers();

    global_state_set_optional();

}



static void spapr_compat_2_2(Object *obj)

static void spapr_machine_2_6_class_options(MachineClass *mc)

{

    spapr_compat_2_3(obj);

    /* Defaults for the latest behaviour inherited from the base class */

}



static void spapr_compat_2_1(Object *obj)

{

    spapr_compat_2_2(obj);

}

DEFINE_SPAPR_MACHINE(2_6, "2.6", true);



/*

 * pseries-2.5

 */

#define SPAPR_COMPAT_2_5 \

        HW_COMPAT_2_5



static void spapr_machine_2_3_instance_init(Object *obj)

static void spapr_machine_2_5_instance_options(MachineState *machine)

{

    spapr_compat_2_3(obj);

    spapr_machine_initfn(obj);

}



static void spapr_machine_2_2_instance_init(Object *obj)

static void spapr_machine_2_5_class_options(MachineClass *mc)

{

    spapr_compat_2_2(obj);

    spapr_machine_initfn(obj);

    sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);



    spapr_machine_2_6_class_options(mc);

    smc->use_ohci_by_default = true;

    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5);

}



static void spapr_machine_2_1_instance_init(Object *obj)

DEFINE_SPAPR_MACHINE(2_5, "2.5", false);



/*

 * pseries-2.4

 */

#define SPAPR_COMPAT_2_4 \

        HW_COMPAT_2_4



static void spapr_machine_2_4_instance_options(MachineState *machine)

{

    spapr_compat_2_1(obj);

    spapr_machine_initfn(obj);

    spapr_machine_2_5_instance_options(machine);

}



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

static void spapr_machine_2_4_class_options(MachineClass *mc)

{

    MachineClass *mc = MACHINE_CLASS(oc);

    static GlobalProperty compat_props[] = {

        SPAPR_COMPAT_2_1

        { /* end of list */ }

    };

    sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);



    mc->desc = "pSeries Logical Partition (PAPR compliant) v2.1";

    mc->compat_props = compat_props;

    spapr_machine_2_5_class_options(mc);

    smc->dr_lmb_enabled = false;

    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_4);

}



static const TypeInfo spapr_machine_2_1_info = {

    .name          = MACHINE_TYPE_NAME("pseries-2.1"),

    .parent        = TYPE_SPAPR_MACHINE,

    .class_init    = spapr_machine_2_1_class_init,

    .instance_init = spapr_machine_2_1_instance_init,

};

DEFINE_SPAPR_MACHINE(2_4, "2.4", false);



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

{

    static GlobalProperty compat_props[] = {

        SPAPR_COMPAT_2_2

        { /* end of list */ }

    };

    MachineClass *mc = MACHINE_CLASS(oc);

/*

 * pseries-2.3

 */

#define SPAPR_COMPAT_2_3 \

        SPAPR_COMPAT_2_4 \

        HW_COMPAT_2_3 \

        {\

            .driver   = "spapr-pci-host-bridge",\

            .property = "dynamic-reconfiguration",\

            .value    = "off",\

        },



    mc->desc = "pSeries Logical Partition (PAPR compliant) v2.2";

    mc->compat_props = compat_props;

static void spapr_machine_2_3_instance_options(MachineState *machine)

{

    spapr_machine_2_4_instance_options(machine);

    savevm_skip_section_footers();

    global_state_set_optional();

}



static const TypeInfo spapr_machine_2_2_info = {

    .name          = MACHINE_TYPE_NAME("pseries-2.2"),

    .parent        = TYPE_SPAPR_MACHINE,

    .class_init    = spapr_machine_2_2_class_init,

    .instance_init = spapr_machine_2_2_instance_init,

};



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

static void spapr_machine_2_3_class_options(MachineClass *mc)

{

    static GlobalProperty compat_props[] = {

        SPAPR_COMPAT_2_3

        { /* end of list */ }

    };

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3";

    mc->compat_props = compat_props;

    spapr_machine_2_4_class_options(mc);

    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_3);

}

DEFINE_SPAPR_MACHINE(2_3, "2.3", false);



static const TypeInfo spapr_machine_2_3_info = {

    .name          = MACHINE_TYPE_NAME("pseries-2.3"),

    .parent        = TYPE_SPAPR_MACHINE,

    .class_init    = spapr_machine_2_3_class_init,

    .instance_init = spapr_machine_2_3_instance_init,

};

/*

 * pseries-2.2

 */



#define SPAPR_COMPAT_2_2 \

        SPAPR_COMPAT_2_3 \

        HW_COMPAT_2_2 \

        {\

            .driver   = TYPE_SPAPR_PCI_HOST_BRIDGE,\

            .property = "mem_win_size",\

            .value    = "0x20000000",\

        },



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

static void spapr_machine_2_2_instance_options(MachineState *machine)

{

    static GlobalProperty compat_props[] = {

        SPAPR_COMPAT_2_4

        { /* end of list */ }

    };

    MachineClass *mc = MACHINE_CLASS(oc);

    spapr_machine_2_3_instance_options(machine);

}



    mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";

    mc->compat_props = compat_props;

static void spapr_machine_2_2_class_options(MachineClass *mc)

{

    spapr_machine_2_3_class_options(mc);

    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_2);

}

DEFINE_SPAPR_MACHINE(2_2, "2.2", false);



static const TypeInfo spapr_machine_2_4_info = {

    .name          = MACHINE_TYPE_NAME("pseries-2.4"),

    .parent        = TYPE_SPAPR_MACHINE,

    .class_init    = spapr_machine_2_4_class_init,

};

/*

 * pseries-2.1

 */

#define SPAPR_COMPAT_2_1 \

        SPAPR_COMPAT_2_2 \

        HW_COMPAT_2_1



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

static void spapr_machine_2_1_instance_options(MachineState *machine)

{

    MachineClass *mc = MACHINE_CLASS(oc);

    sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc);



    mc->name = "pseries-2.5";

    mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5";

    mc->alias = "pseries";

    mc->is_default = 1;

    smc->dr_lmb_enabled = true;

    spapr_machine_2_2_instance_options(machine);

}



static const TypeInfo spapr_machine_2_5_info = {

    .name          = MACHINE_TYPE_NAME("pseries-2.5"),

    .parent        = TYPE_SPAPR_MACHINE,

    .class_init    = spapr_machine_2_5_class_init,

};

static void spapr_machine_2_1_class_options(MachineClass *mc)

{

    spapr_machine_2_2_class_options(mc);

    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_1);

}

DEFINE_SPAPR_MACHINE(2_1, "2.1", false);



static void spapr_machine_register_types(void)

{

    type_register_static(&spapr_machine_info);

    type_register_static(&spapr_machine_2_1_info);

    type_register_static(&spapr_machine_2_2_info);

    type_register_static(&spapr_machine_2_3_info);

    type_register_static(&spapr_machine_2_4_info);

    type_register_static(&spapr_machine_2_5_info);

}



type_init(spapr_machine_register_types)

hw/ppc/spapr_rtc.c

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ static const TypeInfo spapr_rtc_info = { 
    .name          = TYPE_SPAPR_RTC,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(sPAPRRTCState),

    .class_size = sizeof(XICSStateClass),

    .class_init    = spapr_rtc_class_init,

};

hw/ppc/spapr_vio.c

+5 −7
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static void rtas_quiesce(PowerPCCPU *cpu, sPAPRMachineState *spapr, 


static VIOsPAPRDevice *reg_conflict(VIOsPAPRDevice *dev)

{

    VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);

    VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);

    BusChild *kid;

    VIOsPAPRDevice *other;
@@ -449,7 +449,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp) 
        }

    } else {

        /* Need to assign an address */

        VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);

        VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);



        do {

            dev->reg = bus->next_reg++;
@@ -523,13 +523,12 @@ VIOsPAPRBus *spapr_vio_bus_init(void) 
    DeviceState *dev;



    /* Create bridge device */

    dev = qdev_create(NULL, "spapr-vio-bridge");

    dev = qdev_create(NULL, TYPE_SPAPR_VIO_BRIDGE);

    qdev_init_nofail(dev);



    /* Create bus on bridge device */



    qbus = qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio");

    bus = DO_UPCAST(VIOsPAPRBus, bus, qbus);

    bus = SPAPR_VIO_BUS(qbus);

    bus->next_reg = 0x71000000;



    /* hcall-vio */
@@ -567,9 +566,8 @@ static void spapr_vio_bridge_class_init(ObjectClass *klass, void *data) 
}



static const TypeInfo spapr_vio_bridge_info = {

    .name          = "spapr-vio-bridge",

    .name          = TYPE_SPAPR_VIO_BRIDGE,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysBusDevice),

    .class_init    = spapr_vio_bridge_class_init,

};

include/hw/boards.h

+9 −0
Original line number Diff line number Diff line
@@ -157,4 +157,13 @@ struct MachineState { 
    } \

    machine_init(machine_initfn##_register_types)



#define SET_MACHINE_COMPAT(m, COMPAT) \

    do {                              \

        static GlobalProperty props[] = {       \

            COMPAT                              \

            { /* end of list */ }               \

        };                                      \

        (m)->compat_props = props;              \

    } while (0)



#endif

include/hw/i386/pc.h

+0 −8
Original line number Diff line number Diff line
@@ -857,13 +857,5 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
    } \

    machine_init(pc_machine_init_##suffix)



#define SET_MACHINE_COMPAT(m, COMPAT) do { \

    static GlobalProperty props[] = { \

        COMPAT \

        { /* end of list */ } \

    }; \

    (m)->compat_props = props; \

} while (0)



extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);

#endif