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>, linux-pm@vger.kernel.org Cc: Kevin Hilman <khilman@kernel.org>, Lina Iyer <ilina@codeaurora.org>, Lina Iyer <lina.iyer@linaro.org>, Ulf Hansson <ulf.hansson@linaro.org>, Rob Herring <robh+dt@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Vincent Guittot <vincent.guittot@linaro.org>, Stephen Boyd <sboyd@kernel.org>, Juri Lelli <juri.lelli@arm.com>, 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 v8 19/26] drivers: firmware: psci: Prepare to use OS initiated suspend mode Date: Wed, 20 Jun 2018 19:22:19 +0200 [thread overview] Message-ID: <20180620172226.15012-20-ulf.hansson@linaro.org> (raw) In-Reply-To: <20180620172226.15012-1-ulf.hansson@linaro.org> To enable the OS initiated mode, the CPU topology needs to be described using the hierarchical model in DT. When used, the idle state bits for the CPU needs to be created by ORing the bits for CPU's selected idle state with the bits for CPU's PM domain (CPU's cluster) idle state. Let's prepare the PSCI driver to deal with this, via introducing a per CPU variable called domain_state and by adding internal helpers to read/write the value of variable. Cc: Lina Iyer <ilina@codeaurora.org> Co-developed-by: Lina Iyer <lina.iyer@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/firmware/psci/psci.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index e8f4f8444ff1..40b2b8945018 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -87,8 +87,19 @@ static u32 psci_function_id[PSCI_FN_MAX]; (PSCI_1_0_EXT_POWER_STATE_ID_MASK | \ PSCI_1_0_EXT_POWER_STATE_TYPE_MASK) +static DEFINE_PER_CPU(u32, domain_state); static u32 psci_cpu_suspend_feature; +static inline u32 psci_get_domain_state(void) +{ + return this_cpu_read(domain_state); +} + +static inline void psci_set_domain_state(u32 state) +{ + this_cpu_write(domain_state, state); +} + static inline bool psci_has_ext_power_state(void) { return psci_cpu_suspend_feature & @@ -187,6 +198,8 @@ static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) fn = psci_function_id[PSCI_FN_CPU_ON]; err = invoke_psci_fn(fn, cpuid, entry_point, 0); + /* Clear the domain state to start fresh. */ + psci_set_domain_state(0); return psci_to_linux_errno(err); } @@ -408,15 +421,17 @@ int psci_cpu_init_idle(unsigned int cpu) static int psci_suspend_finisher(unsigned long index) { u32 *state = __this_cpu_read(psci_power_state); + u32 composite_state = state[index - 1] | psci_get_domain_state(); - return psci_ops.cpu_suspend(state[index - 1], - __pa_symbol(cpu_resume)); + return psci_ops.cpu_suspend(composite_state, __pa_symbol(cpu_resume)); } 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(); + /* * idle state index 0 corresponds to wfi, should never be called * from the cpu_suspend operations @@ -424,11 +439,14 @@ int psci_cpu_suspend_enter(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; - if (!psci_power_state_loses_context(state[index - 1])) - ret = psci_ops.cpu_suspend(state[index - 1], 0); + if (!psci_power_state_loses_context(composite_state)) + ret = psci_ops.cpu_suspend(composite_state, 0); else ret = cpu_suspend(index, psci_suspend_finisher); + /* Clear the domain state to start fresh when back from idle. */ + psci_set_domain_state(0); + return ret; } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: ulf.hansson@linaro.org (Ulf Hansson) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 19/26] drivers: firmware: psci: Prepare to use OS initiated suspend mode Date: Wed, 20 Jun 2018 19:22:19 +0200 [thread overview] Message-ID: <20180620172226.15012-20-ulf.hansson@linaro.org> (raw) In-Reply-To: <20180620172226.15012-1-ulf.hansson@linaro.org> To enable the OS initiated mode, the CPU topology needs to be described using the hierarchical model in DT. When used, the idle state bits for the CPU needs to be created by ORing the bits for CPU's selected idle state with the bits for CPU's PM domain (CPU's cluster) idle state. Let's prepare the PSCI driver to deal with this, via introducing a per CPU variable called domain_state and by adding internal helpers to read/write the value of variable. Cc: Lina Iyer <ilina@codeaurora.org> Co-developed-by: Lina Iyer <lina.iyer@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/firmware/psci/psci.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index e8f4f8444ff1..40b2b8945018 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -87,8 +87,19 @@ static u32 psci_function_id[PSCI_FN_MAX]; (PSCI_1_0_EXT_POWER_STATE_ID_MASK | \ PSCI_1_0_EXT_POWER_STATE_TYPE_MASK) +static DEFINE_PER_CPU(u32, domain_state); static u32 psci_cpu_suspend_feature; +static inline u32 psci_get_domain_state(void) +{ + return this_cpu_read(domain_state); +} + +static inline void psci_set_domain_state(u32 state) +{ + this_cpu_write(domain_state, state); +} + static inline bool psci_has_ext_power_state(void) { return psci_cpu_suspend_feature & @@ -187,6 +198,8 @@ static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) fn = psci_function_id[PSCI_FN_CPU_ON]; err = invoke_psci_fn(fn, cpuid, entry_point, 0); + /* Clear the domain state to start fresh. */ + psci_set_domain_state(0); return psci_to_linux_errno(err); } @@ -408,15 +421,17 @@ int psci_cpu_init_idle(unsigned int cpu) static int psci_suspend_finisher(unsigned long index) { u32 *state = __this_cpu_read(psci_power_state); + u32 composite_state = state[index - 1] | psci_get_domain_state(); - return psci_ops.cpu_suspend(state[index - 1], - __pa_symbol(cpu_resume)); + return psci_ops.cpu_suspend(composite_state, __pa_symbol(cpu_resume)); } 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(); + /* * idle state index 0 corresponds to wfi, should never be called * from the cpu_suspend operations @@ -424,11 +439,14 @@ int psci_cpu_suspend_enter(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; - if (!psci_power_state_loses_context(state[index - 1])) - ret = psci_ops.cpu_suspend(state[index - 1], 0); + if (!psci_power_state_loses_context(composite_state)) + ret = psci_ops.cpu_suspend(composite_state, 0); else ret = cpu_suspend(index, psci_suspend_finisher); + /* Clear the domain state to start fresh when back from idle. */ + psci_set_domain_state(0); + return ret; } -- 2.17.1
next prev parent reply other threads:[~2018-06-20 17:22 UTC|newest] Thread overview: 165+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-20 17:22 [PATCH v8 00/26] PM / Domains: Support hierarchical CPU arrangement (PSCI/ARM) Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 01/26] PM / Domains: Don't treat zero found compatible idle states as an error Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 02/26] PM / Domains: Deal with multiple states but no governor in genpd Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 03/26] PM / Domains: Add generic data pointer to genpd_power_state struct Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-24 21:09 ` Rafael J. Wysocki 2018-06-24 21:09 ` Rafael J. Wysocki 2018-06-25 8:34 ` Ulf Hansson 2018-06-25 8:34 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 04/26] PM / Domains: Add support for CPU devices to genpd Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-19 10:25 ` Rafael J. Wysocki 2018-07-19 10:25 ` Rafael J. Wysocki 2018-08-03 11:43 ` Ulf Hansson 2018-08-03 11:43 ` Ulf Hansson 2018-08-06 9:36 ` Rafael J. Wysocki 2018-08-06 9:36 ` Rafael J. Wysocki 2018-08-24 6:47 ` Ulf Hansson 2018-08-24 6:47 ` Ulf Hansson 2018-09-14 9:26 ` Rafael J. Wysocki 2018-09-14 9:26 ` Rafael J. Wysocki 2018-06-20 17:22 ` [PATCH v8 05/26] PM / Domains: Add helper functions to attach/detach CPUs to/from genpd Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-19 10:22 ` Rafael J. Wysocki 2018-07-19 10:22 ` Rafael J. Wysocki 2018-08-03 11:44 ` Ulf Hansson 2018-08-03 11:44 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 06/26] timer: Export next wakeup time of a CPU Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-19 10:15 ` Rafael J. Wysocki 2018-07-19 10:15 ` Rafael J. Wysocki 2018-06-20 17:22 ` [PATCH v8 07/26] PM / Domains: Add genpd governor for CPUs Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-19 10:32 ` Rafael J. Wysocki 2018-07-19 10:32 ` Rafael J. Wysocki 2018-07-26 9:14 ` Rafael J. Wysocki 2018-07-26 9:14 ` Rafael J. Wysocki 2018-08-03 14:28 ` Ulf Hansson 2018-08-03 14:28 ` Ulf Hansson 2018-08-03 14:28 ` Ulf Hansson 2018-08-06 9:20 ` Rafael J. Wysocki 2018-08-06 9:20 ` Rafael J. Wysocki 2018-08-06 9:20 ` Rafael J. Wysocki 2018-08-09 15:39 ` Lorenzo Pieralisi 2018-08-09 15:39 ` Lorenzo Pieralisi 2018-08-09 15:39 ` Lorenzo Pieralisi 2018-08-24 9:26 ` Ulf Hansson 2018-08-24 9:26 ` Ulf Hansson 2018-08-24 9:26 ` Ulf Hansson 2018-08-24 10:38 ` Lorenzo Pieralisi 2018-08-24 10:38 ` Lorenzo Pieralisi 2018-08-24 10:38 ` Lorenzo Pieralisi 2018-08-30 13:36 ` Ulf Hansson 2018-08-30 13:36 ` Ulf Hansson 2018-08-30 13:36 ` Ulf Hansson 2018-09-13 15:37 ` Lorenzo Pieralisi 2018-09-13 15:37 ` Lorenzo Pieralisi 2018-09-13 15:37 ` Lorenzo Pieralisi 2018-09-14 9:50 ` Rafael J. Wysocki 2018-09-14 9:50 ` Rafael J. Wysocki 2018-09-14 9:50 ` Rafael J. Wysocki 2018-09-14 10:44 ` Lorenzo Pieralisi 2018-09-14 10:44 ` Lorenzo Pieralisi 2018-09-14 10:44 ` Lorenzo Pieralisi 2018-09-14 11:34 ` Rafael J. Wysocki 2018-09-14 11:34 ` Rafael J. Wysocki 2018-09-14 11:34 ` Rafael J. Wysocki 2018-09-14 12:30 ` Lorenzo Pieralisi 2018-09-14 12:30 ` Lorenzo Pieralisi 2018-09-14 12:30 ` Lorenzo Pieralisi 2018-08-24 8:29 ` Ulf Hansson 2018-08-24 8:29 ` Ulf Hansson 2018-08-24 8:29 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 08/26] PM / Domains: Extend genpd CPU governor to cope with QoS constraints Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-19 10:35 ` Rafael J. Wysocki 2018-07-19 10:35 ` Rafael J. Wysocki 2018-08-03 11:42 ` Ulf Hansson 2018-08-03 11:42 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 09/26] kernel/cpu_pm: Manage runtime PM in the idle path for CPUs Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-18 10:11 ` Rafael J. Wysocki 2018-07-18 10:11 ` Rafael J. Wysocki 2018-07-19 10:12 ` Rafael J. Wysocki 2018-07-19 10:12 ` Rafael J. Wysocki 2018-07-19 10:39 ` Rafael J. Wysocki 2018-07-19 10:39 ` Rafael J. Wysocki 2018-08-03 11:42 ` Ulf Hansson 2018-08-03 11:42 ` Ulf Hansson 2018-08-06 9:37 ` Rafael J. Wysocki 2018-08-06 9:37 ` Rafael J. Wysocki 2018-08-08 10:56 ` Lorenzo Pieralisi 2018-08-08 10:56 ` Lorenzo Pieralisi 2018-08-08 18:02 ` Lina Iyer 2018-08-08 18:02 ` Lina Iyer 2018-08-09 8:16 ` Rafael J. Wysocki 2018-08-09 8:16 ` Rafael J. Wysocki 2018-08-09 8:16 ` Rafael J. Wysocki 2018-08-10 20:36 ` Lina Iyer 2018-08-10 20:36 ` Lina Iyer 2018-08-12 9:53 ` Rafael J. Wysocki 2018-08-12 9:53 ` Rafael J. Wysocki 2018-08-12 9:53 ` Rafael J. Wysocki 2018-08-09 9:58 ` Sudeep Holla 2018-08-09 9:58 ` Sudeep Holla 2018-08-09 9:58 ` Sudeep Holla 2018-08-09 10:25 ` Lorenzo Pieralisi 2018-08-09 10:25 ` Lorenzo Pieralisi 2018-08-10 20:18 ` Lina Iyer 2018-08-10 20:18 ` Lina Iyer 2018-08-15 10:44 ` Lorenzo Pieralisi 2018-08-15 10:44 ` Lorenzo Pieralisi 2018-08-24 12:24 ` Ulf Hansson 2018-08-24 12:24 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 10/26] dt: psci: Update DT bindings to support hierarchical PSCI states Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 11/26] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 12/26] cpuidle: dt: Support hierarchical CPU idle states Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 13/26] drivers: firmware: psci: Move psci to separate directory Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 14/26] MAINTAINERS: Update files for PSCI Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 15/26] drivers: firmware: psci: Split psci_dt_cpu_init_idle() Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 16/26] drivers: firmware: psci: Support hierarchical CPU idle states Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 17/26] drivers: firmware: psci: Simplify error path of psci_dt_init() Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 18/26] drivers: firmware: psci: Announce support for OS initiated suspend mode Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson [this message] 2018-06-20 17:22 ` [PATCH v8 19/26] drivers: firmware: psci: Prepare to use " Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 20/26] drivers: firmware: psci: Share a few internal PSCI functions Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 21/26] drivers: firmware: psci: Add support for PM domains using genpd Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 22/26] drivers: firmware: psci: Introduce psci_dt_topology_init() Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 23/26] drivers: firmware: psci: Try to attach CPU devices to their PM domains Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 24/26] drivers: firmware: psci: Deal with CPU hotplug when using OSI mode Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-11-19 19:50 ` Raju P L S S S N 2018-11-19 19:50 ` Raju P L S S S N 2018-11-20 9:50 ` Ulf Hansson 2018-11-20 9:50 ` Ulf Hansson 2018-11-20 10:47 ` Raju P L S S S N 2018-11-20 10:47 ` Raju P L S S S N 2018-06-20 17:22 ` [PATCH v8 25/26] arm64: kernel: Respect the hierarchical CPU topology in DT for PSCI Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-06-20 17:22 ` [PATCH v8 26/26] arm64: dts: Convert to the hierarchical CPU topology layout for MSM8916 Ulf Hansson 2018-06-20 17:22 ` Ulf Hansson 2018-07-03 5:44 ` [PATCH v8 00/26] PM / Domains: Support hierarchical CPU arrangement (PSCI/ARM) Ulf Hansson 2018-07-03 5:44 ` Ulf Hansson 2018-07-03 7:54 ` Rafael J. Wysocki 2018-07-03 7:54 ` Rafael J. Wysocki 2018-07-09 11:42 ` Ulf Hansson 2018-07-09 11:42 ` 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=20180620172226.15012-20-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=juri.lelli@arm.com \ --cc=khilman@kernel.org \ --cc=lina.iyer@linaro.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=robh+dt@kernel.org \ --cc=sboyd@kernel.org \ --cc=sudeep.holla@arm.com \ --cc=tglx@linutronix.de \ --cc=vincent.guittot@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.