* [PATCH 1/4] arm/arm64: add arm-smccc
2015-11-04 9:46 [PATCH 0/4] ARM SMC Calling Convention interface Jens Wiklander
@ 2015-11-04 9:46 ` Jens Wiklander
2015-11-04 9:46 ` [PATCH 2/4] arm: add implementation for arm-smccc Jens Wiklander
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Jens Wiklander @ 2015-11-04 9:46 UTC (permalink / raw)
To: linux-arm-kernel
Adds helpers to do SMC and HVC based on ARM SMC Calling Convention.
CONFIG_HAVE_ARM_SMCCC is enabled for architectures that may support the
SMC or HVC instruction. It's the responsibility of the caller to know if
the SMC instruction is supported by the platform.
This patch doesn't provide an implementation of the declared functions.
Later patches will bring in implementations and set
CONFIG_HAVE_ARM_SMCCC for ARM and ARM64 respectively.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
include/linux/arm-smccc.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++
init/Kconfig | 3 ++
2 files changed, 101 insertions(+)
create mode 100644 include/linux/arm-smccc.h
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
new file mode 100644
index 0000000..dea68a9
--- /dev/null
+++ b/include/linux/arm-smccc.h
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ *
+ */
+#ifndef __LINUX_ARM_SMCCC_H
+#define __LINUX_ARM_SMCCC_H
+
+#include <linux/types.h>
+#include <linux/linkage.h>
+
+/*
+ * This file provides common defines for ARM SMC Calling Convention as
+ * specified in
+ * http://infocenter.arm.com/help/topic/com.arm.doc.den0028a/index.html
+ */
+
+#define ARM_SMCCC_SMC_32 (0 << 30)
+#define ARM_SMCCC_SMC_64 (1 << 30)
+#define ARM_SMCCC_FAST_CALL (1 << 31)
+#define ARM_SMCCC_STD_CALL (0 << 31)
+
+#define ARM_SMCCC_OWNER_MASK 0x3F
+#define ARM_SMCCC_OWNER_SHIFT 24
+
+#define ARM_SMCCC_FUNC_MASK 0xFFFF
+
+#define ARM_SMCCC_IS_FAST_CALL(smc_val) ((smc_val) & ARM_SMCCC_FAST_CALL)
+#define ARM_SMCCC_IS_64(smc_val) ((smc_val) & ARM_SMCCC_SMC_64)
+#define ARM_SMCCC_FUNC_NUM(smc_val) ((smc_val) & ARM_SMCCC_FUNC_MASK)
+#define ARM_SMCCC_OWNER_NUM(smc_val) \
+ (((smc_val) >> ARM_SMCCC_OWNER_SHIFT) & ARM_SMCCC_OWNER_MASK)
+
+#define ARM_SMCCC_CALL_VAL(type, calling_convention, owner, func_num) \
+ ((type) | (calling_convention) | \
+ (((owner) & ARM_SMCCC_OWNER_MASK) << ARM_SMCCC_OWNER_SHIFT) | \
+ ((func_num) & ARM_SMCCC_FUNC_MASK))
+
+#define ARM_SMCCC_OWNER_ARCH 0
+#define ARM_SMCCC_OWNER_CPU 1
+#define ARM_SMCCC_OWNER_SIP 2
+#define ARM_SMCCC_OWNER_OEM 3
+#define ARM_SMCCC_OWNER_STANDARD 4
+#define ARM_SMCCC_OWNER_TRUSTED_APP 48
+#define ARM_SMCCC_OWNER_TRUSTED_APP_END 49
+#define ARM_SMCCC_OWNER_TRUSTED_OS 50
+#define ARM_SMCCC_OWNER_TRUSTED_OS_END 63
+
+/**
+ * struct arm_smccc_res - Result from SMC/HVC call
+ * @a0-a3 result values from registers 0 to 3
+ */
+struct arm_smccc_res {
+ unsigned long a0;
+ unsigned long a1;
+ unsigned long a2;
+ unsigned long a3;
+};
+
+/**
+ * arm_smccc_smc() - make SMC calls
+ * @a0-a7: arguments passed in registers 0 to 7
+ * @res: result values from registers 0 to 3
+ *
+ * This function is used to make SMC calls following SMC Calling Convention.
+ * The content of the supplied param are copied to registers 0 to 7 prior
+ * to the SMC instruction. The return values are updated with the content
+ * from register 0 to 3 on return from the SMC instruction.
+ */
+asmlinkage 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);
+
+/**
+ * arm_smccc_hvc() - make HVC calls
+ * @a0-a7: arguments passed in registers 0 to 7
+ * @res: result values from registers 0 to 3
+ *
+ * This function is used to make HVC calls following SMC Calling
+ * Convention. The content of the supplied param are copied to registers 0
+ * to 7 prior to the HVC instruction. The return values are updated with
+ * the content from register 0 to 3 on return from the HVC instruction.
+ */
+asmlinkage 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);
+
+#endif /*__LINUX_ARM_SMCCC_H*/
diff --git a/init/Kconfig b/init/Kconfig
index c24b6f7..8d5a7b0 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2061,3 +2061,6 @@ config ASN1
functions to call on what tags.
source "kernel/Kconfig.locks"
+
+config HAVE_ARM_SMCCC
+ bool
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] arm: add implementation for arm-smccc
2015-11-04 9:46 [PATCH 0/4] ARM SMC Calling Convention interface Jens Wiklander
2015-11-04 9:46 ` [PATCH 1/4] arm/arm64: add arm-smccc Jens Wiklander
@ 2015-11-04 9:46 ` Jens Wiklander
2015-11-04 10:23 ` Russell King - ARM Linux
2015-11-04 9:46 ` [PATCH 3/4] arm64: " Jens Wiklander
2015-11-04 9:46 ` [PATCH 4/4] drivers: psci: replace psci firmware calls Jens Wiklander
3 siblings, 1 reply; 8+ messages in thread
From: Jens Wiklander @ 2015-11-04 9:46 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
arch/arm/Kconfig | 1 +
arch/arm/kernel/Makefile | 2 ++
arch/arm/kernel/smccc-call.S | 46 ++++++++++++++++++++++++++++++++++++++++++++
arch/arm/kernel/smccc.c | 18 +++++++++++++++++
4 files changed, 67 insertions(+)
create mode 100644 arch/arm/kernel/smccc-call.S
create mode 100644 arch/arm/kernel/smccc.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 639411f..d394727 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -325,6 +325,7 @@ config ARCH_MULTIPLATFORM
select CLKSRC_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
+ select HAVE_ARM_SMCCC if CPU_V7
select MIGHT_HAVE_PCI
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index af9e59b..c89e6ab 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -92,4 +92,6 @@ obj-y += psci-call.o
obj-$(CONFIG_SMP) += psci_smp.o
endif
+obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o smccc.o
+
extra-y := $(head-y) vmlinux.lds
diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S
new file mode 100644
index 0000000..bbed9f1
--- /dev/null
+++ b/arch/arm/kernel/smccc-call.S
@@ -0,0 +1,46 @@
+/*
+ * 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>
+
+ .macro SMCCC instr
+ mov r12, sp
+ push {r4-r7}
+ ldm r12, {r4-r7}
+ \instr
+ pop {r4-r7}
+ ldr r12, [sp, #(4 * 4)]
+ stm r12, {r0-r3}
+ bx lr
+ .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 __SMC(0)
+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 __HVC(0)
+ENDPROC(arm_smccc_hvc)
diff --git a/arch/arm/kernel/smccc.c b/arch/arm/kernel/smccc.c
new file mode 100644
index 0000000..7941210
--- /dev/null
+++ b/arch/arm/kernel/smccc.c
@@ -0,0 +1,18 @@
+/*
+ * 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/export.h>
+#include <linux/arm-smccc.h>
+
+EXPORT_SYMBOL_GPL(arm_smccc_smc);
+EXPORT_SYMBOL_GPL(arm_smccc_hvc);
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] arm: add implementation for arm-smccc
2015-11-04 9:46 ` [PATCH 2/4] arm: add implementation for arm-smccc Jens Wiklander
@ 2015-11-04 10:23 ` Russell King - ARM Linux
2015-11-06 12:25 ` Will Deacon
0 siblings, 1 reply; 8+ messages in thread
From: Russell King - ARM Linux @ 2015-11-04 10:23 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 04, 2015 at 10:46:10AM +0100, Jens Wiklander wrote:
> + .macro SMCCC instr
> + mov r12, sp
> + push {r4-r7}
> + ldm r12, {r4-r7}
> + \instr
> + pop {r4-r7}
> + ldr r12, [sp, #(4 * 4)]
> + stm r12, {r0-r3}
> + bx lr
> + .endm
Please add unwinding support to this.
--
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/4] arm: add implementation for arm-smccc
2015-11-04 10:23 ` Russell King - ARM Linux
@ 2015-11-06 12:25 ` Will Deacon
2015-11-10 15:25 ` Jens Wiklander
0 siblings, 1 reply; 8+ messages in thread
From: Will Deacon @ 2015-11-06 12:25 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 04, 2015 at 10:23:27AM +0000, Russell King - ARM Linux wrote:
> On Wed, Nov 04, 2015 at 10:46:10AM +0100, Jens Wiklander wrote:
> > + .macro SMCCC instr
> > + mov r12, sp
> > + push {r4-r7}
> > + ldm r12, {r4-r7}
> > + \instr
> > + pop {r4-r7}
> > + ldr r12, [sp, #(4 * 4)]
> > + stm r12, {r0-r3}
> > + bx lr
> > + .endm
>
> Please add unwinding support to this.
Likewise for the arm64 part (which should be easy with
.cfi_startproc/.cfi_endproc).
Will
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/4] arm: add implementation for arm-smccc
2015-11-06 12:25 ` Will Deacon
@ 2015-11-10 15:25 ` Jens Wiklander
0 siblings, 0 replies; 8+ messages in thread
From: Jens Wiklander @ 2015-11-10 15:25 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 06, 2015 at 12:25:10PM +0000, Will Deacon wrote:
> On Wed, Nov 04, 2015 at 10:23:27AM +0000, Russell King - ARM Linux wrote:
> > On Wed, Nov 04, 2015 at 10:46:10AM +0100, Jens Wiklander wrote:
> > > + .macro SMCCC instr
> > > + mov r12, sp
> > > + push {r4-r7}
> > > + ldm r12, {r4-r7}
> > > + \instr
> > > + pop {r4-r7}
> > > + ldr r12, [sp, #(4 * 4)]
> > > + stm r12, {r0-r3}
> > > + bx lr
> > > + .endm
> >
> > Please add unwinding support to this.
>
> Likewise for the arm64 part (which should be easy with
> .cfi_startproc/.cfi_endproc).
Thanks for the feedback, I'll send out a v2 with this.
--
Jens
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] arm64: add implementation for arm-smccc
2015-11-04 9:46 [PATCH 0/4] ARM SMC Calling Convention interface Jens Wiklander
2015-11-04 9:46 ` [PATCH 1/4] arm/arm64: add arm-smccc Jens Wiklander
2015-11-04 9:46 ` [PATCH 2/4] arm: add implementation for arm-smccc Jens Wiklander
@ 2015-11-04 9:46 ` Jens Wiklander
2015-11-04 9:46 ` [PATCH 4/4] drivers: psci: replace psci firmware calls Jens Wiklander
3 siblings, 0 replies; 8+ messages in thread
From: Jens Wiklander @ 2015-11-04 9:46 UTC (permalink / raw)
To: linux-arm-kernel
Adds implementation for arm-smccc and enables CONFIG_HAVE_SMCCC.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/Makefile | 1 +
arch/arm64/kernel/asm-offsets.c | 3 +++
arch/arm64/kernel/smccc-call.S | 41 +++++++++++++++++++++++++++++++++++++++++
arch/arm64/kernel/smccc.c | 18 ++++++++++++++++++
5 files changed, 64 insertions(+)
create mode 100644 arch/arm64/kernel/smccc-call.S
create mode 100644 arch/arm64/kernel/smccc.c
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 07d1811..a7332ca 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -89,6 +89,7 @@ config ARM64
select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE
select HAVE_CONTEXT_TRACKING
+ select HAVE_ARM_SMCCC
help
ARM 64-bit (AArch64) Linux support.
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 22dc9bc..c61d758 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -36,6 +36,7 @@ arm64-obj-$(CONFIG_EFI) += efi.o efi-stub.o efi-entry.o
arm64-obj-$(CONFIG_PCI) += pci.o
arm64-obj-$(CONFIG_ARMV8_DEPRECATED) += armv8_deprecated.o
arm64-obj-$(CONFIG_ACPI) += acpi.o
+arm64-obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o smccc.o
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 8d89cf8..cfa0885 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -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)
{
@@ -161,5 +162,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;
}
diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S
new file mode 100644
index 0000000..2a45d99
--- /dev/null
+++ b/arch/arm64/kernel/smccc-call.S
@@ -0,0 +1,41 @@
+/*
+ * 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
+ \instr #0
+ ldr x4, [sp]
+ stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]
+ stp x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS]
+ ret
+ .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)
diff --git a/arch/arm64/kernel/smccc.c b/arch/arm64/kernel/smccc.c
new file mode 100644
index 0000000..7941210
--- /dev/null
+++ b/arch/arm64/kernel/smccc.c
@@ -0,0 +1,18 @@
+/*
+ * 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/export.h>
+#include <linux/arm-smccc.h>
+
+EXPORT_SYMBOL_GPL(arm_smccc_smc);
+EXPORT_SYMBOL_GPL(arm_smccc_hvc);
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] drivers: psci: replace psci firmware calls
2015-11-04 9:46 [PATCH 0/4] ARM SMC Calling Convention interface Jens Wiklander
` (2 preceding siblings ...)
2015-11-04 9:46 ` [PATCH 3/4] arm64: " Jens Wiklander
@ 2015-11-04 9:46 ` Jens Wiklander
3 siblings, 0 replies; 8+ messages in thread
From: Jens Wiklander @ 2015-11-04 9:46 UTC (permalink / raw)
To: linux-arm-kernel
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 <jens.wiklander@linaro.org>
---
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
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index c89e6ab..e8afdc6 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 <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)
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index c61d758..ff4b88a 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -15,7 +15,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
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 <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)
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 42700f0..9c55d11 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -19,6 +19,7 @@
#include <linux/pm.h>
#include <linux/printk.h>
#include <linux/psci.h>
+#include <linux/arm-smccc.h>
#include <linux/reboot.h>
#include <uapi/linux/psci.h>
@@ -56,8 +57,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 {
@@ -70,6 +69,26 @@ enum psci_function {
static u32 psci_function_id[PSCI_FN_MAX];
+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
^ permalink raw reply related [flat|nested] 8+ messages in thread