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 B0882C83012 for ; Thu, 3 Dec 2020 10:44:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 650C4208FE for ; Thu, 3 Dec 2020 10:44:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730286AbgLCKoY (ORCPT ); Thu, 3 Dec 2020 05:44:24 -0500 Received: from foss.arm.com ([217.140.110.172]:36704 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730214AbgLCKoX (ORCPT ); Thu, 3 Dec 2020 05:44:23 -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 0A77211D4; Thu, 3 Dec 2020 02:43:38 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.0.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6200F3F575; Thu, 3 Dec 2020 02:43:34 -0800 (PST) Date: Thu, 3 Dec 2020 10:43:31 +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 05/26] psci: Replace psci_function_id array with a struct Message-ID: <20201203104331.GB96754@C02TD0UTHF1T.local> References: <20201202184122.26046-1-dbrazdil@google.com> <20201202184122.26046-6-dbrazdil@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201202184122.26046-6-dbrazdil@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 02, 2020 at 06:41:01PM +0000, David Brazdil wrote: > Small refactor that replaces array of v0.1 function IDs indexed by an > enum of function-name constants with a struct of function IDs "indexed" > by field names. This is done in preparation for exposing the IDs to > other parts of the kernel. Exposing a struct avoids the need for > bounds checking. > > Signed-off-by: David Brazdil Acked-by: Mark Rutland Mark. > --- > drivers/firmware/psci/psci.c | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index 13b9ed71b446..593fdd0e09a2 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -58,15 +58,14 @@ typedef unsigned long (psci_fn)(unsigned long, unsigned long, > unsigned long, unsigned long); > static psci_fn *invoke_psci_fn; > > -enum psci_function { > - PSCI_FN_CPU_SUSPEND, > - PSCI_FN_CPU_ON, > - PSCI_FN_CPU_OFF, > - PSCI_FN_MIGRATE, > - PSCI_FN_MAX, > +struct psci_0_1_function_ids { > + u32 cpu_suspend; > + u32 cpu_on; > + u32 cpu_off; > + u32 migrate; > }; > > -static u32 psci_function_id[PSCI_FN_MAX]; > +static struct psci_0_1_function_ids psci_0_1_function_ids; > > #define PSCI_0_2_POWER_STATE_MASK \ > (PSCI_0_2_POWER_STATE_ID_MASK | \ > @@ -178,7 +177,7 @@ static int __psci_cpu_suspend(u32 fn, u32 state, unsigned long entry_point) > > static int psci_0_1_cpu_suspend(u32 state, unsigned long entry_point) > { > - return __psci_cpu_suspend(psci_function_id[PSCI_FN_CPU_SUSPEND], > + return __psci_cpu_suspend(psci_0_1_function_ids.cpu_suspend, > state, entry_point); > } > > @@ -198,7 +197,7 @@ static int __psci_cpu_off(u32 fn, u32 state) > > static int psci_0_1_cpu_off(u32 state) > { > - return __psci_cpu_off(psci_function_id[PSCI_FN_CPU_OFF], state); > + return __psci_cpu_off(psci_0_1_function_ids.cpu_off, state); > } > > static int psci_0_2_cpu_off(u32 state) > @@ -216,7 +215,7 @@ static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point) > > 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); > + return __psci_cpu_on(psci_0_1_function_ids.cpu_on, cpuid, entry_point); > } > > static int psci_0_2_cpu_on(unsigned long cpuid, unsigned long entry_point) > @@ -234,7 +233,7 @@ static int __psci_migrate(u32 fn, unsigned long cpuid) > > static int psci_0_1_migrate(unsigned long cpuid) > { > - return __psci_migrate(psci_function_id[PSCI_FN_MIGRATE], cpuid); > + return __psci_migrate(psci_0_1_function_ids.migrate, cpuid); > } > > static int psci_0_2_migrate(unsigned long cpuid) > @@ -548,22 +547,22 @@ static int __init psci_0_1_init(struct device_node *np) > psci_ops.get_version = psci_0_1_get_version; > > if (!of_property_read_u32(np, "cpu_suspend", &id)) { > - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; > + psci_0_1_function_ids.cpu_suspend = id; > 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_0_1_function_ids.cpu_off = id; > 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_0_1_function_ids.cpu_on = id; > 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_0_1_function_ids.migrate = id; > psci_ops.migrate = psci_0_1_migrate; > } > > -- > 2.29.2.454.gaff20da3a2-goog > 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=ham 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 BB11BC64E8A for ; Thu, 3 Dec 2020 10:43:43 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 03920208FE for ; Thu, 3 Dec 2020 10:43:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03920208FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 5E9954B191; Thu, 3 Dec 2020 05:43:42 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6WFQkozWfAuC; Thu, 3 Dec 2020 05:43:41 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 1A2354B1CC; Thu, 3 Dec 2020 05:43:41 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id D20A24B1C0 for ; Thu, 3 Dec 2020 05:43:39 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wEOvROmZVU0q for ; Thu, 3 Dec 2020 05:43:38 -0500 (EST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id A45464B175 for ; Thu, 3 Dec 2020 05:43:38 -0500 (EST) 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 0A77211D4; Thu, 3 Dec 2020 02:43:38 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.0.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6200F3F575; Thu, 3 Dec 2020 02:43:34 -0800 (PST) Date: Thu, 3 Dec 2020 10:43:31 +0000 From: Mark Rutland To: David Brazdil Subject: Re: [PATCH v4 05/26] psci: Replace psci_function_id array with a struct Message-ID: <20201203104331.GB96754@C02TD0UTHF1T.local> References: <20201202184122.26046-1-dbrazdil@google.com> <20201202184122.26046-6-dbrazdil@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201202184122.26046-6-dbrazdil@google.com> Cc: Lorenzo Pieralisi , kernel-team@android.com, Jonathan Corbet , Catalin Marinas , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla , linux-arm-kernel@lists.infradead.org, Marc Zyngier , Tejun Heo , Dennis Zhou , Christoph Lameter , Will Deacon , kvmarm@lists.cs.columbia.edu X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Wed, Dec 02, 2020 at 06:41:01PM +0000, David Brazdil wrote: > Small refactor that replaces array of v0.1 function IDs indexed by an > enum of function-name constants with a struct of function IDs "indexed" > by field names. This is done in preparation for exposing the IDs to > other parts of the kernel. Exposing a struct avoids the need for > bounds checking. > > Signed-off-by: David Brazdil Acked-by: Mark Rutland Mark. > --- > drivers/firmware/psci/psci.c | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index 13b9ed71b446..593fdd0e09a2 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -58,15 +58,14 @@ typedef unsigned long (psci_fn)(unsigned long, unsigned long, > unsigned long, unsigned long); > static psci_fn *invoke_psci_fn; > > -enum psci_function { > - PSCI_FN_CPU_SUSPEND, > - PSCI_FN_CPU_ON, > - PSCI_FN_CPU_OFF, > - PSCI_FN_MIGRATE, > - PSCI_FN_MAX, > +struct psci_0_1_function_ids { > + u32 cpu_suspend; > + u32 cpu_on; > + u32 cpu_off; > + u32 migrate; > }; > > -static u32 psci_function_id[PSCI_FN_MAX]; > +static struct psci_0_1_function_ids psci_0_1_function_ids; > > #define PSCI_0_2_POWER_STATE_MASK \ > (PSCI_0_2_POWER_STATE_ID_MASK | \ > @@ -178,7 +177,7 @@ static int __psci_cpu_suspend(u32 fn, u32 state, unsigned long entry_point) > > static int psci_0_1_cpu_suspend(u32 state, unsigned long entry_point) > { > - return __psci_cpu_suspend(psci_function_id[PSCI_FN_CPU_SUSPEND], > + return __psci_cpu_suspend(psci_0_1_function_ids.cpu_suspend, > state, entry_point); > } > > @@ -198,7 +197,7 @@ static int __psci_cpu_off(u32 fn, u32 state) > > static int psci_0_1_cpu_off(u32 state) > { > - return __psci_cpu_off(psci_function_id[PSCI_FN_CPU_OFF], state); > + return __psci_cpu_off(psci_0_1_function_ids.cpu_off, state); > } > > static int psci_0_2_cpu_off(u32 state) > @@ -216,7 +215,7 @@ static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point) > > 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); > + return __psci_cpu_on(psci_0_1_function_ids.cpu_on, cpuid, entry_point); > } > > static int psci_0_2_cpu_on(unsigned long cpuid, unsigned long entry_point) > @@ -234,7 +233,7 @@ static int __psci_migrate(u32 fn, unsigned long cpuid) > > static int psci_0_1_migrate(unsigned long cpuid) > { > - return __psci_migrate(psci_function_id[PSCI_FN_MIGRATE], cpuid); > + return __psci_migrate(psci_0_1_function_ids.migrate, cpuid); > } > > static int psci_0_2_migrate(unsigned long cpuid) > @@ -548,22 +547,22 @@ static int __init psci_0_1_init(struct device_node *np) > psci_ops.get_version = psci_0_1_get_version; > > if (!of_property_read_u32(np, "cpu_suspend", &id)) { > - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; > + psci_0_1_function_ids.cpu_suspend = id; > 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_0_1_function_ids.cpu_off = id; > 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_0_1_function_ids.cpu_on = id; > 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_0_1_function_ids.migrate = id; > psci_ops.migrate = psci_0_1_migrate; > } > > -- > 2.29.2.454.gaff20da3a2-goog > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 5CF7EC63777 for ; Thu, 3 Dec 2020 10:44:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DCDE3208A9 for ; Thu, 3 Dec 2020 10:44:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCDE3208A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dtpzmb0ldKEH8TVbzunDkrbcsk329KPsOpFdTT9A6xQ=; b=o9D0Mu7Ac95wE3SKHxVgBZnqe Gxzdrzp5/op5No3xvIez/Qzo1rEwsRkZ1xWmtTG1IzE3im9AxhIIx+4wQY1eNEvhcL1KstXexg524 Gq16KVE5sxXrP5dxPY3rKBo7ZcsD4eQyLM9l8w0Qd+clJjScy/cvQ9z7PoyAfZqH4V3x96iWs47wd ryskaGFdkIiOiHtwLUaXLbDSlugGOxkq6RK3v7ga035SFeSo0apyx+SiF8gkQdTLamQ/xh/QkDzqG wRvwBYf4BDx7QRCoUnxWSSn2hbn86C2y9nKaVcKP85lai6U55WzD1/Y6z8pEnoVSjM/mDq/wVegNO 7N9H2+RRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkm5N-0006fq-3l; Thu, 03 Dec 2020 10:43:41 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkm5L-0006fH-8V for linux-arm-kernel@lists.infradead.org; Thu, 03 Dec 2020 10:43:40 +0000 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 0A77211D4; Thu, 3 Dec 2020 02:43:38 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.0.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6200F3F575; Thu, 3 Dec 2020 02:43:34 -0800 (PST) Date: Thu, 3 Dec 2020 10:43:31 +0000 From: Mark Rutland To: David Brazdil Subject: Re: [PATCH v4 05/26] psci: Replace psci_function_id array with a struct Message-ID: <20201203104331.GB96754@C02TD0UTHF1T.local> References: <20201202184122.26046-1-dbrazdil@google.com> <20201202184122.26046-6-dbrazdil@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201202184122.26046-6-dbrazdil@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_054339_427938_EE371AB1 X-CRM114-Status: GOOD ( 20.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , kernel-team@android.com, Jonathan Corbet , Catalin Marinas , Suzuki K Poulose , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla , James Morse , linux-arm-kernel@lists.infradead.org, Marc Zyngier , Tejun Heo , Dennis Zhou , Christoph Lameter , Will Deacon , kvmarm@lists.cs.columbia.edu, Julien Thierry Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Dec 02, 2020 at 06:41:01PM +0000, David Brazdil wrote: > Small refactor that replaces array of v0.1 function IDs indexed by an > enum of function-name constants with a struct of function IDs "indexed" > by field names. This is done in preparation for exposing the IDs to > other parts of the kernel. Exposing a struct avoids the need for > bounds checking. > > Signed-off-by: David Brazdil Acked-by: Mark Rutland Mark. > --- > drivers/firmware/psci/psci.c | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index 13b9ed71b446..593fdd0e09a2 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -58,15 +58,14 @@ typedef unsigned long (psci_fn)(unsigned long, unsigned long, > unsigned long, unsigned long); > static psci_fn *invoke_psci_fn; > > -enum psci_function { > - PSCI_FN_CPU_SUSPEND, > - PSCI_FN_CPU_ON, > - PSCI_FN_CPU_OFF, > - PSCI_FN_MIGRATE, > - PSCI_FN_MAX, > +struct psci_0_1_function_ids { > + u32 cpu_suspend; > + u32 cpu_on; > + u32 cpu_off; > + u32 migrate; > }; > > -static u32 psci_function_id[PSCI_FN_MAX]; > +static struct psci_0_1_function_ids psci_0_1_function_ids; > > #define PSCI_0_2_POWER_STATE_MASK \ > (PSCI_0_2_POWER_STATE_ID_MASK | \ > @@ -178,7 +177,7 @@ static int __psci_cpu_suspend(u32 fn, u32 state, unsigned long entry_point) > > static int psci_0_1_cpu_suspend(u32 state, unsigned long entry_point) > { > - return __psci_cpu_suspend(psci_function_id[PSCI_FN_CPU_SUSPEND], > + return __psci_cpu_suspend(psci_0_1_function_ids.cpu_suspend, > state, entry_point); > } > > @@ -198,7 +197,7 @@ static int __psci_cpu_off(u32 fn, u32 state) > > static int psci_0_1_cpu_off(u32 state) > { > - return __psci_cpu_off(psci_function_id[PSCI_FN_CPU_OFF], state); > + return __psci_cpu_off(psci_0_1_function_ids.cpu_off, state); > } > > static int psci_0_2_cpu_off(u32 state) > @@ -216,7 +215,7 @@ static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point) > > 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); > + return __psci_cpu_on(psci_0_1_function_ids.cpu_on, cpuid, entry_point); > } > > static int psci_0_2_cpu_on(unsigned long cpuid, unsigned long entry_point) > @@ -234,7 +233,7 @@ static int __psci_migrate(u32 fn, unsigned long cpuid) > > static int psci_0_1_migrate(unsigned long cpuid) > { > - return __psci_migrate(psci_function_id[PSCI_FN_MIGRATE], cpuid); > + return __psci_migrate(psci_0_1_function_ids.migrate, cpuid); > } > > static int psci_0_2_migrate(unsigned long cpuid) > @@ -548,22 +547,22 @@ static int __init psci_0_1_init(struct device_node *np) > psci_ops.get_version = psci_0_1_get_version; > > if (!of_property_read_u32(np, "cpu_suspend", &id)) { > - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; > + psci_0_1_function_ids.cpu_suspend = id; > 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_0_1_function_ids.cpu_off = id; > 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_0_1_function_ids.cpu_on = id; > 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_0_1_function_ids.migrate = id; > psci_ops.migrate = psci_0_1_migrate; > } > > -- > 2.29.2.454.gaff20da3a2-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel