[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 43/44] ppc/pnv: introduce new skiboot platform properti
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 43/44] ppc/pnv: introduce new skiboot platform properties |
Date: |
Wed, 29 May 2019 16:50:16 +1000 |
From: Cédric Le Goater <address@hidden>
Newer skiboots (after 6.3) support QEMU platforms that have
characteristics closer to real OpenPOWER systems. The CPU type is used
to define the BMC drivers: Aspeed AST2400 for POWER8 processors and
AST2500 for POWER9s.
Advertise the new platform property names, "qemu,powernv8" and
"qemu,powernv9", using the CPU type chosen for the QEMU PowerNV
machine. Also, advertise the original platform name "qemu,powernv" in
case of POWER8 processors for compatibility with older skiboots.
Signed-off-by: Cédric Le Goater <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/pnv.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 31aa20ee25..046f0a83c8 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -450,7 +450,8 @@ static void pnv_dt_power_mgt(void *fdt)
static void *pnv_dt_create(MachineState *machine)
{
- const char plat_compat[] = "qemu,powernv\0ibm,powernv";
+ const char plat_compat8[] = "qemu,powernv8\0qemu,powernv\0ibm,powernv";
+ const char plat_compat9[] = "qemu,powernv9\0ibm,powernv";
PnvMachineState *pnv = PNV_MACHINE(machine);
void *fdt;
char *buf;
@@ -465,8 +466,14 @@ static void *pnv_dt_create(MachineState *machine)
_FDT((fdt_setprop_cell(fdt, 0, "#size-cells", 0x2)));
_FDT((fdt_setprop_string(fdt, 0, "model",
"IBM PowerNV (emulated by qemu)")));
- _FDT((fdt_setprop(fdt, 0, "compatible", plat_compat,
- sizeof(plat_compat))));
+ if (pnv_is_power9(pnv)) {
+ _FDT((fdt_setprop(fdt, 0, "compatible", plat_compat9,
+ sizeof(plat_compat9))));
+ } else {
+ _FDT((fdt_setprop(fdt, 0, "compatible", plat_compat8,
+ sizeof(plat_compat8))));
+ }
+
buf = qemu_uuid_unparse_strdup(&qemu_uuid);
_FDT((fdt_setprop_string(fdt, 0, "vm,uuid", buf)));
--
2.21.0
- [Qemu-ppc] [PULL 23/44] target/ppc: Use vector variable shifts for VSL, VSR, VSRA, (continued)
- [Qemu-ppc] [PULL 23/44] target/ppc: Use vector variable shifts for VSL, VSR, VSRA, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 34/44] spapr: check for the activation of the KVM IRQ device, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 29/44] spapr/xive: introduce a VM state change handler, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 19/44] target/ppc: Fix xvabs[sd]p, xvnabs[sd]p, xvneg[sd]p, xvcpsgn[sd]p, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 22/44] spapr: Add forgotten capability to migration stream, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 31/44] spapr/xive: activate KVM support, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 27/44] spapr/xive: add hcall support when under KVM, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 21/44] target/ppc: Set PSSCR_EC on cpu halt to prevent spurious wakeup, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 32/44] sysbus: add a sysbus_mmio_unmap() helper, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 44/44] ppc/pnv: add dummy XSCOM registers for PRD initialization, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 43/44] ppc/pnv: introduce new skiboot platform properties,
David Gibson <=
- [Qemu-ppc] [PULL 36/44] spapr/irq: initialize the IRQ device only once, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 41/44] spapr: change default interrupt mode to 'dual', David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 42/44] spapr: Don't migrate the hpt_maxpagesize cap to older machine types, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 38/44] spapr/irq: add KVM support to the 'dual' machine, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 40/44] spapr/xive: fix multiple resets when using the 'dual' interrupt mode, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 35/44] spapr/irq: introduce a spapr_irq_init_device() helper, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 37/44] ppc/xics: fix irq priority in ics_set_irq_type(), David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 33/44] spapr: introduce routines to delete the KVM IRQ device, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 39/44] docs: provide documentation on the POWER9 XIVE interrupt controller, David Gibson, 2019/05/29
- [Qemu-ppc] [PULL 30/44] spapr/xive: add migration support for KVM, David Gibson, 2019/05/29