[v1,3/7] KVM: PPC: Book3S 64: add hcall interrupt handler

Message ID	20210412075103.1533302-4-npiggin@gmail.com
State	New
Headers	show Return-Path: <kvm-ppc-owner@vger.kernel.org> From: Nicholas Piggin <npiggin@gmail.com> To: kvm-ppc@vger.kernel.org Cc: Nicholas Piggin <npiggin@gmail.com>, linuxppc-dev@lists.ozlabs.org, Daniel Axtens <dja@axtens.net>, Fabiano Rosas <farosas@linux.ibm.com> Subject: [PATCH v1 3/7] KVM: PPC: Book3S 64: add hcall interrupt handler Date: Mon, 12 Apr 2021 17:50:59 +1000 Message-Id: <20210412075103.1533302-4-npiggin@gmail.com> In-Reply-To: <20210412075103.1533302-1-npiggin@gmail.com> References: <20210412075103.1533302-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	KVM / 64s interrupt handling changes \| expand [v1,0/7] KVM / 64s interrupt handling changes [v1,1/7] KVM: PPC: Book3S 64: move KVM interrupt entry to a common entry point [v1,2/7] KVM: PPC: Book3S 64: Move GUEST_MODE_SKIP test into KVM [v1,3/7] KVM: PPC: Book3S 64: add hcall interrupt handler [v1,4/7] KVM: PPC: Book3S 64: Move hcall early register setup to KVM [v1,5/7] KVM: PPC: Book3S 64: Move interrupt early register setup to KVM [v1,6/7] KVM: PPC: Book3S 64: move bad_host_intr check to HV handler [v1,7/7] KVM: PPC: Book3S 64: Minimise hcall handler calling convention differences

Message ID

20210412075103.1533302-4-npiggin@gmail.com

State

New

Headers

From: Nicholas Piggin <npiggin@gmail.com>
To: kvm-ppc@vger.kernel.org
Cc: Nicholas Piggin <npiggin@gmail.com>, linuxppc-dev@lists.ozlabs.org,
        Daniel Axtens <dja@axtens.net>,
        Fabiano Rosas <farosas@linux.ibm.com>
Subject: [PATCH v1 3/7] KVM: PPC: Book3S 64: add hcall interrupt handler
Date: Mon, 12 Apr 2021 17:50:59 +1000
Message-Id: <20210412075103.1533302-4-npiggin@gmail.com>
In-Reply-To: <20210412075103.1533302-1-npiggin@gmail.com>
References: <20210412075103.1533302-1-npiggin@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

KVM / 64s interrupt handling changes | expand

Commit Message

Nicholas Piggin April 12, 2021, 7:50 a.m. UTC

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

Reviewed-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/exceptions-64s.S | 6 +++---
 arch/powerpc/kvm/book3s_64_entry.S   | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 5842cc3ebbbb..9467fd1038f9 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1989,16 +1989,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 bf927e7a06af..c21fa64059ef 100644
--- 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:

[v1,3/7] KVM: PPC: Book3S 64: add hcall interrupt handler

Commit Message

Patch