From patchwork Tue Sep 25 17:20:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 147516 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp987584lji; Tue, 25 Sep 2018 10:23:19 -0700 (PDT) X-Google-Smtp-Source: ACcGV63BDDKkHnvo5ae5pFfnjhXTp5/awe+skkIN9h3DYOkdMJ7yMhp+io7Q/3Za5K0lQtgAc1Rw X-Received: by 2002:a6b:2985:: with SMTP id p127-v6mr1741790iop.95.1537896199032; Tue, 25 Sep 2018 10:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537896199; cv=none; d=google.com; s=arc-20160816; b=HeffPPRuFXWUSHw1LZaZfWDlTMTJYfyWtLKXmbll/wC4iVc4T1cjn+w/MY5unLL9En 0qPpswVOHDtIRj8t724V/5JQszyc89H9jkqi6jjB4ZZfP2CoFVqYwgXXWq18zI64kCOQ b/R8BsEPiShoyuTgaDpl6/aV/8BdgnB3wecoTJdHnc0pMf7+5CsbYIT+11vS0E1oo1om gB9ZP44KNfXZ0R523+fbCX3ly5xnevnI/TdmsWtrjaNN+2x9s4oMuGv5QRuHBo8opfws mz8vfK+2S0+4C4Q1ZGYUoITLJbJyh4U9z2hw81ZaJXrbrGdY6rgCWyATUCoeePG6L+zn 9w0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=LftVdSeA48w8v+Qoqb621InPwmhq6+H2MHtj1G61u50=; b=ycIjhHece9mUsY9NGi7rxaIWlYnJNQVVJEZ7samRm0Yz+ry4I0O624G5bFCin/wJox XAbRqkAZlDKt1ahtFeFgMLruk8qCPM6cAaxzU1KcysA6MmrUh/ZB7JDDzgFVcCRDDzUE 7+WnmPE1C/ORQZaKLlwKYZU9Stp+E7og0H8JnBd3JeNlHAfeoUuggfcKbvHzBMGippUV qAzuLkV3t7/lAVQQUS+TNFWNgfexNbgJE3+AWvGheeJf/NUVh6l6oAcxJwqwqRm7966x O1bNH+YH7vP8aNYzEYJEc3KwLGwr6ahOYBeUrNNtm4AX68ahPovlZylRpzlPCpptF2Wj YO6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id q124-v6si1939357iod.118.2018.09.25.10.23.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Sep 2018 10:23:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g4r18-0004C2-1j; Tue, 25 Sep 2018 17:20:58 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g4r17-0004BU-1n for xen-devel@lists.xen.org; Tue, 25 Sep 2018 17:20:57 +0000 X-Inumbo-ID: 845b2730-c0e7-11e8-a6a9-d7ebe60f679a Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 845b2730-c0e7-11e8-a6a9-d7ebe60f679a; Tue, 25 Sep 2018 17:22:02 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5F07515AD; Tue, 25 Sep 2018 10:20:56 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.Emea.Arm.com [10.4.12.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 71F0E3F5BD; Tue, 25 Sep 2018 10:20:55 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 25 Sep 2018 18:20:42 +0100 Message-Id: <20180925172043.20248-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180925172043.20248-1-julien.grall@arm.com> References: <20180925172043.20248-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 5/6] xen/arm: smccc: Add wrapper to automatically select the calling convention X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , sstabellini@kernel.org, volodymyr_babchuk@epam.com MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini Reviewed-by: Volodymyr Babchuk --- Changes in v2: - Invert the condition - Add missing includes --- xen/arch/arm/psci.c | 4 ++++ xen/include/asm-arm/cpufeature.h | 3 ++- xen/include/asm-arm/smccc.h | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 3cf5ecf0f3..941eec921b 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -118,6 +119,9 @@ static void __init psci_init_smccc(void) smccc_ver = ret; } + if ( smccc_ver >= SMCCC_VERSION(1, 1) ) + cpus_set_cap(ARM_SMCCC_1_1); + printk(XENLOG_INFO "Using SMC Calling Convention v%u.%u\n", SMCCC_VERSION_MAJOR(smccc_ver), SMCCC_VERSION_MINOR(smccc_ver)); } diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index c6cbc2ec84..2d82264427 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -44,8 +44,9 @@ #define SKIP_CTXT_SWITCH_SERROR_SYNC 6 #define ARM_HARDEN_BRANCH_PREDICTOR 7 #define ARM_SSBD 8 +#define ARM_SMCCC_1_1 9 -#define ARM_NCAPS 9 +#define ARM_NCAPS 10 #ifndef __ASSEMBLY__ diff --git a/xen/include/asm-arm/smccc.h b/xen/include/asm-arm/smccc.h index 1ed6cbaa48..126399dd70 100644 --- a/xen/include/asm-arm/smccc.h +++ b/xen/include/asm-arm/smccc.h @@ -16,6 +16,9 @@ #ifndef __ASM_ARM_SMCCC_H__ #define __ASM_ARM_SMCCC_H__ +#include +#include + #define SMCCC_VERSION_MAJOR_SHIFT 16 #define SMCCC_VERSION_MINOR_MASK \ ((1U << SMCCC_VERSION_MAJOR_SHIFT) - 1) @@ -213,6 +216,7 @@ struct arm_smccc_res { */ #ifdef CONFIG_ARM_32 #define arm_smccc_1_0_smc(...) arm_smccc_1_1_smc(__VA_ARGS__) +#define arm_smccc_smc(...) arm_smccc_1_1_smc(__VA_ARGS__) #else void __arm_smccc_1_0_smc(register_t a0, register_t a1, register_t a2, @@ -254,6 +258,13 @@ void __arm_smccc_1_0_smc(register_t a0, register_t a1, register_t a2, #define arm_smccc_1_0_smc(...) \ __arm_smccc_1_0_smc_count(__count_args(__VA_ARGS__), __VA_ARGS__) +#define arm_smccc_smc(...) \ + do { \ + if ( cpus_have_const_cap(ARM_SMCCC_1_1) ) \ + arm_smccc_1_1_smc(__VA_ARGS__); \ + else \ + arm_smccc_1_0_smc(__VA_ARGS__); \ + } while ( 0 ) #endif /* CONFIG_ARM_64 */ #endif /* __ASSEMBLY__ */