diff options
author | Jon Medhurst <tixy@linaro.org> | 2014-09-11 08:45:38 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2014-09-11 08:45:38 +0100 |
commit | 3c0f33c011991491bedc80bad0e0c3ce790d3ade (patch) | |
tree | 09edf790818a057f6c0e90fd87fca7f7a3fc0cdb | |
parent | 6014f1abe04d79c5dca730b0fa86622b285d068f (diff) | |
parent | d7facf01bb8e7b2033ec93687be9c6eea7450015 (diff) |
Merge branch 'tracking-armlt-mcpm' into integration-linaro-vexpress
-rw-r--r-- | arch/arm/kernel/setup.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 84db893dedc2..f827b5632c5f 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -277,6 +277,19 @@ static int cpu_has_aliasing_icache(unsigned int arch) int aliasing_icache; unsigned int id_reg, num_sets, line_size; +#ifdef CONFIG_BIG_LITTLE + /* + * We expect a combination of Cortex-A15 and Cortex-A7 cores. + * A7 = VIPT aliasing I-cache + * A15 = PIPT (non-aliasing) I-cache + * To cater for this discrepancy, let's assume aliasing I-cache + * all the time. This means unneeded extra work on the A15 but + * only ptrace is affected which is not performance critical. + */ + if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc0f0) + return 1; +#endif + /* PIPT caches never alias. */ if (icache_is_pipt()) return 0; |