Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: tegra: skip SCU and PL310 code when CPU is not Cortex-A9

Browse source 
For supporting single image on all Tegra series, we need to skip some HW
support code for Cortex-A9 only.

Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Joseph Lo 2013-05-20 18:39:25 +08:00 committed by Stephen Warren
parent 4b3e2edacf
commit f6d06f3366
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/mach-tegra/sleep.S
View file

@ -106,9 +106,11 @@ ENTRY(tegra_shut_off_mmu)
isb isb
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
/* Disable L2 cache */ /* Disable L2 cache */
mov32 r4, TEGRA_ARM_PERIF_BASE + 0x3000 check_cpu_part_num 0xc09, r9, r10
mov r5, #0 movweq r4, #:lower16:(TEGRA_ARM_PERIF_BASE + 0x3000)
str r5, [r4, #L2X0_CTRL] movteq r4, #:upper16:(TEGRA_ARM_PERIF_BASE + 0x3000)
moveq r5, #0
streq r5, [r4, #L2X0_CTRL]
#endif #endif
mov pc, r0 mov pc, r0
ENDPROC(tegra_shut_off_mmu) ENDPROC(tegra_shut_off_mmu)

24
arch/arm/mach-tegra/sleep.h
View file

@ -70,19 +70,31 @@
movt \reg, #:upper16:\val movt \reg, #:upper16:\val
.endm .endm
/* Marco to check CPU part num */
.macro check_cpu_part_num part_num, tmp1, tmp2
mrc p15, 0, \tmp1, c0, c0, 0
ubfx \tmp1, \tmp1, #4, #12
mov32 \tmp2, \part_num
cmp \tmp1, \tmp2
.endm
/* Macro to exit SMP coherency. */ /* Macro to exit SMP coherency. */
.macro exit_smp, tmp1, tmp2 .macro exit_smp, tmp1, tmp2
mrc p15, 0, \tmp1, c1, c0, 1 @ ACTLR mrc p15, 0, \tmp1, c1, c0, 1 @ ACTLR
bic \tmp1, \tmp1, #(1<<6) | (1<<0) @ clear ACTLR.SMP | ACTLR.FW bic \tmp1, \tmp1, #(1<<6) | (1<<0) @ clear ACTLR.SMP | ACTLR.FW
mcr p15, 0, \tmp1, c1, c0, 1 @ ACTLR mcr p15, 0, \tmp1, c1, c0, 1 @ ACTLR
isb isb
cpu_id \tmp1 #ifdef CONFIG_HAVE_ARM_SCU
mov \tmp1, \tmp1, lsl #2 check_cpu_part_num 0xc09, \tmp1, \tmp2
mov \tmp2, #0xf mrceq p15, 0, \tmp1, c0, c0, 5
mov \tmp2, \tmp2, lsl \tmp1 andeq \tmp1, \tmp1, #0xF
mov32 \tmp1, TEGRA_ARM_PERIF_VIRT + 0xC moveq \tmp1, \tmp1, lsl #2
str \tmp2, [\tmp1] @ invalidate SCU tags for CPU moveq \tmp2, #0xf
moveq \tmp2, \tmp2, lsl \tmp1
ldreq \tmp1, =(TEGRA_ARM_PERIF_VIRT + 0xC)
streq \tmp2, [\tmp1] @ invalidate SCU tags for CPU
dsb dsb
#endif
.endm .endm
/* Macro to check Tegra revision */ /* Macro to check Tegra revision */