Page MenuHomeFreeBSD
Files F151125624

D41916.id127533.diff
No OneTemporary
Actions

D41916.id127533.diff
View Options

diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c
--- a/sys/arm64/arm64/cpu_errata.c
+++ b/sys/arm64/arm64/cpu_errata.c
@@ -47,6 +47,9 @@
cpu_quirk_install *quirk_install;
u_int midr_mask;
u_int midr_value;
+#define CPU_QUIRK_POST_DEVICE (1 << 0) /* After device attach */
+ /* e.g. needs SMCCC */
+ u_int flags;
};
static enum {
@@ -85,11 +88,13 @@
.midr_value =
CPU_ID_RAW(CPU_IMPL_CAVIUM, CPU_PART_THUNDERX2, 0,0),
.quirk_install = install_psci_bp_hardening,
+ .flags = CPU_QUIRK_POST_DEVICE,
},
{
.midr_mask = 0,
.midr_value = 0,
.quirk_install = install_ssbd_workaround,
+ .flags = CPU_QUIRK_POST_DEVICE,
},
{
.midr_mask = CPU_IMPL_MASK | CPU_PART_MASK,
@@ -173,8 +178,8 @@
}
}
-void
-install_cpu_errata(void)
+static void
+install_cpu_errata_flags(u_int mask, u_int flags)
{
u_int midr;
size_t i;
@@ -183,8 +188,38 @@
for (i = 0; i < nitems(cpu_quirks); i++) {
if ((midr & cpu_quirks[i].midr_mask) ==
- cpu_quirks[i].midr_value) {
+ cpu_quirks[i].midr_value &&
+ (cpu_quirks[i].flags & mask) == flags) {
cpu_quirks[i].quirk_install();
}
}
}
+
+/* Intall all CPU errata. Used to install the errata on secondary CPUs. */
+void
+install_cpu_errata(void)
+{
+ /*
+ * Only install early CPU errata on CPU 0, device drivers may not
+ * have attached and some workarounds depend on them, e.g. to query
+ * SMCCC.
+ */
+ if (PCPU_GET(cpuid) == 0) {
+ install_cpu_errata_flags(CPU_QUIRK_POST_DEVICE, 0);
+ } else {
+ install_cpu_errata_flags(0, 0);
+ }
+}
+
+/*
+ * Install any errata workarounds that depend on device drivers, e.g. use
+ * SMCCC to install a workaround.
+ */
+static void
+install_cpu_errata_late(void *dummy __unused)
+{
+ MPASS(PCPU_GET(cpuid) == 0);
+ install_cpu_errata_flags(CPU_QUIRK_POST_DEVICE, CPU_QUIRK_POST_DEVICE);
+}
+SYSINIT(install_cpu_errata_late, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE,
+ install_cpu_errata_late, NULL);

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 6:28 AM (34 m, 28 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31015450
Default Alt Text
D41916.id127533.diff (1 KB)

Event Timeline