diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-20 17:29:06 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-20 17:31:50 -0400 |
| commit | 02b0d3b9d4dd1ef76b3e8c63175f1ae9ff392313 (patch) | |
| tree | 6fd8979dabdeeb054150e9511d220df5c73281a1 /arch/arm64/kvm/nested.c | |
| parent | 8a4e2742a54ed7e844f99fa56982da169accfb2b (diff) | |
| parent | 676f819c3e982db3695a371f336a05086585ea4f (diff) | |
Merge branch 'kvm-6.10-fixes' into HEAD
Diffstat (limited to 'arch/arm64/kvm/nested.c')
| -rw-r--r-- | arch/arm64/kvm/nested.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 6813c7c7f00a..bae8536cbf00 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -58,8 +58,10 @@ static u64 limit_nv_id_reg(u32 id, u64 val) break; case SYS_ID_AA64PFR1_EL1: - /* Only support SSBS */ - val &= NV_FTR(PFR1, SSBS); + /* Only support BTI, SSBS, CSV2_frac */ + val &= (NV_FTR(PFR1, BT) | + NV_FTR(PFR1, SSBS) | + NV_FTR(PFR1, CSV2_frac)); break; case SYS_ID_AA64MMFR0_EL1: |