From: Rich Wiley <rwiley@nvidia.com>
Date: Tue, 5 Nov 2019 18:45:10 +0000 (-0800)
Subject: arm64: kpti: Add NVIDIA's Carmel core to the KPTI whitelist
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=918e1946c8ac2c0473eefc1dc910780178490e95;p=openwrt%2Fstaging%2Fblogic.git

arm64: kpti: Add NVIDIA's Carmel core to the KPTI whitelist

NVIDIA Carmel CPUs don't implement ID_AA64PFR0_EL1.CSV3 but
aren't susceptible to Meltdown, so add Carmel to kpti_safe_list[].

Signed-off-by: Rich Wiley <rwiley@nvidia.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index cabebf1a7976..b3eea965c930 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -977,6 +977,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
 		MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),
+		MIDR_ALL_VERSIONS(MIDR_NVIDIA_CARMEL),
 		{ /* sentinel */ }
 	};
 	char const *str = "kpti command line option";