[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 09/99] spapr: don't advertise radix GTSE if max-com
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 09/99] spapr: don't advertise radix GTSE if max-compat-cpu < power9 |
Date: |
Mon, 23 Jul 2018 15:16:18 -0500 |
From: Greg Kurz <address@hidden>
On a POWER9 host, if a guest runs in pre POWER9 compat mode, it necessarily
uses the hash MMU mode. In this case, we shouldn't advertise radix GTSE in
the ibm,arch-vec-5-platform-support DT property as the current code does.
The first reason is that it doesn't make sense, and the second one is that
causes the CAS-negotiated options subsection to be migrated. This breaks
backward migration to QEMU 2.7 and older versions on POWER8 hosts:
qemu-system-ppc64: error while loading state for instance 0x0 of device
'spapr'
qemu-system-ppc64: load of migration failed: No such file or directory
This patch hence initialize CPUs a bit earlier so that we can check the
requested compat mode, and don't set OV5_MMU_RADIX_GTSE for power8 and
older.
Signed-off-by: Greg Kurz <address@hidden>
Signed-off-by: David Gibson <address@hidden>
(cherry picked from commit 0550b1206a91d66051a21441a02c4ff126b531fe)
Signed-off-by: Michael Roth <address@hidden>
---
hw/ppc/spapr.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a81570e7c8..092ec2498c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2392,6 +2392,7 @@ static void spapr_machine_init(MachineState *machine)
long load_limit, fw_size;
char *filename;
Error *resize_hpt_err = NULL;
+ PowerPCCPU *first_ppc_cpu;
msi_nonbroken = true;
@@ -2484,11 +2485,6 @@ static void spapr_machine_init(MachineState *machine)
}
spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY);
- if (!kvm_enabled() || kvmppc_has_cap_mmu_radix()) {
- /* KVM and TCG always allow GTSE with radix... */
- spapr_ovec_set(spapr->ov5, OV5_MMU_RADIX_GTSE);
- }
- /* ... but not with hash (currently). */
/* advertise support for dedicated HP event source to guests */
if (spapr->use_hotplug_event_source) {
@@ -2503,6 +2499,15 @@ static void spapr_machine_init(MachineState *machine)
/* init CPUs */
spapr_init_cpus(spapr);
+ first_ppc_cpu = POWERPC_CPU(first_cpu);
+ if ((!kvm_enabled() || kvmppc_has_cap_mmu_radix()) &&
+ ppc_check_compat(first_ppc_cpu, CPU_POWERPC_LOGICAL_3_00, 0,
+ spapr->max_compat_pvr)) {
+ /* KVM and TCG always allow GTSE with radix... */
+ spapr_ovec_set(spapr->ov5, OV5_MMU_RADIX_GTSE);
+ }
+ /* ... but not with hash (currently). */
+
if (kvm_enabled()) {
/* Enable H_LOGICAL_CI_* so SLOF can talk to in-kernel devices */
kvmppc_enable_logical_ci_hcalls();
--
2.17.1
- [Qemu-stable] [PATCH 00/99] Patch Round-up for stable 2.12.1, freeze on 2018-07-30, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 99/99] tcg/i386: Mark xmm registers call-clobbered, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 09/99] spapr: don't advertise radix GTSE if max-compat-cpu < power9,
Michael Roth <=
- [Qemu-stable] [PATCH 10/99] qxl: fix local renderer crash, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 11/99] configure: recognize more rpmbuild macros, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 13/99] iotests: Add test for rebasing with relative paths, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 12/99] qemu-img: Resolve relative backing paths in rebase, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 14/99] qemu-io: Use purely string blockdev options, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 15/99] qemu-img: Use only string options in img_open_opts, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 17/99] lm32: take BQL before writing IP/IM register, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 16/99] iotests: Add test for -U/force-share conflicts, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 18/99] raw: Check byte range uniformly, Michael Roth, 2018/07/23
- [Qemu-stable] [PATCH 19/99] s390x/css: disabled subchannels cannot be status pending, Michael Roth, 2018/07/23