From patchwork Fri Nov 8 12:35:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 178897 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp2636490ilf; Fri, 8 Nov 2019 04:36:32 -0800 (PST) X-Google-Smtp-Source: APXvYqzoRQ8gM54cW+5Is8n6dhtWV5JQ6fEoJjoDvaMIyBLHnfLcSHw1lmZoC4S8+9K+RUTJ9QS/ X-Received: by 2002:a05:6402:20c:: with SMTP id t12mr9889137edv.109.1573216592087; Fri, 08 Nov 2019 04:36:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573216592; cv=none; d=google.com; s=arc-20160816; b=jqcfrZ0fdMc5iayfO17KS2lgwuIlDtSHLmXtrPbTTCGVyKYVxV+uc8tC9D1nVISQ+2 GrbXE1JU5D+JnFMHPYvuWOAtzhlFmV+rAHIOXbkzz8pqdARE4xHAGulseD8pig+Ow+SG pI7Z/OfYTY+h+uu+kIjJg2AimF0/0nItIkHv+rrMldrAogFy1FoBTARn9jRPYkiHUzBB a3Vd4nk2AemntwiQ2eWq2+OZu2H/B1FgvdqIOZJgWDmx6k9ev7WmYOxyOhqMXT+FfnNy 9ee9b6laBk6irkhHzZHznYwlhvCKNcPvAw+RTu8MVHNp2y5ZkXOUNp6fdQEf/uirzVo7 blSw== 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=Zl7NE+rbqKR37xlAlOnQNX3h0HPfNe9qB8I7g0K5rDM=; b=0e2fD7hMBe26ZOgCooWm3C8kZPnLYNgrbi1bLQxSODIIygLiDG2KIT5oQXi5dIYMzn JQrhVrfTN1EjPooFBQ8+TC1dqB9YUd2dehmx8BZFUEkgRz8ybbYW9KyteLhl3yN2D4PA cizZnn8sHnth0TlUSlDWeGjOIZOQxjnPs9eB7NI/bRsqt9qWzDI5S9Lbxqu+VoT5uPr6 2qC3/GHPb3IxcFDB8C3zkB1ocP//wZW2A0wRvEeN5vV4USF7lF3m11JzwcvTanopTXc7 XsFC+fihrAezmBjDMOG1u5VT1MrX+1IZlJDCIQq7ezztYM52Jc6EFJqDKh1AgScWN2aH 4zxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xcm4sKP5; 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.31; Fri, 08 Nov 2019 04:36:32 -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=xcm4sKP5; 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 S1726964AbfKHMgb (ORCPT + 14 others); Fri, 8 Nov 2019 07:36:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:44042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfKHMgb (ORCPT ); Fri, 8 Nov 2019 07:36:31 -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 455662245A; Fri, 8 Nov 2019 12:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216590; bh=R/teWzkKlAclgziOTLglPUbWYKOqfY6WpljAdcggmHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xcm4sKP507/rfZcd0zFRBc/sX/ISZXeaa9Tvrga2q4N5Xp1WaomCJ0T5qKxV1nVv4 zRFvcmw9IbRscHkTs347HfppVXf0WkSvwCwaYrOmmzxsP+zU1NlDg6oKkzOr+Q9bnp 95IYpW9d5Kv2VQigQIn/gvGwlVf5f9vK20VMDmUc= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Mark Rutland , Ard Biesheuvel Subject: [PATCH for-stable-4.4 11/50] firmware/psci: Expose SMCCC version through psci_ops Date: Fri, 8 Nov 2019 13:35:15 +0100 Message-Id: <20191108123554.29004-12-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: Mark Rutland From: Marc Zyngier commit e78eef554a912ef6c1e0bbf97619dafbeae3339f upstream. Since PSCI 1.0 allows the SMCCC version to be (indirectly) probed, let's do that at boot time, and expose the version of the calling convention as part of the psci_ops structure. Acked-by: Lorenzo Pieralisi Reviewed-by: Robin Murphy Tested-by: Ard Biesheuvel Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas Signed-off-by: Mark Rutland [v4.9 backport] Tested-by: Greg Hackmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Ard Biesheuvel --- drivers/firmware/psci.c | 27 ++++++++++++++++++++ include/linux/psci.h | 6 +++++ 2 files changed, 33 insertions(+) -- 2.20.1 diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index eb5f9161ff10..bc3efe6c9279 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -57,6 +57,7 @@ bool psci_tos_resident_on(int cpu) struct psci_operations psci_ops = { .conduit = PSCI_CONDUIT_NONE, + .smccc_version = SMCCC_VERSION_1_0, }; typedef unsigned long (psci_fn)(unsigned long, unsigned long, @@ -339,6 +340,31 @@ static void __init psci_init_migrate(void) pr_info("Trusted OS resident on physical CPU 0x%lx\n", cpuid); } +static void __init psci_init_smccc(void) +{ + u32 ver = ARM_SMCCC_VERSION_1_0; + int feature; + + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); + + if (feature != PSCI_RET_NOT_SUPPORTED) { + u32 ret; + ret = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); + if (ret == ARM_SMCCC_VERSION_1_1) { + psci_ops.smccc_version = SMCCC_VERSION_1_1; + ver = ret; + } + } + + /* + * Conveniently, the SMCCC and PSCI versions are encoded the + * same way. No, this isn't accidental. + */ + pr_info("SMC Calling Convention v%d.%d\n", + PSCI_VERSION_MAJOR(ver), PSCI_VERSION_MINOR(ver)); + +} + static void __init psci_0_2_set_functions(void) { pr_info("Using standard PSCI v0.2 function IDs\n"); @@ -385,6 +411,7 @@ static int __init psci_probe(void) psci_init_migrate(); if (PSCI_VERSION_MAJOR(ver) >= 1) { + psci_init_smccc(); psci_init_cpu_suspend(); psci_init_system_suspend(); } diff --git a/include/linux/psci.h b/include/linux/psci.h index 864cdede8d15..f78438214a59 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -30,6 +30,11 @@ enum psci_conduit { PSCI_CONDUIT_HVC, }; +enum smccc_version { + SMCCC_VERSION_1_0, + SMCCC_VERSION_1_1, +}; + struct psci_operations { int (*cpu_suspend)(u32 state, unsigned long entry_point); int (*cpu_off)(u32 state); @@ -39,6 +44,7 @@ struct psci_operations { unsigned long lowest_affinity_level); int (*migrate_info_type)(void); enum psci_conduit conduit; + enum smccc_version smccc_version; }; extern struct psci_operations psci_ops;