This is the start of the stable review cycle for the 4.9.310 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri, 08 Apr 2022 18:24:27 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.310-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Linux 4.9.310-rc1 James Morse <james.morse@xxxxxxx> arm64: Use the clearbhb instruction in mitigations James Morse <james.morse@xxxxxxx> arm64: add ID_AA64ISAR2_EL1 sys register James Morse <james.morse@xxxxxxx> KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated James Morse <james.morse@xxxxxxx> arm64: Mitigate spectre style branch history side channels James Morse <james.morse@xxxxxxx> KVM: arm64: Add templates for BHB mitigation sequences James Morse <james.morse@xxxxxxx> arm64: Add percpu vectors for EL1 James Morse <james.morse@xxxxxxx> arm64: entry: Add macro for reading symbol addresses from the trampoline James Morse <james.morse@xxxxxxx> arm64: entry: Add vectors that have the bhb mitigation sequences James Morse <james.morse@xxxxxxx> arm64: Move arm64_update_smccc_conduit() out of SSBD ifdef James Morse <james.morse@xxxxxxx> arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations James Morse <james.morse@xxxxxxx> arm64: entry: Allow the trampoline text to occupy multiple pages James Morse <james.morse@xxxxxxx> arm64: entry: Make the kpti trampoline's kpti sequence optional James Morse <james.morse@xxxxxxx> arm64: entry: Move trampoline macros out of ifdef'd section James Morse <james.morse@xxxxxxx> arm64: entry: Don't assume tramp_vectors is the start of the vectors James Morse <james.morse@xxxxxxx> arm64: entry: Allow tramp_alias to access symbols after the 4K boundary James Morse <james.morse@xxxxxxx> arm64: entry: Move the trampoline data page before the text page James Morse <james.morse@xxxxxxx> arm64: entry: Free up another register on kpti's tramp_exit path James Morse <james.morse@xxxxxxx> arm64: entry: Make the trampoline cleanup optional James Morse <james.morse@xxxxxxx> arm64: entry.S: Add ventry overflow sanity checks Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: Add helper to decode register from instruction Anshuman Khandual <anshuman.khandual@xxxxxxx> arm64: Add Cortex-X2 CPU part definition Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: Add Neoverse-N2, Cortex-A710 CPU part definition Rob Herring <robh@xxxxxxxxxx> arm64: Add part number for Arm Cortex-A77 Marc Zyngier <marc.zyngier@xxxxxxx> arm64: Add part number for Neoverse N1 Marc Zyngier <marc.zyngier@xxxxxxx> arm64: Make ARM64_ERRATUM_1188873 depend on COMPAT Marc Zyngier <marc.zyngier@xxxxxxx> arm64: Add silicon-errata.txt entry for ARM erratum 1188873 Arnd Bergmann <arnd@xxxxxxxx> arm64: arch_timer: avoid unused function warning Marc Zyngier <marc.zyngier@xxxxxxx> arm64: arch_timer: Add workaround for ARM erratum 1188873 Marc Zyngier <marc.zyngier@xxxxxxx> arm64: arch_timer: Add erratum handler for CPU-specific capability Marc Zyngier <marc.zyngier@xxxxxxx> arm64: arch_timer: Add infrastructure for multiple erratum detection methods Ding Tianhong <dingtianhong@xxxxxxxxxx> clocksource/drivers/arm_arch_timer: Introduce generic errata handling infrastructure Ding Tianhong <dingtianhong@xxxxxxxxxx> clocksource/drivers/arm_arch_timer: Remove fsl-a008585 parameter Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: capabilities: Add support for checks based on a list of MIDRs Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: Add helpers for checking CPU MIDR against a range Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: capabilities: Clean up midr range helpers Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: capabilities: Add flags to handle the conflicts on late CPU Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: capabilities: Prepare for fine grained capabilities Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: capabilities: Move errata processing code Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: capabilities: Move errata work around check on boot CPU Dave Martin <dave.martin@xxxxxxx> arm64: capabilities: Update prototype for enable call back Suzuki K Poulose <suzuki.poulose@xxxxxxx> arm64: Add MIDR encoding for Arm Cortex-A55 and Cortex-A35 James Morse <james.morse@xxxxxxx> arm64: Remove useless UAO IPI and describe how this gets enabled Robert Richter <rrichter@xxxxxxxxxx> arm64: errata: Provide macro for major and minor cpu revisions ------------- Diffstat: Documentation/arm64/silicon-errata.txt | 1 + Documentation/kernel-parameters.txt | 9 - Makefile | 4 +- arch/arm/include/asm/kvm_host.h | 5 + arch/arm/kvm/psci.c | 4 + arch/arm64/Kconfig | 24 ++ arch/arm64/include/asm/arch_timer.h | 44 ++- arch/arm64/include/asm/assembler.h | 34 ++ arch/arm64/include/asm/cpu.h | 1 + arch/arm64/include/asm/cpucaps.h | 4 +- arch/arm64/include/asm/cpufeature.h | 232 ++++++++++++- arch/arm64/include/asm/cputype.h | 63 ++++ arch/arm64/include/asm/fixmap.h | 6 +- arch/arm64/include/asm/insn.h | 2 + arch/arm64/include/asm/kvm_host.h | 4 + arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/include/asm/mmu.h | 8 +- arch/arm64/include/asm/processor.h | 6 +- arch/arm64/include/asm/sections.h | 6 + arch/arm64/include/asm/sysreg.h | 5 + arch/arm64/include/asm/vectors.h | 74 +++++ arch/arm64/kernel/bpi.S | 55 +++ arch/arm64/kernel/cpu_errata.c | 591 ++++++++++++++++++++++++++------- arch/arm64/kernel/cpufeature.c | 167 +++++++--- arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kernel/entry.S | 197 ++++++++--- arch/arm64/kernel/fpsimd.c | 1 + arch/arm64/kernel/insn.c | 29 ++ arch/arm64/kernel/smp.c | 6 - arch/arm64/kernel/traps.c | 4 +- arch/arm64/kernel/vmlinux.lds.S | 2 +- arch/arm64/kvm/hyp/hyp-entry.S | 4 + arch/arm64/kvm/hyp/switch.c | 9 +- arch/arm64/mm/fault.c | 17 +- arch/arm64/mm/mmu.c | 11 +- drivers/clocksource/Kconfig | 4 + drivers/clocksource/arm_arch_timer.c | 192 ++++++++--- include/linux/arm-smccc.h | 7 + 38 files changed, 1504 insertions(+), 331 deletions(-)
