diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-04-05 17:54:56 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-27 21:37:29 +1000 |
| commit | 5af50993850a48ba749b122173d789ea90976c72 (patch) | |
| tree | 3c5f1707c434f1a6271b69d27231ba799e5fd4ed /arch/powerpc/include/asm/kvm_book3s_asm.h | |
| parent | 8bf8f2e8c786f37991bd27332c75edcc524d2232 (diff) | |
| download | linux-stable-5af50993850a48ba749b122173d789ea90976c72.tar.gz linux-stable-5af50993850a48ba749b122173d789ea90976c72.tar.bz2 linux-stable-5af50993850a48ba749b122173d789ea90976c72.zip | |
KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller
This patch makes KVM capable of using the XIVE interrupt controller
to provide the standard PAPR "XICS" style hypercalls. It is necessary
for proper operations when the host uses XIVE natively.
This has been lightly tested on an actual system, including PCI
pass-through with a TG3 device.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
[mpe: Cleanup pr_xxx(), unsplit pr_xxx() strings, etc., fix build
failures by adding KVM_XIVE which depends on KVM_XICS and XIVE, and
adding empty stubs for the kvm_xive_xxx() routines, fixup subject,
integrate fixes from Paul for building PR=y HV=n]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s_asm.h')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s_asm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h index 0593d9479f74..b148496ffe36 100644 --- a/arch/powerpc/include/asm/kvm_book3s_asm.h +++ b/arch/powerpc/include/asm/kvm_book3s_asm.h @@ -111,6 +111,8 @@ struct kvmppc_host_state { struct kvm_vcpu *kvm_vcpu; struct kvmppc_vcore *kvm_vcore; void __iomem *xics_phys; + void __iomem *xive_tima_phys; + void __iomem *xive_tima_virt; u32 saved_xirr; u64 dabr; u64 host_mmcr[7]; /* MMCR 0,1,A, SIAR, SDAR, MMCR2, SIER */ |