diff mbox

[v3,6/6] ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up

Message ID 1351178560-19188-7-git-send-email-t.figa@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tomasz Figa Oct. 25, 2012, 3:22 p.m. UTC 
Boards using secure firmware must use different CPU boot registers and
call secure firmware to boot the CPU.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
---
 arch/arm/mach-exynos/platsmp.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Russell King - ARM Linux Nov. 12, 2012, 9:52 a.m. UTC | #1 
On Thu, Oct 25, 2012 at 05:22:40PM +0200, Tomasz Figa wrote:
> @@ -47,6 +48,8 @@ static inline void __iomem *cpu_boot_reg(int cpu)
>  {
>  	void __iomem *boot_reg;
>  
> +	if (!call_firmware_op(cpu_boot_reg, cpu, &boot_reg))
> +		return boot_reg;
>  	boot_reg = cpu_boot_reg_base();

That code makes no sense.
Tomasz Figa Nov. 12, 2012, 10:11 a.m. UTC | #2 
On Monday 12 of November 2012 09:52:31 Russell King - ARM Linux wrote:
> On Thu, Oct 25, 2012 at 05:22:40PM +0200, Tomasz Figa wrote:
> > @@ -47,6 +48,8 @@ static inline void __iomem *cpu_boot_reg(int cpu)
> > 
> >  {
> >  
> >  	void __iomem *boot_reg;
> > 
> > +	if (!call_firmware_op(cpu_boot_reg, cpu, &boot_reg))
> > +		return boot_reg;
> > 
> >  	boot_reg = cpu_boot_reg_base();
> 
> That code makes no sense.

Why?

call_firmware_op returning 0 means a success, so boot_reg is filled with 
proper boot register address, which should be used.

Otherwise (call_firmware_op returning an error) the legacy boot register 
is used.

Best regards,
diff mbox

Patch

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 4ca8ff1..9f8bdaf 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -25,6 +25,7 @@ 
 #include <asm/hardware/gic.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
+#include <asm/firmware.h>
 
 #include <mach/hardware.h>
 #include <mach/regs-clock.h>
@@ -47,6 +48,8 @@  static inline void __iomem *cpu_boot_reg(int cpu)
 {
 	void __iomem *boot_reg;
 
+	if (!call_firmware_op(cpu_boot_reg, cpu, &boot_reg))
+		return boot_reg;
 	boot_reg = cpu_boot_reg_base();
 	if (soc_is_exynos4412())
 		boot_reg += 4*cpu;
@@ -149,6 +152,10 @@  static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
 
 		__raw_writel(virt_to_phys(exynos4_secondary_startup),
 							cpu_boot_reg(phys_cpu));
+
+		/* Call Exynos specific smc call */
+		call_firmware_op(cpu_boot, phys_cpu);
+
 		gic_raise_softirq(cpumask_of(cpu), 0);
 
 		if (pen_release == -1)