Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: b1a568c1c2192f090536b8ac76d135ce1f46a0ee https://github.com/qemu/qemu/commit/b1a568c1c2192f090536b8ac76d135ce1f46a0ee Author: Greg Kurz <gr...@kaod.org> Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths: M hw/ppc/spapr.c Log Message: ----------- spapr: fix missing CPU core nodes in DT when running with TCG Commit 5d0fb1508e2d "spapr: consolidate the VCPU id numbering logic in a single place" introduced a helper to detect thread0 of a virtual core based on its VCPU id. This is used to create CPU core nodes in the DT, but it is broken in TCG. $ qemu-system-ppc64 -nographic -accel tcg -machine dumpdtb=dtb.bin \ -smp cores=16,maxcpus=16,threads=1 $ dtc -f -O dts dtb.bin | grep POWER8 PowerPC,POWER8@0 { PowerPC,POWER8@8 { instead of the expected 16 cores that we get with KVM: $ dtc -f -O dts dtb.bin | grep POWER8 PowerPC,POWER8@0 { PowerPC,POWER8@8 { PowerPC,POWER8@10 { PowerPC,POWER8@18 { PowerPC,POWER8@20 { PowerPC,POWER8@28 { PowerPC,POWER8@30 { PowerPC,POWER8@38 { PowerPC,POWER8@40 { PowerPC,POWER8@48 { PowerPC,POWER8@50 { PowerPC,POWER8@58 { PowerPC,POWER8@60 { PowerPC,POWER8@68 { PowerPC,POWER8@70 { PowerPC,POWER8@78 { This happens because spapr_get_vcpu_id() maps VCPU ids to cs->cpu_index in TCG mode. This confuses the code in spapr_is_thread0_in_vcore(), since it assumes thread0 VCPU ids to have a spapr->vsmt spacing. spapr_get_vcpu_id(cpu) % spapr->vsmt == 0 Actually, there's no real reason to expose cs->cpu_index instead of the VCPU id, since we also generate it with TCG. Also we already set it explicitly in spapr_set_vcpu_id(), so there's no real reason either to call kvm_arch_vcpu_id() with KVM. This patch unifies spapr_get_vcpu_id() to always return the computed VCPU id both in TCG and KVM. This is one step forward towards KVM<->TCG migration. Fixes: 5d0fb1508e2d Reported-by: Cédric Le Goater <c...@kaod.org> Signed-off-by: Greg Kurz <gr...@kaod.org> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: ff22e0eb259af531a75795c472beb5f1ff006679 https://github.com/qemu/qemu/commit/ff22e0eb259af531a75795c472beb5f1ff006679 Author: BALATON Zoltan <bala...@eik.bme.hu> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/ppc440_uc.c Log Message: ----------- ppc440_uc: Fix unintialized variable warning with older gcc Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 7ccc89b5c8015b3f0d6220601a1e5e3010d8c2e1 https://github.com/qemu/qemu/commit/7ccc89b5c8015b3f0d6220601a1e5e3010d8c2e1 Author: BALATON Zoltan <bala...@eik.bme.hu> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/Makefile.objs A hw/ppc/ppc440_pcix.c M hw/ppc/trace-events Log Message: ----------- ppc440: Add emulation of plb-pcix controller found in some 440 SoCs This is the PCIX controller found in newer 440 core SoCs e.g. the AMMC 460EX. The device tree refers to this as plb-pcix compared to the plb-pci controller in older 440 SoCs. Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> [dwg: Remove hwaddr from trace-events, that doesn't work with some trace backends] Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: b41a162c1bcd4b5d44191d465002dc790054db3f https://github.com/qemu/qemu/commit/b41a162c1bcd4b5d44191d465002dc790054db3f Author: BALATON Zoltan <bala...@eik.bme.hu> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M .gitmodules M roms/Makefile A roms/u-boot-sam460ex Log Message: ----------- roms: Added git submodule for u-boot-sam460 (firmware for sam460ex) Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 82e65fe01eebf37c86b1f301dc8a7bfff1adbefc https://github.com/qemu/qemu/commit/82e65fe01eebf37c86b1f301dc8a7bfff1adbefc Author: BALATON Zoltan <bala...@eik.bme.hu> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M Makefile A pc-bios/u-boot-sam460-20100605.bin Log Message: ----------- pc-bios: Added u-boot-sam460 firmware binary Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 4b387f9ee16358ab17ce74ff7266071bd2ae25ff https://github.com/qemu/qemu/commit/4b387f9ee16358ab17ce74ff7266071bd2ae25ff Author: BALATON Zoltan <bala...@eik.bme.hu> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M Makefile M default-configs/ppc-softmmu.mak M default-configs/ppcemb-softmmu.mak M hw/ppc/Makefile.objs A hw/ppc/sam460ex.c A pc-bios/canyonlands.dtb A pc-bios/canyonlands.dts Log Message: ----------- ppc: Add aCube Sam460ex board Add emulation of aCube Sam460ex board based on AMCC 460EX embedded SoC. This is not a complete implementation yet with a lot of components still missing but enough for the U-Boot firmware to start and to boot a Linux kernel or AROS. Signed-off-by: François Revol <re...@free.fr> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 72fdd4de8e5fdc1a6078e000835fb54592a3fe97 https://github.com/qemu/qemu/commit/72fdd4de8e5fdc1a6078e000835fb54592a3fe97 Author: Greg Kurz <gr...@kaod.org> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr.c Log Message: ----------- spapr: register dummy ICPs later Some older machine types create more ICPs than needed. We hence need to register up to xics_max_server_number() dummy ICPs to accomodate the migration of these machine types. Recent VSMT rework changed xics_max_server_number() to return DIV_ROUND_UP(max_cpus * spapr->vsmt, smp_threads) instead of DIV_ROUND_UP(max_cpus * kvmppc_smt_threads(), smp_threads); The change is okay but it requires spapr->vsmt to be set, which isn't the case with the current code. This causes the formula to return zero and we don't create dummy ICPs. This breaks migration of older guests as reported here: https://bugzilla.redhat.com/show_bug.cgi?id=1549087 The dummy ICP workaround doesn't really have a dependency on XICS itself. But it does depend on proper VCPU id numbering and it must be applied before creating vCPUs (ie, creating real ICPs). So this patch moves the workaround to spapr_init_cpus(), which already assumes VSMT to be set. Fixes: 72194664c8a1 ("spapr: use spapr->vsmt to compute VCPU ids") Reported-by: Lukas Doktor <ldok...@redhat.com> Signed-off-by: Greg Kurz <gr...@kaod.org> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 1a5008fc17fe3d286baa6d07b5cce122553968e7 https://github.com/qemu/qemu/commit/1a5008fc17fe3d286baa6d07b5cce122553968e7 Author: Greg Kurz <gr...@kaod.org> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr.c Log Message: ----------- spapr: harden code that depends on VSMT VSMT must be set in order to compute VCPU ids. This means that the following functions must not be called before spapr_set_vsmt_mode() was called: - spapr_vcpu_id() - spapr_is_thread0_in_vcore() - xics_max_server_number() We had a recent regression where the latter would be called before VSMT was set, and broke migration of some old machine types. This patch adds assert() in the above functions to avoid problems in the future. Also, since VSMT is really a CPU related thing, spapr_set_vsmt_mode() is now called from spapr_init_cpus(), just before the first VSMT user. Signed-off-by: Greg Kurz <gr...@kaod.org> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: a504b9b91a1a884ce7e5296f4692b9cac85beab5 https://github.com/qemu/qemu/commit/a504b9b91a1a884ce7e5296f4692b9cac85beab5 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c Log Message: ----------- macio: embed DBDMA device directly within macio The current recommendation is to embed subdevices directly within their container device, so do this for the DBDMA device. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 343bd85a40811f0522063e58d565c6965bd81e00 https://github.com/qemu/qemu/commit/343bd85a40811f0522063e58d565c6965bd81e00 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c M hw/ppc/mac.h M hw/ppc/mac_newworld.c M hw/ppc/mac_oldworld.c Log Message: ----------- macio: move ESCC device within the macio device Now that the ESCC device is instantiated directly via qdev, move it to within the macio device and wire up the IRQs and memory regions using the sysbus API. This enables to remove the now-obsolete escc_mem parameter to the macio_init() function. (Note this patch also contains small touch-ups to the formatting in macio_escc_legacy_setup() and ppc_heathrow_init() in order to keep checkpatch happy) Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 086df4f30a8f33e7b696c79b6f5cd2c94afbf98f https://github.com/qemu/qemu/commit/086df4f30a8f33e7b696c79b6f5cd2c94afbf98f Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/intc/heathrow_pic.c A include/hw/intc/heathrow_pic.h Log Message: ----------- heathrow: QOMify heathrow PIC Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: ec7c2709d7f2ac04070ae7f10146f9ab733092c4 https://github.com/qemu/qemu/commit/ec7c2709d7f2ac04070ae7f10146f9ab733092c4 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/intc/heathrow_pic.c M hw/intc/trace-events Log Message: ----------- heathrow: convert to trace-events Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: c29646009a6a5428cf13600281f7d51eba9e8458 https://github.com/qemu/qemu/commit/c29646009a6a5428cf13600281f7d51eba9e8458 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/intc/heathrow_pic.c M hw/ppc/mac.h M hw/ppc/mac_oldworld.c Log Message: ----------- heathrow: change heathrow_pic_init() to return the heathrow device This enables the device to be made available during the setup of the Old World machine. In order to pass back the previous set of IRQs we temporarily introduce a new pic_irqs parameter until it can be removed. An additional benefit of this change is that it is also possible to remove the pic_mem pointer used for macio by accessing the memory region via sysbus. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: e1218e48128164d0971322f4577eb3ad5f2a17f5 https://github.com/qemu/qemu/commit/e1218e48128164d0971322f4577eb3ad5f2a17f5 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c M hw/ppc/mac.h M hw/ppc/mac_newworld.c M hw/ppc/mac_oldworld.c A include/hw/misc/macio/macio.h Log Message: ----------- macio: move macio related structures and defines into separate macio.h file Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 017812df5d97e587a6eef03ec5a9e94a471439f9 https://github.com/qemu/qemu/commit/017812df5d97e587a6eef03ec5a9e94a471439f9 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c M hw/ppc/mac_oldworld.c M include/hw/misc/macio/macio.h Log Message: ----------- mac_oldworld: use object link to pass heathrow PIC object to macio Also switch macio_oldworld_realize() over to use it rather than using the pic_mem memory region directly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 8d085cf03b4fe511089b540c10244ba53b414b57 https://github.com/qemu/qemu/commit/8d085cf03b4fe511089b540c10244ba53b414b57 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/intc/openpic_kvm.c M hw/ppc/e500.c M include/hw/ppc/openpic.h A include/hw/ppc/openpic_kvm.h M target/ppc/kvm-stub.c Log Message: ----------- openpic: move KVM-specific declarations into separate openpic_kvm.h file This is needed before the next patch because the target-dependent kvm stub uses the existing kvm_openpic_connect_vcpu() declaration, making it impossible to move the device-specific declarations into the same file without breaking ppc-linux-user compilation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: f7bd7941d8c0478c123603fb4958bdbc25bdaf9a https://github.com/qemu/qemu/commit/f7bd7941d8c0478c123603fb4958bdbc25bdaf9a Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/intc/openpic.c M include/hw/ppc/openpic.h Log Message: ----------- openpic: move OpenPIC state and related definitions to openpic.h This is to faciliate access to OpenPICState when wiring up the PIC to the macio controller. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: dda12e9a6f6ffcfac2642c11a1afb27af877e2c9 https://github.com/qemu/qemu/commit/dda12e9a6f6ffcfac2642c11a1afb27af877e2c9 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c M hw/ppc/mac_newworld.c M include/hw/misc/macio/macio.h Log Message: ----------- mac_newworld: use object link to pass OpenPIC object to macio Also switch macio_newworld_realize() over to use it rather than using the pic_mem memory region directly. Now that both Old World and New World macio devices no longer make use of the pic_mem memory region directly, we can remove it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: aa79b0860e795d879a06656a13bd8f987a36d199 https://github.com/qemu/qemu/commit/aa79b0860e795d879a06656a13bd8f987a36d199 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c Log Message: ----------- macio: move setting of CUDA timebase frequency to macio_common_realize() This removes the last of the functionality from macio_init() in preparation for its subsequent removal. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: b6712ea39117c87de87b687ec4055e6ddbde9b37 https://github.com/qemu/qemu/commit/b6712ea39117c87de87b687ec4055e6ddbde9b37 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/misc/macio/macio.c M hw/ppc/mac_newworld.c M hw/ppc/mac_oldworld.c Log Message: ----------- macio: remove macio_init() function Move the remaining comment into macio.c for reference, then remove the macio_init() function and instantiate the macio devices for both Old World and New World machines via qdev_init_nofail() directly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: cb931c2108a59db0b4a22f0c439ee7362c4f95ab https://github.com/qemu/qemu/commit/cb931c2108a59db0b4a22f0c439ee7362c4f95ab Author: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M target/ppc/kvm.c Log Message: ----------- target/ppc: Check mask when setting cap_ppc_safe_indirect_branch Check the character and character_mask field when setting cap_ppc_safe_indirect_branch based on the hypervisor response to KVM_PPC_GET_CPU_CHAR. Previously the mask field wasn't checked which was incorrect. Fixes: 8acc2ae5 (target/ppc/kvm: Add cap_ppc_safe_[cache/bounds_check/indirect_branch]) Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 87175d1bc5272fff5cffb05c410b39f839dfc948 https://github.com/qemu/qemu/commit/87175d1bc5272fff5cffb05c410b39f839dfc948 Author: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr_caps.c Log Message: ----------- ppc/spapr-caps: Add support for custom spapr_capabilities There are currently 2 implemented types of spapr-caps, boolean and tristate. However there may be a need for caps which don't fit either of these options. Add a custom capability type for which a list of custom valid strings can be specified and implement the get/set functions for these. Also add a field for help text to describe the available options. Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com> [dwg: Change "help" option to "?" matching qemu conventions] [dwg: Add ATTRIBUTE_UNUSED to avoid breaking bisect] Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: f27aa81e72b5a5e184a0f3aa3e77061f4fcfb265 https://github.com/qemu/qemu/commit/f27aa81e72b5a5e184a0f3aa3e77061f4fcfb265 Author: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr_caps.c Log Message: ----------- ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap Convert cap-cfpc (cache flush on privilege change) to a custom spapr-cap type. Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com> [dwg: Don't explicitly list "?"/help option, trusting convention] [dwg: Strip no-longer-necessary ATTRIBUTE_UNUSED back off] [dwg: Fix some minor style problems] Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: aaf265ffde352c4100a8e2adc554ec11aa6abe08 https://github.com/qemu/qemu/commit/aaf265ffde352c4100a8e2adc554ec11aa6abe08 Author: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr_caps.c Log Message: ----------- ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap Convert cap-sbbc (speculation barrier bounds checking) to a custom spapr-cap type. Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com> [dwg: Removed trailing whitespace] [dwg: Don't explicitly list "?"/help option, trust convention] [dwg: Fix some minor style problems] Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: c76c0d3090136773219baad486c836c67ba9ea6d https://github.com/qemu/qemu/commit/c76c0d3090136773219baad486c836c67ba9ea6d Author: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr_caps.c M hw/ppc/spapr_hcall.c M include/hw/ppc/spapr.h M target/ppc/kvm.c Log Message: ----------- ppc/spapr-caps: Convert cap-ibs to custom spapr-cap Convert cap-ibs (indirect branch speculation) to a custom spapr-cap type. All tristate caps have now been converted to custom spapr-caps, so remove the remaining support for them. Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com> [dwg: Don't explicitly list "?"/help option, trust convention] [dwg: Fold tristate removal into here, to not break bisect] [dwg: Fix minor style problems] Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 813f3cf655c6f3afe6e2ef04281ba7cd5ea24357 https://github.com/qemu/qemu/commit/813f3cf655c6f3afe6e2ef04281ba7cd5ea24357 Author: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/spapr.c M hw/ppc/spapr_caps.c Log Message: ----------- ppc/spapr-caps: Define the pseries-2.12-sxxm machine type The sxxm (speculative execution exploit mitigation) machine type is a variant of the 2.12 machine type with workarounds for speculative execution vulnerabilities enabled by default. Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 90ee4e01a1cddcb56bd65f10dd80aad7f86b5829 https://github.com/qemu/qemu/commit/90ee4e01a1cddcb56bd65f10dd80aad7f86b5829 Author: Nikunj A Dadhania <nik...@linux.vnet.ibm.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/e500.c M hw/ppc/spapr.c Log Message: ----------- hw/ppc/spapr,e500: Use new property "stdout-path" for boot console Linux kernel commit 2a9d832cc9aae21ea827520fef635b6c49a06c6d (of: Add bindings for chosen node, stdout-path) deprecated chosen property "linux,stdout-path" and "stdout". Introduce the new property "stdout-path" and continue supporting the older property to remain compatible with existing/older firmware. This older property can be deprecated after 5 years. Signed-off-by: Nikunj A Dadhania <nik...@linux.vnet.ibm.com> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 8d622594201286ddbb9e2dbf32a9e65c060ed4ed https://github.com/qemu/qemu/commit/8d622594201286ddbb9e2dbf32a9e65c060ed4ed Author: David Engraf <david.eng...@sysgo.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/ppc/e500.c Log Message: ----------- PPC: e500: Fix duplicate kernel load and device tree overlap This patch fixes an incorrect behavior when the -kernel argument has been specified without -bios. In this case the kernel was loaded twice. At address 32M as a raw image and afterwards by load_elf/load_uimage at the corresponding load address. In this case the region for the device tree and the raw kernel image may overlap. The patch fixes the behavior by loading the kernel image once with load_elf/load_uimage and skips loading the raw image. When here do not use bios_name/size for the kernel and use a more generic name called payload_name/size. New in v3: dtb must be stored between kernel and initrd because Linux can handle the dtb only within the first 64MB. Add a comment to clarify the behavior. Signed-off-by: David Engraf <david.eng...@sysgo.com> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 9d9769c2082bc0bdb88d0f138c5aae562b0c1826 https://github.com/qemu/qemu/commit/9d9769c2082bc0bdb88d0f138c5aae562b0c1826 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M hw/input/adb-kbd.c M hw/input/adb-mouse.c M hw/input/trace-events Log Message: ----------- adb: add trace-events for monitoring keyboard/mouse during bus enumeration This is useful to help diagnose problems related to address clashes during MacOS 9 boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: 21b786f607b11d888f90bbb8c3414500515d11e7 https://github.com/qemu/qemu/commit/21b786f607b11d888f90bbb8c3414500515d11e7 Author: Simon Guo <wei.guo.si...@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M target/ppc/translate_init.c Log Message: ----------- PowerPC: Add TS bits into msr_mask During migration, after MSR bits is synced, cpu_post_load() will use msr_mask to determine which PPC MSR bits will be applied into the target side. Hardware Transaction Memory(HTM) has been supported since Power8, but TS0/TS1 bit was not in msr_mask yet. That will prevent target KVM from loading TM checkpointed values. This patch adds TS bits into msr_mask for Power8, so that transactional application can be migrated across qemu. Signed-off-by: Simon Guo <wei.guo.si...@gmail.com> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> Commit: e1ee9ee139ed7091c2c592d5b784fbb7227bfc0d https://github.com/qemu/qemu/commit/e1ee9ee139ed7091c2c592d5b784fbb7227bfc0d Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M .gitmodules M Makefile M default-configs/ppc-softmmu.mak M default-configs/ppcemb-softmmu.mak M hw/input/adb-kbd.c M hw/input/adb-mouse.c M hw/input/trace-events M hw/intc/heathrow_pic.c M hw/intc/openpic.c M hw/intc/openpic_kvm.c M hw/intc/trace-events M hw/misc/macio/macio.c M hw/ppc/Makefile.objs M hw/ppc/e500.c M hw/ppc/mac.h M hw/ppc/mac_newworld.c M hw/ppc/mac_oldworld.c A hw/ppc/ppc440_pcix.c M hw/ppc/ppc440_uc.c A hw/ppc/sam460ex.c M hw/ppc/spapr.c M hw/ppc/spapr_caps.c M hw/ppc/spapr_hcall.c M hw/ppc/trace-events A include/hw/intc/heathrow_pic.h A include/hw/misc/macio/macio.h M include/hw/ppc/openpic.h A include/hw/ppc/openpic_kvm.h M include/hw/ppc/spapr.h A pc-bios/canyonlands.dtb A pc-bios/canyonlands.dts A pc-bios/u-boot-sam460-20100605.bin M roms/Makefile A roms/u-boot-sam460ex M target/ppc/kvm-stub.c M target/ppc/kvm.c M target/ppc/translate_init.c Log Message: ----------- 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 <da...@gibson.dropbear.id.au>" # gpg: aka "David Gibson (Red Hat) <dgib...@redhat.com>" # gpg: aka "David Gibson (ozlabs.org) <dgib...@ozlabs.org>" # gpg: aka "David Gibson (kernel.org) <d...@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.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/f2bb2d14c295...e1ee9ee139ed