]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf186dbb6448678f7ad270f6f32d49008c44c8212
tree07ba1eb24f8d44baeb07916351d4819026feccae
parent4dba076dd35cb513d19a0b6166b58c6ffb4bbec5
parent24de0ae43df35a98c18b01461ef457341156579b
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/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