diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-02-20 12:21:58 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-20 12:21:58 -0500 |
commit | 9cb0d1babfcb1b4ac248c09425f7d5de1e771133 (patch) | |
tree | 49467516b30e9b80ed92fee6659aaa9df1d1ed96 /arch/arm | |
parent | 6e7f7cfce26cabea2965a43b69b4a0c285a7e4c5 (diff) |
ARM: prima2: remove duplicate v7_invalidate_l1
Patch c08e20d "arm: Add v7_invalidate_l1 to cache-v7.S" added
a generic version of this function and removed all platform
specific versions, while 4898de3 "ARM: PRIMA2: add new SiRFmarco
SMP SoC infrastructures" added another one, leading to a link
error. I verified that the two are identical, so we can
just remove the one in mach-prima2.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-prima2/headsmp.S | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S index ada82d0917ef..5b8a408d8921 100644 --- a/arch/arm/mach-prima2/headsmp.S +++ b/arch/arm/mach-prima2/headsmp.S | |||
@@ -12,46 +12,6 @@ | |||
12 | __CPUINIT | 12 | __CPUINIT |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * Cold boot and hardware reset show different behaviour, | ||
16 | * system will be always panic if we warm-reset the board | ||
17 | * Here we invalidate L1 of CPU1 to make sure there isn't | ||
18 | * uninitialized data written into memory later | ||
19 | */ | ||
20 | ENTRY(v7_invalidate_l1) | ||
21 | mov r0, #0 | ||
22 | mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache | ||
23 | mcr p15, 2, r0, c0, c0, 0 | ||
24 | mrc p15, 1, r0, c0, c0, 0 | ||
25 | |||
26 | ldr r1, =0x7fff | ||
27 | and r2, r1, r0, lsr #13 | ||
28 | |||
29 | ldr r1, =0x3ff | ||
30 | |||
31 | and r3, r1, r0, lsr #3 @ NumWays - 1 | ||
32 | add r2, r2, #1 @ NumSets | ||
33 | |||
34 | and r0, r0, #0x7 | ||
35 | add r0, r0, #4 @ SetShift | ||
36 | |||
37 | clz r1, r3 @ WayShift | ||
38 | add r4, r3, #1 @ NumWays | ||
39 | 1: sub r2, r2, #1 @ NumSets-- | ||
40 | mov r3, r4 @ Temp = NumWays | ||
41 | 2: subs r3, r3, #1 @ Temp-- | ||
42 | mov r5, r3, lsl r1 | ||
43 | mov r6, r2, lsl r0 | ||
44 | orr r5, r5, r6 @ Reg = (Temp<<WayShift)|(NumSets<<SetShift) | ||
45 | mcr p15, 0, r5, c7, c6, 2 | ||
46 | bgt 2b | ||
47 | cmp r2, #0 | ||
48 | bgt 1b | ||
49 | dsb | ||
50 | isb | ||
51 | mov pc, lr | ||
52 | ENDPROC(v7_invalidate_l1) | ||
53 | |||
54 | /* | ||
55 | * SIRFSOC specific entry point for secondary CPUs. This provides | 15 | * SIRFSOC specific entry point for secondary CPUs. This provides |
56 | * a "holding pen" into which all secondary cores are held until we're | 16 | * a "holding pen" into which all secondary cores are held until we're |
57 | * ready for them to initialise. | 17 | * ready for them to initialise. |