diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-03-22 16:32:34 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-03-25 14:01:03 +0300 |
| commit | 7c4199375ae347449fbde43cc8bf174ae6383d8e (patch) | |
| tree | 15403240bf72e0c6f8c23f2bfbe6b6b6e339c854 /arch/arm64/kvm/arm.c | |
| parent | 755db23420a1ce4b740186543432983e9bbe713e (diff) | |
| download | linux-7c4199375ae347449fbde43cc8bf174ae6383d8e.tar.xz | |
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/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 368159021dee..2835400fd298 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1730,6 +1730,9 @@ static int kvm_hyp_init_protection(u32 hyp_va_bits) void *addr = phys_to_virt(hyp_mem_base); int ret; + kvm_nvhe_sym(id_aa64mmfr0_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1); + kvm_nvhe_sym(id_aa64mmfr1_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1); + ret = create_hyp_mappings(addr, addr + hyp_mem_size, PAGE_HYP); if (ret) return ret; |