Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9f7e56e authored by Jens Wiklander's avatar Jens Wiklander Committed by Victor Chong
Browse files

ARM: 8479/2: add implementation for arm-smccc 



Adds implementation for arm-smccc and enables CONFIG_HAVE_SMCCC for
architectures that may support arm-smccc. It's the responsibility of the
caller to know if the SMC instruction is supported by the platform.

Change-Id: I11bacaf436a1178fee13169f8f65214011044783
Reviewed-by: default avatarLars Persson <lars.persson@axis.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit b329f95d70f3f955093e9a2b18ac1ed3587a8f73)
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent 6d7ed3d3

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ config ARM 
	select HAVE_ARCH_MMAP_RND_BITS if MMU

	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARM_SMCCC if CPU_V7

	select HAVE_BPF_JIT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CONTEXT_TRACKING

arch/arm/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -91,4 +91,6 @@ obj-y += psci-call.o 
obj-$(CONFIG_SMP)		+= psci_smp.o

endif



obj-$(CONFIG_HAVE_ARM_SMCCC)	+= smccc-call.o



extra-y := $(head-y) vmlinux.lds

arch/arm/kernel/armksyms.c

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/syscalls.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/arm-smccc.h>



#include <asm/checksum.h>

#include <asm/ftrace.h>
@@ -175,3 +176,8 @@ EXPORT_SYMBOL(__gnu_mcount_nc); 
EXPORT_SYMBOL(__pv_phys_pfn_offset);

EXPORT_SYMBOL(__pv_offset);

#endif



#ifdef CONFIG_HAVE_ARM_SMCCC

EXPORT_SYMBOL(arm_smccc_smc);

EXPORT_SYMBOL(arm_smccc_hvc);

#endif

arch/arm/kernel/smccc-call.S

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, Linaro Limited

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */

#include <linux/linkage.h>



#include <asm/opcodes-sec.h>

#include <asm/opcodes-virt.h>

#include <asm/unwind.h>



	/*

	 * Wrap c macros in asm macros to delay expansion until after the

	 * SMCCC asm macro is expanded.

	 */

	.macro SMCCC_SMC

	__SMC(0)

	.endm



	.macro SMCCC_HVC

	__HVC(0)

	.endm



	.macro SMCCC instr

UNWIND(	.fnstart)

	mov	r12, sp

	push	{r4-r7}

UNWIND(	.save	{r4-r7})

	ldm	r12, {r4-r7}

	\instr

	pop	{r4-r7}

	ldr	r12, [sp, #(4 * 4)]

	stm	r12, {r0-r3}

	bx	lr

UNWIND(	.fnend)

	.endm



/*

 * void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,

 *		  unsigned long a3, unsigned long a4, unsigned long a5,

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)

 */

ENTRY(arm_smccc_smc)

	SMCCC SMCCC_SMC

ENDPROC(arm_smccc_smc)



/*

 * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,

 *		  unsigned long a3, unsigned long a4, unsigned long a5,

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)

 */

ENTRY(arm_smccc_hvc)

	SMCCC SMCCC_HVC

ENDPROC(arm_smccc_hvc)