diff options
| author | Will Deacon <will.deacon@arm.com> | 2012-01-20 12:10:18 +0100 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-03-09 21:44:42 -0800 |
| commit | 2cdb45d19ebd62bcd249b4cff49c414fcf1f420c (patch) | |
| tree | 5e5f85aff20cab5c6f4b366ba1672b9aac65d708 | |
| parent | e078a22b6f226ecf4cf3add7e5a7cb09b458bff1 (diff) | |
| download | kernel_samsung_aries-2cdb45d19ebd62bcd249b4cff49c414fcf1f420c.zip kernel_samsung_aries-2cdb45d19ebd62bcd249b4cff49c414fcf1f420c.tar.gz kernel_samsung_aries-2cdb45d19ebd62bcd249b4cff49c414fcf1f420c.tar.bz2 | |
ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
commit 612539e81f655f6ac73c7af1da8701c1ee618aee upstream.
On v7, we use the same cache maintenance instructions for data lines
as for unified lines. This was not the case for v6, where HARVARD_CACHE
was defined to indicate the L1 cache topology.
This patch removes the erroneous compile-time check for HARVARD_CACHE in
proc-v7.S, ensuring that we perform I-side invalidation at boot.
Reported-and-Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Catalin Marinas <Catalin.Marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 089c0b5..b6ba103 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -270,10 +270,6 @@ cpu_resume_l1_flags: * Initialise TLB, Caches, and MMU state ready to switch the MMU * on. Return in r0 the new CP15 C1 control register setting. * - * We automatically detect if we have a Harvard cache, and use the - * Harvard cache control instructions insead of the unified cache - * control instructions. - * * This should be able to cover all ARMv7 cores. * * It is assumed that: @@ -363,9 +359,7 @@ __v7_setup: #endif 3: mov r10, #0 -#ifdef HARVARD_CACHE mcr p15, 0, r10, c7, c5, 0 @ I+BTB cache invalidate -#endif dsb #ifdef CONFIG_MMU mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs |