Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 9 May 2017 09:50:01 +0000 (11:50 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 9 May 2017 09:50:01 +0000 (11:50 +0200)
commit4415b335282591e76762cd9e6dc60932a7595fc3
tree07ba1eb24f8d44baeb07916351d4819026feccae
parent3bed8888edc8f60d734c44fdcdb7c6abd5e2d02e
parentfb7dcf723dd2cb1d5d8f2f49c3023130938848e3
Merge branch 'kvm-ppc-next' of git://git./linux/kernel/git/paulus/powerpc into HEAD

The main thing here is a new implementation of the in-kernel
XICS interrupt controller emulation for POWER9 machines, from Ben
Herrenschmidt.

POWER9 has a new interrupt controller called XIVE (eXternal Interrupt
Virtualization Engine) which is able to deliver interrupts directly
to guest virtual CPUs in hardware without hypervisor intervention.
With this new code, the guest still sees the old XICS interface but
performance is better because the XICS emulation in the host uses the
XIVE directly rather than going through a XICS emulation in firmware.

Conflicts:
arch/powerpc/kernel/cpu_setup_power.S [cherry-picked fix]
arch/powerpc/kvm/book3s_xive.c [include asm/debugfs.h]
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kvm/book3s_hv_builtin.c
arch/powerpc/kvm/book3s_hv_rm_xics.c
arch/powerpc/kvm/book3s_xics.c
arch/powerpc/kvm/book3s_xive.c
arch/powerpc/kvm/powerpc.c
arch/powerpc/platforms/powernv/opal.c
arch/powerpc/sysdev/xive/common.c
arch/powerpc/sysdev/xive/native.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c