From patchwork Wed Nov 4 09:46:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 7548521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 255DEBEEA4 for ; Wed, 4 Nov 2015 09:49:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E65DA206AF for ; Wed, 4 Nov 2015 09:49:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CF2F20695 for ; Wed, 4 Nov 2015 09:49:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtufN-0002kz-Nl; Wed, 04 Nov 2015 09:47:41 +0000 Received: from mail-lb0-x22d.google.com ([2a00:1450:4010:c04::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtufC-0002cn-3M for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2015 09:47:32 +0000 Received: by lbbes7 with SMTP id es7so11847496lbb.2 for ; Wed, 04 Nov 2015 01:47:07 -0800 (PST) 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=DXYt+EibnjOHe5z0vR7KHyXH3Opp3foN7TrBm7TeRnQ=; b=0HD4w7ziAcjhf6vHQUIcDE43lNBAAI+74YRKbYNguhtM60PTjsCGgF7U1SsIOYEWvL oxqdgmzAPSvfHI0/whnMS2ZxuKfsHOzrR/XXOOOb8yVdCIX+Dq5FubDSgb0Oh5YzPZBX 80QYr3HUf0IYR4LqpJcD6U4hh+2N1dd9NXEZddjLTJxOOkbtv3H2DfgDAv8HDi0V/Byp eLMTpjni3qQB3uFp4+3nPe6RKEa0vEaei1Pr5wnCTRcG99WSNr2NPp8s0s6jO7A0mE0T JzIEmcYW3rrb1UEy3P8gMKT0gw0bBFx6DQRyPIiZ0ydBrWAUQC+olJHGEryAdvAOxv8F ss6g== 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=DXYt+EibnjOHe5z0vR7KHyXH3Opp3foN7TrBm7TeRnQ=; b=JWKJvYPsUnpGs88qDzHQOvez0aJcRWcDlkxKKAbzm4RqOnjI4jaq5At1fpOp74LtrT VAxRP5u683xv7/+Si36nYZNdbVBeJjACCwI/Kr0OCJGqsbieM/K2Dx73nl2d9DCzPyw0 EVPp4Kb3DQy7eI3G+df+MBObzGnT+pk7RnvMHMlhqUJKXPUVC3WmXtcx4jA4L9nxDkp8 q1mHQ1DqMIXEXSepfZA1QtzABL156LD8b1ZshzvvZ9L4bLa9Iu1zcgYkCgyJl5PwSnJa e97s3llwbOQuh2aVYzXbWxO3ZY+SzZYgZMeql8uhPnXUnvjPlj7B59F6lIAzWRhcftI/ 3pZQ== X-Gm-Message-State: ALoCoQmCuCERRYGKse+G8Z7oP2lVyWrdYkCToRz+9EGb5sITw5l2XAQld02vk4DTG7q4TAAgokP4 X-Received: by 10.112.155.195 with SMTP id vy3mr400014lbb.9.1446630427170; Wed, 04 Nov 2015 01:47:07 -0800 (PST) Received: from ermac.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id qh2sm74250lbb.42.2015.11.04.01.47.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 01:47:06 -0800 (PST) From: Jens Wiklander To: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Mark Rutland , Will Deacon , Catalin Marinas , Russell King Subject: [PATCH 2/4] arm: add implementation for arm-smccc Date: Wed, 4 Nov 2015 10:46:10 +0100 Message-Id: <1446630372-1598-3-git-send-email-jens.wiklander@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446630372-1598-1-git-send-email-jens.wiklander@linaro.org> References: <1446630372-1598-1-git-send-email-jens.wiklander@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151104_014730_514990_47A3511E X-CRM114-Status: GOOD ( 18.11 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Wiklander , Lars Persson MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 + +#include +#include + + .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 +#include + +EXPORT_SYMBOL_GPL(arm_smccc_smc); +EXPORT_SYMBOL_GPL(arm_smccc_hvc);