mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
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. Acked-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
14457459f9
commit
e679660dbb
6 changed files with 23 additions and 64 deletions
|
@ -1481,7 +1481,7 @@ config HOTPLUG_CPU
|
||||||
|
|
||||||
config ARM_PSCI
|
config ARM_PSCI
|
||||||
bool "Support for the ARM Power State Coordination Interface (PSCI)"
|
bool "Support for the ARM Power State Coordination Interface (PSCI)"
|
||||||
depends on CPU_V7
|
depends on HAVE_ARM_SMCCC
|
||||||
select ARM_PSCI_FW
|
select ARM_PSCI_FW
|
||||||
help
|
help
|
||||||
Say Y here if you want Linux to communicate with system firmware
|
Say Y here if you want Linux to communicate with system firmware
|
||||||
|
|
|
@ -87,7 +87,6 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||||
|
|
||||||
obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
|
obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
|
||||||
ifeq ($(CONFIG_ARM_PSCI),y)
|
ifeq ($(CONFIG_ARM_PSCI),y)
|
||||||
obj-y += psci-call.o
|
|
||||||
obj-$(CONFIG_SMP) += psci_smp.o
|
obj-$(CONFIG_SMP) += psci_smp.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
/*
|
|
||||||
* 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)
|
|
|
@ -14,7 +14,7 @@ CFLAGS_REMOVE_return_address.o = -pg
|
||||||
arm64-obj-y := debug-monitors.o entry.o irq.o fpsimd.o \
|
arm64-obj-y := debug-monitors.o entry.o irq.o fpsimd.o \
|
||||||
entry-fpsimd.o process.o ptrace.o setup.o signal.o \
|
entry-fpsimd.o process.o ptrace.o setup.o signal.o \
|
||||||
sys.o stacktrace.o time.o traps.o io.o vdso.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 \
|
return_address.o cpuinfo.o cpu_errata.o \
|
||||||
cpufeature.o alternative.o cacheinfo.o \
|
cpufeature.o alternative.o cacheinfo.o \
|
||||||
smp.o smp_spin_table.o topology.o smccc-call.o
|
smp.o smp_spin_table.o topology.o smccc-call.o
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
/*
|
|
||||||
* 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)
|
|
|
@ -13,6 +13,7 @@
|
||||||
|
|
||||||
#define pr_fmt(fmt) "psci: " fmt
|
#define pr_fmt(fmt) "psci: " fmt
|
||||||
|
|
||||||
|
#include <linux/arm-smccc.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
@ -58,8 +59,6 @@ struct psci_operations psci_ops;
|
||||||
|
|
||||||
typedef unsigned long (psci_fn)(unsigned long, unsigned long,
|
typedef unsigned long (psci_fn)(unsigned long, unsigned long,
|
||||||
unsigned long, unsigned long);
|
unsigned long, unsigned long);
|
||||||
asmlinkage psci_fn __invoke_psci_fn_hvc;
|
|
||||||
asmlinkage psci_fn __invoke_psci_fn_smc;
|
|
||||||
static psci_fn *invoke_psci_fn;
|
static psci_fn *invoke_psci_fn;
|
||||||
|
|
||||||
enum psci_function {
|
enum psci_function {
|
||||||
|
@ -107,6 +106,26 @@ bool psci_power_state_is_valid(u32 state)
|
||||||
return !(state & ~valid_mask);
|
return !(state & ~valid_mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static unsigned long __invoke_psci_fn_hvc(unsigned long function_id,
|
||||||
|
unsigned long arg0, unsigned long arg1,
|
||||||
|
unsigned long arg2)
|
||||||
|
{
|
||||||
|
struct arm_smccc_res res;
|
||||||
|
|
||||||
|
arm_smccc_hvc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res);
|
||||||
|
return res.a0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned long __invoke_psci_fn_smc(unsigned long function_id,
|
||||||
|
unsigned long arg0, unsigned long arg1,
|
||||||
|
unsigned long arg2)
|
||||||
|
{
|
||||||
|
struct arm_smccc_res res;
|
||||||
|
|
||||||
|
arm_smccc_smc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res);
|
||||||
|
return res.a0;
|
||||||
|
}
|
||||||
|
|
||||||
static int psci_to_linux_errno(int errno)
|
static int psci_to_linux_errno(int errno)
|
||||||
{
|
{
|
||||||
switch (errno) {
|
switch (errno) {
|
||||||
|
|
Loading…
Reference in a new issue