Skip to content

Commit

Permalink
ARM: owl: smp: Drop owl_secondary_boot()
Browse files Browse the repository at this point in the history
Commit 18cfd94 simplified the S500 SMP
code by removing a loop for pen_release in owl_secondary_boot().

Since then it is only calling owl_v7_invalidate_l1() before branching to
secondary_startup().

The owl_v7_invalidate_l1() assembler function is superfluous, too.
Therefore drop owl_secondary_boot() and use secondary_boot() directly.

Fixes: 18cfd94 ("ARM: owl: smp: Drop bogus holding pen")
Cc: David Liu <liuwei@actions-semi.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
Andreas Färber committed Sep 20, 2017
1 parent bad2993 commit 6c2eb3e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 56 deletions.
4 changes: 1 addition & 3 deletions arch/arm/mach-actions/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
obj-${CONFIG_SMP} += platsmp.o headsmp.o

AFLAGS_headsmp.o := -Wa,-march=armv7-a
obj-${CONFIG_SMP} += platsmp.o
52 changes: 0 additions & 52 deletions arch/arm/mach-actions/headsmp.S

This file was deleted.

2 changes: 1 addition & 1 deletion arch/arm/mach-actions/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int s500_wakeup_secondary(unsigned int cpu)
/* wait for CPUx to run to WFE instruction */
udelay(200);

writel(__pa_symbol(owl_secondary_startup),
writel(__pa_symbol(secondary_startup),
timer_base_addr + OWL_CPU1_ADDR + (cpu - 1) * 4);
writel(OWL_CPUx_FLAG_BOOT,
timer_base_addr + OWL_CPU1_FLAG + (cpu - 1) * 4);
Expand Down

0 comments on commit 6c2eb3e

Please sign in to comment.