From: Mark Rutland <mark.rutland@arm.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Sudeep Holla <sudeep.holla@arm.com>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Lina Iyer <ilina@codeaurora.org>,
linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 7/7] drivers: firmware: psci: Announce support for OS initiated suspend mode
Date: Fri, 1 Mar 2019 17:32:39 +0000 [thread overview]
Message-ID: <20190301173238.GT15517@lakrids.cambridge.arm.com> (raw)
In-Reply-To: <20190228135919.3747-8-ulf.hansson@linaro.org>
On Thu, Feb 28, 2019 at 02:59:19PM +0100, Ulf Hansson wrote:
> PSCI firmware v1.0+, supports two different modes for CPU_SUSPEND. The
> Platform Coordinated mode, which is the default and mandatory mode, while
> support for the OS initiated (OSI) mode is optional.
>
> In some cases it's interesting for the user/developer to know if the OSI
> mode is supported by the PSCI FW. Therefore, let's print a message to the
> log, if that is the case.
>
> Cc: Lina Iyer <ilina@codeaurora.org>
> Co-developed-by: Lina Iyer <lina.iyer@linaro.org>
> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> drivers/firmware/psci/psci.c | 21 ++++++++++++++++++++-
> include/uapi/linux/psci.h | 5 +++++
> 2 files changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index 14d25b54b9f2..417d43886948 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -95,6 +95,11 @@ 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)
> +{
> + return psci_cpu_suspend_feature & PSCI_1_0_OS_INITIATED;
> +}
> +
> static inline bool psci_power_state_loses_context(u32 state)
> {
> const u32 mask = psci_has_ext_power_state() ?
> @@ -659,10 +664,24 @@ static int __init psci_0_1_init(struct device_node *np)
> return 0;
> }
>
> +static int __init psci_1_0_init(struct device_node *np)
> +{
> + int err;
> +
> + err = psci_0_2_init(np);
> + if (err)
> + return err;
> +
> + if (psci_has_osi_support())
> + pr_info("OSI mode supported.\n");
> +
> + return 0;
> +}
> +
> static const struct of_device_id psci_of_match[] __initconst = {
> { .compatible = "arm,psci", .data = psci_0_1_init},
> { .compatible = "arm,psci-0.2", .data = psci_0_2_init},
> - { .compatible = "arm,psci-1.0", .data = psci_0_2_init},
> + { .compatible = "arm,psci-1.0", .data = psci_1_0_init},
> {},
> };
>
> diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
> index b3bcabe380da..581f72085c33 100644
> --- a/include/uapi/linux/psci.h
> +++ b/include/uapi/linux/psci.h
> @@ -49,6 +49,7 @@
>
> #define PSCI_1_0_FN_PSCI_FEATURES PSCI_0_2_FN(10)
> #define PSCI_1_0_FN_SYSTEM_SUSPEND PSCI_0_2_FN(14)
> +#define PSCI_1_0_FN_SET_SUSPEND_MODE PSCI_0_2_FN(15)
>
> #define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14)
>
> @@ -97,6 +98,10 @@
> #define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK \
> (0x1 << PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT)
>
> +#define PSCI_1_0_OS_INITIATED BIT(0)
> +#define PSCI_1_0_SUSPEND_MODE_PC 0
> +#define PSCI_1_0_SUSPEND_MODE_OSI 1
> +
> /* PSCI return values (inclusive of all PSCI versions) */
> #define PSCI_RET_SUCCESS 0
> #define PSCI_RET_NOT_SUPPORTED -1
> --
> 2.17.1
>
prev parent reply other threads:[~2019-03-01 17:32 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 13:59 [PATCH 0/7] drivers: firmware: psci: Some cleanup and refactoring Ulf Hansson
2019-02-28 13:59 ` [PATCH 1/7] drivers: firmware: psci: Move psci to separate directory Ulf Hansson
2019-02-28 14:34 ` Daniel Lezcano
2019-03-01 17:03 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 2/7] MAINTAINERS: Update files for PSCI Ulf Hansson
2019-02-28 14:35 ` Daniel Lezcano
2019-03-01 17:04 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 3/7] drivers: firmware: psci: Split psci_dt_cpu_init_idle() Ulf Hansson
2019-02-28 14:42 ` Daniel Lezcano
2019-02-28 22:13 ` Ulf Hansson
2019-03-01 17:07 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 4/7] ARM/ARM64: cpuidle: Let back-end init ops take the driver as input Ulf Hansson
2019-02-28 15:30 ` Daniel Lezcano
2019-03-01 17:31 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 5/7] drivers: firmware: psci: Simplify state node parsing Ulf Hansson
2019-02-28 15:40 ` Daniel Lezcano
2019-02-28 22:26 ` Ulf Hansson
2019-02-28 22:41 ` Daniel Lezcano
2019-03-01 17:28 ` Mark Rutland
2019-03-04 10:14 ` Ulf Hansson
2019-03-06 18:15 ` Lorenzo Pieralisi
2019-03-08 10:36 ` Ulf Hansson
2019-03-08 11:49 ` Lorenzo Pieralisi
2019-03-08 13:07 ` Ulf Hansson
2019-03-08 13:17 ` Lorenzo Pieralisi
2019-03-08 13:23 ` Ulf Hansson
2019-03-08 13:31 ` Lorenzo Pieralisi
2019-03-08 13:43 ` Ulf Hansson
2019-02-28 13:59 ` [PATCH 6/7] drivers: firmware: psci: Simplify error path of psci_dt_init() Ulf Hansson
2019-02-28 13:59 ` [PATCH 7/7] drivers: firmware: psci: Announce support for OS initiated suspend mode Ulf Hansson
2019-03-01 17:28 ` Stephen Boyd
2019-03-04 10:25 ` Ulf Hansson
2019-03-01 17:32 ` Mark Rutland [this message]
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=20190301173238.GT15517@lakrids.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=ilina@codeaurora.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=rjw@rjwysocki.net \
--cc=sudeep.holla@arm.com \
--cc=ulf.hansson@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).