Commit d127e9c5 authored by Joseph Lo's avatar Joseph Lo Committed by Stephen Warren

ARM: tegra: make tegra_resume can work with current and later chips

Because the CPU0 was the first up and the last down core when cluster
power up/down or platform suspend. So only CPU0 needs the rest of the
functions to reset flow controller and re-enable SCU and L2. We also
move the L2 init function for Cortex-A15 to there. The secondery CPU
can just call cpu_resume.
Signed-off-by: default avatarJoseph Lo <josephl@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 9997e626
...@@ -45,17 +45,11 @@ ...@@ -45,17 +45,11 @@
ENTRY(tegra_resume) ENTRY(tegra_resume)
check_cpu_part_num 0xc09, r8, r9 check_cpu_part_num 0xc09, r8, r9
bleq v7_invalidate_l1 bleq v7_invalidate_l1
blne tegra_init_l2_for_a15
cpu_id r0 cpu_id r0
tegra_get_soc_id TEGRA_APB_MISC_BASE, r6
cmp r6, #TEGRA114
beq no_cpu0_chk
cmp r0, #0 @ CPU0? cmp r0, #0 @ CPU0?
THUMB( it ne ) THUMB( it ne )
bne cpu_resume @ no bne cpu_resume @ no
no_cpu0_chk:
/* Are we on Tegra20? */ /* Are we on Tegra20? */
cmp r6, #TEGRA20 cmp r6, #TEGRA20
...@@ -75,7 +69,7 @@ no_cpu0_chk: ...@@ -75,7 +69,7 @@ no_cpu0_chk:
mov32 r9, 0xc09 mov32 r9, 0xc09
cmp r8, r9 cmp r8, r9
bne not_ca9 bne end_ca9_scu_l2_resume
#ifdef CONFIG_HAVE_ARM_SCU #ifdef CONFIG_HAVE_ARM_SCU
/* enable SCU */ /* enable SCU */
mov32 r0, TEGRA_ARM_PERIF_BASE mov32 r0, TEGRA_ARM_PERIF_BASE
...@@ -86,7 +80,10 @@ no_cpu0_chk: ...@@ -86,7 +80,10 @@ no_cpu0_chk:
/* L2 cache resume & re-enable */ /* L2 cache resume & re-enable */
l2_cache_resume r0, r1, r2, l2x0_saved_regs_addr l2_cache_resume r0, r1, r2, l2x0_saved_regs_addr
not_ca9: end_ca9_scu_l2_resume:
mov32 r9, 0xc0f
cmp r8, r9
bleq tegra_init_l2_for_a15
b cpu_resume b cpu_resume
ENDPROC(tegra_resume) ENDPROC(tegra_resume)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment