Merge 17c7f46e ("KVM: arm64: Eagerly switch ZCR_EL{1,2}") into android14-6.1-lts
Steps on the way to 6.1.135 Resolves merge conflicts in: arch/arm64/include/asm/kvm_host.h arch/arm64/include/asm/kvm_hyp.h arch/arm64/include/asm/processor.h arch/arm64/kvm/fpsimd.c arch/arm64/kvm/hyp/include/hyp/switch.h arch/arm64/kvm/hyp/nvhe/hyp-main.c arch/arm64/kvm/hyp/nvhe/pkvm.c arch/arm64/kvm/hyp/nvhe/switch.c arch/arm64/kvm/reset.c by merging away the following upstream commits due to the massive merge conflicts: 17c7f46e KVM: arm64: Eagerly switch ZCR_EL{1,2} bde20e15 KVM: arm64: Calculate cptr_el2 traps on activating traps 0ff8c9a7 KVM: arm64: Mark some header functions as inline 60d55eb2 KVM: arm64: Refactor exit handlers 6648fef8 KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN 9f2386b2 KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN a539ca5c KVM: arm64: Remove host FPSIMD saving for non-protected KVM 04c50cc2 KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state 2fb83650 arm64/fpsimd: Stop using TIF_SVE to manage register saving in KVM 254fe3a1 arm64/fpsimd: Have KVM explicitly say which FP registers to save 312024dc arm64/fpsimd: Track the saved FPSIMD state type separately to TIF_SVE d5f7d383 KVM: arm64: Discard any SVE state when entering KVM guests Bug: 411040189 Change-Id: If766b3560ab9af5f783dd11f92ed42c772487405 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading