blob: 76518ae850647ab8ae787eb19877f26c44668ab0 [file] [log] [blame]
Patrick Williams2194f502022-10-16 14:26:09 -05001From 748cb5125b381330563b5339a4573827b015b0e9 Mon Sep 17 00:00:00 2001
Brad Bishopbec4ebc2022-08-03 09:55:16 -04002From: Andre Przywara <andre.przywara@arm.com>
3Date: Fri, 17 May 2019 17:39:27 +0100
Patrick Williams8dd68482022-10-04 07:57:18 -05004Subject: [PATCH] arm64: kpti: Whitelist early Arm Neoverse N1 revisions
Brad Bishopbec4ebc2022-08-03 09:55:16 -04005
6Early revisions (r1p0) of the Neoverse N1 core did not feature the
7CSV3 field in ID_AA64PFR0_EL1 to advertise they are not affected by
8the Spectre variant 3 (aka Meltdown) vulnerability.
9
10Add this particular revision to the whitelist to avoid enabling KPTI.
11
12Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Patrick Williams8dd68482022-10-04 07:57:18 -050013
14Upstream-Status: Inappropriate
15Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Patrick Williams2194f502022-10-16 14:26:09 -050016Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
17Signed-off-by: Adam Johnston <adam.johnston@arm.com>
Brad Bishopbec4ebc2022-08-03 09:55:16 -040018---
19 arch/arm64/kernel/cpufeature.c | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
Patrick Williams2194f502022-10-16 14:26:09 -050023index f34c9f8b9ee0..a778cf472d64 100644
Brad Bishopbec4ebc2022-08-03 09:55:16 -040024--- a/arch/arm64/kernel/cpufeature.c
25+++ b/arch/arm64/kernel/cpufeature.c
Patrick Williams2194f502022-10-16 14:26:09 -050026@@ -1589,6 +1589,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
Brad Bishopbec4ebc2022-08-03 09:55:16 -040027 MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_SILVER),
28 MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
29 MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
30+ MIDR_REV(MIDR_NEOVERSE_N1, 1, 0), /* missing CSV3 */
31 { /* sentinel */ }
32 };
33 char const *str = "kpti command line option";