[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 10/19] pseries: Fix compat_pvr on reset
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 10/19] pseries: Fix compat_pvr on reset |
Date: |
Thu, 29 Aug 2019 16:08:18 +1000 |
From: Laurent Vivier <address@hidden>
If we a migrate P8 machine to a P9 machine, the migration fails on
destination with:
error while loading state for instance 0x1 of device 'cpu'
load of migration failed: Operation not permitted
This is caused because the compat_pvr field is only present for the first
CPU.
Originally, spapr_machine_reset() calls ppc_set_compat() to set the value
max_compat_pvr for the first cpu and this was propagated to all CPUs by
spapr_cpu_reset(). Now, as spapr_cpu_reset() is called before that, the
value is not propagated to all CPUs and the migration fails.
To fix that, propagate the new value to all CPUs in spapr_machine_reset().
Fixes: 25c9780d38d4 ("spapr: Reset CAS & IRQ subsystem after devices")
Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 8 +++++++-
hw/ppc/spapr_cpu_core.c | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index baedadf20b..d063312a3b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1752,7 +1752,13 @@ static void spapr_machine_reset(MachineState *machine)
spapr_ovec_cleanup(spapr->ov5_cas);
spapr->ov5_cas = spapr_ovec_new();
- ppc_set_compat(first_ppc_cpu, spapr->max_compat_pvr, &error_fatal);
+ /*
+ * reset compat_pvr for all CPUs
+ * as qemu_devices_reset() is called before this,
+ * it can't be propagated by spapr_cpu_reset()
+ * from the first CPU to all the others
+ */
+ ppc_set_compat_all(spapr->max_compat_pvr, &error_fatal);
}
/*
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index bf47fbdf6f..45e2f2747f 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -43,6 +43,8 @@ static void spapr_cpu_reset(void *opaque)
/* Set compatibility mode to match the boot CPU, which was either set
* by the machine reset code or by CAS. This should never fail.
+ * At startup the value is already set for all the CPUs
+ * but we need this when we hotplug a new CPU
*/
ppc_set_compat(cpu, POWERPC_CPU(first_cpu)->compat_pvr, &error_abort);
--
2.21.0
- [Qemu-ppc] [PULL 00/19] ppc-for-4.2 queue 20190829, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 01/19] ppc/pnv: Set default ram size to 1.75GB, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 03/19] ppc/pnv: add more dummy XSCOM addresses for the P9 CAPP, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 06/19] tests/boot-serial-test: add support for all the PowerNV machines, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 05/19] ppc/pnv: Introduce PowerNV machines with fixed CPU models, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 04/19] ppc/pnv: Generate phandle for the "interrupt-parent" property, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 07/19] ppc: Fix xsmaddmdp and friends, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 11/19] target/ppc: Set float_tininess_before_rounding at cpu reset, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 10/19] pseries: Fix compat_pvr on reset,
David Gibson <=
- [Qemu-ppc] [PULL 13/19] target/ppc: Refactor emulation of vmrgew and vmrgow instructions, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 12/19] target/ppc: Fix do_float_check_status vs inexact, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 08/19] ppc: Fix xscvdpspn for SNAN, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 18/19] spapr/pci: Convert types to QEMU coding style, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 09/19] spapr_pci: remove all child functions in function zero unplug, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 15/19] powerpc/spapr: Add host threads parameter to ibm, get_system_parameter, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 19/19] spapr: Set compat mode in spapr_core_plug(), David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 16/19] spapr: Use SHUTDOWN_CAUSE_SUBSYSTEM_RESET for CAS reboots, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 17/19] spapr_pci: Advertise BAR reallocation capability, David Gibson, 2019/08/29
- [Qemu-ppc] [PULL 14/19] pseries: Update SLOF firmware image, David Gibson, 2019/08/29