From patchwork Fri Nov 8 12:35:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 178891 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp2636193ilf; Fri, 8 Nov 2019 04:36:19 -0800 (PST) X-Google-Smtp-Source: APXvYqz9qx+SHQqEGpoIJLF0SsgDNHK8FKd3AWvjOM4clpNLTX+2c+iszPnJ9qVYXVKMnK7W0KUO X-Received: by 2002:a05:6402:1299:: with SMTP id w25mr9906613edv.10.1573216579212; Fri, 08 Nov 2019 04:36:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573216579; cv=none; d=google.com; s=arc-20160816; b=gu1/iauddF4wf1ewSm2m0baoweZ94zH5QyB+CKjL0sasa15lS8FOE9yR4g8fo6CckB VXK5H8cupb0ReHFGVr0P0IiQ5EX4W2X1CcmCbkHmGHbL5LKY+LhDpnlItMKNbIk5jPe7 naZf+mj3ynlCK8PU6BLwOVQQ+zmYsi4eqpnisKrbdMQ2HTPnE/d+dQZ8Z5vHm7DiqSi6 KVCIfvrB32blXRFBHZDHwCDM4FA83wYF4qa+FJ8BRyLp7YO+mA6L4u09a46nIgObs030 mtciojExClKDIPZDZROYZYPpoHRDFUqbvN1f6aiYNWqXVZdTGRnOxXFPu4Ev+zmZCoSD LSNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E/nm+w17Zblg/2bBrlqrb8u49cYE2PmikEjH8Ej1A3o=; b=FXV6yCZxIuLXRcIo3ekwTkcf6yzpoHjZj9kOyQOvKVoVj1TFQctZMvqAj+zJaHQQyz Kzs//uR08K5n6IsEzm50aO5LpsAQd8/S0S9wNOKIQ482QSqkkxXHglo2KK82fyih0wWc beDlzgSxPawVnbGx6ZERtYYu0wtGFi7bJE2/Ryknmt1FirK5NESPhL8PvU4XEXE5erUO RujCE9ZNpghnKDPqLQ7rL/5Yz0omhdVX5ETYLG3jf7iwXWudzjtGvQxG1NWb8Hkuwfa2 qs6j3NZtiSGsefAEhFZiV5mOfAouDT4NPx584qfzZZyvgygRBSfvtehNIFV1WFN5Q5BO Swrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UdACFC15; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o19si3411305ejc.315.2019.11.08.04.36.19; Fri, 08 Nov 2019 04:36:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UdACFC15; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726932AbfKHMgS (ORCPT + 14 others); Fri, 8 Nov 2019 07:36:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:43820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726251AbfKHMgS (ORCPT ); Fri, 8 Nov 2019 07:36:18 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CF06C222CE; Fri, 8 Nov 2019 12:36:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216577; bh=eqbrTzgAoQz/Aum8KB3AxELDR9bRDRjpvbg+YfXUfpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UdACFC15vhQrIRbH14f5d7ZwZf8UfTEpG2RKyEgVFhbcn9uJHuKaRcwwVotLyMukd Iy2J6TaslEvxg3zgbUkahFjd/5IzJwQCoYxEgEh9MiNRUfjsMeKvzAANsmKd5MkNPa d+930+mq8kCJvzZ0F6NnGbWxDlnEOvFdWSHWvizo= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Jens Wiklander , Ard Biesheuvel Subject: [PATCH for-stable-4.4 03/50] ARM: 8479/2: add implementation for arm-smccc Date: Fri, 8 Nov 2019 13:35:07 +0100 Message-Id: <20191108123554.29004-4-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Wiklander Commit b329f95d70f3f955093e9a2b18ac1ed3587a8f73 upstream. 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. Reviewed-by: Lars Persson Signed-off-by: Jens Wiklander Signed-off-by: Russell King Signed-off-by: Ard Biesheuvel --- arch/arm/Kconfig | 1 + arch/arm/kernel/Makefile | 2 + arch/arm/kernel/armksyms.c | 6 ++ arch/arm/kernel/smccc-call.S | 62 ++++++++++++++++++++ 4 files changed, 71 insertions(+) -- 2.20.1 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 737c8b0dda84..ef742bacd568 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -37,6 +37,7 @@ config ARM select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) select HAVE_ARCH_TRACEHOOK + select HAVE_ARM_SMCCC if CPU_V7 select HAVE_BPF_JIT select HAVE_CC_STACKPROTECTOR select HAVE_CONTEXT_TRACKING diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 3c789496297f..599c950468fc 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -91,4 +91,6 @@ obj-y += psci-call.o obj-$(CONFIG_SMP) += psci_smp.o endif +obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o + extra-y := $(head-y) vmlinux.lds diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index f89811fb9a55..7e45f69a0ddc 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -175,3 +176,8 @@ EXPORT_SYMBOL(__gnu_mcount_nc); EXPORT_SYMBOL(__pv_phys_pfn_offset); EXPORT_SYMBOL(__pv_offset); #endif + +#ifdef CONFIG_HAVE_ARM_SMCCC +EXPORT_SYMBOL(arm_smccc_smc); +EXPORT_SYMBOL(arm_smccc_hvc); +#endif diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S new file mode 100644 index 000000000000..2e48b674aab1 --- /dev/null +++ b/arch/arm/kernel/smccc-call.S @@ -0,0 +1,62 @@ +/* + * 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 +#include + + /* + * Wrap c macros in asm macros to delay expansion until after the + * SMCCC asm macro is expanded. + */ + .macro SMCCC_SMC + __SMC(0) + .endm + + .macro SMCCC_HVC + __HVC(0) + .endm + + .macro SMCCC instr +UNWIND( .fnstart) + mov r12, sp + push {r4-r7} +UNWIND( .save {r4-r7}) + ldm r12, {r4-r7} + \instr + pop {r4-r7} + ldr r12, [sp, #(4 * 4)] + stm r12, {r0-r3} + bx lr +UNWIND( .fnend) + .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 SMCCC_SMC +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 SMCCC_HVC +ENDPROC(arm_smccc_hvc)