diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-05 06:32:18 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-05 06:32:18 -0400 |
| commit | 45ce0314bf258bd387d92782d5393e7b84b0121f (patch) | |
| tree | 734e0d9f158f41bc666e7c1e2caf818f0ec6fb50 /arch/arm64/kvm/nested.c | |
| parent | b50788f7cd31a07e0c69c02d2f34b65121ff8775 (diff) | |
| parent | afb91f5f8ad7af172d993a34fde1947892408f53 (diff) | |
| download | linux-stable-45ce0314bf258bd387d92782d5393e7b84b0121f.tar.gz linux-stable-45ce0314bf258bd387d92782d5393e7b84b0121f.tar.bz2 linux-stable-45ce0314bf258bd387d92782d5393e7b84b0121f.zip | |
Merge tag 'kvmarm-fixes-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.10, take #1
- Large set of FP/SVE fixes for pKVM, addressing the fallout
from the per-CPU data rework and making sure that the host
is not involved in the FP/SVE switching any more
- Allow FEAT_BTI to be enabled with NV now that FEAT_PAUTH
is copletely supported
- Fix for the respective priorities of Failed PAC, Illegal
Execution state and Instruction Abort exceptions
- Fix the handling of AArch32 instruction traps failing their
condition code, which was broken by the introduction of
ESR_EL2.ISS2
- Allow vpcus running in AArch32 state to be restored in
System mode
- Fix AArch32 GPR restore that would lose the 64 bit state
under some conditions
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: |