Revision 4374cbca952851b92ec2532041f7557d959dbd23 authored by Greg Kurz on 17 January 2018, 09:20:42 UTC, committed by Michael Roth on 06 February 2018, 00:55:26 UTC
Commit 51f84465dd98 changed the compatility mode setting logic:
- machine reset only sets compatibility mode for the boot CPU
- compatibility mode is set for other CPUs when they are put online
  by the guest with the "start-cpu" RTAS call

This causes a regression for machines started with max-compat-cpu:
the device tree nodes related to secondary CPU cores contain wrong
"cpu-version" and "ibm,pa-features" values, as shown below.

Guest started on a POWER8 host with:
     -smp cores=2 -machine pseries,max-cpu-compat=compat7

                        ibm,pa-features = [18 00 f6 3f c7 c0 80 f0 80 00
 00 00 00 00 00 00 00 00 80 00 80 00 80 00 00 00];
                        cpu-version = <0x4d0200>;

                               ^^^
                        second CPU core

                        ibm,pa-features = <0x600f63f 0xc70080c0>;
                        cpu-version = <0xf000003>;

                               ^^^
                          boot CPU core

The second core is advertised in raw POWER8 mode. This happens because
CAS assumes all CPUs to have the same compatibility mode. Since the
boot CPU already has the requested compatibility mode, the CAS code
does not set it for the secondary one, and exposes the bogus device
tree properties in in the CAS response to the guest.

A similar situation is observed when hot-plugging a CPU core. The
related device tree properties are generated and exposed to guest
with the "ibm,configure-connector" RTAS before "start-cpu" is called.
The CPU core is advertised to the guest in raw mode as well.

It both cases, it boils down to the fact that "start-cpu" happens too
late. This can be fixed globally by propagating the compatibility mode
of the boot CPU to the other CPUs during reset.  For this to work, the
compatibility mode of the boot CPU must be set before the machine code
actually resets all CPUs.

It is not needed to set the compatibility mode in "start-cpu" anymore,
so the code is dropped.

Fixes: 51f84465dd98
Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit 9012a53f067a78022947e18050b145c34a3dc599)
 Conflicts:
	hw/ppc/spapr_cpu_core.c
	hw/ppc/spapr_rtas.c
* drop context dep on d6322252b32
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
1 parent a1f33a5
History
File Mode Size
accel
audio
backends
block
bsd-user
capstone @ 22ead3e
chardev
contrib
crypto
default-configs
disas
docs
dtc @ 558cd81
fpu
fsdev
gdb-xml
hw
include
io
libdecnumber
linux-headers
linux-user
migration
nbd
net
pc-bios
po
qapi
qga
qobject
qom
replay
roms
scripts
scsi
slirp
stubs
target
tcg
tests
trace
ui
util
.dir-locals.el -rw-r--r-- 75 bytes
.editorconfig -rw-r--r-- 200 bytes
.exrc -rw-r--r-- 220 bytes
.gdbinit -rw-r--r-- 326 bytes
.gitignore -rw-r--r-- 2.5 KB
.gitmodules -rw-r--r-- 1.3 KB
.mailmap -rw-r--r-- 1.4 KB
.shippable.yml -rw-r--r-- 1.9 KB
.travis.yml -rw-r--r-- 6.4 KB
CODING_STYLE -rw-r--r-- 5.7 KB
COPYING -rw-r--r-- 17.6 KB
COPYING.LIB -rw-r--r-- 25.8 KB
COPYING.PYTHON -rw-r--r-- 13.3 KB
Changelog -rw-r--r-- 22.6 KB
HACKING -rw-r--r-- 9.9 KB
LICENSE -rw-r--r-- 840 bytes
MAINTAINERS -rw-r--r-- 40.5 KB
Makefile -rw-r--r-- 32.9 KB
Makefile.objs -rw-r--r-- 5.7 KB
Makefile.target -rw-r--r-- 6.4 KB
README -rw-r--r-- 3.5 KB
VERSION -rw-r--r-- 7 bytes
arch_init.c -rw-r--r-- 3.1 KB
balloon.c -rw-r--r-- 3.4 KB
block.c -rw-r--r-- 151.3 KB
blockdev-nbd.c -rw-r--r-- 5.1 KB
blockdev.c -rw-r--r-- 121.0 KB
blockjob.c -rw-r--r-- 25.6 KB
bootdevice.c -rw-r--r-- 9.2 KB
bt-host.c -rw-r--r-- 5.2 KB
bt-vhci.c -rw-r--r-- 4.5 KB
configure -rwxr-xr-x 174.4 KB
cpus-common.c -rw-r--r-- 10.1 KB
cpus.c -rw-r--r-- 54.4 KB
device-hotplug.c -rw-r--r-- 2.6 KB
device_tree.c -rw-r--r-- 12.9 KB
disas.c -rw-r--r-- 17.7 KB
dma-helpers.c -rw-r--r-- 7.9 KB
dump.c -rw-r--r-- 59.5 KB
exec.c -rw-r--r-- 107.8 KB
gdbstub.c -rw-r--r-- 52.1 KB
hmp-commands-info.hx -rw-r--r-- 18.0 KB
hmp-commands.hx -rw-r--r-- 52.9 KB
hmp.c -rw-r--r-- 89.4 KB
hmp.h -rw-r--r-- 7.9 KB
ioport.c -rw-r--r-- 9.0 KB
iothread.c -rw-r--r-- 10.3 KB
memory.c -rw-r--r-- 98.8 KB
memory_ldst.inc.c -rw-r--r-- 20.1 KB
memory_mapping.c -rw-r--r-- 10.5 KB
module-common.c -rw-r--r-- 113 bytes
monitor.c -rw-r--r-- 111.8 KB
numa.c -rw-r--r-- 22.5 KB
os-posix.c -rw-r--r-- 7.9 KB
os-win32.c -rw-r--r-- 3.7 KB
qapi-schema.json -rw-r--r-- 81.6 KB
qdev-monitor.c -rw-r--r-- 26.4 KB
qdict-test-data.txt -rw-r--r-- 88.4 KB
qemu-bridge-helper.c -rw-r--r-- 11.0 KB
qemu-doc.texi -rw-r--r-- 75.7 KB
qemu-ga.texi -rw-r--r-- 3.2 KB
qemu-img-cmds.hx -rw-r--r-- 5.2 KB
qemu-img.c -rw-r--r-- 137.2 KB
qemu-img.texi -rw-r--r-- 29.3 KB
qemu-io-cmds.c -rw-r--r-- 59.1 KB
qemu-io.c -rw-r--r-- 16.6 KB
qemu-keymap.c -rw-r--r-- 7.4 KB
qemu-nbd.c -rw-r--r-- 32.8 KB
qemu-nbd.texi -rw-r--r-- 4.3 KB
qemu-option-trace.texi -rw-r--r-- 1021 bytes
qemu-options-wrapper.h -rw-r--r-- 1.0 KB
qemu-options.h -rw-r--r-- 1.4 KB
qemu-options.hx -rw-r--r-- 175.5 KB
qemu-seccomp.c -rw-r--r-- 5.4 KB
qemu-tech.texi -rw-r--r-- 12.3 KB
qemu.nsi -rw-r--r-- 7.1 KB
qemu.sasl -rw-r--r-- 1.8 KB
qmp.c -rw-r--r-- 19.5 KB
qtest.c -rw-r--r-- 20.2 KB
replication.c -rw-r--r-- 2.5 KB
replication.h -rw-r--r-- 5.2 KB
rules.mak -rw-r--r-- 14.1 KB
thunk.c -rw-r--r-- 9.1 KB
tpm.c -rw-r--r-- 5.7 KB
trace-events -rw-r--r-- 5.3 KB
version.rc -rw-r--r-- 790 bytes
vl.c -rw-r--r-- 144.7 KB

README

back to top