|
|
@@ -233,6 +233,7 @@ static int detect_harden_bp_fw(void)
|
|
|
DEFINE_PER_CPU_READ_MOSTLY(u64, arm64_ssbd_callback_required);
|
|
|
|
|
|
int ssbd_state __read_mostly = ARM64_SSBD_KERNEL;
|
|
|
+static bool __ssb_safe = true;
|
|
|
|
|
|
static const struct ssbd_options {
|
|
|
const char *str;
|
|
|
@@ -336,6 +337,7 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,
|
|
|
struct arm_smccc_res res;
|
|
|
bool required = true;
|
|
|
s32 val;
|
|
|
+ bool this_cpu_safe = false;
|
|
|
|
|
|
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
|
|
|
|
|
|
@@ -344,8 +346,14 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,
|
|
|
goto out_printmsg;
|
|
|
}
|
|
|
|
|
|
+ /* delay setting __ssb_safe until we get a firmware response */
|
|
|
+ if (is_midr_in_range_list(read_cpuid_id(), entry->midr_range_list))
|
|
|
+ this_cpu_safe = true;
|
|
|
+
|
|
|
if (psci_ops.smccc_version == SMCCC_VERSION_1_0) {
|
|
|
ssbd_state = ARM64_SSBD_UNKNOWN;
|
|
|
+ if (!this_cpu_safe)
|
|
|
+ __ssb_safe = false;
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -362,6 +370,8 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,
|
|
|
|
|
|
default:
|
|
|
ssbd_state = ARM64_SSBD_UNKNOWN;
|
|
|
+ if (!this_cpu_safe)
|
|
|
+ __ssb_safe = false;
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -370,14 +380,18 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,
|
|
|
switch (val) {
|
|
|
case SMCCC_RET_NOT_SUPPORTED:
|
|
|
ssbd_state = ARM64_SSBD_UNKNOWN;
|
|
|
+ if (!this_cpu_safe)
|
|
|
+ __ssb_safe = false;
|
|
|
return false;
|
|
|
|
|
|
+ /* machines with mixed mitigation requirements must not return this */
|
|
|
case SMCCC_RET_NOT_REQUIRED:
|
|
|
pr_info_once("%s mitigation not required\n", entry->desc);
|
|
|
ssbd_state = ARM64_SSBD_MITIGATED;
|
|
|
return false;
|
|
|
|
|
|
case SMCCC_RET_SUCCESS:
|
|
|
+ __ssb_safe = false;
|
|
|
required = true;
|
|
|
break;
|
|
|
|
|
|
@@ -387,6 +401,8 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,
|
|
|
|
|
|
default:
|
|
|
WARN_ON(1);
|
|
|
+ if (!this_cpu_safe)
|
|
|
+ __ssb_safe = false;
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -427,6 +443,14 @@ out_printmsg:
|
|
|
return required;
|
|
|
}
|
|
|
|
|
|
+/* known invulnerable cores */
|
|
|
+static const struct midr_range arm64_ssb_cpus[] = {
|
|
|
+ MIDR_ALL_VERSIONS(MIDR_CORTEX_A35),
|
|
|
+ MIDR_ALL_VERSIONS(MIDR_CORTEX_A53),
|
|
|
+ MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
|
|
|
+ {},
|
|
|
+};
|
|
|
+
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_1463225
|
|
|
DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463225_wa);
|
|
|
|
|
|
@@ -748,6 +772,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
|
|
|
.capability = ARM64_SSBD,
|
|
|
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
|
|
|
.matches = has_ssbd_mitigation,
|
|
|
+ .midr_range_list = arm64_ssb_cpus,
|
|
|
},
|
|
|
#ifdef CONFIG_ARM64_ERRATUM_1463225
|
|
|
{
|
|
|
@@ -778,3 +803,20 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr,
|
|
|
|
|
|
return sprintf(buf, "Vulnerable\n");
|
|
|
}
|
|
|
+
|
|
|
+ssize_t cpu_show_spec_store_bypass(struct device *dev,
|
|
|
+ struct device_attribute *attr, char *buf)
|
|
|
+{
|
|
|
+ if (__ssb_safe)
|
|
|
+ return sprintf(buf, "Not affected\n");
|
|
|
+
|
|
|
+ switch (ssbd_state) {
|
|
|
+ case ARM64_SSBD_KERNEL:
|
|
|
+ case ARM64_SSBD_FORCE_ENABLE:
|
|
|
+ if (IS_ENABLED(CONFIG_ARM64_SSBD))
|
|
|
+ return sprintf(buf,
|
|
|
+ "Mitigation: Speculative Store Bypass disabled via prctl\n");
|
|
|
+ }
|
|
|
+
|
|
|
+ return sprintf(buf, "Vulnerable\n");
|
|
|
+}
|