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

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

ARM: 8481/2: drivers: psci: replace psci firmware calls 



Switch to use a generic interface for issuing SMC/HVC based on ARM SMC
Calling Convention. Removes now the now unused psci-call.S.

Change-Id: Ic3be85884c9d4726211346c6ecfff60ca51b08b7
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@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 e679660dbb8347f275fe5d83a5dd59c1fb6c8e63)
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent a794759d

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ config HOTPLUG_CPU 


config ARM_PSCI

	bool "Support for the ARM Power State Coordination Interface (PSCI)"

	depends on CPU_V7

	depends on HAVE_ARM_SMCCC

	select ARM_PSCI_FW

	help

	  Say Y here if you want Linux to communicate with system firmware

arch/arm/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 


obj-$(CONFIG_ARM_VIRT_EXT)	+= hyp-stub.o

ifeq ($(CONFIG_ARM_PSCI),y)

obj-y				+= psci-call.o

obj-$(CONFIG_SMP)		+= psci_smp.o

endif

arch/arm/kernel/psci-call.S

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

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

 *

 * Copyright (C) 2015 ARM Limited

 *

 * Author: Mark Rutland <mark.rutland@arm.com>

 */



#include <linux/linkage.h>



#include <asm/opcodes-sec.h>

#include <asm/opcodes-virt.h>



/* int __invoke_psci_fn_hvc(u32 function_id, u32 arg0, u32 arg1, u32 arg2) */

ENTRY(__invoke_psci_fn_hvc)

	__HVC(0)

	bx	lr

ENDPROC(__invoke_psci_fn_hvc)



/* int __invoke_psci_fn_smc(u32 function_id, u32 arg0, u32 arg1, u32 arg2) */

ENTRY(__invoke_psci_fn_smc)

	__SMC(0)

	bx	lr

ENDPROC(__invoke_psci_fn_smc)

arch/arm64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ CFLAGS_REMOVE_return_address.o = -pg 
arm64-obj-y		:= debug-monitors.o entry.o irq.o fpsimd.o		\

			   entry-fpsimd.o process.o ptrace.o setup.o signal.o	\

			   sys.o stacktrace.o time.o traps.o io.o vdso.o	\

			   hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o	\

			   hyp-stub.o psci.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 smccc-call.o

arch/arm64/kernel/psci-call.S

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

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

 *

 * Copyright (C) 2015 ARM Limited

 *

 * Author: Will Deacon <will.deacon@arm.com>

 */



#include <linux/linkage.h>



/* int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1, u64 arg2) */

ENTRY(__invoke_psci_fn_hvc)

	hvc	#0

	ret

ENDPROC(__invoke_psci_fn_hvc)



/* int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1, u64 arg2) */

ENTRY(__invoke_psci_fn_smc)

	smc	#0

	ret

ENDPROC(__invoke_psci_fn_smc)