diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2017-07-06 11:53:08 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2017-08-21 11:13:11 +0100 |
| commit | af29678fe785ad79e7386e97b57093482f0dd7c4 (patch) | |
| tree | 73fcfd132e409c592abe2c5e57104d060c9adb27 /arch/arm64/kvm | |
| parent | 64c26841b34957ef8f33f7a9e8663aeee59c3ded (diff) | |
| download | linux-stable-af29678fe785ad79e7386e97b57093482f0dd7c4.tar.gz linux-stable-af29678fe785ad79e7386e97b57093482f0dd7c4.tar.bz2 linux-stable-af29678fe785ad79e7386e97b57093482f0dd7c4.zip | |
arm64: Remove the !CONFIG_ARM64_HW_AFDBM alternative code paths
Since the pte handling for hardware AF/DBM works even when the hardware
feature is not present, make the pte accessors implementation permanent
and remove the corresponding #ifdefs. The Kconfig option is kept as it
can still be used to disable the feature at the hardware level.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/hyp/s2-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/s2-setup.c b/arch/arm64/kvm/hyp/s2-setup.c index b81f4091c909..a81f5e10fc8c 100644 --- a/arch/arm64/kvm/hyp/s2-setup.c +++ b/arch/arm64/kvm/hyp/s2-setup.c @@ -70,7 +70,7 @@ u32 __hyp_text __init_stage2_translation(void) * Management in ID_AA64MMFR1_EL1 and enable the feature in VTCR_EL2. */ tmp = (read_sysreg(id_aa64mmfr1_el1) >> ID_AA64MMFR1_HADBS_SHIFT) & 0xf; - if (IS_ENABLED(CONFIG_ARM64_HW_AFDBM) && tmp) + if (tmp) val |= VTCR_EL2_HA; /* |