diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-03-22 14:32:34 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-03-25 12:01:03 +0100 |
| commit | 7c4199375ae347449fbde43cc8bf174ae6383d8e (patch) | |
| tree | 15403240bf72e0c6f8c23f2bfbe6b6b6e339c854 /arch/arm64/kernel | |
| parent | KVM: arm64: Generate final CTR_EL0 value when running in Protected mode (diff) | |
| download | linux-7c4199375ae347449fbde43cc8bf174ae6383d8e.tar.xz linux-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/kernel')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 6252476e4e73..066030717a4c 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1154,18 +1154,6 @@ u64 read_sanitised_ftr_reg(u32 id) } EXPORT_SYMBOL_GPL(read_sanitised_ftr_reg); -int copy_ftr_reg(u32 id, struct arm64_ftr_reg *dst) -{ - struct arm64_ftr_reg *regp = get_arm64_ftr_reg(id); - - if (!regp) - return -EINVAL; - - *dst = *regp; - - return 0; -} - #define read_sysreg_case(r) \ case r: val = read_sysreg_s(r); break; @@ -2785,7 +2773,6 @@ void __init setup_cpu_features(void) setup_system_capabilities(); setup_elf_hwcaps(arm64_elf_hwcaps); - setup_kvm_el2_caps(); if (system_supports_32bit_el0()) setup_elf_hwcaps(compat_elf_hwcaps); |