Commit e1ee9ee1 authored Mar 06, 2018 by Peter Maydell

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180306' into staging



ppc patch queue 2018-03-06

This pull request supersedes ppc-for-2.12-20180302 which had compile
problems with some gcc versions.  It also contains a few additional
patches.

Highlights are:
    * New Sam460ex machine type
    * Yet more fixes related to vcpu id allocation for spapr
    * Numerous macio cleanupsr
    * Some enhancements to the Spectre/Meltdown fixes for pseries,
      allowing use of a better mitigation for indirect branch based
      exploits
    * New pseries machine types with Spectre/Meltdown mitigations
      enabled (stop gap until libvirt and management understands the
      machine options)
    * A handful of other fixes

# gpg: Signature made Tue 06 Mar 2018 04:01:00 GMT
# gpg:                using RSA key 6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.12-20180306: (30 commits)
  PowerPC: Add TS bits into msr_mask
  adb: add trace-events for monitoring keyboard/mouse during bus enumeration
  PPC: e500: Fix duplicate kernel load and device tree overlap
  hw/ppc/spapr,e500: Use new property "stdout-path" for boot console
  ppc/spapr-caps: Define the pseries-2.12-sxxm machine type
  ppc/spapr-caps: Convert cap-ibs to custom spapr-cap
  ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap
  ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap
  ppc/spapr-caps: Add support for custom spapr_capabilities
  target/ppc: Check mask when setting cap_ppc_safe_indirect_branch
  macio: remove macio_init() function
  macio: move setting of CUDA timebase frequency to macio_common_realize()
  mac_newworld: use object link to pass OpenPIC object to macio
  openpic: move OpenPIC state and related definitions to openpic.h
  openpic: move KVM-specific declarations into separate openpic_kvm.h file
  mac_oldworld: use object link to pass heathrow PIC object to macio
  macio: move macio related structures and defines into separate macio.h file
  heathrow: change heathrow_pic_init() to return the heathrow device
  heathrow: convert to trace-events
  heathrow: QOMify heathrow PIC
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents f2bb2d14 21b786f6

.gitmodules

+3 −0

Original line number	Diff line number	Diff line
		@@ -43,3 +43,6 @@
		[submodule "roms/seabios-hppa"]
		path = roms/seabios-hppa
		url = git://github.com/hdeller/seabios-hppa.git
		[submodule "roms/u-boot-sam460ex"]
		path = roms/u-boot-sam460ex
		url = git://github.com/zbalaton/u-boot-sam460ex

Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -779,12 +779,12 @@ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
		efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
		efi-e1000e.rom efi-vmxnet3.rom \
		qemu-icon.bmp qemu_logo_no_text.svg \
		bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
		bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
		multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \
		s390-ccw.img s390-netboot.img \
		spapr-rtas.bin slof.bin skiboot.lid \
		palcode-clipper \
		u-boot.e500 \
		u-boot.e500 u-boot-sam460-20100605.bin \
		qemu_vga.ndrv \
		hppa-firmware.img
		else

default-configs/ppc-softmmu.mak

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ CONFIG_E500=y
		CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
		CONFIG_PLATFORM_BUS=y
		CONFIG_ETSEC=y
		# For Sam460ex
		CONFIG_USB_EHCI_SYSBUS=y
		CONFIG_SM501=y
		CONFIG_IDE_SII3112=y
		CONFIG_I2C=y

default-configs/ppcemb-softmmu.mak

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ CONFIG_PTIMER=y
		CONFIG_I8259=y
		CONFIG_XILINX=y
		CONFIG_XILINX_ETHLITE=y
		CONFIG_USB_EHCI_SYSBUS=y
		CONFIG_SM501=y
		CONFIG_IDE_SII3112=y
		CONFIG_I2C=y

hw/input/adb-kbd.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -258,6 +258,7 @@ static int adb_kbd_request(ADBDevice d, uint8_t obuf,
		case ADB_CMD_CHANGE_ID_AND_ACT:
		case ADB_CMD_CHANGE_ID_AND_ENABLE:
		d->devaddr = buf[1] & 0xf;
		trace_adb_kbd_request_change_addr(d->devaddr);
		break;
		default:
		d->devaddr = buf[1] & 0xf;
		@@ -269,6 +270,9 @@ static int adb_kbd_request(ADBDevice d, uint8_t obuf,
		if (buf[2] == 1 \|\| buf[2] == 2 \|\| buf[2] == 3) {
		d->handler = buf[2];
		}

		trace_adb_kbd_request_change_addr_and_handler(d->devaddr,
		d->handler);
		break;
		}
		}