From patchwork Wed Oct 15 14:08:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 38782 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DFB3520973 for ; Wed, 15 Oct 2014 14:11:22 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf787037lbv.8 for ; Wed, 15 Oct 2014 07:11:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive :content-type:content-transfer-encoding; bh=niGb+Y6BEpezHvHt8+4N9eBLRJRR9/qGcQ44r76e4Ug=; b=blbMWsJANo5XyecSFtDHNePL6a35Bg1lfCjF3iG45/nC2NcgSpb/vf3QJAlUpFE/Wn rWigaMDGgy2rqX/1EWMVxxa4tIbO9rOZJQVYB/RO4pBYSDS1Q9u+sampNvYmkdqC+dRe uBkrHyt4DoFpLBHm+zbOzrtF6BXITKTiAkcGu2TB+go2UB3atAjjitk11EJsP7tKKuJT FSb6uNcv1fXbHMUV6zEpcVgHO5MrzHXDUQq5xX5RT8AeeD5H2v6Pqau0pEBZN5cNvW6u L753crjPQP/N7sFoEJ3sBx1sifGGZnV+38E3+zYNPXQt344qlxB0Y9xugCtZAFtUa1y8 AEeA== X-Gm-Message-State: ALoCoQk8KbWlB7qiqEbE21zF1Yebn1qZk4D02IEeS3yQhiMKlF87qozsHaGRtYMbc+R80aYkuGds X-Received: by 10.112.225.135 with SMTP id rk7mr2090784lbc.6.1413382281324; Wed, 15 Oct 2014 07:11:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.44 with SMTP id kv12ls61629lac.44.gmail; Wed, 15 Oct 2014 07:11:21 -0700 (PDT) X-Received: by 10.112.52.33 with SMTP id q1mr13014197lbo.42.1413382281162; Wed, 15 Oct 2014 07:11:21 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id tl10si30555136lbb.131.2014.10.15.07.11.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Oct 2014 07:11:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id mc6so1130995lab.30 for ; Wed, 15 Oct 2014 07:11:20 -0700 (PDT) X-Received: by 10.152.87.98 with SMTP id w2mr12377647laz.27.1413382280806; Wed, 15 Oct 2014 07:11:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp604556lbz; Wed, 15 Oct 2014 07:11:19 -0700 (PDT) X-Received: by 10.221.67.137 with SMTP id xu9mr12173143vcb.11.1413382279113; Wed, 15 Oct 2014 07:11:19 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id cp3si7462649vdc.6.2014.10.15.07.11.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Oct 2014 07:11:19 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XePG7-0001zy-Ja; Wed, 15 Oct 2014 14:08:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XePG6-0001zt-Ji for xen-devel@lists.xenproject.org; Wed, 15 Oct 2014 14:08:58 +0000 Received: from [193.109.254.147:8282] by server-15.bemta-14.messagelabs.com id 42/54-30948-9FF7E345; Wed, 15 Oct 2014 14:08:57 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1413382136!12957852!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2601 invoked from network); 15 Oct 2014 14:08:57 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 15 Oct 2014 14:08:57 -0000 Received: by mail-wi0-f179.google.com with SMTP id d1so2028636wiv.6 for ; Wed, 15 Oct 2014 07:08:56 -0700 (PDT) X-Received: by 10.180.205.148 with SMTP id lg20mr12380167wic.18.1413382135944; Wed, 15 Oct 2014 07:08:55 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id ky3sm24015182wjb.39.2014.10.15.07.08.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Oct 2014 07:08:54 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 15 Oct 2014 15:08:45 +0100 Message-Id: <1413382125-27759-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 Cc: ian.campbell@citrix.com, Julien Grall , tim@xen.org, stefano.stabellini@citrix.com, Jan Beulich Subject: [Xen-devel] [PATCH v3 for 4.5] arm32: fix build after 063188f4b3 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: "xen: arm: Add support for the Exynos secure firmware" introduced code assuming that exynos_smc() would get called with arguments in certain registers. While the "noinline" attribute guarantees the function to not get inlined, it does not guarantee that all arguments arrive in the assumed registers: gcc's interprocedural analysis can result in clone functions to be created where some of the incoming arguments (commonly when they have constant values) get replaced by putting in place the respective values inside the clone. Xen contains in multiple place of this SMC function: consolidate the function in a single place and write it in assembly. Signed-off-by: Julien Grall Reported-by: Jan Beulich --- This is a fix for Xen 4.5 to compile the hypervisor with GCC 4.9.1, used by Fedora & co. Changes in v3: - Introduce macros assembly helper - Consolidate the SMC code in a single assembly file - Rename do_scm into call_smc and create helper for different number of argument - Rebase on top of PSCI v0.2 host support Changes in v2: - Write the SMC call in assembly - Consolidate the code in a single place --- xen/arch/arm/Makefile | 1 + xen/arch/arm/platforms/exynos5.c | 15 +-------------- xen/arch/arm/platforms/seattle.c | 12 ++---------- xen/arch/arm/psci.c | 34 ++++------------------------------ xen/arch/arm/smc.S | 21 +++++++++++++++++++++ xen/include/asm-arm/arm32/macros.h | 8 ++++++++ xen/include/asm-arm/macros.h | 16 ++++++++++++++++ xen/include/asm-arm/processor.h | 9 +++++++++ 8 files changed, 62 insertions(+), 54 deletions(-) create mode 100644 xen/arch/arm/smc.S create mode 100644 xen/include/asm-arm/arm32/macros.h create mode 100644 xen/include/asm-arm/macros.h diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 9a25290..41aba2e 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -37,6 +37,7 @@ obj-y += hvm.o obj-y += device.o obj-y += decode.o obj-y += processor.o +obj-y += smc.o #obj-bin-y += ....o diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index ac556cb..cfb293d 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -37,19 +37,6 @@ static bool_t secure_firmware; #define SMC_CMD_CPU1BOOT (-4) -static noinline void exynos_smc(register_t function_id, register_t arg0, - register_t arg1, register_t arg2) -{ - asm volatile( - __asmeq("%0", "r0") - __asmeq("%1", "r1") - __asmeq("%2", "r2") - __asmeq("%3", "r3") - "smc #0" - : - : "r" (function_id), "r" (arg0), "r" (arg1), "r" (arg2)); -} - static int exynos5_init_time(void) { uint32_t reg; @@ -263,7 +250,7 @@ static int exynos5_cpu_up(int cpu) iounmap(power); if ( secure_firmware ) - exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0); + call_smc1(SMC_CMD_CPU1BOOT, cpu); return cpu_up_send_sgi(cpu); } diff --git a/xen/arch/arm/platforms/seattle.c b/xen/arch/arm/platforms/seattle.c index edfc391..f717039 100644 --- a/xen/arch/arm/platforms/seattle.c +++ b/xen/arch/arm/platforms/seattle.c @@ -31,22 +31,14 @@ static const char * const seattle_dt_compat[] __initconst = * This is temporary until full PSCI-0.2 is supported. * Then, these function will be removed. */ -static noinline void seattle_smc_psci(register_t func_id) -{ - asm volatile( - "smc #0" - : "+r" (func_id) - :); -} - static void seattle_system_reset(void) { - seattle_smc_psci(PSCI_0_2_FN_SYSTEM_RESET); + call_smc0(PSCI_0_2_FN_SYSTEM_RESET); } static void seattle_system_off(void) { - seattle_smc_psci(PSCI_0_2_FN_SYSTEM_OFF); + call_smc0(PSCI_0_2_FN_SYSTEM_OFF); } PLATFORM_START(seattle, "SEATTLE") diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 604ff4c..c186c13 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -25,49 +25,23 @@ uint32_t psci_ver; -#ifdef CONFIG_ARM_32 -#define REG_PREFIX "r" -#else -#define REG_PREFIX "x" -#endif - -static noinline int __invoke_psci_fn_smc(register_t function_id, - register_t arg0, - register_t arg1, - register_t arg2) -{ - asm volatile( - __asmeq("%0", REG_PREFIX"0") - __asmeq("%1", REG_PREFIX"1") - __asmeq("%2", REG_PREFIX"2") - __asmeq("%3", REG_PREFIX"3") - "smc #0" - : "+r" (function_id) - : "r" (arg0), "r" (arg1), "r" (arg2)); - - return function_id; -} - -#undef REG_PREFIX - static uint32_t psci_cpu_on_nr; int call_psci_cpu_on(int cpu) { - return __invoke_psci_fn_smc(psci_cpu_on_nr, - cpu_logical_map(cpu), __pa(init_secondary), 0); + return call_smc2(psci_cpu_on_nr, cpu_logical_map(cpu), __pa(init_secondary)); } void call_psci_system_off(void) { if ( psci_ver > XEN_PSCI_V_0_1 ) - __invoke_psci_fn_smc(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); + call_smc0(PSCI_0_2_FN_SYSTEM_OFF); } void call_psci_system_reset(void) { if ( psci_ver > XEN_PSCI_V_0_1 ) - __invoke_psci_fn_smc(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); + call_smc0(PSCI_0_2_FN_SYSTEM_RESET); } int __init psci_is_smc_method(const struct dt_device_node *psci) @@ -134,7 +108,7 @@ int __init psci_init_0_2(void) if ( ret ) return -EINVAL; - psci_ver = __invoke_psci_fn_smc(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); + psci_ver = call_smc0(PSCI_0_2_FN_PSCI_VERSION); if ( psci_ver != XEN_PSCI_V_0_2 ) { diff --git a/xen/arch/arm/smc.S b/xen/arch/arm/smc.S new file mode 100644 index 0000000..b8f1822 --- /dev/null +++ b/xen/arch/arm/smc.S @@ -0,0 +1,21 @@ +/* + * xen/arch/arm/smc.S + * + * Wrapper for Secure Monitors Calls + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + +ENTRY(call_smc) + smc #0 + ret diff --git a/xen/include/asm-arm/arm32/macros.h b/xen/include/asm-arm/arm32/macros.h new file mode 100644 index 0000000..a4e20aa --- /dev/null +++ b/xen/include/asm-arm/arm32/macros.h @@ -0,0 +1,8 @@ +#ifndef __ASM_ARM_ARM32_MACROS_H +#define __ASM_ARM_ARM32_MACROS_H + + .macro ret + mov pc, lr + .endm + +#endif /* __ASM_ARM_ARM32_MACROS_H */ diff --git a/xen/include/asm-arm/macros.h b/xen/include/asm-arm/macros.h new file mode 100644 index 0000000..f92f905 --- /dev/null +++ b/xen/include/asm-arm/macros.h @@ -0,0 +1,16 @@ +#ifndef __ASM_MACROS_H +#define __ASM_MACROS_H + +#ifndef __ASSEMBLY__ +# error "This file should only be included in assembly file" +#endif + +#if defined (CONFIG_ARM_32) +# include +#elif defined(CONFIG_ARM_64) +/* Not specific ARM64 macros for now */ +#else +# error "unknown ARM variant" +#endif + +#endif /* __ASM_ARM_MACROS_H */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index e719c26..90c2647 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -614,6 +614,15 @@ void vcpu_regs_hyp_to_user(const struct vcpu *vcpu, void vcpu_regs_user_to_hyp(struct vcpu *vcpu, const struct vcpu_guest_core_regs *regs); +int call_smc(register_t function_id, register_t arg0, register_t arg1, + register_t arg2); + +#define call_smc0(func) call_smc((func), 0, 0, 0) +#define call_smc1(func, a0) call_smc((func), (a0), 0, 0) +#define call_smc2(func, a0, a1) call_smc((func), (a0), (a1), 0) + +int do_smc(register_t function_id, ...); + #endif /* __ASSEMBLY__ */ #endif /* __ASM_ARM_PROCESSOR_H */ /*