From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751632AbeA2Rzu (ORCPT ); Mon, 29 Jan 2018 12:55:50 -0500 Received: from foss.arm.com ([217.140.101.70]:44006 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbeA2Rzt (ORCPT ); Mon, 29 Jan 2018 12:55:49 -0500 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Catalin Marinas , Will Deacon , Peter Maydell , Christoffer Dall , Lorenzo Pieralisi , Mark Rutland , Robin Murphy , Ard Biesheuvel , Jon Masters Subject: [PATCH v2 13/16] firmware/psci: Expose SMCCC version through psci_ops Date: Mon, 29 Jan 2018 17:45:56 +0000 Message-Id: <20180129174559.1866-14-marc.zyngier@arm.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180129174559.1866-1-marc.zyngier@arm.com> References: <20180129174559.1866-1-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Marc Zyngier --- drivers/firmware/psci.c | 21 +++++++++++++++++++++ include/linux/psci.h | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index e9493da2b111..dd035aaa1c33 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -511,6 +511,26 @@ 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(u32 ver) +{ + int feature = PSCI_RET_NOT_SUPPORTED; + + if (PSCI_VERSION_MAJOR(ver) >= 1) + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); + + if (feature == PSCI_RET_NOT_SUPPORTED) { + psci_ops.variant = SMCCC_VARIANT_1_0; + } else { + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); + if (ver != ARM_SMCCC_VERSION_1_1) + psci_ops.variant = SMCCC_VARIANT_1_0; + else + psci_ops.variant = SMCCC_VARIANT_1_1; + } + + pr_info("SMC Calling Convention v1.%d\n", psci_ops.variant); +} + static void __init psci_0_2_set_functions(void) { pr_info("Using standard PSCI v0.2 function IDs\n"); @@ -557,6 +577,7 @@ static int __init psci_probe(void) psci_0_2_set_functions(); psci_init_migrate(); + psci_init_smccc(ver); if (PSCI_VERSION_MAJOR(ver) >= 1) { psci_init_cpu_suspend(); diff --git a/include/linux/psci.h b/include/linux/psci.h index f2679e5faa4f..83fd16a37be3 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -31,6 +31,11 @@ enum psci_conduit { PSCI_CONDUIT_HVC, }; +enum smccc_variant { + SMCCC_VARIANT_1_0, + SMCCC_VARIANT_1_1, +}; + struct psci_operations { u32 (*get_version)(void); int (*cpu_suspend)(u32 state, unsigned long entry_point); @@ -41,6 +46,7 @@ struct psci_operations { unsigned long lowest_affinity_level); int (*migrate_info_type)(void); enum psci_conduit conduit; + enum smccc_variant variant; }; extern struct psci_operations psci_ops; -- 2.14.2