diff options
| author | Will Deacon <will@kernel.org> | 2022-03-14 19:01:32 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-14 19:01:32 +0000 |
| commit | 292ca2d8eedfe6580b2b5ce6a8a08b07c8562992 (patch) | |
| tree | aa35a7535a3e67c9b169da74f596bb5ff0755cd4 /arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | |
| parent | bf587af2abd8c4ff630f260040f7d2722e37e054 (diff) | |
| parent | def8c222f054d18aac1fd065a50b9db5feaefa9d (diff) | |
Merge branch 'for-next/pauth' into for-next/core
* for-next/pauth:
arm64: Add support of PAuth QARMA3 architected algorithm
arm64: cpufeature: Mark existing PAuth architected algorithm as QARMA5
arm64: cpufeature: Account min_field_value when cheking secondaries for PAuth
Diffstat (limited to 'arch/arm64/kvm/hyp/include/nvhe/fixed_config.h')
| -rw-r--r-- | arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h index eea1f6a53723..5ad626527d41 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h +++ b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h @@ -192,6 +192,11 @@ ARM64_FEATURE_MASK(ID_AA64ISAR1_I8MM) \ ) +#define PVM_ID_AA64ISAR2_ALLOW (\ + ARM64_FEATURE_MASK(ID_AA64ISAR2_GPA3) | \ + ARM64_FEATURE_MASK(ID_AA64ISAR2_APA3) \ + ) + u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id); bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code); bool kvm_handle_pvm_restricted(struct kvm_vcpu *vcpu, u64 *exit_code); |