kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: keystone: Move CPU bringup code to dedicated asm file

Browse source 
Because of inline asm usage in platsmp.c, smc instruction
creates build failure for ARM V6+V7 build where as using instruction
encoding for smc breaks the thumb2 build.

So move the code snippet to separate asm file and mark
it with 'armv7-a$(plus_sec)' to avoid any build issues.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Santosh Shilimkar 2013-06-21 18:54:47 -04:00 committed by Arnd Bergmann
parent 24e860fbfd
commit 3aae7ab0f1
4 changed files with 43 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-keystone/Makefile
View file

@ -1,2 +1,6 @@
obj-y := keystone.o
obj-y := keystone.o smc.o
plus_sec := $(call as-instr,.arch_extension sec,+sec)
AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec)
obj-$(CONFIG_SMP) += platsmp.o

6
arch/arm/mach-keystone/keystone.h
View file

@ -11,7 +11,13 @@
#ifndef __KEYSTONE_H__
#define __KEYSTONE_H__
#define KEYSTONE_MON_CPU_UP_IDX 0x00
#ifndef __ASSEMBLER__
extern struct smp_operations keystone_smp_ops;
extern void secondary_startup(void);
extern u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr);
#endif /* __ASSEMBLER__ */
#endif /* __KEYSTONE_H__ */

15
arch/arm/mach-keystone/platsmp.c
View file

@ -30,18 +30,9 @@ static int __cpuinit keystone_smp_boot_secondary(unsigned int cpu,
pr_debug("keystone-smp: booting cpu %d, vector %08lx\n",
cpu, start);
asm volatile (
"mov r0, #0\n" /* power on cmd */
"mov r1, %1\n" /* cpu */
"mov r2, %2\n" /* start */
".inst 0xe1600070\n" /* smc #0 */
"mov %0, r0\n"
: "=r" (error)
: "r"(cpu), "r"(start)
: "cc", "r0", "r1", "r2", "memory"
);
pr_debug("keystone-smp: monitor returned %d\n", error);
error = keystone_cpu_smc(KEYSTONE_MON_CPU_UP_IDX, cpu, start);
if (error)
pr_err("CPU %d bringup failed with %d\n", cpu, error);
return error;
}

29
arch/arm/mach-keystone/smc.S Normal file
View file

@ -0,0 +1,29 @@
/*
* Keystone Secure APIs
*
* Copyright (C) 2013 Texas Instruments, Inc.
* Santosh Shilimkar <santosh.shilimkar@ti.com>
*
* This program is free software,you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
/**
* u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr)
*
* Low level CPU monitor API
* @command: Monitor command.
* @cpu: CPU Number
* @addr: Kernel jump address for boot CPU
*
* Return: Non zero value on failure
*/
ENTRY(keystone_cpu_smc)
stmfd sp!, {r4-r12, lr}
smc #0
dsb
ldmfd sp!, {r4-r12, pc}
ENDPROC(keystone_cpu_smc)