Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From 748cb5125b381330563b5339a4573827b015b0e9 Mon Sep 17 00:00:00 2001 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 2 | From: Andre Przywara <andre.przywara@arm.com> |
| 3 | Date: Fri, 17 May 2019 17:39:27 +0100 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 4 | Subject: [PATCH] arm64: kpti: Whitelist early Arm Neoverse N1 revisions |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 5 | |
| 6 | Early revisions (r1p0) of the Neoverse N1 core did not feature the |
| 7 | CSV3 field in ID_AA64PFR0_EL1 to advertise they are not affected by |
| 8 | the Spectre variant 3 (aka Meltdown) vulnerability. |
| 9 | |
| 10 | Add this particular revision to the whitelist to avoid enabling KPTI. |
| 11 | |
| 12 | Signed-off-by: Andre Przywara <andre.przywara@arm.com> |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 13 | |
| 14 | Upstream-Status: Inappropriate |
| 15 | Signed-off-by: Andre Przywara <andre.przywara@arm.com> |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 16 | Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> |
| 17 | Signed-off-by: Adam Johnston <adam.johnston@arm.com> |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 18 | --- |
| 19 | arch/arm64/kernel/cpufeature.c | 1 + |
| 20 | 1 file changed, 1 insertion(+) |
| 21 | |
| 22 | diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 23 | index f34c9f8b9ee0..a778cf472d64 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 24 | --- a/arch/arm64/kernel/cpufeature.c |
| 25 | +++ b/arch/arm64/kernel/cpufeature.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 26 | @@ -1589,6 +1589,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 27 | 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"; |