From: Ulf Hansson <ulf.hansson@linaro.org> To: "Rafael J . Wysocki" <rjw@rjwysocki.net>, Sudeep Holla <sudeep.holla@arm.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, linux-pm@vger.kernel.org Cc: "Raju P . L . S . S . S . N" <rplsssn@codeaurora.org>, Stephen Boyd <sboyd@kernel.org>, Tony Lindgren <tony@atomide.com>, Kevin Hilman <khilman@kernel.org>, Lina Iyer <ilina@codeaurora.org>, Ulf Hansson <ulf.hansson@linaro.org>, Viresh Kumar <viresh.kumar@linaro.org>, Vincent Guittot <vincent.guittot@linaro.org>, Geert Uytterhoeven <geert+renesas@glider.be>, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v10 23/27] drivers: firmware: psci: Manage runtime PM in the idle path for CPUs Date: Thu, 29 Nov 2018 18:46:56 +0100 [thread overview] Message-ID: <20181129174700.16585-24-ulf.hansson@linaro.org> (raw) In-Reply-To: <20181129174700.16585-1-ulf.hansson@linaro.org> When the hierarchical CPU topology layout is used in DT, let's allow the CPU to be power managed through its PM domain and via runtime PM. In other words, let's deploy runtime PM support to the PSCI driver during idle management of the CPU. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- Changes in v10: - New patch: Replaces the earlier patch "kernel/cpu_pm: Manage runtime PM in the idle path for CPUs". In the end it seemed like a better idea to start with something specific to PSCI, rather than (ab?)using the generic functions cpu_pm_enter|exit(). - Do runtime PM get/put for the deepest idle state for the CPU. --- drivers/firmware/psci/psci.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 94cd0431b004..b03bccce0a5d 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -20,6 +20,7 @@ #include <linux/linkage.h> #include <linux/of.h> #include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/printk.h> #include <linux/psci.h> #include <linux/reboot.h> @@ -319,6 +320,7 @@ int psci_dt_parse_state_node(struct device_node *np, u32 *state) #ifdef CONFIG_CPU_IDLE static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); +static DEFINE_PER_CPU_READ_MOSTLY(u32, psci_rpm_state_id); static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, struct device_node *cpu_node, int cpu) @@ -369,6 +371,9 @@ static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, ret = psci_dt_attach_cpu(cpu); if (ret) goto free_mem; + + /* Store index of deepest state to later for runtime PM. */ + per_cpu(psci_rpm_state_id, cpu) = drv->state_count - 1; } /* Idle states parsed correctly, initialize per-cpu pointer */ @@ -466,7 +471,9 @@ int psci_cpu_suspend_enter(unsigned long index) { int ret; u32 *state = __this_cpu_read(psci_power_state); - u32 composite_state = state[index - 1] | psci_get_domain_state(); + u32 composite_state, rpm_state_id; + bool runtime_pm = false; + struct device *dev = NULL; /* * idle state index 0 corresponds to wfi, should never be called @@ -475,11 +482,29 @@ int psci_cpu_suspend_enter(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; + /* + * Do runtime PM if we are using the hierarchical CPU toplogy, but only + * when cpuidle have selected the deepest idle state for the CPU. + */ + if (psci_dt_topology) { + rpm_state_id = __this_cpu_read(psci_rpm_state_id); + runtime_pm = rpm_state_id == index; + if (runtime_pm) { + dev = get_cpu_device(smp_processor_id()); + pm_runtime_put_sync_suspend(dev); + } + } + + composite_state = state[index - 1] | psci_get_domain_state(); + if (!psci_power_state_loses_context(composite_state)) ret = psci_ops.cpu_suspend(composite_state, 0); else ret = cpu_suspend(index, psci_suspend_finisher); + if (runtime_pm) + pm_runtime_get_sync(dev); + /* Clear the domain state to start fresh when back from idle. */ psci_set_domain_state(0); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Ulf Hansson <ulf.hansson@linaro.org> To: "Rafael J . Wysocki" <rjw@rjwysocki.net>, Sudeep Holla <sudeep.holla@arm.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, linux-pm@vger.kernel.org Cc: Ulf Hansson <ulf.hansson@linaro.org>, Vincent Guittot <vincent.guittot@linaro.org>, Geert Uytterhoeven <geert+renesas@glider.be>, Kevin Hilman <khilman@kernel.org>, Stephen Boyd <sboyd@kernel.org>, Viresh Kumar <viresh.kumar@linaro.org>, linux-kernel@vger.kernel.org, Lina Iyer <ilina@codeaurora.org>, Tony Lindgren <tony@atomide.com>, linux-arm-msm@vger.kernel.org, "Raju P . L . S . S . S . N" <rplsssn@codeaurora.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 23/27] drivers: firmware: psci: Manage runtime PM in the idle path for CPUs Date: Thu, 29 Nov 2018 18:46:56 +0100 [thread overview] Message-ID: <20181129174700.16585-24-ulf.hansson@linaro.org> (raw) In-Reply-To: <20181129174700.16585-1-ulf.hansson@linaro.org> When the hierarchical CPU topology layout is used in DT, let's allow the CPU to be power managed through its PM domain and via runtime PM. In other words, let's deploy runtime PM support to the PSCI driver during idle management of the CPU. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- Changes in v10: - New patch: Replaces the earlier patch "kernel/cpu_pm: Manage runtime PM in the idle path for CPUs". In the end it seemed like a better idea to start with something specific to PSCI, rather than (ab?)using the generic functions cpu_pm_enter|exit(). - Do runtime PM get/put for the deepest idle state for the CPU. --- drivers/firmware/psci/psci.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 94cd0431b004..b03bccce0a5d 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -20,6 +20,7 @@ #include <linux/linkage.h> #include <linux/of.h> #include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/printk.h> #include <linux/psci.h> #include <linux/reboot.h> @@ -319,6 +320,7 @@ int psci_dt_parse_state_node(struct device_node *np, u32 *state) #ifdef CONFIG_CPU_IDLE static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); +static DEFINE_PER_CPU_READ_MOSTLY(u32, psci_rpm_state_id); static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, struct device_node *cpu_node, int cpu) @@ -369,6 +371,9 @@ static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, ret = psci_dt_attach_cpu(cpu); if (ret) goto free_mem; + + /* Store index of deepest state to later for runtime PM. */ + per_cpu(psci_rpm_state_id, cpu) = drv->state_count - 1; } /* Idle states parsed correctly, initialize per-cpu pointer */ @@ -466,7 +471,9 @@ int psci_cpu_suspend_enter(unsigned long index) { int ret; u32 *state = __this_cpu_read(psci_power_state); - u32 composite_state = state[index - 1] | psci_get_domain_state(); + u32 composite_state, rpm_state_id; + bool runtime_pm = false; + struct device *dev = NULL; /* * idle state index 0 corresponds to wfi, should never be called @@ -475,11 +482,29 @@ int psci_cpu_suspend_enter(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; + /* + * Do runtime PM if we are using the hierarchical CPU toplogy, but only + * when cpuidle have selected the deepest idle state for the CPU. + */ + if (psci_dt_topology) { + rpm_state_id = __this_cpu_read(psci_rpm_state_id); + runtime_pm = rpm_state_id == index; + if (runtime_pm) { + dev = get_cpu_device(smp_processor_id()); + pm_runtime_put_sync_suspend(dev); + } + } + + composite_state = state[index - 1] | psci_get_domain_state(); + if (!psci_power_state_loses_context(composite_state)) ret = psci_ops.cpu_suspend(composite_state, 0); else ret = cpu_suspend(index, psci_suspend_finisher); + if (runtime_pm) + pm_runtime_get_sync(dev); + /* Clear the domain state to start fresh when back from idle. */ psci_set_domain_state(0); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-11-29 17:46 UTC|newest] Thread overview: 157+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-29 17:46 [PATCH v10 00/27] PM / Domains: Support hierarchical CPU arrangement (PSCI/ARM) Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 01/27] PM / Domains: Add generic data pointer to genpd_power_state struct Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-18 10:39 ` Daniel Lezcano 2018-12-18 10:39 ` Daniel Lezcano 2018-12-18 11:53 ` Ulf Hansson 2018-12-18 11:53 ` Ulf Hansson 2019-01-11 10:52 ` Rafael J. Wysocki 2019-01-11 10:52 ` Rafael J. Wysocki 2018-11-29 17:46 ` [PATCH v10 02/27] PM / Domains: Add support for CPU devices to genpd Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-19 9:53 ` Daniel Lezcano 2018-12-19 9:53 ` Daniel Lezcano 2018-12-19 10:02 ` Ulf Hansson 2018-12-19 10:02 ` Ulf Hansson 2019-01-11 10:54 ` Rafael J. Wysocki 2019-01-11 10:54 ` Rafael J. Wysocki 2018-11-29 17:46 ` [PATCH v10 03/27] timer: Export next wakeup time of a CPU Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2019-01-11 11:06 ` Rafael J. Wysocki 2019-01-11 11:06 ` Rafael J. Wysocki 2019-01-11 11:06 ` Rafael J. Wysocki 2019-01-16 7:57 ` Ulf Hansson 2019-01-16 7:57 ` Ulf Hansson 2019-01-16 7:57 ` Ulf Hansson 2019-01-16 10:59 ` Rafael J. Wysocki 2019-01-16 10:59 ` Rafael J. Wysocki 2019-01-16 10:59 ` Rafael J. Wysocki 2019-01-16 12:00 ` Ulf Hansson 2019-01-16 12:00 ` Ulf Hansson 2019-01-16 12:00 ` Ulf Hansson 2019-01-25 10:04 ` Ulf Hansson 2019-01-25 10:04 ` Ulf Hansson 2019-01-25 10:04 ` Ulf Hansson 2019-01-25 10:18 ` Rafael J. Wysocki 2019-01-25 10:18 ` Rafael J. Wysocki 2019-01-25 10:18 ` Rafael J. Wysocki 2018-11-29 17:46 ` [PATCH v10 04/27] PM / Domains: Add genpd governor for CPUs Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-19 9:54 ` Daniel Lezcano 2018-12-19 9:54 ` Daniel Lezcano 2018-12-19 10:09 ` Ulf Hansson 2018-12-19 10:09 ` Ulf Hansson 2018-12-19 10:09 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 05/27] dt: psci: Update DT bindings to support hierarchical PSCI states Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 06/27] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-19 11:05 ` Daniel Lezcano 2018-12-19 11:05 ` Daniel Lezcano 2018-11-29 17:46 ` [PATCH v10 07/27] cpuidle: dt: Support hierarchical CPU idle states Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-19 11:20 ` Daniel Lezcano 2018-12-19 11:20 ` Daniel Lezcano 2018-11-29 17:46 ` [PATCH v10 08/27] ARM/ARM64: cpuidle: Let back-end init ops take the driver as input Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 09/27] drivers: firmware: psci: Move psci to separate directory Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 10/27] MAINTAINERS: Update files for PSCI Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 11/27] drivers: firmware: psci: Split psci_dt_cpu_init_idle() Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 12/27] drivers: firmware: psci: Simplify state node parsing Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 13/27] drivers: firmware: psci: Support hierarchical CPU idle states Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-19 12:11 ` Daniel Lezcano 2018-12-19 12:11 ` Daniel Lezcano 2018-12-19 12:53 ` Ulf Hansson 2018-12-19 12:53 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 14/27] drivers: firmware: psci: Simplify error path of psci_dt_init() Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-19 12:08 ` Daniel Lezcano 2018-12-19 12:08 ` Daniel Lezcano 2018-11-29 17:46 ` [PATCH v10 15/27] drivers: firmware: psci: Announce support for OS initiated suspend mode Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-20 13:11 ` Daniel Lezcano 2018-12-20 13:11 ` Daniel Lezcano 2018-11-29 17:46 ` [PATCH v10 16/27] drivers: firmware: psci: Prepare to use " Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-20 14:08 ` Daniel Lezcano 2018-12-20 14:08 ` Daniel Lezcano 2018-12-20 15:41 ` Ulf Hansson 2018-12-20 15:41 ` Ulf Hansson 2018-12-20 17:16 ` Daniel Lezcano 2018-12-20 17:16 ` Daniel Lezcano 2018-11-29 17:46 ` [PATCH v10 17/27] drivers: firmware: psci: Prepare to support PM domains Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-20 14:19 ` Daniel Lezcano 2018-12-20 14:19 ` Daniel Lezcano 2018-12-20 15:49 ` Ulf Hansson 2018-12-20 15:49 ` Ulf Hansson 2018-12-20 18:06 ` Daniel Lezcano 2018-12-20 18:06 ` Daniel Lezcano 2018-12-20 21:37 ` Ulf Hansson 2018-12-20 21:37 ` Ulf Hansson 2018-12-21 7:15 ` Daniel Lezcano 2018-12-21 7:15 ` Daniel Lezcano 2018-11-29 17:46 ` [PATCH v10 18/27] drivers: firmware: psci: Add support for PM domains using genpd Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-03 16:37 ` Lina Iyer 2018-12-03 16:37 ` Lina Iyer 2018-12-03 20:03 ` Ulf Hansson 2018-12-03 20:03 ` Ulf Hansson 2018-12-20 14:35 ` Daniel Lezcano 2018-12-20 14:35 ` Daniel Lezcano 2018-12-20 21:09 ` Ulf Hansson 2018-12-20 21:09 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 19/27] drivers: firmware: psci: Add hierarchical domain idle states converter Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 20/27] drivers: firmware: psci: Introduce psci_dt_topology_init() Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 21/27] drivers: firmware: psci: Add a helper to attach a CPU to its PM domain Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-12-04 18:45 ` Lina Iyer 2018-12-04 18:45 ` Lina Iyer 2018-12-06 9:15 ` Ulf Hansson 2018-12-06 9:15 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 22/27] drivers: firmware: psci: Attach the CPU's device " Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson [this message] 2018-11-29 17:46 ` [PATCH v10 23/27] drivers: firmware: psci: Manage runtime PM in the idle path for CPUs Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 24/27] drivers: firmware: psci: Support CPU hotplug for the hierarchical model Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 22:31 ` Lina Iyer 2018-11-29 22:31 ` Lina Iyer 2018-11-30 8:25 ` Ulf Hansson 2018-11-30 8:25 ` Ulf Hansson 2018-11-30 20:57 ` Lina Iyer 2018-11-30 20:57 ` Lina Iyer 2018-12-19 11:17 ` Lorenzo Pieralisi 2018-12-19 11:17 ` Lorenzo Pieralisi 2018-12-19 11:47 ` Ulf Hansson 2018-12-19 11:47 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 25/27] arm64: kernel: Respect the hierarchical CPU topology in DT for PSCI Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:46 ` [PATCH v10 26/27] arm64: dts: Convert to the hierarchical CPU topology layout for MSM8916 Ulf Hansson 2018-11-29 17:46 ` Ulf Hansson 2018-11-29 17:47 ` [PATCH v10 27/27] arm64: dts: hikey: Convert to the hierarchical CPU topology layout Ulf Hansson 2018-11-29 17:47 ` Ulf Hansson 2018-12-17 16:12 ` [PATCH v10 00/27] PM / Domains: Support hierarchical CPU arrangement (PSCI/ARM) Ulf Hansson 2018-12-17 16:12 ` Ulf Hansson 2019-01-11 11:08 ` Rafael J. Wysocki 2019-01-11 11:08 ` Rafael J. Wysocki 2019-01-03 12:06 ` Sudeep Holla 2019-01-03 12:06 ` Sudeep Holla 2019-01-03 12:06 ` Sudeep Holla 2019-01-16 9:10 ` Ulf Hansson 2019-01-16 9:10 ` Ulf Hansson 2019-01-17 17:44 ` Sudeep Holla 2019-01-17 17:44 ` Sudeep Holla 2019-01-17 17:44 ` Sudeep Holla 2019-01-18 11:56 ` Ulf Hansson 2019-01-18 11:56 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181129174700.16585-24-ulf.hansson@linaro.org \ --to=ulf.hansson@linaro.org \ --cc=Lorenzo.Pieralisi@arm.com \ --cc=daniel.lezcano@linaro.org \ --cc=geert+renesas@glider.be \ --cc=ilina@codeaurora.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=rjw@rjwysocki.net \ --cc=rplsssn@codeaurora.org \ --cc=sboyd@kernel.org \ --cc=sudeep.holla@arm.com \ --cc=tony@atomide.com \ --cc=vincent.guittot@linaro.org \ --cc=viresh.kumar@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.