Commit 861cd431 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171017' into staging 



ppc patch queue 2017-10-17

Here's the currently accumulated set of ppc patches for qemu.

  * The biggest set here is the ppc parts of Igor Mammedov's cleanups
    to cpu model handling
  * The above also includes a generic patches which are required as
    prerequisites for the ppc parts.  They don't seem to have been
    merged by Eduardo yet, so I hope they're ok to include here.
  * Apart from that it's basically just assorted bug fixes and cleanups

# gpg: Signature made Tue 17 Oct 2017 05:20:03 BST
# gpg:                using RSA key 0x6C38CACA20D9B392
# 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:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.11-20171017: (34 commits)
  spapr_cpu_core: rewrite machine type sanity check
  spapr_pci: fail gracefully with non-pseries machine types
  spapr: Correct RAM size calculation for HPT resizing
  ppc: pnv: consolidate type definitions and batch register them
  ppc: pnv: drop PnvChipClass::cpu_model field
  ppc: pnv: define core types statically
  ppc: pnv: drop PnvCoreClass::cpu_oc field
  ppc: pnv: normalize core/chip type names
  ppc: pnv: use generic cpu_model parsing
  ppc: spapr: use generic cpu_model parsing
  ppc: move ppc_cpu_lookup_alias() before its first user
  ppc: spapr: use cpu model names as tcg defaults instead of aliases
  ppc: spapr: register 'host' core type along with the rest of core types
  ppc: spapr: use cpu type name directly
  ppc: spapr: define core types statically
  ppc: move '-cpu foo,compat=xxx' parsing into ppc_cpu_parse_featurestr()
  ppc: spapr: replace ppc_cpu_parse_features() with cpu_parse_cpu_model()
  ppc: 40p/prep: replace cpu_model with cpu_type
  ppc: virtex-ml507: replace cpu_model with cpu_type
  ppc: replace cpu_model with cpu_type on ref405ep,taihu boards
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a9038e5e e7cca3e9

hw/ide/macio.c

+3 −1
Original line number Diff line number Diff line
@@ -353,12 +353,14 @@ static const MemoryRegionOps pmac_ide_ops = { 


static const VMStateDescription vmstate_pmac = {

    .name = "ide",

    .version_id = 4,

    .version_id = 5,

    .minimum_version_id = 0,

    .fields = (VMStateField[]) {

        VMSTATE_IDE_BUS(bus, MACIOIDEState),

        VMSTATE_IDE_DRIVES(bus.ifs, MACIOIDEState),

        VMSTATE_BOOL(dma_active, MACIOIDEState),

        VMSTATE_UINT32(timing_reg, MACIOIDEState),

        VMSTATE_UINT32(irq_reg, MACIOIDEState),

        VMSTATE_END_OF_LIST()

    }

};

hw/ppc/e500.c

+1 −7
Original line number Diff line number Diff line
@@ -803,11 +803,6 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) 
    SysBusDevice *s;

    PPCE500CCSRState *ccsr;



    /* Setup CPUs */

    if (machine->cpu_model == NULL) {

        machine->cpu_model = "e500v2_v30";

    }



    irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));

    irqs[0] = g_malloc0(smp_cpus * sizeof(qemu_irq) * OPENPIC_OUTPUT_NB);

    for (i = 0; i < smp_cpus; i++) {
@@ -815,8 +810,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) 
        CPUState *cs;

        qemu_irq *input;



        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,

                                           machine->cpu_model));

        cpu = POWERPC_CPU(cpu_create(machine->cpu_type));

        env = &cpu->env;

        cs = CPU(cpu);

hw/ppc/e500plat.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static void e500plat_machine_init(MachineClass *mc) 
    mc->init = e500plat_init;

    mc->max_cpus = 32;

    mc->has_dynamic_sysbus = true;

    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");

}



DEFINE_MACHINE("ppce500", e500plat_machine_init)

hw/ppc/mac_newworld.c

+6 −9
Original line number Diff line number Diff line
@@ -174,16 +174,8 @@ static void ppc_core99_init(MachineState *machine) 
    linux_boot = (kernel_filename != NULL);



    /* init CPUs */

    if (machine->cpu_model == NULL) {

#ifdef TARGET_PPC64

        machine->cpu_model = "970fx";

#else

        machine->cpu_model = "G4";

#endif

    }

    for (i = 0; i < smp_cpus; i++) {

        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,

                                           machine->cpu_model));

        cpu = POWERPC_CPU(cpu_create(machine->cpu_type));

        env = &cpu->env;



        /* Set time-base frequency to 100 Mhz */
@@ -520,6 +512,11 @@ static void core99_machine_class_init(ObjectClass *oc, void *data) 
    mc->max_cpus = MAX_CPUS;

    mc->default_boot_order = "cd";

    mc->kvm_type = core99_kvm_type;

#ifdef TARGET_PPC64

    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1");

#else

    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");

#endif

}



static const TypeInfo core99_machine_info = {

hw/ppc/mac_oldworld.c

+2 −4
Original line number Diff line number Diff line
@@ -108,11 +108,8 @@ static void ppc_heathrow_init(MachineState *machine) 
    linux_boot = (kernel_filename != NULL);



    /* init CPUs */

    if (machine->cpu_model == NULL)

        machine->cpu_model = "G3";

    for (i = 0; i < smp_cpus; i++) {

        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,

                                           machine->cpu_model));

        cpu = POWERPC_CPU(cpu_create(machine->cpu_type));

        env = &cpu->env;



        /* Set time-base frequency to 16.6 Mhz */
@@ -385,6 +382,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data) 
    /* TOFIX "cad" when Mac floppy is implemented */

    mc->default_boot_order = "cd";

    mc->kvm_type = heathrow_kvm_type;

    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("750_v3.1");

}



static const TypeInfo ppc_heathrow_machine_info = {