Commit 035b2197 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200203' into staging 



ppc patch queue 2020-02093

This pull request supersedes ppc-for-5.0-20200131.  The only changes
are one extra patch to suppress some irritating warnings during tests
under TCG, and an extra Tested-by in one of the other patches.

Here's the next batch of patches for ppc and associated machine types.
Highlights includes:
 * Remove the deprecated "prep" machine type and its OpenHackware
   firmware
 * Add TCG emulation of the msgsndp etc. supervisor privileged
   doorbell instructions
 * Allow "pnv" machine type to run Hostboot style firmwares
 * Add a virtual TPM device for spapr machines
 * Implement devices for POWER8 PHB3 and POWER9 PHB4 host bridges for
   the pnv machine type
 * Use faster Spectre mitigation by default for POWER9 DD2.3 machines
 * Introduce Firmware Assisted NMI dump facility for spapr machines
 * Fix a performance regression with load/store multiple instructions
   in TCG

as well as some other assorted cleanups and fixes.

# gpg: Signature made Mon 03 Feb 2020 03:30:24 GMT
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-5.0-20200203: (35 commits)
  tests: Silence various warnings with pseries
  target/ppc: Use probe_write for DCBZ
  target/ppc: Remove redundant mask in DCBZ
  target/ppc: Use probe_access for LMW, STMW
  target/ppc: Use probe_access for LSW, STSW
  ppc: spapr: Activate the FWNMI functionality
  migration: Include migration support for machine check handling
  ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls
  target/ppc: Build rtas error log upon an MCE
  target/ppc: Handle NMI guest exit
  ppc: spapr: Introduce FWNMI capability
  Wrapper function to wait on condition for the main loop mutex
  target/ppc/cpu.h: Put macro parameter in parentheses
  spapr: Enable DD2.3 accelerated count cache flush in pseries-5.0 machine
  ppc/pnv: change the PowerNV machine devices to be non user creatable
  ppc/pnv: Add models for POWER8 PHB3 PCIe Host bridge
  ppc/pnv: Add models for POWER9 PHB4 PCIe Host bridge
  docs/specs/tpm: reST-ify TPM documentation
  hw/ppc/Kconfig: Enable TPM_SPAPR as part of PSERIES config
  tpm_spapr: Support suspend and resume
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 28db64fc 63d57c8f

.gitmodules

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
[submodule "roms/openbios"]

	path = roms/openbios

	url = https://git.qemu.org/git/openbios.git

[submodule "roms/openhackware"]

	path = roms/openhackware

	url = https://git.qemu.org/git/openhackware.git

[submodule "roms/qemu-palcode"]

	path = roms/qemu-palcode

	url = https://git.qemu.org/git/qemu-palcode.git

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,6 @@ F: hw/dma/i82374.c 
F: hw/rtc/m48t59-isa.c

F: include/hw/isa/pc87312.h

F: include/hw/rtc/m48t59.h

F: pc-bios/ppc_rom.bin

F: tests/acceptance/ppc_prep_40p.py



sPAPR

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ ifdef INSTALL_BLOBS 
BLOBS=bios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \

vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \

pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \

efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \

cpus.c

+5 −0
Original line number Diff line number Diff line
@@ -1839,6 +1839,11 @@ void qemu_mutex_unlock_iothread(void) 
    qemu_mutex_unlock(&qemu_global_mutex);

}



void qemu_cond_wait_iothread(QemuCond *cond)

{

    qemu_cond_wait(cond, &qemu_global_mutex);

}



static bool all_vcpus_paused(void)

{

    CPUState *cpu;

docs/interop/firmware.json

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#

# @openfirmware: The interface is defined by the (historical) IEEE

#                1275-1994 standard. Examples for firmware projects that

#                provide this interface are: OpenBIOS, OpenHackWare,

#                SLOF.

#                provide this interface are: OpenBIOS and SLOF.

#

# @uboot: Firmware interface defined by the U-Boot project.

#