The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=843bea18711d726cd2f0a3c3f9144b218e4de3e8
commit 843bea18711d726cd2f0a3c3f9144b218e4de3e8
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2023-09-21 09:32:55 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2023-09-21 09:32:55 +0000
arm64: Move all BP hardening quirks later
Some quirks were missed due to the change being initially written on a
branch where they are all merged. Move all calls to
install_psci_bp_hardening until after device drivers have attached.
Sponsored by: Arm Ltd
---
sys/arm64/arm64/cpu_errata.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c
index 6c294ff1237c..fee22240bb0e 100644
--- a/sys/arm64/arm64/cpu_errata.c
+++ b/sys/arm64/arm64/cpu_errata.c
@@ -67,21 +67,25 @@ static struct cpu_quirks cpu_quirks[] = {
.midr_mask = CPU_IMPL_MASK | CPU_PART_MASK,
.midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A57,0,0),
.quirk_install = install_psci_bp_hardening,
+ .flags = CPU_QUIRK_POST_DEVICE,
},
{
.midr_mask = CPU_IMPL_MASK | CPU_PART_MASK,
.midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A72,0,0),
.quirk_install = install_psci_bp_hardening,
+ .flags = CPU_QUIRK_POST_DEVICE,
},
{
.midr_mask = CPU_IMPL_MASK | CPU_PART_MASK,
.midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A73,0,0),
.quirk_install = install_psci_bp_hardening,
+ .flags = CPU_QUIRK_POST_DEVICE,
},
{
.midr_mask = CPU_IMPL_MASK | CPU_PART_MASK,
.midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A75,0,0),
.quirk_install = install_psci_bp_hardening,
+ .flags = CPU_QUIRK_POST_DEVICE,
},
{
.midr_mask = CPU_IMPL_MASK | CPU_PART_MASK,
