Merge 9202c71e ("arm64: proton-pack: Add new CPUs 'k' values for branch...
Merge 9202c71e ("arm64: proton-pack: Add new CPUs 'k' values for branch mitigation") into android12-5.10-lts 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. 9202c71e arm64: proton-pack: Add new CPUs 'k' values for branch mitigation 038866e0 arm64: bpf: Only mitigate cBPF programs loaded by unprivileged users c6a8735d arm64: bpf: Add BHB mitigation to the epilogue for cBPF programs d38941ee arm64: spectre: increase parameters that can be used to turn off bhb mitigation individually 86ca6765 arm64: proton-pack: Expose whether the branchy loop k value e68da90a arm64: errata: Add missing sentinels to Spectre-BHB MIDR arrays 4a2f3d82 arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists 777f973a arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list 1c24e2af arm64: errata: Assume that unknown CPUs _are_ vulnerable to Spectre BHB cde8ad8a 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>
Loading