From: Ulf Hansson <ulf.hansson@linaro.org>
To: Sudeep Holla <sudeep.holla@arm.com>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Rob Herring <robh+dt@kernel.org>,
linux-pm@vger.kernel.org
Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Lina Iyer <ilina@codeaurora.org>,
Vincent Guittot <vincent.guittot@linaro.org>,
Stephen Boyd <sboyd@kernel.org>, Andy Gross <agross@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 v3 03/13] firmware: psci: Export functions to manage the OSI mode
Date: Wed, 27 Nov 2019 11:29:04 +0100 [thread overview]
Message-ID: <20191127102914.18729-4-ulf.hansson@linaro.org> (raw)
In-Reply-To: <20191127102914.18729-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>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
---
Changes in v3:
- None.
---
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 b3b6c15e7b36..2937d44b5df4 100644
--- a/drivers/firmware/psci/psci.c
+++ b/drivers/firmware/psci/psci.c
@@ -97,7 +97,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;
}
@@ -162,6 +162,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;
@@ -544,9 +553,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 ebe0a881d13d..a67712b73b6c 100644
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -18,6 +18,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 smccc_version {
SMCCC_VERSION_1_0,
--
2.17.1
next prev parent reply other threads:[~2019-11-27 10:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 10:29 [PATCH v3 00/13] cpuidle: psci: Support hierarchical CPU arrangement Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 01/13] cpuidle: psci: Align psci_power_state count with idle state count Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 02/13] dt: psci: Update DT bindings to support hierarchical PSCI states Ulf Hansson
2019-11-27 10:29 ` Ulf Hansson [this message]
2019-11-27 10:29 ` [PATCH v3 04/13] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 05/13] cpuidle: dt: Support hierarchical CPU idle states Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 06/13] cpuidle: psci: Simplify OF parsing of CPU idle state nodes Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 07/13] cpuidle: psci: Support hierarchical CPU idle states Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 08/13] cpuidle: psci: Add a helper to attach a CPU to its PM domain Ulf Hansson
2019-11-28 14:14 ` Lorenzo Pieralisi
2019-11-28 17:21 ` Ulf Hansson
2019-11-28 18:31 ` Lorenzo Pieralisi
2019-11-28 22:04 ` Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 09/13] cpuidle: psci: Attach CPU devices to their PM domains Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 10/13] cpuidle: psci: Prepare to use OS initiated suspend mode via " Ulf Hansson
2019-12-05 18:35 ` Lorenzo Pieralisi
2019-12-05 20:25 ` Ulf Hansson
2019-12-05 20:38 ` Ulf Hansson
2019-12-06 11:25 ` Lorenzo Pieralisi
2019-12-06 14:26 ` Ulf Hansson
2019-12-06 15:14 ` Lorenzo Pieralisi
2019-12-06 17:23 ` Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 11/13] cpuidle: psci: Manage runtime PM in the idle path Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 12/13] cpuidle: psci: Add support for PM domains by using genpd Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 13/13] arm64: dts: Convert to the hierarchical CPU topology layout for MSM8916 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=20191127102914.18729-4-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=agross@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).