diff options
| author | Andreas Färber <afaerber@suse.de> | 2017-07-03 20:18:04 +0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2017-09-20 17:49:27 +0300 |
| commit | 6c2eb3e76fb84e2eb46d484f71fab469c0d9532c (patch) | |
| tree | fc026dc8b2949f7c05c00940be80ae20fcf257c6 /arch/arm/mach-actions/platsmp.c | |
| parent | bad29933fef76fb6ee577f4a0b6d145c1f52f663 (diff) | |
| download | linux-6c2eb3e76fb84e2eb46d484f71fab469c0d9532c.tar.xz | |
ARM: owl: smp: Drop owl_secondary_boot()
Commit 18cfd9429d8a82c49add8f3ca9d366599bfcac45 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: 18cfd9429d8a ("ARM: owl: smp: Drop bogus holding pen")
Cc: David Liu <liuwei@actions-semi.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'arch/arm/mach-actions/platsmp.c')
| -rw-r--r-- | arch/arm/mach-actions/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-actions/platsmp.c b/arch/arm/mach-actions/platsmp.c index 7238926ab015..3efaa10efc43 100644 --- a/arch/arm/mach-actions/platsmp.c +++ b/arch/arm/mach-actions/platsmp.c @@ -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); |