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

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

ARM: 8480/2: arm64: add implementation for arm-smccc 



Adds implementation for arm-smccc and enables CONFIG_HAVE_SMCCC.

Change-Id: Iee20985ae688c68c5f3d6494545718c70057661b
Acked-by: default avatarWill Deacon <will.deacon@arm.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 14457459f9ca2ff8521686168ea179edc3a56a44)
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent e9f7e56e

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ config ARM64 
	select SYSCTL_EXCEPTION_TRACE

	select HAVE_CONTEXT_TRACKING

	select THREAD_INFO_IN_TASK

	select HAVE_ARM_SMCCC

	help

	  ARM 64-bit (AArch64) Linux support.

arch/arm64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ arm64-obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ 
			   hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o	\

			   return_address.o cpuinfo.o cpu_errata.o		\

			   cpufeature.o alternative.o cacheinfo.o		\

			   smp.o smp_spin_table.o topology.o

			   smp.o smp_spin_table.o topology.o smccc-call.o



extra-$(CONFIG_EFI)			:= efi-entry.o

arch/arm64/kernel/arm64ksyms.c

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

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/arm-smccc.h>



#include <asm/checksum.h>
@@ -68,3 +69,7 @@ EXPORT_SYMBOL(test_and_change_bit); 
#ifdef CONFIG_FUNCTION_TRACER

EXPORT_SYMBOL(_mcount);

#endif



	/* arm-smccc */

EXPORT_SYMBOL(arm_smccc_smc);

EXPORT_SYMBOL(arm_smccc_hvc);

arch/arm64/kernel/asm-offsets.c

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/suspend.h>

#include <asm/vdso_datapage.h>

#include <linux/kbuild.h>

#include <linux/arm-smccc.h>



int main(void)

{
@@ -179,5 +180,7 @@ int main(void) 
  DEFINE(SLEEP_SAVE_SP_PHYS,	offsetof(struct sleep_save_sp, save_ptr_stash_phys));

  DEFINE(SLEEP_SAVE_SP_VIRT,	offsetof(struct sleep_save_sp, save_ptr_stash));

#endif

  DEFINE(ARM_SMCCC_RES_X0_OFFS,	offsetof(struct arm_smccc_res, a0));

  DEFINE(ARM_SMCCC_RES_X2_OFFS,	offsetof(struct arm_smccc_res, a2));

  return 0;

}

arch/arm64/kernel/smccc-call.S

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

 * Copyright (c) 2015, Linaro Limited

 *

 * 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.

 *

 * 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/asm-offsets.h>



	.macro SMCCC instr

	.cfi_startproc

	\instr	#0

	ldr	x4, [sp]

	stp	x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]

	stp	x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS]

	ret

	.cfi_endproc

	.endm



/*

 * void arm_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	smc

ENDPROC(arm_smccc_smc)



/*

 * void arm_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	hvc

ENDPROC(arm_smccc_hvc)