From patchwork Fri Feb 23 16:47:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 129463 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp814073lja; Fri, 23 Feb 2018 08:50:18 -0800 (PST) X-Google-Smtp-Source: AG47ELuCtOVNgVbnW0Nkm+CMEeJNsAqJrJgYMJ6bMyb+oLKZcNOccpBR/OFjydtasMGUgirOPQGM X-Received: by 10.107.138.35 with SMTP id m35mr2516592iod.81.1519404617980; Fri, 23 Feb 2018 08:50:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519404617; cv=none; d=google.com; s=arc-20160816; b=yLJj4qEuXeL7KCMlBMJX05zKULUCO/qYoE/uWrsVC6b78AFSoBEYvzCZUmuCwUaPIv 8FXvVlsr+cND7Vn13G2LZ7GT2LUMQvKVPL0CcvTw1zCyyJ7xmtpIndram0RHWtW5RNhU q504LASiWMSvPW3MXmL4MUcxJdTCxyit2TIxI0Ww2GRK9xJWqWfXNjhVahsnYrAS0yDH 1Q/NC+hkSLxB/On7eM5naTiY9mQVdra7Yuu+nygfDD+umCFakIU1wgCcKT1LBYTUKzsK dwV7YPdbUs47tLLTf5Q5hEHMthNHBJApBXM8ehKZ2v83HRHkrh+2IvwQlKwssy3QCSJC wXCw== 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 :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=WGbMsGuqZDtZmGK0UfDctps0gL2rcTPHPjWrum80ep8=; b=O+SWHPQlUQBju/JxrRKxNGK2i1GbDRXVcv1cY507oByew5vkbhLkht/L8nNOA4hwR1 DD8ezByFNQxM7Z52FcLWCsoeRPyOcyEK2ImxKnLUtXI2tlVZsKkB+/HZRtIhQau6PHHC ODThvt2wwD/xV6z6ERTbUjC9/wKSOUWKlxUtWsceqeZiZq2KHbZ3STuI5y0qWn5KQNMf 3TqBNC5I6cTCsP5HEJXN3vgBCbr4iAJuvXZQAF7wmbbumUZ7n5c0xSKaeL445XJjcCx8 AzcyXCp7ENwV3BB9O925u9zvP1Qnthb2hq2rIGbFFJGDyIQKco3sEmu/rFsqqzCvlExy tY0g== 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 135si1623525itr.68.2018.02.23.08.50.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 08:50:17 -0800 (PST) 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.84_2) (envelope-from ) id 1epGWH-0003c7-5q; Fri, 23 Feb 2018 16:48:25 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epGWG-0003YZ-L5 for xen-devel@lists.xen.org; Fri, 23 Feb 2018 16:48:24 +0000 X-Inumbo-ID: 96b41d28-18b9-11e8-b9b1-635ca7ef6cff Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 96b41d28-18b9-11e8-b9b1-635ca7ef6cff; Fri, 23 Feb 2018 16:50:01 +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 F34E315AD; Fri, 23 Feb 2018 08:48:17 -0800 (PST) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C08633F25C; Fri, 23 Feb 2018 08:48:16 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 23 Feb 2018 16:47:43 +0000 Message-Id: <20180223164753.27311-10-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180223164753.27311-1-julien.grall@arm.com> References: <20180223164753.27311-1-julien.grall@arm.com> Cc: Andre Przywara , Julien Grall , sstabellini@kernel.org, volodymyr_babchuk@epam.com, andre.przywara@linaro.org Subject: [Xen-devel] [PATCH v4 09/19] xen/arm: psci: Detect SMCCC version X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" PSCI 1.0 and later allows the SMCCC version to be (indirectly) probed via PSCI_FEATURES. If the PSCI_FEATURES does not exist (PSCI 0.2 or earlier) and the function returns an error, then we assume SMCCC 1.0 is implemented. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini Reviewed-by: Andre Przywara --- Changes in v4: - Add Stefano's reviewed-by - Add Andre's reviewed-by - Fix typoes Changes in v2: - Patch added --- xen/arch/arm/psci.c | 34 +++++++++++++++++++++++++++++++++- xen/include/asm-arm/smccc.h | 2 ++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 5dda35cd7c..909d1c176f 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -37,6 +37,7 @@ #endif uint32_t psci_ver; +uint32_t smccc_ver; static uint32_t psci_cpu_on_nr; @@ -57,6 +58,14 @@ void call_psci_system_reset(void) call_smc(PSCI_0_2_FN32_SYSTEM_RESET, 0, 0, 0); } +static int __init psci_features(uint32_t psci_func_id) +{ + if ( psci_ver < PSCI_VERSION(1, 0) ) + return PSCI_NOT_SUPPORTED; + + return call_smc(PSCI_1_0_FN32_PSCI_FEATURES, psci_func_id, 0, 0); +} + int __init psci_is_smc_method(const struct dt_device_node *psci) { int ret; @@ -82,6 +91,24 @@ int __init psci_is_smc_method(const struct dt_device_node *psci) return 0; } +static void __init psci_init_smccc(void) +{ + /* PSCI is using at least SMCCC 1.0 calling convention. */ + smccc_ver = ARM_SMCCC_VERSION_1_0; + + if ( psci_features(ARM_SMCCC_VERSION_FID) != PSCI_NOT_SUPPORTED ) + { + uint32_t ret; + + ret = call_smc(ARM_SMCCC_VERSION_FID, 0, 0, 0); + if ( ret != ARM_SMCCC_NOT_SUPPORTED ) + smccc_ver = ret; + } + + printk(XENLOG_INFO "Using SMC Calling Convention v%u.%u\n", + SMCCC_VERSION_MAJOR(smccc_ver), SMCCC_VERSION_MINOR(smccc_ver)); +} + int __init psci_init_0_1(void) { int ret; @@ -173,7 +200,12 @@ int __init psci_init(void) if ( ret ) ret = psci_init_0_1(); - return ret; + if ( ret ) + return ret; + + psci_init_smccc(); + + return 0; } /* diff --git a/xen/include/asm-arm/smccc.h b/xen/include/asm-arm/smccc.h index d0240d64bf..bc067892c7 100644 --- a/xen/include/asm-arm/smccc.h +++ b/xen/include/asm-arm/smccc.h @@ -52,6 +52,8 @@ #ifndef __ASSEMBLY__ +extern uint32_t smccc_ver; + /* Check if this is fast call. */ static inline bool smccc_is_fast_call(register_t funcid) {