summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2018-08-10 12:34:22 -0700
committerAlistair Strachan <astrachan@google.com>2018-08-14 12:18:25 -0700
commit22f7ebd6690b0f1599c35304b50191556cab4120 (patch)
treee58b72b978ee82c5217100982e148aa7b068831d
parentdd678fc010ca7401aab91bd479ace6cd4c3da095 (diff)
Revert "arm64: KVM: Add HYP per-cpu accessors"
This reverts commit 7b62e8503fbbf7702a55b1abbfdb2c290c96609e. Bug: none Test: local Change-Id: I5724bda8e146b8d20710d594475fabe84763ab85 Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--arch/arm64/include/asm/kvm_asm.h27
1 files changed, 2 insertions, 25 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
index b3b4a03f2d2f..217630dc51c9 100644
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@ -66,37 +66,14 @@ extern u32 __kvm_get_mdcr_el2(void);
extern u32 __init_stage2_translation(void);
-/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */
-#define __hyp_this_cpu_ptr(sym) \
- ({ \
- void *__ptr = hyp_symbol_addr(sym); \
- __ptr += read_sysreg(tpidr_el2); \
- (typeof(&sym))__ptr; \
- })
-
-#define __hyp_this_cpu_read(sym) \
- ({ \
- *__hyp_this_cpu_ptr(sym); \
- })
-
#else /* __ASSEMBLY__ */
-.macro hyp_adr_this_cpu reg, sym, tmp
- adr_l \reg, \sym
+.macro get_host_ctxt reg, tmp
+ adr_l \reg, kvm_host_cpu_state
mrs \tmp, tpidr_el2
add \reg, \reg, \tmp
.endm
-.macro hyp_ldr_this_cpu reg, sym, tmp
- adr_l \reg, \sym
- mrs \tmp, tpidr_el2
- ldr \reg, [\reg, \tmp]
-.endm
-
-.macro get_host_ctxt reg, tmp
- hyp_adr_this_cpu \reg, kvm_host_cpu_state, \tmp
-.endm
-
.macro get_vcpu_ptr vcpu, ctxt
get_host_ctxt \ctxt, \vcpu
ldr \vcpu, [\ctxt, #HOST_CONTEXT_VCPU]