• Paolo Bonzini's avatar
    Merge branch 'kvm-ppc-next' of... · 4415b335
    Paolo Bonzini authored
    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]
    4415b335
kvm_main.c 94 KB