[07/13] KVM: PPC: Book3S 64: add hcall interrupt handler

Message ID	20210219063542.1425130-8-npiggin@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> From: Nicholas Piggin <npiggin@gmail.com> To: kvm-ppc@vger.kernel.org Subject: [PATCH 07/13] KVM: PPC: Book3S 64: add hcall interrupt handler Date: Fri, 19 Feb 2021 16:35:36 +1000 Message-Id: <20210219063542.1425130-8-npiggin@gmail.com> In-Reply-To: <20210219063542.1425130-1-npiggin@gmail.com> References: <20210219063542.1425130-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: linuxppc-dev@lists.ozlabs.org, Nicholas Piggin <npiggin@gmail.com>, Fabiano Rosas <farosas@linux.ibm.com> Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>
Series	KVM: PPC: Book3S: C-ify the P9 entry/exit code \| expand [00/13] KVM: PPC: Book3S: C-ify the P9 entry/exit code [01/13] powerpc/64s: Remove KVM handler support from CBE_RAS interrupts [02/13] powerpc/64s: remove KVM SKIP test from instruction breakpoint handler [03/13] KVM: PPC: Book3S HV: Ensure MSR[ME] is always set in guest MSR [04/13] KVM: PPC: Book3S 64: remove unused kvmppc_h_protect argument [05/13] KVM: PPC: Book3S 64: move KVM interrupt entry to a common entry point [06/13] KVM: PPC: Book3S 64: Move GUEST_MODE_SKIP test into KVM [07/13] KVM: PPC: Book3S 64: add hcall interrupt handler [08/13] KVM: PPC: Book3S HV: Move hcall early register setup to KVM [09/13] KVM: PPC: Book3S HV: Move interrupt early register setup to KVM [10/13] KVM: PPC: Book3S HV: move bad_host_intr check to HV handler [11/13] KVM: PPC: Book3S HV: Minimise hcall handler calling convention differences [12/13] KVM: PPC: Book3S HV: Move radix MMU switching together in the P9 path [13/13] KVM: PPC: Book3S HV: Implement the rest of the P9 entry/exit handling in C

Message ID

20210219063542.1425130-8-npiggin@gmail.com (mailing list archive)

State

Superseded

Headers

From: Nicholas Piggin <npiggin@gmail.com>
To: kvm-ppc@vger.kernel.org
Subject: [PATCH 07/13] KVM: PPC: Book3S 64: add hcall interrupt handler
Date: Fri, 19 Feb 2021 16:35:36 +1000
Message-Id: <20210219063542.1425130-8-npiggin@gmail.com>
In-Reply-To: <20210219063542.1425130-1-npiggin@gmail.com>
References: <20210219063542.1425130-1-npiggin@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: linuxppc-dev@lists.ozlabs.org, Nicholas Piggin <npiggin@gmail.com>,
 Fabiano Rosas <farosas@linux.ibm.com>
Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org
Sender: "Linuxppc-dev"
 <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>

Series

KVM: PPC: Book3S: C-ify the P9 entry/exit code | expand

Checks

Context	Check	Description
snowpatch_ozlabs/apply_patch	warning	Failed to apply on branch powerpc/merge (626a6c3d2e20da80aaa710104f34ea6037b28b33)
snowpatch_ozlabs/apply_patch	warning	Failed to apply on branch powerpc/next (6895c5ba7bdcc55eacad03cf309ab23be63b9cac)
snowpatch_ozlabs/apply_patch	warning	Failed to apply on branch linus/master (92bf22614b21a2706f4993b278017e437f7785b3)
snowpatch_ozlabs/apply_patch	warning	Failed to apply on branch powerpc/fixes (24321ac668e452a4942598533d267805f291fdc9)
snowpatch_ozlabs/apply_patch	warning	Failed to apply on branch linux-next (1e0d27fce010b0a4a9e595506b6ede75934c31be)
snowpatch_ozlabs/apply_patch	fail	Failed to apply to any branch

Context

Check

Description

snowpatch_ozlabs/apply_patch

warning

Failed to apply on branch powerpc/merge (626a6c3d2e20da80aaa710104f34ea6037b28b33)

snowpatch_ozlabs/apply_patch

warning

Failed to apply on branch powerpc/next (6895c5ba7bdcc55eacad03cf309ab23be63b9cac)

snowpatch_ozlabs/apply_patch

warning

Failed to apply on branch linus/master (92bf22614b21a2706f4993b278017e437f7785b3)

snowpatch_ozlabs/apply_patch

warning

Failed to apply on branch powerpc/fixes (24321ac668e452a4942598533d267805f291fdc9)

snowpatch_ozlabs/apply_patch

warning

Failed to apply on branch linux-next (1e0d27fce010b0a4a9e595506b6ede75934c31be)

snowpatch_ozlabs/apply_patch

fail

Failed to apply to any branch

Commit Message

Nicholas Piggin Feb. 19, 2021, 6:35 a.m. UTC

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

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

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 96f22c582213..a61a45704925 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -2023,13 +2023,13 @@  END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
 	 * Requires __LOAD_FAR_HANDLER beause kvmppc_interrupt 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 820d103e5f50..53addbbe7b1a 100644
--- a/arch/powerpc/kvm/book3s_64_entry.S
+++ b/arch/powerpc/kvm/book3s_64_entry.S
@@ -7,9 +7,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:

[07/13] KVM: PPC: Book3S 64: add hcall interrupt handler

Checks

Commit Message

Patch