From mboxrd@z Thu Jan 1 00:00:00 1970 From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) Date: Wed, 2 Dec 2015 18:37:29 +0000 Subject: [PATCH v4 4/4] drivers: psci: replace psci firmware calls In-Reply-To: <1449049626-13991-5-git-send-email-jens.wiklander@linaro.org> References: <1449049626-13991-1-git-send-email-jens.wiklander@linaro.org> <1449049626-13991-5-git-send-email-jens.wiklander@linaro.org> Message-ID: <20151202183729.GC20520@red-moon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Dec 02, 2015 at 10:47:06AM +0100, Jens Wiklander wrote: > Switch to use a generic interface for issuing SMC/HVC based on ARM SMC > Calling Convention. Removes now the now unused psci-call.S. > > Signed-off-by: Jens Wiklander > Acked-by: Will Deacon > Reviewed-by: Mark Rutland > Tested-by: Mark Rutland > --- > arch/arm/kernel/Makefile | 1 - > arch/arm/kernel/psci-call.S | 31 ------------------------------- > arch/arm64/kernel/Makefile | 2 +- > arch/arm64/kernel/psci-call.S | 28 ---------------------------- > drivers/firmware/psci.c | 23 +++++++++++++++++++++-- > 5 files changed, 22 insertions(+), 63 deletions(-) > delete mode 100644 arch/arm/kernel/psci-call.S > delete mode 100644 arch/arm64/kernel/psci-call.S Thanks for implementing this patchset: Acked-by: Lorenzo Pieralisi Tested-by: Lorenzo Pieralisi > > diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile > index d2d0042..80856de 100644 > --- a/arch/arm/kernel/Makefile > +++ b/arch/arm/kernel/Makefile > @@ -88,7 +88,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 > > diff --git a/arch/arm/kernel/psci-call.S b/arch/arm/kernel/psci-call.S > deleted file mode 100644 > index a78e9e1..0000000 > --- a/arch/arm/kernel/psci-call.S > +++ /dev/null > @@ -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 > - */ > - > -#include > - > -#include > -#include > - > -/* 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) > diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > index 0170bea..27bf1e5 100644 > --- a/arch/arm64/kernel/Makefile > +++ b/arch/arm64/kernel/Makefile > @@ -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 > diff --git a/arch/arm64/kernel/psci-call.S b/arch/arm64/kernel/psci-call.S > deleted file mode 100644 > index cf83e61..0000000 > --- a/arch/arm64/kernel/psci-call.S > +++ /dev/null > @@ -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 > - */ > - > -#include > - > -/* 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) > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index d24f35d..f25cd79 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -13,6 +13,7 @@ > > #define pr_fmt(fmt) "psci: " fmt > > +#include > #include > #include > #include > @@ -58,8 +59,6 @@ struct psci_operations psci_ops; > > typedef unsigned long (psci_fn)(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; > > enum psci_function { > @@ -107,6 +106,26 @@ bool psci_power_state_is_valid(u32 state) > 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) > { > switch (errno) { > -- > 1.9.1 >