From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27729C63777 for ; Thu, 3 Dec 2020 10:43:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA2C121D1A for ; Thu, 3 Dec 2020 10:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727431AbgLCKnn (ORCPT ); Thu, 3 Dec 2020 05:43:43 -0500 Received: from foss.arm.com ([217.140.110.172]:36678 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727007AbgLCKnn (ORCPT ); Thu, 3 Dec 2020 05:43:43 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3F2AF113E; Thu, 3 Dec 2020 02:42:57 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.0.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6D5F43F575; Thu, 3 Dec 2020 02:42:53 -0800 (PST) Date: Thu, 3 Dec 2020 10:42:46 +0000 From: Mark Rutland To: David Brazdil Cc: kvmarm@lists.cs.columbia.edu, Jonathan Corbet , Catalin Marinas , Will Deacon , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , Dennis Zhou , Tejun Heo , Christoph Lameter , Lorenzo Pieralisi , Sudeep Holla , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com Subject: Re: [PATCH v4 04/26] psci: Split functions to v0.1 and v0.2+ variants Message-ID: <20201203104246.GA96754@C02TD0UTHF1T.local> References: <20201202184122.26046-1-dbrazdil@google.com> <20201202184122.26046-5-dbrazdil@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201202184122.26046-5-dbrazdil@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On Wed, Dec 02, 2020 at 06:41:00PM +0000, David Brazdil wrote: > Refactor implementation of v0.1+ functions (CPU_SUSPEND, CPU_OFF, > CPU_ON, MIGRATE) to have two functions psci_0_1_foo / psci_0_2_foo that > select the function ID and call a common helper __psci_foo. > > This is a small cleanup so that the function ID array is only used for > v0.1 configurations. > > Signed-off-by: David Brazdil Acked-by: Mark Rutland Mark. > --- > drivers/firmware/psci/psci.c | 94 +++++++++++++++++++++++------------- > 1 file changed, 60 insertions(+), 34 deletions(-) > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index ace5b9ac676c..13b9ed71b446 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -168,46 +168,80 @@ int psci_set_osi_mode(bool enable) > return psci_to_linux_errno(err); > } > > -static int psci_cpu_suspend(u32 state, unsigned long entry_point) > +static int __psci_cpu_suspend(u32 fn, u32 state, unsigned long entry_point) > { > int err; > - u32 fn; > > - fn = psci_function_id[PSCI_FN_CPU_SUSPEND]; > err = invoke_psci_fn(fn, state, entry_point, 0); > return psci_to_linux_errno(err); > } > > -static int psci_cpu_off(u32 state) > +static int psci_0_1_cpu_suspend(u32 state, unsigned long entry_point) > +{ > + return __psci_cpu_suspend(psci_function_id[PSCI_FN_CPU_SUSPEND], > + state, entry_point); > +} > + > +static int psci_0_2_cpu_suspend(u32 state, unsigned long entry_point) > +{ > + return __psci_cpu_suspend(PSCI_FN_NATIVE(0_2, CPU_SUSPEND), > + state, entry_point); > +} > + > +static int __psci_cpu_off(u32 fn, u32 state) > { > int err; > - u32 fn; > > - fn = psci_function_id[PSCI_FN_CPU_OFF]; > err = invoke_psci_fn(fn, state, 0, 0); > return psci_to_linux_errno(err); > } > > -static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) > +static int psci_0_1_cpu_off(u32 state) > +{ > + return __psci_cpu_off(psci_function_id[PSCI_FN_CPU_OFF], state); > +} > + > +static int psci_0_2_cpu_off(u32 state) > +{ > + return __psci_cpu_off(PSCI_0_2_FN_CPU_OFF, state); > +} > + > +static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point) > { > int err; > - u32 fn; > > - fn = psci_function_id[PSCI_FN_CPU_ON]; > err = invoke_psci_fn(fn, cpuid, entry_point, 0); > return psci_to_linux_errno(err); > } > > -static int psci_migrate(unsigned long cpuid) > +static int psci_0_1_cpu_on(unsigned long cpuid, unsigned long entry_point) > +{ > + return __psci_cpu_on(psci_function_id[PSCI_FN_CPU_ON], cpuid, entry_point); > +} > + > +static int psci_0_2_cpu_on(unsigned long cpuid, unsigned long entry_point) > +{ > + return __psci_cpu_on(PSCI_FN_NATIVE(0_2, CPU_ON), cpuid, entry_point); > +} > + > +static int __psci_migrate(u32 fn, unsigned long cpuid) > { > int err; > - u32 fn; > > - fn = psci_function_id[PSCI_FN_MIGRATE]; > err = invoke_psci_fn(fn, cpuid, 0, 0); > return psci_to_linux_errno(err); > } > > +static int psci_0_1_migrate(unsigned long cpuid) > +{ > + return __psci_migrate(psci_function_id[PSCI_FN_MIGRATE], cpuid); > +} > + > +static int psci_0_2_migrate(unsigned long cpuid) > +{ > + return __psci_migrate(PSCI_FN_NATIVE(0_2, MIGRATE), cpuid); > +} > + > static int psci_affinity_info(unsigned long target_affinity, > unsigned long lowest_affinity_level) > { > @@ -352,7 +386,7 @@ static void __init psci_init_system_suspend(void) > > static void __init psci_init_cpu_suspend(void) > { > - int feature = psci_features(psci_function_id[PSCI_FN_CPU_SUSPEND]); > + int feature = psci_features(PSCI_FN_NATIVE(0_2, CPU_SUSPEND)); > > if (feature != PSCI_RET_NOT_SUPPORTED) > psci_cpu_suspend_feature = feature; > @@ -426,24 +460,16 @@ static void __init psci_init_smccc(void) > static void __init psci_0_2_set_functions(void) > { > pr_info("Using standard PSCI v0.2 function IDs\n"); > - psci_ops.get_version = psci_0_2_get_version; > - > - psci_function_id[PSCI_FN_CPU_SUSPEND] = > - PSCI_FN_NATIVE(0_2, CPU_SUSPEND); > - psci_ops.cpu_suspend = psci_cpu_suspend; > - > - psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF; > - psci_ops.cpu_off = psci_cpu_off; > - > - psci_function_id[PSCI_FN_CPU_ON] = PSCI_FN_NATIVE(0_2, CPU_ON); > - psci_ops.cpu_on = psci_cpu_on; > > - psci_function_id[PSCI_FN_MIGRATE] = PSCI_FN_NATIVE(0_2, MIGRATE); > - psci_ops.migrate = psci_migrate; > - > - psci_ops.affinity_info = psci_affinity_info; > - > - psci_ops.migrate_info_type = psci_migrate_info_type; > + psci_ops = (struct psci_operations){ > + .get_version = psci_0_2_get_version, > + .cpu_suspend = psci_0_2_cpu_suspend, > + .cpu_off = psci_0_2_cpu_off, > + .cpu_on = psci_0_2_cpu_on, > + .migrate = psci_0_2_migrate, > + .affinity_info = psci_affinity_info, > + .migrate_info_type = psci_migrate_info_type, > + }; > > arm_pm_restart = psci_sys_reset; > > @@ -523,22 +549,22 @@ static int __init psci_0_1_init(struct device_node *np) > > if (!of_property_read_u32(np, "cpu_suspend", &id)) { > psci_function_id[PSCI_FN_CPU_SUSPEND] = id; > - psci_ops.cpu_suspend = psci_cpu_suspend; > + psci_ops.cpu_suspend = psci_0_1_cpu_suspend; > } > > if (!of_property_read_u32(np, "cpu_off", &id)) { > psci_function_id[PSCI_FN_CPU_OFF] = id; > - psci_ops.cpu_off = psci_cpu_off; > + psci_ops.cpu_off = psci_0_1_cpu_off; > } > > if (!of_property_read_u32(np, "cpu_on", &id)) { > psci_function_id[PSCI_FN_CPU_ON] = id; > - psci_ops.cpu_on = psci_cpu_on; > + psci_ops.cpu_on = psci_0_1_cpu_on; > } > > if (!of_property_read_u32(np, "migrate", &id)) { > psci_function_id[PSCI_FN_MIGRATE] = id; > - psci_ops.migrate = psci_migrate; > + psci_ops.migrate = psci_0_1_migrate; > } > > return 0; > -- > 2.29.2.454.gaff20da3a2-goog >