diff mbox series

[04/27] arm64: KVM: Drop VHE-specific HYP call stub

Message ID	20190222162605.5054-5-marc.zyngier@arm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Marc Zyngier <marc.zyngier@arm.com> To: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com> Cc: Andre Przywara <andre.przywara@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Christoffer Dall <christoffer.dall@arm.com>, Colin Ian King <colin.king@canonical.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Dave Martin <Dave.Martin@arm.com>, James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry@arm.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Shaokun Zhang <zhangshaokun@hisilicon.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Zenghui Yu <yuzenghui@huawei.com>, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH 04/27] arm64: KVM: Drop VHE-specific HYP call stub Date: Fri, 22 Feb 2019 16:25:42 +0000 Message-Id: <20190222162605.5054-5-marc.zyngier@arm.com> In-Reply-To: <20190222162605.5054-1-marc.zyngier@arm.com> References: <20190222162605.5054-1-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	[GIT,PULL] KVM/arm updates for Linux v5.1 \| expand [GIT,PULL] KVM/arm updates for Linux v5.1 [02/27] arm/arm64: KVM: Introduce kvm_call_hyp_ret() [03/27] arm64: KVM: Allow for direct call of HYP functions when using VHE [04/27] arm64: KVM: Drop VHE-specific HYP call stub [05/27] ARM: KVM: Teach some form of type-safety to kvm_call_hyp [06/27] arm/arm64: KVM: Statically configure the host's view of MPIDR [07/27] KVM: arm/arm64: Factor out VMID into struct kvm_vmid [08/27] KVM: arm/arm64: Simplify bg_timer programming [09/27] KVM: arm64: Fix ICH_ELRSR_EL2 sysreg naming [10/27] KVM: arm64: Reuse sys_reg() macro when searching the trap table [11/27] KVM: arm/arm64: consolidate arch timer trap handlers [12/27] KVM: arm/arm64: timer: Rework data structures for multiple timers [13/27] KVM: arm/arm64: arch_timer: Assign the phys timer on VHE systems [14/27] KVM: arm/arm64: Rework the timer code to use a timer_map [15/27] KVM: arm/arm64: Move kvm_is_write_fault to header file [16/27] arm64: KVM: Expose sanitised cache type register to guest [17/27] arm64: KVM: Describe data or unified caches as having 1 set and 1 way [18/27] KVM: arm/arm64: arch_timer: Mark physical interrupt active when a virtual interrupt is pend… [19/27] KVM: arm/arm64: Fix TRACE_INCLUDE_PATH [20/27] KVM: arm/arm64: Remove -I. header search paths [21/27] KVM: arm/arm64: Prefix header search paths with $(srctree)/ [22/27] KVM: arm/arm64: Update MAINTAINERS entries [23/27] KVM: arm/arm64: fix spelling mistake: "auxilary" -> "auxiliary" [24/27] KVM: arm64: Fix comment for KVM_PHYS_SHIFT [25/27] KVM: arm/arm64: Remove unused gpa_end variable [26/27] KVM: arm/arm64: Remove unused timer variable [27/27] arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2

Commit Message

Marc Zyngier Feb. 22, 2019, 4:25 p.m. UTC

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>
Signed-off-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 mbox series

Patch

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