From patchwork Wed Sep 14 16:28:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Gondois X-Patchwork-Id: 12976399 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCAA7C6FA89 for ; Wed, 14 Sep 2022 16:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230133AbiINQbc (ORCPT ); Wed, 14 Sep 2022 12:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbiINQbK (ORCPT ); Wed, 14 Sep 2022 12:31:10 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D07FB20BFE; Wed, 14 Sep 2022 09:29:50 -0700 (PDT) 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 0921A1682; Wed, 14 Sep 2022 09:29:57 -0700 (PDT) Received: from pierre123.arm.com (unknown [10.57.78.24]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 88E0A3F73D; Wed, 14 Sep 2022 09:29:48 -0700 (PDT) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Pierre Gondois , Daniel Lezcano , "Rafael J. Wysocki" , Abhyuday Godhasara , Michal Simek , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] driver: soc: xilinx: Save cpuhp dynamic state Date: Wed, 14 Sep 2022 18:28:14 +0200 Message-Id: <20220914162815.1954866-2-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220914162815.1954866-1-pierre.gondois@arm.com> References: <20220914162815.1954866-1-pierre.gondois@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Requesting a CPUHP_AP_ONLINE_DYN cpuhp state reserves a state among the range [CPUHP_AP_ONLINE_DYN:CPUHP_AP_ONLINE_DYN_END]. The reserved state must be saved in order to remove it later. Cf. __cpuhp_setup_state_cpuslocked() documentation: Return: On success: Positive state number if @state is CPUHP_AP_ONLINE_DYN; 0 for all other states Signed-off-by: Pierre Gondois --- drivers/soc/xilinx/xlnx_event_manager.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c index 5dcb7665fe22..be67f74f3b5c 100644 --- a/drivers/soc/xilinx/xlnx_event_manager.c +++ b/drivers/soc/xilinx/xlnx_event_manager.c @@ -24,6 +24,8 @@ static DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number1); static int virq_sgi; static int event_manager_availability = -EACCES; +static int cpuhp_event_state; + /* SGI number used for Event management driver */ #define XLNX_EVENT_SGI_NUM (15) @@ -609,7 +611,10 @@ static void xlnx_event_cleanup_sgi(struct platform_device *pdev) per_cpu(cpu_number1, cpu) = cpu; - cpuhp_remove_state(CPUHP_AP_ONLINE_DYN); + if (cpuhp_event_state > 0) { + cpuhp_remove_state(cpuhp_event_state); + cpuhp_event_state = 0; + } on_each_cpu(xlnx_disable_percpu_irq, NULL, 1); @@ -644,8 +649,11 @@ static int xlnx_event_manager_probe(struct platform_device *pdev) } /* Setup function for the CPU hot-plug cases */ - cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "soc/event:starting", + ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "soc/event:starting", xlnx_event_cpuhp_start, xlnx_event_cpuhp_down); + if (ret > 0) + cpuhp_event_state = ret; + ret = zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_REGISTER_SGI, sgi_num, 0, NULL); From patchwork Wed Sep 14 16:28:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Gondois X-Patchwork-Id: 12976400 X-Patchwork-Delegate: daniel.lezcano@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3491BC6FA82 for ; Wed, 14 Sep 2022 16:31:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230145AbiINQbi (ORCPT ); Wed, 14 Sep 2022 12:31:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbiINQbO (ORCPT ); Wed, 14 Sep 2022 12:31:14 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8D32525C50; Wed, 14 Sep 2022 09:29:53 -0700 (PDT) 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 A96211BF3; Wed, 14 Sep 2022 09:29:59 -0700 (PDT) Received: from pierre123.arm.com (unknown [10.57.78.24]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4F8403F73D; Wed, 14 Sep 2022 09:29:51 -0700 (PDT) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Pierre Gondois , Daniel Lezcano , "Rafael J. Wysocki" , Abhyuday Godhasara , Michal Simek , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] powercap/drivers/dtpm: Save cpuhp dynamic state Date: Wed, 14 Sep 2022 18:28:15 +0200 Message-Id: <20220914162815.1954866-3-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220914162815.1954866-1-pierre.gondois@arm.com> References: <20220914162815.1954866-1-pierre.gondois@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Requesting a CPUHP_AP_ONLINE_DYN cpuhp state reserves a state among the range [CPUHP_AP_ONLINE_DYN:CPUHP_AP_ONLINE_DYN_END]. The reserved state must be saved in order to remove it later. Cf. __cpuhp_setup_state_cpuslocked() documentation: Return: On success: Positive state number if @state is CPUHP_AP_ONLINE_DYN; 0 for all other states Signed-off-by: Pierre Gondois --- drivers/powercap/dtpm_cpu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index f5eced0842b3..1dfbfe54d3bf 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -33,6 +33,7 @@ struct dtpm_cpu { }; static DEFINE_PER_CPU(struct dtpm_cpu *, dtpm_per_cpu); +static int cpuhp_dtpm_cpu_online_state; static struct dtpm_cpu *to_dtpm_cpu(struct dtpm *dtpm) { @@ -296,12 +297,16 @@ static int dtpm_cpu_init(void) if (ret < 0) return ret; + cpuhp_dtpm_cpu_online_state = ret; return 0; } static void dtpm_cpu_exit(void) { - cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN); + if (cpuhp_dtpm_cpu_online_state > 0) { + cpuhp_remove_state_nocalls(cpuhp_dtpm_cpu_online_state); + cpuhp_dtpm_cpu_online_state = 0; + } cpuhp_remove_state_nocalls(CPUHP_AP_DTPM_CPU_DEAD); }