* [PATCH v2 1/2] ARM: owl: smp: Use __pa_symbol()
2017-09-05 21:19 [PATCH v2 0/2] ARM: Actions Semi S500 SMP cleanups Andreas Färber
@ 2017-09-05 21:19 ` Andreas Färber
2017-09-05 21:20 ` [PATCH v2 2/2] ARM: owl: smp: Drop owl_secondary_boot() Andreas Färber
2017-09-20 14:56 ` [PATCH v2 0/2] ARM: Actions Semi S500 SMP cleanups Andreas Färber
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2017-09-05 21:19 UTC (permalink / raw)
To: Andreas Färber, linux-arm-kernel
Cc: Thomas Liau, 张东风, 刘炜,
张天益, 梅利,
96boards, support, support, lee, Ioan B, Florian Fainelli,
linux-kernel, Russell King
Replace an occurrence of virt_to_phys() with __pa_symbol() macro.
See 64fc2a947a9873700929ec0ef02b4654a04e0476 ("ARM: 8641/1: treewide:
Replace uses of virt_to_phys with __pa_symbol").
Fixes: 172067e0bc87 ("ARM: owl: Implement CPU enable-method for S500")
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
v1 -> v2: New
arch/arm/mach-actions/platsmp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-actions/platsmp.c b/arch/arm/mach-actions/platsmp.c
index 12a9e331b432..7238926ab015 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(__pa_symbol(owl_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.13.5
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2 2/2] ARM: owl: smp: Drop owl_secondary_boot()
2017-09-05 21:19 [PATCH v2 0/2] ARM: Actions Semi S500 SMP cleanups Andreas Färber
2017-09-05 21:19 ` [PATCH v2 1/2] ARM: owl: smp: Use __pa_symbol() Andreas Färber
@ 2017-09-05 21:20 ` Andreas Färber
2017-09-20 14:56 ` [PATCH v2 0/2] ARM: Actions Semi S500 SMP cleanups Andreas Färber
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2017-09-05 21:20 UTC (permalink / raw)
To: Andreas Färber, linux-arm-kernel
Cc: Thomas Liau, 张东风, 刘炜,
张天益, 梅利,
96boards, support, support, lee, Ioan B, Florian Fainelli,
linux-kernel, Russell King
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>
---
v1 -> v2:
* Rebased onto __pa_symbol()
* Tweaked commit message
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 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);
--
2.13.5
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 0/2] ARM: Actions Semi S500 SMP cleanups
2017-09-05 21:19 [PATCH v2 0/2] ARM: Actions Semi S500 SMP cleanups Andreas Färber
2017-09-05 21:19 ` [PATCH v2 1/2] ARM: owl: smp: Use __pa_symbol() Andreas Färber
2017-09-05 21:20 ` [PATCH v2 2/2] ARM: owl: smp: Drop owl_secondary_boot() Andreas Färber
@ 2017-09-20 14:56 ` Andreas Färber
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2017-09-20 14:56 UTC (permalink / raw)
To: linux-arm-kernel, Florian Fainelli, 刘炜
Cc: support, 张天益, 梅利,
linux-kernel, Thomas Liau, support, lee, 张东风,
Ioan B
Am 05.09.2017 um 23:19 schrieb Andreas Färber:
> Hello,
>
> This mini-series further cleans up the SMP code for Actions Semi S500 SoC.
>
> @David, can you please reply with an Acked-by for the second patch? Thanks!
>
> Work branch for testing:
> https://github.com/afaerber/linux/commits/bg96-next
>
> Have a lot of fun!
>
> Cheers,
> Andreas
>
> v1 -> v2:
> * Prepended __pa_symbol cleanup (Florian)
>
> Cc: David Liu <liuwei@actions-semi.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
>
> Andreas Färber (2):
> ARM: owl: smp: Use __pa_symbol()
> ARM: owl: smp: Drop owl_secondary_boot()
No further review from David or Florian on v1 or this v2, so applied to
v4.15/arm now:
https://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git/log/?h=v4.15/arm
Regards,
Andreas
> 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
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
^ permalink raw reply [flat|nested] 4+ messages in thread