summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kvm/hyp/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-07-04 18:02:50 +0100
committerWill Deacon <will@kernel.org>2022-07-05 11:45:46 +0100
commitb2d71f275d544719598ed754069f2bb421e4af17 (patch)
tree5cfab261cd535a8a292ea8f9a0a044e9360e6a21 /arch/arm64/kvm/hyp/include
parentaa50479b4f8adc8d4f0744a2d060f6e5c014d279 (diff)
downloadlinux-stable-b2d71f275d544719598ed754069f2bb421e4af17.tar.gz
linux-stable-b2d71f275d544719598ed754069f2bb421e4af17.tar.bz2
linux-stable-b2d71f275d544719598ed754069f2bb421e4af17.zip
arm64/sysreg: Add _EL1 into ID_AA64ISAR2_EL1 definition names
Normally we include the full register name in the defines for fields within registers but this has not been followed for ID registers. In preparation for automatic generation of defines add the _EL1s into the defines for ID_AA64ISAR2_EL1 to follow the convention. No functional changes. Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20220704170302.2609529-17-broonie@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/include')
-rw-r--r--arch/arm64/kvm/hyp/include/nvhe/fixed_config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h
index 46cf9dec21ba..fa6e466ed57f 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h
@@ -193,8 +193,8 @@
)
#define PVM_ID_AA64ISAR2_ALLOW (\
- ARM64_FEATURE_MASK(ID_AA64ISAR2_GPA3) | \
- ARM64_FEATURE_MASK(ID_AA64ISAR2_APA3) \
+ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_GPA3) | \
+ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_APA3) \
)
u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id);