From: Ulf Hansson <ulf.hansson@linaro.org> To: "Rafael J . Wysocki" <rjw@rjwysocki.net>, Daniel Lezcano <daniel.lezcano@linaro.org>, Sudeep Holla <sudeep.holla@arm.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Lina Iyer <ilina@codeaurora.org>, linux-pm@vger.kernel.org Cc: Rob Herring <robh+dt@kernel.org>, Vincent Guittot <vincent.guittot@linaro.org>, Stephen Boyd <sboyd@kernel.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Kevin Hilman <khilman@kernel.org>, Ulf Hansson <ulf.hansson@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 03/13] firmware: psci: Export functions to manage the OSI mode Date: Thu, 10 Oct 2019 13:39:27 +0200 [thread overview] Message-ID: <20191010113937.15962-4-ulf.hansson@linaro.org> (raw) In-Reply-To: <20191010113937.15962-1-ulf.hansson@linaro.org> To allow subsequent changes to implement support for OSI mode through the cpuidle-psci driver, export the existing psci_has_osi_support(). Export also a new function, psci_set_osi_mode(), that allows its caller to enable the OS-initiated CPU-suspend mode in the PSCI FW. To deal with backwards compatibility for a kernel started through a kexec call, default to set the CPU-suspend mode to the Platform Coordinated mode during boot. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/firmware/psci/psci.c | 18 ++++++++++++++++-- include/linux/psci.h | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 84f4ff351c62..76f3a991d4d7 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -89,7 +89,7 @@ static inline bool psci_has_ext_power_state(void) PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK; } -static inline bool psci_has_osi_support(void) +bool psci_has_osi_support(void) { return psci_cpu_suspend_feature & PSCI_1_0_OS_INITIATED; } @@ -154,6 +154,15 @@ static u32 psci_get_version(void) return invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); } +int psci_set_osi_mode(void) +{ + int err; + + err = invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_OSI, 0, 0); + return psci_to_linux_errno(err); +} + static int psci_cpu_suspend(u32 state, unsigned long entry_point) { int err; @@ -536,9 +545,14 @@ static int __init psci_1_0_init(struct device_node *np) if (err) return err; - if (psci_has_osi_support()) + if (psci_has_osi_support()) { pr_info("OSI mode supported.\n"); + /* Default to PC mode. */ + invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_PC, 0, 0); + } + return 0; } diff --git a/include/linux/psci.h b/include/linux/psci.h index e2bacc6fd2f2..f76b45341adf 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -17,6 +17,8 @@ bool psci_tos_resident_on(int cpu); int psci_cpu_suspend_enter(u32 state); bool psci_power_state_is_valid(u32 state); +int psci_set_osi_mode(void); +bool psci_has_osi_support(void); enum psci_conduit { PSCI_CONDUIT_NONE, -- 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>, Daniel Lezcano <daniel.lezcano@linaro.org>, Sudeep Holla <sudeep.holla@arm.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Lina Iyer <ilina@codeaurora.org>, linux-pm@vger.kernel.org Cc: Ulf Hansson <ulf.hansson@linaro.org>, Kevin Hilman <khilman@kernel.org>, Stephen Boyd <sboyd@kernel.org>, linux-arm-msm@vger.kernel.org, Bjorn Andersson <bjorn.andersson@linaro.org>, Rob Herring <robh+dt@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/13] firmware: psci: Export functions to manage the OSI mode Date: Thu, 10 Oct 2019 13:39:27 +0200 [thread overview] Message-ID: <20191010113937.15962-4-ulf.hansson@linaro.org> (raw) In-Reply-To: <20191010113937.15962-1-ulf.hansson@linaro.org> To allow subsequent changes to implement support for OSI mode through the cpuidle-psci driver, export the existing psci_has_osi_support(). Export also a new function, psci_set_osi_mode(), that allows its caller to enable the OS-initiated CPU-suspend mode in the PSCI FW. To deal with backwards compatibility for a kernel started through a kexec call, default to set the CPU-suspend mode to the Platform Coordinated mode during boot. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/firmware/psci/psci.c | 18 ++++++++++++++++-- include/linux/psci.h | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 84f4ff351c62..76f3a991d4d7 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -89,7 +89,7 @@ static inline bool psci_has_ext_power_state(void) PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK; } -static inline bool psci_has_osi_support(void) +bool psci_has_osi_support(void) { return psci_cpu_suspend_feature & PSCI_1_0_OS_INITIATED; } @@ -154,6 +154,15 @@ static u32 psci_get_version(void) return invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); } +int psci_set_osi_mode(void) +{ + int err; + + err = invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_OSI, 0, 0); + return psci_to_linux_errno(err); +} + static int psci_cpu_suspend(u32 state, unsigned long entry_point) { int err; @@ -536,9 +545,14 @@ static int __init psci_1_0_init(struct device_node *np) if (err) return err; - if (psci_has_osi_support()) + if (psci_has_osi_support()) { pr_info("OSI mode supported.\n"); + /* Default to PC mode. */ + invoke_psci_fn(PSCI_1_0_FN_SET_SUSPEND_MODE, + PSCI_1_0_SUSPEND_MODE_PC, 0, 0); + } + return 0; } diff --git a/include/linux/psci.h b/include/linux/psci.h index e2bacc6fd2f2..f76b45341adf 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -17,6 +17,8 @@ bool psci_tos_resident_on(int cpu); int psci_cpu_suspend_enter(u32 state); bool psci_power_state_is_valid(u32 state); +int psci_set_osi_mode(void); +bool psci_has_osi_support(void); enum psci_conduit { PSCI_CONDUIT_NONE, -- 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:[~2019-10-10 11:40 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-10 11:39 [PATCH 00/13] cpuidle: psci: Support hierarchical CPU arrangement Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 01/13] cpuidle: psci: Fix potential access to unmapped memory Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-18 9:38 ` Lorenzo Pieralisi 2019-10-18 9:38 ` Lorenzo Pieralisi 2019-10-18 9:51 ` Ulf Hansson 2019-10-18 9:51 ` Ulf Hansson 2019-10-18 10:03 ` Lorenzo Pieralisi 2019-10-18 10:03 ` Lorenzo Pieralisi 2019-10-18 10:29 ` Ulf Hansson 2019-10-18 10:29 ` Ulf Hansson 2019-10-18 16:47 ` Lorenzo Pieralisi 2019-10-18 16:47 ` Lorenzo Pieralisi 2019-10-24 15:18 ` [PATCH] cpuidle: psci: Align psci_power_state count with idle state count Sudeep Holla 2019-10-24 15:18 ` Sudeep Holla 2019-10-24 16:10 ` Ulf Hansson 2019-10-24 16:10 ` Ulf Hansson 2019-10-27 2:20 ` Sudeep Holla 2019-10-27 2:20 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 02/13] dt: psci: Update DT bindings to support hierarchical PSCI states Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:26 ` Sudeep Holla 2019-10-24 15:26 ` Sudeep Holla 2019-10-24 16:23 ` Ulf Hansson 2019-10-24 16:23 ` Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson [this message] 2019-10-10 11:39 ` [PATCH 03/13] firmware: psci: Export functions to manage the OSI mode Ulf Hansson 2019-10-24 15:27 ` Sudeep Holla 2019-10-24 15:27 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 04/13] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:28 ` Sudeep Holla 2019-10-24 15:28 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 05/13] cpuidle: dt: Support hierarchical CPU idle states Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:30 ` Sudeep Holla 2019-10-24 15:30 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 06/13] cpuidle: psci: Simplify OF parsing of CPU idle state nodes Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:36 ` Sudeep Holla 2019-10-24 15:36 ` Sudeep Holla 2019-10-24 16:33 ` Ulf Hansson 2019-10-24 16:33 ` Ulf Hansson 2019-10-27 2:24 ` Sudeep Holla 2019-10-27 2:24 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 07/13] cpuidle: psci: Support hierarchical CPU idle states Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:39 ` Sudeep Holla 2019-10-24 15:39 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 08/13] cpuidle: psci: Prepare to use OS initiated suspend mode via PM domains Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:42 ` Sudeep Holla 2019-10-24 15:42 ` Sudeep Holla 2019-10-24 17:01 ` Ulf Hansson 2019-10-24 17:01 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 09/13] cpuidle: psci: Add support for PM domains by using genpd Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:46 ` Sudeep Holla 2019-10-24 15:46 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 10/13] cpuidle: psci: Add a helper to attach a CPU to its PM domain Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:31 ` Sudeep Holla 2019-10-24 16:31 ` Sudeep Holla 2019-10-24 16:47 ` Ulf Hansson 2019-10-24 16:47 ` Ulf Hansson 2019-10-27 2:30 ` Sudeep Holla 2019-10-27 2:30 ` Sudeep Holla 2019-10-28 7:35 ` Ulf Hansson 2019-10-28 7:35 ` Ulf Hansson 2019-10-28 7:49 ` Sudeep Holla 2019-10-28 7:49 ` Sudeep Holla 2019-10-28 9:45 ` Ulf Hansson 2019-10-28 9:45 ` Ulf Hansson 2019-10-29 5:34 ` Sudeep Holla 2019-10-29 5:34 ` Sudeep Holla 2019-10-29 9:44 ` Niklas Cassel 2019-10-29 9:44 ` Niklas Cassel 2019-10-30 0:50 ` Sudeep Holla 2019-10-30 0:50 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 11/13] cpuidle: psci: Attach CPU devices to their PM domains Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:35 ` Sudeep Holla 2019-10-24 16:35 ` Sudeep Holla 2019-10-24 16:55 ` Ulf Hansson 2019-10-24 16:55 ` Ulf Hansson 2019-10-27 2:32 ` Sudeep Holla 2019-10-27 2:32 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 12/13] cpuidle: psci: Manage runtime PM in the idle path Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:32 ` Sudeep Holla 2019-10-24 16:32 ` Sudeep Holla 2019-10-24 17:00 ` Ulf Hansson 2019-10-24 17:00 ` Ulf Hansson 2019-10-25 8:28 ` Lorenzo Pieralisi 2019-10-25 8:28 ` Lorenzo Pieralisi 2019-10-25 14:13 ` Ulf Hansson 2019-10-25 14:13 ` Ulf Hansson 2019-10-27 2:34 ` Sudeep Holla 2019-10-27 2:34 ` Sudeep Holla 2019-10-28 22:40 ` Ulf Hansson 2019-10-28 22:40 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 13/13] arm64: dts: Convert to the hierarchical CPU topology layout for MSM8916 Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:41 ` Sudeep Holla 2019-10-24 16:41 ` Sudeep Holla 2019-10-24 17:03 ` Ulf Hansson 2019-10-24 17:03 ` Ulf Hansson 2019-10-18 8:10 ` [PATCH 00/13] cpuidle: psci: Support hierarchical CPU arrangement Ulf Hansson 2019-10-18 8:10 ` 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=20191010113937.15962-4-ulf.hansson@linaro.org \ --to=ulf.hansson@linaro.org \ --cc=Lorenzo.Pieralisi@arm.com \ --cc=bjorn.andersson@linaro.org \ --cc=daniel.lezcano@linaro.org \ --cc=ilina@codeaurora.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@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=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.