From patchwork Fri Nov 8 18:49:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 178930 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3123034ilf; Fri, 8 Nov 2019 10:53:30 -0800 (PST) X-Google-Smtp-Source: APXvYqxvdzIp4Ik3S6YuKKP12t2hgJ4S4EyuSrhku/iKG07Q6nHmfXwogek9d62mNjXJZp4TA9z1 X-Received: by 2002:aa7:c716:: with SMTP id i22mr12029166edq.237.1573239210725; Fri, 08 Nov 2019 10:53:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573239210; cv=none; d=google.com; s=arc-20160816; b=n3hxZj4psODdlRPR3Sr1jTIsQOY9nXmVtj9P79etGJT0K0s0Su2rj/gVLLwZ7ZPx4R LJP4Z1IbIaR7OD1/dHZhu4/VanAhXDEiwQHPLgZQGPRouqNuS/NQPKiaqPyqKT/ixzZU 8w7K2K8CGS2m6BmK5k8mbBKTwLqq2svM4BW7ARa2lsDoTik/Nks1Lze6lqKTMRKol46/ XoRfoEdzoQEapeCZn0XZuUx5MMnF1HzwAZtR+/fJB7tHbXZda3iSyogMWeWt6euNwVyy GQJV3/NNGkty/Hs/U9qSFM+8mNCAkvA+cl9aU1zP5EWwA3zQi36O1EV8+xts/GyFX7E0 UTDw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vwObMO21ygZ8YzmZgROTPtNfS02+cAaBZA+K18y9pbs=; b=o8X20Q9wdlLrcDltleYfPJvUVZUpcbNp0XTOPSNWZkv6FGC/9cBBVXzX1fCeHoPTke NENzhoazYk+9drRN6PVLx0uvv9hYxLxyI85Xa3Lmq2VxmKmP6Ybgd8K7JAi+VOLeo6Bv oqpkI1pEIW0GsTT1VxLUf0O/Y8ExSPMJ74ZyctDWCUPgJDTLmzAgWkkOp3xRzVv46RMs sEsguJOAXP2zialWbPvafNMcecjWKikoN9shuaK2iXSiSZSq0AzjppxaEDk6ifB1za3K VU53OOxGhYZlngYCmYF4u4gjdVGhJp2TqWDKqyMouOkDAJY2cP7exlfqxbGTrLKZp/Rq XW1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RNznpc9k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t17si4617768ejg.44.2019.11.08.10.53.30; Fri, 08 Nov 2019 10:53:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=RNznpc9k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732364AbfKHSx3 (ORCPT + 26 others); Fri, 8 Nov 2019 13:53:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:50036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732330AbfKHSx0 (ORCPT ); Fri, 8 Nov 2019 13:53:26 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C412C21D7E; Fri, 8 Nov 2019 18:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239205; bh=KKlZJcdyhqlpd3ZchIkEbH2IObcSf15DEVJq/PrKNuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RNznpc9kP/kcjMjzBiSl1CTLGNHJic/m3gfV1A70sPao7YXMymBQijGZoktVsh9K+ anhvNCFfNfkZjOJxkrJVQtxi4tOpcJeSMnzvRXyKd65ZMOKFUNa5mv8Y22PHayYcd4 kGV+xuQdiE48/CIPVppDtXVqGSV0pVIwRZHplBOg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Lorenzo Pieralisi , Robin Murphy , Ard Biesheuvel , Marc Zyngier , Catalin Marinas , Greg Hackmann , Ard Biesheuvel , Mark Rutland Subject: [PATCH 4.4 34/75] firmware/psci: Expose SMCCC version through psci_ops Date: Fri, 8 Nov 2019 19:49:51 +0100 Message-Id: <20191108174743.129720226@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174708.135680837@linuxfoundation.org> References: <20191108174708.135680837@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/psci.c | 27 +++++++++++++++++++++++++++ include/linux/psci.h | 6 ++++++ 2 files changed, 33 insertions(+) --- 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(voi 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(); } --- 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;