[03/14] arm64: KVM: Drop VHE-specific HYP call stub

Message ID	20190124140032.8588-4-christoffer.dall@arm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Christoffer Dall <christoffer.dall@arm.com> To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com> Subject: [PATCH 03/14] arm64: KVM: Drop VHE-specific HYP call stub Date: Thu, 24 Jan 2019 15:00:21 +0100 Message-Id: <20190124140032.8588-4-christoffer.dall@arm.com> In-Reply-To: <20190124140032.8588-1-christoffer.dall@arm.com> References: <20190124140032.8588-1-christoffer.dall@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: arm/arm64: Various rework in preparation of nested virt support \| expand [00/14] KVM: arm/arm64: Various rework in preparation of nested virt support [01/14] arm/arm64: KVM: Introduce kvm_call_hyp_ret() [02/14] arm64: KVM: Allow for direct call of HYP functions when using VHE [03/14] arm64: KVM: Drop VHE-specific HYP call stub [04/14] ARM: KVM: Teach some form of type-safety to kvm_call_hyp [05/14] arm/arm64: KVM: Statically configure the host's view of MPIDR [06/14] KVM: arm/arm64: Factor out VMID into struct kvm_vmid [07/14] KVM: arm/arm64: Simplify bg_timer programming [08/14] KVM: arm64: Fix ICH_ELRSR_EL2 sysreg naming [09/14] KVM: arm64: Reuse sys_reg() macro when searching the trap table [10/14] KVM: arm/arm64: consolidate arch timer trap handlers [11/14] KVM: arm/arm64: timer: Rework data structures for multiple timers [12/14] KVM: arm/arm64: arch_timer: Assign the phys timer on VHE systems [13/14] KVM: arm/arm64: Rework the timer code to use a timer_map [14/14] KVM: arm/arm64: Move kvm_is_write_fault to header file

Message ID

20190124140032.8588-4-christoffer.dall@arm.com (mailing list archive)

State

New, archived

Headers

From: Christoffer Dall <christoffer.dall@arm.com>
To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org
Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>
Subject: [PATCH 03/14] arm64: KVM: Drop VHE-specific HYP call stub
Date: Thu, 24 Jan 2019 15:00:21 +0100
Message-Id: <20190124140032.8588-4-christoffer.dall@arm.com>
In-Reply-To: <20190124140032.8588-1-christoffer.dall@arm.com>
References: <20190124140032.8588-1-christoffer.dall@arm.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk

Series

KVM: arm/arm64: Various rework in preparation of nested virt support | expand

Commit Message

Christoffer Dall Jan. 24, 2019, 2 p.m. UTC

From: Marc Zyngier <marc.zyngier@arm.com>

We now call VHE code directly, without going through any central
dispatching function. Let's drop that code.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@arm.com>
---
 arch/arm64/kvm/hyp.S           |  3 ---
 arch/arm64/kvm/hyp/hyp-entry.S | 12 ------------
 2 files changed, 15 deletions(-)

diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index 952f6cb9cf72..2845aa680841 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -40,9 +40,6 @@ 
  * arch/arm64/kernel/hyp_stub.S.
  */
 ENTRY(__kvm_call_hyp)
-alternative_if_not ARM64_HAS_VIRT_HOST_EXTN
 	hvc	#0
 	ret
-alternative_else_nop_endif
-	b	__vhe_hyp_call
 ENDPROC(__kvm_call_hyp)
diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S
index 73c1b483ec39..2b1e686772bf 100644
--- a/arch/arm64/kvm/hyp/hyp-entry.S
+++ b/arch/arm64/kvm/hyp/hyp-entry.S
@@ -43,18 +43,6 @@ 
 	ldr	lr, [sp], #16
 .endm
 
-ENTRY(__vhe_hyp_call)
-	do_el2_call
-	/*
-	 * We used to rely on having an exception return to get
-	 * an implicit isb. In the E2H case, we don't have it anymore.
-	 * rather than changing all the leaf functions, just do it here
-	 * before returning to the rest of the kernel.
-	 */
-	isb
-	ret
-ENDPROC(__vhe_hyp_call)
-
 el1_sync:				// Guest trapped into EL2
 
 	mrs	x0, esr_el2

[03/14] arm64: KVM: Drop VHE-specific HYP call stub

Commit Message

Patch