summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/cpuinfo.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2017-03-10 20:32:24 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2017-03-20 16:17:02 +0000
commitdda288d7e4f605632dc6e19c69063f1725056208 (patch)
tree72ee2d87ea23475afc08611168ff64257b9dab84 /arch/arm64/kernel/cpuinfo.c
parent02f7760e6e5c3d726cd9622749cdae17c571b9a3 (diff)
downloadop-kernel-dev-dda288d7e4f605632dc6e19c69063f1725056208.zip
op-kernel-dev-dda288d7e4f605632dc6e19c69063f1725056208.tar.gz
arm64: cache: Identify VPIPT I-caches
Add support for detecting VPIPT I-caches, as introduced by ARMv8.2. Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpuinfo.c')
-rw-r--r--arch/arm64/kernel/cpuinfo.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 260b54f..7d27f4b 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -46,6 +46,7 @@ static char *icache_policy_str[] = {
[0 ... ICACHE_POLICY_PIPT] = "RESERVED/UNKNOWN",
[ICACHE_POLICY_VIPT] = "VIPT",
[ICACHE_POLICY_PIPT] = "PIPT",
+ [ICACHE_POLICY_VPIPT] = "VPIPT",
};
unsigned long __icache_flags;
@@ -291,6 +292,9 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info)
switch (l1ip) {
case ICACHE_POLICY_PIPT:
break;
+ case ICACHE_POLICY_VPIPT:
+ set_bit(ICACHEF_VPIPT, &__icache_flags);
+ break;
default:
/* Fallthrough */
case ICACHE_POLICY_VIPT:
OpenPOWER on IntegriCloud