From: "Andreas Färber" <afaerber@suse.de>
To: linux-arm-kernel@lists.infradead.org
Cc: "Thomas Liau" <thomas.liau@actions-semi.com>,
张东风 <zhangdf@actions-semi.com>, 刘炜 <liuwei@actions-semi.com>,
张天益 <tyzhang@actions-semi.com>, 梅利 <harrymei@actions-semi.com>,
support@lemaker.org, support@cubietech.com, lee@cubietech.com,
"Arnd Bergmann" <arnd@arndb.de>,
linux-kernel@vger.kernel.org, "Andreas Färber" <afaerber@suse.de>,
"Russell King" <linux@armlinux.org.uk>
Subject: [PATCH] ARM: owl: smp: Drop owl_secondary_boot()
Date: Wed, 5 Jul 2017 01:32:18 +0200 [thread overview]
Message-ID: <20170704233219.18790-1-afaerber@suse.de> (raw)
In-Reply-To: <DC4E6E803E914F4B8AFE57F1456019F10364478E@srv-mail-02.actions.com.cn>
Commit 18cfd9429d8a82c49add8f3ca9d366599bfcac45 ("ARM: owl: smp: Drop
bogus holding pen") 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.
Cc: David Liu <liuwei@actions-semi.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm/mach-actions/Makefile | 4 +---
arch/arm/mach-actions/headsmp.S | 52 -----------------------------------------
arch/arm/mach-actions/platsmp.c | 2 +-
3 files changed, 2 insertions(+), 56 deletions(-)
delete mode 100644 arch/arm/mach-actions/headsmp.S
diff --git a/arch/arm/mach-actions/Makefile b/arch/arm/mach-actions/Makefile
index c0f116241da7..13831037d8cd 100644
--- a/arch/arm/mach-actions/Makefile
+++ b/arch/arm/mach-actions/Makefile
@@ -1,3 +1 @@
-obj-${CONFIG_SMP} += platsmp.o headsmp.o
-
-AFLAGS_headsmp.o := -Wa,-march=armv7-a
+obj-${CONFIG_SMP} += platsmp.o
diff --git a/arch/arm/mach-actions/headsmp.S b/arch/arm/mach-actions/headsmp.S
deleted file mode 100644
index 65f53bdb69e7..000000000000
--- a/arch/arm/mach-actions/headsmp.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2012 Actions Semi Inc.
- * Author: Actions Semi, Inc.
- *
- * Copyright (c) 2017 Andreas Färber
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#include <linux/linkage.h>
-#include <linux/init.h>
-
-ENTRY(owl_v7_invalidate_l1)
- mov r0, #0
- mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache
- mcr p15, 2, r0, c0, c0, 0
- mrc p15, 1, r0, c0, c0, 0
-
- ldr r1, =0x7fff
- and r2, r1, r0, lsr #13
-
- ldr r1, =0x3ff
-
- and r3, r1, r0, lsr #3 @ NumWays - 1
- add r2, r2, #1 @ NumSets
-
- and r0, r0, #0x7
- add r0, r0, #4 @ SetShift
-
- clz r1, r3 @ WayShift
- add r4, r3, #1 @ NumWays
-1: sub r2, r2, #1 @ NumSets--
- mov r3, r4 @ Temp = NumWays
-2: subs r3, r3, #1 @ Temp--
- mov r5, r3, lsl r1
- mov r6, r2, lsl r0
- orr r5, r5, r6 @ Reg = (Temp<<WayShift)|(NumSets<<SetShift)
- mcr p15, 0, r5, c7, c6, 2
- bgt 2b
- cmp r2, #0
- bgt 1b
- dsb
- isb
- mov pc, lr
-ENDPROC(owl_v7_invalidate_l1)
-
-ENTRY(owl_secondary_startup)
- bl owl_v7_invalidate_l1
- b secondary_startup
diff --git a/arch/arm/mach-actions/platsmp.c b/arch/arm/mach-actions/platsmp.c
index 12a9e331b432..506ba32f235d 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(virt_to_phys(owl_secondary_startup),
+ writel(virt_to_phys(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);
--
2.12.3
next prev parent reply other threads:[~2017-07-04 23:32 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 0:53 [PATCH v4 00/28] ARM: Initial Actions Semi S500 and S900 enablement Andreas Färber
2017-06-06 0:53 ` [PATCH v4 01/28] dt-bindings: Add vendor prefix for Actions Semi Andreas Färber
2017-06-18 18:46 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 02/28] dt-bindings: arm: Document Actions Semi S500 Andreas Färber
2017-06-18 18:48 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 03/28] dt-bindings: timer: Document Owl timer Andreas Färber
2017-06-18 20:18 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 04/28] clocksource: Add " Andreas Färber
2017-06-06 16:33 ` Daniel Lezcano
2017-06-18 20:43 ` Andreas Färber
2017-06-19 13:53 ` Daniel Lezcano
2017-06-19 14:31 ` Andreas Färber
2017-06-21 11:57 ` Daniel Lezcano
2017-06-06 0:54 ` [PATCH v4 05/28] clocksource: owl: Add S900 support Andreas Färber
2017-06-06 16:34 ` Daniel Lezcano
2017-06-18 20:50 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 06/28] ARM: Prepare Actions Semi S500 Andreas Färber
2017-06-18 21:21 ` Andreas Färber
2017-07-01 21:41 ` [PATCH] ARM: owl: Drop custom machine Andreas Färber
2017-06-06 0:54 ` [PATCH v4 07/28] ARM64: Prepare Actions Semi S900 Andreas Färber
2017-06-11 13:04 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 08/28] dt-bindings: serial: Document Actions Semi Owl UARTs Andreas Färber
2017-06-06 0:54 ` [PATCH v4 09/28] tty: serial: Add Actions Semi Owl UART earlycon Andreas Färber
2017-06-18 21:45 ` Andreas Färber
2017-06-19 1:16 ` Greg Kroah-Hartman
2017-06-19 1:24 ` Andreas Färber
2017-06-19 1:46 ` [PATCH v5 07/26] dt-bindings: serial: Document Actions Semi Owl UARTs Andreas Färber
2017-06-19 1:46 ` [PATCH v5 08/26] tty: serial: Add Actions Semi Owl UART earlycon Andreas Färber
2017-06-19 2:12 ` [PATCH v4 09/28] " Greg Kroah-Hartman
2017-06-19 2:26 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 10/28] Documentation: kernel-parameters: Document owl earlycon Andreas Färber
2017-06-06 0:54 ` [PATCH v4 11/28] ARM: dts: Add Actions Semi S500 and LeMaker Guitar Andreas Färber
2017-06-18 22:10 ` Andreas Färber
2017-06-19 1:08 ` [PATCH v5 10/27] " Andreas Färber
2017-06-19 2:01 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 12/28] dt-bindings: Add vendor prefix for uCRobotics Andreas Färber
2017-06-18 22:19 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 13/28] dt-bindings: arm: Document Actions Semi S900 Andreas Färber
2017-06-18 22:29 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 14/28] ARM64: dts: Add Actions Semi S900 and Bubblegum-96 Andreas Färber
2017-06-18 22:40 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 15/28] MAINTAINERS: Add Actions Semi Owl section Andreas Färber
2017-06-18 22:49 ` Andreas Färber
2017-06-19 2:44 ` [PATCH v5 13/26] " Andreas Färber
2017-06-26 6:56 ` 答复: " 张天益
2017-06-06 0:54 ` [PATCH v4 16/28] tty: serial: owl: Implement console driver Andreas Färber
2017-06-06 13:34 ` Alan Cox
2017-07-02 20:27 ` Andreas Färber
2017-06-07 14:37 ` Andy Shevchenko
2017-07-02 22:36 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 17/28] ARM64: dts: actions: s900-bubblegum-96: Add fake uart5 clock Andreas Färber
2017-09-05 21:29 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 18/28] ARM: dts: s500-guitar-bb-rev-b: Add fake uart3 clock Andreas Färber
2017-09-05 21:37 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 19/28] dt-bindings: arm: cpus: Add S500 enable-method Andreas Färber
2017-06-19 2:09 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 20/28] ARM: owl: Implement CPU enable-method for S500 Andreas Färber
2017-06-19 2:11 ` Andreas Färber
2017-06-21 8:16 ` Arnd Bergmann
2017-06-21 10:25 ` Arnd Bergmann
2017-06-21 16:48 ` Andreas Färber
2017-06-21 18:02 ` Arnd Bergmann
2017-06-29 15:07 ` Arnd Bergmann
2017-06-29 15:22 ` Andreas Färber
2017-06-29 15:50 ` Arnd Bergmann
2017-07-01 21:29 ` [PATCH] ARM: owl: smp: Drop bogus holding pen Andreas Färber
2017-07-03 12:35 ` Arnd Bergmann
2017-07-01 4:42 ` 答复: [PATCH v4 20/28] ARM: owl: Implement CPU enable-method for S500 刘炜
2017-07-01 19:56 ` Andreas Färber
2017-07-03 8:13 ` 刘炜
2017-07-04 23:32 ` Andreas Färber [this message]
2017-07-05 2:36 ` [PATCH] ARM: owl: smp: Drop owl_secondary_boot() Florian Fainelli
2017-07-06 17:17 ` Andreas Färber
2017-07-06 17:38 ` Alexandre Belloni
2017-07-06 19:47 ` Florian Fainelli
2017-07-07 7:34 ` Gregory CLEMENT
2017-07-07 17:32 ` Florian Fainelli
2017-07-06 17:39 ` Mark Rutland
2017-07-06 21:16 ` Florian Fainelli
2017-07-09 21:55 ` Andreas Färber
2017-07-10 4:27 ` Florian Fainelli
2017-06-06 0:54 ` [PATCH v4 21/28] ARM: dts: s500: Set CPU enable-method Andreas Färber
2017-06-19 2:09 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 22/28] dt-bindings: power: Add Owl SPS power domains Andreas Färber
2017-06-19 3:36 ` [PATCH v5 20/26] " Andreas Färber
2017-06-19 3:57 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 23/28] soc: actions: Add Owl SPS Andreas Färber
2017-06-19 3:40 ` [PATCH v5 21/26] " Andreas Färber
2017-06-19 3:59 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 24/28] MAINTAINERS: Update Actions Semi section with SPS Andreas Färber
2017-06-19 3:44 ` [PATCH v5 22/26] " Andreas Färber
2017-06-19 4:00 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 25/28] ARM: dts: s500: Add SPS node Andreas Färber
2017-06-19 4:01 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 26/28] ARM: dts: s500: Set power domains for CPU2 and CPU3 Andreas Färber
2017-07-27 20:58 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 27/28] soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating Andreas Färber
2017-06-19 4:12 ` Andreas Färber
2017-06-06 0:54 ` [PATCH v4 28/28] ARM: owl: smp: Implement SPS power-gating for CPU2 and CPU3 Andreas Färber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170704233219.18790-1-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=arnd@arndb.de \
--cc=harrymei@actions-semi.com \
--cc=lee@cubietech.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=liuwei@actions-semi.com \
--cc=support@cubietech.com \
--cc=support@lemaker.org \
--cc=thomas.liau@actions-semi.com \
--cc=tyzhang@actions-semi.com \
--cc=zhangdf@actions-semi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).