Evolution-X-Devices/kernel_xiaomi_garnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 9202c71e95 ("arm64: proton-pack: Add new CPUs 'k' values for branch mitigation") into android12-5.10-lts

Browse Source 
Steps on the way to 5.10.239

Merges the following commits OUT of the way, due to massive merge conflits due
to previous cherry-picks.  These should probably come back in the future
sometime if people feel they are still needed in Android devices for this
threat model.

	9202c71e95 arm64: proton-pack: Add new CPUs 'k' values for branch mitigation
	038866e01e arm64: bpf: Only mitigate cBPF programs loaded by unprivileged users
	c6a8735d84 arm64: bpf: Add BHB mitigation to the epilogue for cBPF programs
	d38941ee87 arm64: spectre: increase parameters that can be used to turn off bhb mitigation individually
	86ca67653d arm64: proton-pack: Expose whether the branchy loop k value
	e68da90ac0 arm64: errata: Add missing sentinels to Spectre-BHB MIDR arrays
	4a2f3d8260 arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists
	777f973a91 arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list
	1c24e2af30 arm64: errata: Assume that unknown CPUs _are_ vulnerable to Spectre BHB
	cde8ad8a7a arm64: proton-pack: Expose whether the platform is mitigated by firmware

Which touches the following files:
	Documentation/admin-guide/kernel-parameters.txt
	arch/arm64/include/asm/cputype.h
	arch/arm64/include/asm/spectre.h
	arch/arm64/net/bpf_jit_comp.c
	arch/arm64/kernel/proton-pack.c

Change-Id: I27885a252d736efe2d564deaf8b048f592dc85e1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-07-13 11:34:04 +00:00
parent 1da2cbb952 9202c71e95
commit 6200a3734e
Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available