@@ -18,17 +18,14 @@ u32 __ro_after_init errata_migrn_target_num;
struct migrn_target __ro_after_init errata_migrn_target_cpus[MAX_MIGRN_TARGET_CPUS];
static bool __maybe_unused
-is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)
+__is_affected_midr_range(const struct arm64_cpu_capabilities *entry, u32 midr, u32 revidr)
{
const struct arm64_midr_revidr *fix;
- u32 midr = read_cpuid_id(), revidr;
- WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
if (!is_midr_in_range(midr, &entry->midr_range))
return false;
midr &= MIDR_REVISION_MASK | MIDR_VARIANT_MASK;
- revidr = read_cpuid(REVIDR_EL1);
for (fix = entry->fixed_revs; fix && fix->revidr_mask; fix++)
if (midr == fix->midr_rv && (revidr & fix->revidr_mask))
return false;
@@ -37,27 +34,56 @@ is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)
}
static bool __maybe_unused
-is_affected_midr_range_list(const struct arm64_cpu_capabilities *entry,
- int scope)
+is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)
{
+ int i;
+
+ for (i = 0; i < errata_migrn_target_num; i++) {
+ if (__is_affected_midr_range(entry, errata_migrn_target_cpus[i].midr,
+ errata_migrn_target_cpus[i].revidr))
+ return true;
+ }
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
- return is_midr_in_range_list(read_cpuid_id(), entry->midr_range_list);
+ return __is_affected_midr_range(entry, read_cpuid_id(), read_cpuid(REVIDR_EL1));
}
static bool __maybe_unused
-is_kryo_midr(const struct arm64_cpu_capabilities *entry, int scope)
+is_affected_midr_range_list(const struct arm64_cpu_capabilities *entry,
+ int scope)
{
- u32 model;
+ int i;
+ for (i = 0; i < errata_migrn_target_num; i++) {
+ if (is_midr_in_range_list(errata_migrn_target_cpus[i].midr,
+ entry->midr_range_list))
+ return true;
+ }
WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
+ return is_midr_in_range_list(read_cpuid_id(), entry->midr_range_list);
+}
- model = read_cpuid_id();
+static bool __maybe_unused
+__is_kryo_midr(const struct arm64_cpu_capabilities *entry, u32 model)
+{
model &= MIDR_IMPLEMENTOR_MASK | (0xf00 << MIDR_PARTNUM_SHIFT) |
MIDR_ARCHITECTURE_MASK;
return model == entry->midr_range.model;
}
+static bool __maybe_unused
+is_kryo_midr(const struct arm64_cpu_capabilities *entry, int scope)
+{
+ int i;
+
+ for (i = 0; i < errata_migrn_target_num; i++) {
+ if (__is_kryo_midr(entry, errata_migrn_target_cpus[i].midr))
+ return true;
+ }
+ WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());
+ return __is_kryo_midr(entry, read_cpuid_id());
+}
+
static bool
has_mismatched_cache_type(const struct arm64_cpu_capabilities *entry,
int scope)
@@ -86,6 +86,7 @@
#include <asm/mmu_context.h>
#include <asm/mpam.h>
#include <asm/mte.h>
+#include <asm/paravirt.h>
#include <asm/processor.h>
#include <asm/smp.h>
#include <asm/sysreg.h>
@@ -3597,6 +3598,8 @@ unsigned long cpu_get_elf_hwcap2(void)
static void __init setup_boot_cpu_capabilities(void)
{
+ pv_errata_migrn_target_init();
+
/*
* The boot CPU's feature register values have been recorded. Detect
* boot cpucaps and local cpucaps for the boot CPU, then enable and
If the Guest has migration target CPUs set, enable all errata that are based on target MIDR/REVIDR. Also make sure we call the paravirt helper to retrieve migration targets if any. Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> --- arch/arm64/kernel/cpu_errata.c | 46 ++++++++++++++++++++++++++-------- arch/arm64/kernel/cpufeature.c | 3 +++ 2 files changed, 39 insertions(+), 10 deletions(-)