Merge 17c7f46efb ("KVM: arm64: Eagerly switch ZCR_EL{1,2}") into android14-6.1-lts

Browse Source

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:
	17c7f46efb KVM: arm64: Eagerly switch ZCR_EL{1,2}
	bde20e154a KVM: arm64: Calculate cptr_el2 traps on activating traps
	0ff8c9a71e KVM: arm64: Mark some header functions as inline
	60d55eb282 KVM: arm64: Refactor exit handlers
	6648fef8ff KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN
	9f2386b273 KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN
	a539ca5c23 KVM: arm64: Remove host FPSIMD saving for non-protected KVM
	04c50cc23a KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state
	2fb8365017 arm64/fpsimd: Stop using TIF_SVE to manage register saving in KVM
	254fe3a162 arm64/fpsimd: Have KVM explicitly say which FP registers to save
	312024dc1b arm64/fpsimd: Track the saved FPSIMD state type separately to TIF_SVE
	d5f7d3833b KVM: arm64: Discard any SVE state when entering KVM guests

Bug: 411040189
Change-Id: If766b3560ab9af5f783dd11f92ed42c772487405
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2025-05-01 09:24:34 +00:00

parent d46f37d6c7 17c7f46efb

commit 3ba386dd55

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available