spapr: fix missing CPU core nodes in DT when running with TCG

[qemu.git] / hw / ppc / e500plat.c

diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 25ac4b1daebf6b6599b1200afd211548c0898f15..81d03e103803c75b89134ebc0e1a41334994b295 100644 (file)
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -9,59 +9,64 @@
  * (at your option) any later version.
  */
 
  * (at your option) any later version.
  */
 

-#include "config.h"
+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "e500.h"
 #include "qemu-common.h"
 #include "e500.h"

-#include "../boards.h"
+#include "hw/net/fsl_etsec/etsec.h"
+#include "hw/boards.h"

 #include "sysemu/device_tree.h"
 #include "sysemu/device_tree.h"

+#include "sysemu/kvm.h"
+#include "hw/sysbus.h"

 #include "hw/pci/pci.h"
 #include "hw/pci/pci.h"

-#include "hw/openpic.h"
+#include "hw/ppc/openpic.h"
+#include "kvm_ppc.h"

 
 static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
 {
     const char model[] = "QEMU ppce500";
     const char compatible[] = "fsl,qemu-e500";
 
 
 static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
 {
     const char model[] = "QEMU ppce500";
     const char compatible[] = "fsl,qemu-e500";
 

-    qemu_devtree_setprop(fdt, "/", "model", model, sizeof(model));
-    qemu_devtree_setprop(fdt, "/", "compatible", compatible,
-                         sizeof(compatible));
+    qemu_fdt_setprop(fdt, "/", "model", model, sizeof(model));
+    qemu_fdt_setprop(fdt, "/", "compatible", compatible,
+                     sizeof(compatible));

 }
 
 }
 

-static void e500plat_init(QEMUMachineInitArgs *args)
+static void e500plat_init(MachineState *machine)

 {
 {

-    ram_addr_t ram_size = args->ram_size;
-    const char *boot_device = args->boot_device;
-    const char *cpu_model = args->cpu_model;
-    const char *kernel_filename = args->kernel_filename;
-    const char *kernel_cmdline = args->kernel_cmdline;
-    const char *initrd_filename = args->initrd_filename;

     PPCE500Params params = {
     PPCE500Params params = {

-        .ram_size = ram_size,
-        .boot_device = boot_device,
-        .kernel_filename = kernel_filename,
-        .kernel_cmdline = kernel_cmdline,
-        .initrd_filename = initrd_filename,
-        .cpu_model = cpu_model,

         .pci_first_slot = 0x1,
         .pci_nr_slots = PCI_SLOT_MAX - 1,
         .fixup_devtree = e500plat_fixup_devtree,
         .mpic_version = OPENPIC_MODEL_FSL_MPIC_42,
         .pci_first_slot = 0x1,
         .pci_nr_slots = PCI_SLOT_MAX - 1,
         .fixup_devtree = e500plat_fixup_devtree,
         .mpic_version = OPENPIC_MODEL_FSL_MPIC_42,

+        .has_mpc8xxx_gpio = true,
+        .has_platform_bus = true,
+        .platform_bus_base = 0xf00000000ULL,
+        .platform_bus_size = (128ULL * 1024 * 1024),
+        .platform_bus_first_irq = 5,
+        .platform_bus_num_irqs = 10,
+        .ccsrbar_base = 0xFE0000000ULL,
+        .pci_pio_base = 0xFE1000000ULL,
+        .pci_mmio_base = 0xC00000000ULL,
+        .pci_mmio_bus_base = 0xE0000000ULL,
+        .spin_base = 0xFEF000000ULL,

     };
 
     };
 

-    ppce500_init(&params);
-}
+    /* Older KVM versions don't support EPR which breaks guests when we announce
+       MPIC variants that support EPR. Revert to an older one for those */
+    if (kvm_enabled() && !kvmppc_has_cap_epr()) {
+        params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20;
+    }

 
 

-static QEMUMachine e500plat_machine = {
-    .name = "ppce500",
-    .desc = "generic paravirt e500 platform",
-    .init = e500plat_init,
-    .max_cpus = 32,
-    DEFAULT_MACHINE_OPTIONS,
-};
+    ppce500_init(machine, &params);
+}

 
 

-static void e500plat_machine_init(void)
+static void e500plat_machine_init(MachineClass *mc)

 {
 {

-    qemu_register_machine(&e500plat_machine);
+    mc->desc = "generic paravirt e500 platform";
+    mc->init = e500plat_init;
+    mc->max_cpus = 32;
+    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ETSEC_COMMON);
+    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");

 }
 
 }
 

-machine_init(e500plat_machine_init);
+DEFINE_MACHINE("ppce500", e500plat_machine_init)