From c3e70381b5b111c250821c0d08f304d76c0d08da Mon Sep 17 00:00:00 2001
From: Abdulla Kamar <abdulla@google.com>
Date: Mon, 26 Nov 2018 22:13:50 +1100
Subject: [PATCH] [arm64][hypervisor] Remove redundant timer disable
We were already disabling the virtual timer when exiting the guest, so
no need to repeat it.
MAC-180
Test: Ran "zircon_guest" on a VIM2.
Change-Id: I30600ddcb0a4ea5cb856f108f9620fcfc457aff9
---
kernel/arch/arm64/hypervisor/el2.S | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/arch/arm64/hypervisor/el2.S b/kernel/arch/arm64/hypervisor/el2.S
index beb35ae00cb..99100909b26 100644
--- a/kernel/arch/arm64/hypervisor/el2.S
+++ b/kernel/arch/arm64/hypervisor/el2.S
@@ -155,7 +155,6 @@
.macro guest_exit_state
mrs x10, cntv_ctl_el0
str x10, [x9, GS_CNTV_CTL_EL0]
- msr cntv_ctl_el0, xzr
mrs x10, cntv_cval_el0
str x10, [x9, GS_CNTV_CVAL_EL0]
mrs x10, esr_el2
--
GitLab