KVM: PPC: Book3S 64: add hcall interrupt handler

Add a separate hcall entry point. This can be used to deal with the
different calling convention.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210528090752.3542186-4-npiggin@gmail.com

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 192b927b429e49ca0b3e7bc4731c5e2660f534e8..4819bf60324c6db7b91cb46faefe65f5dfb22538 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1966,16 +1966,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
        ori     r12,r12,0xc00
 #ifdef CONFIG_RELOCATABLE
        /*
-        * Requires __LOAD_FAR_HANDLER beause kvmppc_interrupt lives
+        * Requires __LOAD_FAR_HANDLER beause kvmppc_hcall lives
         * outside the head section.
         */
-       __LOAD_FAR_HANDLER(r10, kvmppc_interrupt)
+       __LOAD_FAR_HANDLER(r10, kvmppc_hcall)
        mtctr   r10
        ld      r10,PACA_EXGEN+EX_R10(r13)
        bctr
 #else
        ld      r10,PACA_EXGEN+EX_R10(r13)
-       b       kvmppc_interrupt
+       b       kvmppc_hcall
 #endif
 #endif
 

diff --git a/arch/powerpc/kvm/book3s_64_entry.S b/arch/powerpc/kvm/book3s_64_entry.S
index bf927e7a06afce77bd3b3582a7a10e4aca36067c..c21fa64059ef6cffa25c4bea58973e7cc7c11e65 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_entry.S
+++ b/arch/powerpc/kvm/book3s_64_entry.S
@@ -8,9 +8,13 @@
 #include <asm/reg.h>
 
 /*
- * This is branched to from interrupt handlers in exception-64s.S which set
+ * These are branched to from interrupt handlers in exception-64s.S which set
  * IKVM_REAL or IKVM_VIRT, if HSTATE_IN_GUEST was found to be non-zero.
  */
+.global        kvmppc_hcall
+.balign IFETCH_ALIGN_BYTES
+kvmppc_hcall:
+
 .global        kvmppc_interrupt
 .balign IFETCH_ALIGN_BYTES
 kvmppc_interrupt: