arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field
authorWill Deacon <will.deacon@arm.com>
Thu, 13 Dec 2018 13:47:38 +0000 (13:47 +0000)
committerWill Deacon <will.deacon@arm.com>
Thu, 13 Dec 2018 14:14:21 +0000 (14:14 +0000)
While the CSV3 field of the ID_AA64_PFR0 CPU ID register can be checked
to see if a CPU is susceptible to Meltdown and therefore requires kpti
to be enabled, existing CPUs do not implement this field.

We therefore whitelist all unaffected Cortex-A CPUs that do not implement
the CSV3 field.

Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/kernel/cpufeature.c

index e6467e64ee9120902373d237f20ba910e342bca2..7b6f26fd075fcbc27372745540d5b278955bd9cc 100644 (file)
@@ -946,6 +946,12 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
        static const struct midr_range kpti_safe_list[] = {
                MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2),
                MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN),
+               MIDR_ALL_VERSIONS(MIDR_CORTEX_A35),
+               MIDR_ALL_VERSIONS(MIDR_CORTEX_A53),
+               MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
+               MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
+               MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
+               MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
                { /* sentinel */ }
        };
        char const *str = "command line option";