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 24/27] drivers: firmware: psci: Support CPU hotplug for the hierarchical model Date: Thu, 29 Nov 2018 18:46:57 +0100 [thread overview] Message-ID: <20181129174700.16585-25-ulf.hansson@linaro.org> (raw) In-Reply-To: <20181129174700.16585-1-ulf.hansson@linaro.org> When the hierarchical CPU topology is used and when a CPU has been put offline (hotplug), that same CPU prevents its PM domain and thus also potential master PM domains, from being powered off. This is because genpd observes the CPU's struct device to remain being active from a runtime PM point of view. To deal with this, let's decrease the runtime PM usage count by calling pm_runtime_put_sync_suspend() of the CPU's struct device when putting it offline. Consequentially, we must then increase the runtime PM usage for the CPU, while putting it online again. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- Changes in v10: - Make it work when the hierarchical CPU topology is used, which may be used both for OSI and PC mode. - Rework the code to prevent "BUG: sleeping function called from invalid context". --- drivers/firmware/psci/psci.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index b03bccce0a5d..f62c4963eb62 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -15,6 +15,7 @@ #include <linux/acpi.h> #include <linux/arm-smccc.h> +#include <linux/cpu.h> #include <linux/cpuidle.h> #include <linux/errno.h> #include <linux/linkage.h> @@ -199,9 +200,20 @@ static int psci_cpu_suspend(u32 state, unsigned long entry_point) static int psci_cpu_off(u32 state) { + struct device *dev; int err; u32 fn; + /* + * When the hierarchical CPU topology is used, decrease the runtime PM + * usage count for the current CPU, as to allow other parts in the + * topology to enter low power states. + */ + if (psci_dt_topology) { + dev = get_cpu_device(smp_processor_id()); + pm_runtime_put_sync_suspend(dev); + } + fn = psci_function_id[PSCI_FN_CPU_OFF]; err = invoke_psci_fn(fn, state, 0, 0); return psci_to_linux_errno(err); @@ -209,6 +221,7 @@ static int psci_cpu_off(u32 state) static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) { + struct device *dev; int err; u32 fn; @@ -216,6 +229,13 @@ static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) err = invoke_psci_fn(fn, cpuid, entry_point, 0); /* Clear the domain state to start fresh. */ psci_set_domain_state(0); + + /* Increase runtime PM usage count if the hierarchical CPU toplogy. */ + if (!err && psci_dt_topology) { + dev = get_cpu_device(cpuid); + pm_runtime_get_sync(dev); + } + return psci_to_linux_errno(err); } -- 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 24/27] drivers: firmware: psci: Support CPU hotplug for the hierarchical model Date: Thu, 29 Nov 2018 18:46:57 +0100 [thread overview] Message-ID: <20181129174700.16585-25-ulf.hansson@linaro.org> (raw) In-Reply-To: <20181129174700.16585-1-ulf.hansson@linaro.org> When the hierarchical CPU topology is used and when a CPU has been put offline (hotplug), that same CPU prevents its PM domain and thus also potential master PM domains, from being powered off. This is because genpd observes the CPU's struct device to remain being active from a runtime PM point of view. To deal with this, let's decrease the runtime PM usage count by calling pm_runtime_put_sync_suspend() of the CPU's struct device when putting it offline. Consequentially, we must then increase the runtime PM usage for the CPU, while putting it online again. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- Changes in v10: - Make it work when the hierarchical CPU topology is used, which may be used both for OSI and PC mode. - Rework the code to prevent "BUG: sleeping function called from invalid context". --- drivers/firmware/psci/psci.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index b03bccce0a5d..f62c4963eb62 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -15,6 +15,7 @@ #include <linux/acpi.h> #include <linux/arm-smccc.h> +#include <linux/cpu.h> #include <linux/cpuidle.h> #include <linux/errno.h> #include <linux/linkage.h> @@ -199,9 +200,20 @@ static int psci_cpu_suspend(u32 state, unsigned long entry_point) static int psci_cpu_off(u32 state) { + struct device *dev; int err; u32 fn; + /* + * When the hierarchical CPU topology is used, decrease the runtime PM + * usage count for the current CPU, as to allow other parts in the + * topology to enter low power states. + */ + if (psci_dt_topology) { + dev = get_cpu_device(smp_processor_id()); + pm_runtime_put_sync_suspend(dev); + } + fn = psci_function_id[PSCI_FN_CPU_OFF]; err = invoke_psci_fn(fn, state, 0, 0); return psci_to_linux_errno(err); @@ -209,6 +221,7 @@ static int psci_cpu_off(u32 state) static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) { + struct device *dev; int err; u32 fn; @@ -216,6 +229,13 @@ static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) err = invoke_psci_fn(fn, cpuid, entry_point, 0); /* Clear the domain state to start fresh. */ psci_set_domain_state(0); + + /* Increase runtime PM usage count if the hierarchical CPU toplogy. */ + if (!err && psci_dt_topology) { + dev = get_cpu_device(cpuid); + pm_runtime_get_sync(dev); + } + return psci_to_linux_errno(err); } -- 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 ` [PATCH v10 23/27] drivers: firmware: psci: Manage runtime PM in the idle path for CPUs 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 24/27] drivers: firmware: psci: Support CPU hotplug for the hierarchical model 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-25-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.