From ff02f77788f8c01e9d675912c063e89415804b7d Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Fri, 17 May 2019 17:39:27 +0100 Subject: [PATCH] arm64: kpti: Whitelist early Arm Neoverse N1 revisions Early revisions (r1p0) of the Neoverse N1 core did not feature the CSV3 field in ID_AA64PFR0_EL1 to advertise they are not affected by the Spectre variant 3 (aka Meltdown) vulnerability. Add this particular revision to the whitelist to avoid enabling KPTI. Signed-off-by: Andre Przywara Change-Id: I78df055a3e674aefd195d41cc6dc4ee08b0af099 Upstream-Status: Inappropriate Signed-off-by: Andre Przywara Signed-off-by: Vishnu Banavath Signed-off-by: Adam Johnston --- arch/arm64/kernel/cpufeature.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index b3f37e2209ad..b74210f38cd8 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1646,6 +1646,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_SILVER), MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER), MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER), + MIDR_REV(MIDR_NEOVERSE_N1, 1, 0), /* missing CSV3 */ { /* sentinel */ } }; char const *str = "kpti command line option";