Commit 2f77ec73 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'dgibson/tags/ppc-for-2.10-20170511' into staging 



ppc patch queue for 2017-05-11

This pull request supersedes the one from yesterday (20170510), fixing
an important style bug in one patch, and adding an extra couple of
simple patches.

Highlights of this set:
  * Some fixes for POWER9
  * TCG support for POWER9 radix MMU
  * VGA rom for Mac machine types
  * Fixes for the XICS interrupt controller
  * MTTCG support for ppc targets

As suggested by Paolo, I've tried to add the Docker tests to my
standard pre-pull-request tests.  I haven't wholly suceeded; this has
been tested with some of the Docker images, but others I haven't
managed due to problems that as best I can tell are not due to
problems in this patch series.  I'll continue working on this for
future pull requests.  Specifically, 'travis', 'fedora', and 'centos6'
seem to work.  'min-glib' jammed while gtesting moxie, which seems
very unlikely to be caused by this series.  'ubuntu', 'debian' and
'debian-bootstrap' hit build errors almost immediately that look like
problems with the container configuration, and 'debian-*-cross' hit
build errors later on which also look like missing dependencies from
the container.

# gpg: Signature made Thu 11 May 2017 05:13:46 AM BST
# gpg:                using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* dgibson/tags/ppc-for-2.10-20170511: (23 commits)
  target/ppc: Avoid printing wrong aliases in CPU help text
  pnv: Fix build failures on some host platforms
  target/ppc: Allow workarounds for POWER9 DD1
  spapr: Don't accidentally advertise HTM support on POWER9
  ppc: xics: fix compilation with CentOS 6
  target/ppc: Enable RADIX mmu mode for pseries TCG guest
  target/ppc: Implement ISA V3.00 radix page fault handler
  target/ppc: Change tlbie invalid fields for POWER9 support
  target/ppc: Update tlbie to check privilege level based on GTSE
  target/ppc: Set UPRT and GTSE on all cpus in H_REGISTER_PROCESS_TABLE
  ppc: add qemu_vga.ndrv ROM to fw_cfg interface for NewWorld Macs
  ppc: add qemu_vga.ndrv ROM to fw_cfg interface for OldWorld Macs
  Add QemuMacDrivers qemu_vga.ndrv revision d4e7d7a built as submodule
  Add QemuMacDrivers as submodule
  ppc/xics: preserve P and Q bits for KVM IRQs
  ppc/xics: Fix stale irq->status bits after get
  target/ppc: do not reset reserve_addr in exec_enter
  tcg: enable MTTCG by default for PPC64 on x86
  cpus: Fix CPU unplug for MTTCG
  target/ppc: Generate fence operations
  ...

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 3a876066 e9edd931

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -34,3 +34,6 @@ 
[submodule "roms/skiboot"]

	path = roms/skiboot

	url = git://git.qemu.org/skiboot.git

[submodule "roms/QemuMacDrivers"]

	path = roms/QemuMacDrivers

	url = git://git.qemu.org/QemuMacDrivers.git

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -552,7 +552,8 @@ multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \ 
s390-ccw.img \

spapr-rtas.bin slof.bin skiboot.lid \

palcode-clipper \

u-boot.e500

u-boot.e500 \

qemu_vga.ndrv

else

BLOBS=

endif

configure

+2 −0
Original line number Diff line number Diff line
@@ -6101,12 +6101,14 @@ case "$target_name" in 
  ppc64)

    TARGET_BASE_ARCH=ppc

    TARGET_ABI_DIR=ppc

    mttcg=yes

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml"

  ;;

  ppc64le)

    TARGET_ARCH=ppc64

    TARGET_BASE_ARCH=ppc

    TARGET_ABI_DIR=ppc

    mttcg=yes

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml"

  ;;

  ppc64abi32)

cpus.c

+6 −0
Original line number Diff line number Diff line
@@ -1483,6 +1483,12 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 
                /* Ignore everything else? */

                break;

            }

        } else if (cpu->unplug) {

            qemu_tcg_destroy_vcpu(cpu);

            cpu->created = false;

            qemu_cond_signal(&qemu_cpu_cond);

            qemu_mutex_unlock_iothread();

            return NULL;

        }



        atomic_mb_set(&cpu->exit_request, 0);

cputlb.c

+7 −1
Original line number Diff line number Diff line
@@ -930,7 +930,13 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, 
        tlb_addr = tlbe->addr_write;

    }



    /* Notice an IO access, or a notdirty page.  */

    /* Check notdirty */

    if (unlikely(tlb_addr & TLB_NOTDIRTY)) {

        tlb_set_dirty(ENV_GET_CPU(env), addr);

        tlb_addr = tlb_addr & ~TLB_NOTDIRTY;

    }



    /* Notice an IO access  */

    if (unlikely(tlb_addr & ~TARGET_PAGE_MASK)) {

        /* There's really nothing that can be done to

           support this apart from stop-the-world.  */