From patchwork Thu Oct 29 08:21:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 55743 Delivered-To: patches@linaro.org Received: by 10.112.61.134 with SMTP id p6csp403802lbr; Thu, 29 Oct 2015 01:21:56 -0700 (PDT) X-Received: by 10.112.156.2 with SMTP id wa2mr233473lbb.39.1446106916352; Thu, 29 Oct 2015 01:21:56 -0700 (PDT) Return-Path: Received: from mail-lb0-x232.google.com (mail-lb0-x232.google.com. [2a00:1450:4010:c04::232]) by mx.google.com with ESMTPS id ed1si295576lbc.40.2015.10.29.01.21.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2015 01:21:56 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c04::232 as permitted sender) client-ip=2a00:1450:4010:c04::232; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c04::232 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dkim=pass header.i=@linaro_org.20150623.gappssmtp.com Received: by lbbec13 with SMTP id ec13so23246663lbb.0 for ; Thu, 29 Oct 2015 01:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6JCBVhb3J+8NojUWqp+X96RRwjfLS+O7pZtsuvow5+w=; b=jkDmOyzyaioXXv0QK6H2OxWLxmld5/3RmbtSrik35h+bSbNG3t/VvbTHBWgRcRX8tJ F5QRGpURU3QeVdp1UK/V7+9dTaTlxJ4cSCcJiF+0ZGpRDuJEBG/x/qDqTlv6K+VklWgt 4qK1UjcJATWOsCPuhElM6xzJi1hHDNETSfg3q+HtEXtCWF0mfohawzpJo6swNUK19FWZ /v0AK53yEjUYGThrq/Id76IjOcYf1UV9tRZwjuCpUjwC5MWnfiCdIP0/J9MHjKxgKM9f bp8k3UPIRa5pelpkqZjeMPoBIJUBb03aAN3x6w19mF4g0NID/rtddM9bCEkHju0dzLEY 3URQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6JCBVhb3J+8NojUWqp+X96RRwjfLS+O7pZtsuvow5+w=; b=nOfuMVa5nYZ0tm+QRU1OYMbO05lUf7A6nFGnlWMxUXZMCQeMQTpkLP2V+zAV4SaHkp FYUAUSl01llfFrTyreupehR8zdAnolrDk1U06kpVc1IHj7F9hPTaI2hm9GcA9+gMV9h7 5qYVlky+Ly1ux+FAP6GwSpXgCHYubGpuzLwnxWMlaN0EKLbhCkViuJe8//4K4cRPLbXg GhZtrjZiJiTWD5EOP408ooNyIKg/coWxybZClWhxES0Q4dhRerp2k9cyWMcmXiANgxM1 FetO9EV5FonnP0ohtdqpbDPBCqncJbkjJNb5LGS2YPlpVnXR2Lx6ObuJfSd5eMiXKFOh 8XOg== X-Gm-Message-State: ALoCoQmjzuzH+NPAR2qC3OR1zOxLYsf9JXX7MGv7hefDVS4RGm6ZngWi8BSrAKIZZdO84O9nKCZy X-Received: by 10.112.146.2 with SMTP id sy2mr256040lbb.104.1446106914651; Thu, 29 Oct 2015 01:21:54 -0700 (PDT) Return-Path: Received: from ermac.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id q201sm73103lfe.43.2015.10.29.01.21.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Oct 2015 01:21:53 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , Kees Cook Cc: valentin.manea@huawei.com, jean-michel.delorme@st.com, emmanuel.michel@st.com, javier@javigon.com, Jason Gunthorpe , Mark Rutland , Michal Simek , Rob Herring , Will Deacon , Jens Wiklander Subject: [PATCH v6 2/6] drivers: psci: replace psci firmware calls Date: Thu, 29 Oct 2015 09:21:24 +0100 Message-Id: <1446106888-8983-3-git-send-email-jens.wiklander@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446106888-8983-1-git-send-email-jens.wiklander@linaro.org> References: <1446106888-8983-1-git-send-email-jens.wiklander@linaro.org> 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 --- 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 | 21 +++++++++++++++++++-- 5 files changed, 20 insertions(+), 63 deletions(-) delete mode 100644 arch/arm/kernel/psci-call.S delete mode 100644 arch/arm64/kernel/psci-call.S -- 1.9.1 diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index a98867d..190fa74 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 250948e..748e595 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 - */ - -#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 42700f0..53c9606 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -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,24 @@ enum psci_function { static u32 psci_function_id[PSCI_FN_MAX]; +static unsigned long __invoke_psci_fn_hvc(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3) +{ + struct smccc_res res; + + smccc_hvc(a0, a1, a2, a3, 0, 0, 0, 0, &res); + return res.a0; +} + +static unsigned long __invoke_psci_fn_smc(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3) +{ + struct smccc_res res; + + smccc_smc(a0, a1, a2, a3, 0, 0, 0, 0, &res); + return res.a0; +} + static int psci_to_linux_errno(int errno) { switch (errno) {