aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/kvm_hyp.h
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2021-03-22 13:32:34 +0000
committerMarc Zyngier <maz@kernel.org>2021-03-25 11:01:03 +0000
commit7c4199375ae347449fbde43cc8bf174ae6383d8e (patch)
tree15403240bf72e0c6f8c23f2bfbe6b6b6e339c854 /arch/arm64/include/asm/kvm_hyp.h
parentKVM: arm64: Generate final CTR_EL0 value when running in Protected mode (diff)
downloadlinux-dev-7c4199375ae347449fbde43cc8bf174ae6383d8e.tar.xz
linux-dev-7c4199375ae347449fbde43cc8bf174ae6383d8e.zip
KVM: arm64: Drop the CPU_FTR_REG_HYP_COPY infrastructure
Now that the read_ctr macro has been specialised for nVHE, the whole CPU_FTR_REG_HYP_COPY infrastrcture looks completely overengineered. Simplify it by populating the two u64 quantities (MMFR0 and 1) that the hypervisor need. Reviewed-by: Quentin Perret <qperret@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_hyp.h')
-rw-r--r--arch/arm64/include/asm/kvm_hyp.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index de40a565d7e5..8ef9d88826d4 100644
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -116,4 +116,7 @@ int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long nr_cpus,
void __noreturn __host_enter(struct kvm_cpu_context *host_ctxt);
#endif
+extern u64 kvm_nvhe_sym(id_aa64mmfr0_el1_sys_val);
+extern u64 kvm_nvhe_sym(id_aa64mmfr1_el1_sys_val);
+
#endif /* __ARM64_KVM_HYP_H__ */