From: Mark Rutland <mark.rutland@arm•com>
To: Elliot Berman <eberman@codeaurora•org>
Cc: Trilok Soni <tsoni@codeaurora•org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm•com>,
David Collins <collinsd@codeaurora•org>,
linux-arm-msm@vger•kernel.org, linux-kernel@vger•kernel.org,
Bjorn Andersson <bjorn.andersson@linaro•org>,
Sudeep Holla <sudeep.holla@arm•com>,
Prasad Sodagudi <psodagud@codeaurora•org>,
linux-arm-kernel@lists•infradead.org
Subject: Re: [PATCH v3 2/3] firmware: psci: Add support for dt-supplied SYSTEM_RESET2 type
Date: Fri, 20 Mar 2020 12:04:12 +0000 [thread overview]
Message-ID: <20200320120412.GB36658@C02TD0UTHF1T.local> (raw)
In-Reply-To: <1583435129-31356-3-git-send-email-eberman@codeaurora.org>
On Thu, Mar 05, 2020 at 11:05:28AM -0800, Elliot Berman wrote:
> Some implementors of PSCI may wish to use a different reset type than
> SYSTEM_WARM_RESET. For instance, Qualcomm SoCs support an alternate
> reset_type which may be used in more warm reboot scenarios than
> SYSTEM_WARM_RESET permits (e.g. to reboot into recovery mode).
>
> Signed-off-by: Elliot Berman <eberman@codeaurora•org>
I think we need to discuss the expected semantics on patch 1, and as
things stand, I do not want to take this patch until we understand and
agree to how things should behave.
Thanks,
Mark.
> ---
> drivers/firmware/psci/psci.c | 21 +++++++++++++++++----
> include/uapi/linux/psci.h | 5 +++++
> 2 files changed, 22 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index 2937d44..43fe3af 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -90,6 +90,8 @@ static u32 psci_function_id[PSCI_FN_MAX];
>
> static u32 psci_cpu_suspend_feature;
> static bool psci_system_reset2_supported;
> +static u32 psci_sys_reset2_reset_param =
> + PSCI_1_1_SYSTEM_RESET2_SYSTEM_WARM_RESET;
>
> static inline bool psci_has_ext_power_state(void)
> {
> @@ -272,11 +274,10 @@ static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
> if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) &&
> psci_system_reset2_supported) {
> /*
> - * reset_type[31] = 0 (architectural)
> - * reset_type[30:0] = 0 (SYSTEM_WARM_RESET)
> * cookie = 0 (ignored by the implementation)
> */
> - invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, 0, 0);
> + invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2),
> + psci_sys_reset2_reset_param, 0, 0);
> } else {
> invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
> }
> @@ -493,6 +494,7 @@ typedef int (*psci_initcall_t)(const struct device_node *);
> static int __init psci_0_2_init(struct device_node *np)
> {
> int err;
> + u32 param;
>
> err = get_set_conduit_method(np);
> if (err)
> @@ -505,7 +507,18 @@ static int __init psci_0_2_init(struct device_node *np)
> * can be carried out according to the specific version reported
> * by firmware
> */
> - return psci_probe();
> + err = psci_probe();
> + if (err)
> + return err;
> +
> + if (psci_system_reset2_supported &&
> + !of_property_read_u32(np, "arm,psci-sys-reset2-vendor-param", ¶m)) {
> + psci_sys_reset2_reset_param = param |
> + (PSCI_1_1_SYSTEM_RESET2_OWNER_VENDOR <<
> + PSCI_1_1_SYSTEM_RESET2_OWNER_SHIFT);
> + }
> +
> + return 0;
> }
>
> /*
> diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
> index 2fcad1d..0829175 100644
> --- a/include/uapi/linux/psci.h
> +++ b/include/uapi/linux/psci.h
> @@ -55,6 +55,11 @@
> #define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14)
> #define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18)
>
> +#define PSCI_1_1_SYSTEM_RESET2_OWNER_SHIFT 31
> +#define PSCI_1_1_SYSTEM_RESET2_OWNER_ARCH 0
> +#define PSCI_1_1_SYSTEM_RESET2_OWNER_VENDOR 1
> +#define PSCI_1_1_SYSTEM_RESET2_SYSTEM_WARM_RESET 0
> +
> /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
> #define PSCI_0_2_POWER_STATE_ID_MASK 0xffff
> #define PSCI_0_2_POWER_STATE_ID_SHIFT 0
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
_______________________________________________
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:[~2020-03-20 12:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 19:05 [PATCH v3 0/3] ARM PSCI: Add support for vendor-specific SYSTEM_RESET2 Elliot Berman
2020-03-05 19:05 ` [PATCH v3 1/3] dt: psci: Add arm, psci-sys-reset2-vendor-param property Elliot Berman
2020-03-20 12:01 ` [PATCH v3 1/3] dt: psci: Add arm,psci-sys-reset2-vendor-param property Mark Rutland
2023-06-13 20:54 ` Elliot Berman
2020-03-05 19:05 ` [PATCH v3 2/3] firmware: psci: Add support for dt-supplied SYSTEM_RESET2 type Elliot Berman
2020-03-20 12:04 ` Mark Rutland [this message]
2020-03-05 19:05 ` [PATCH v3 3/3] arm64: dts: qcom: sm8250: Add vendor-specific PSCI system reset2 type Elliot Berman
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=20200320120412.GB36658@C02TD0UTHF1T.local \
--to=mark.rutland@arm$(echo .)com \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=collinsd@codeaurora$(echo .)org \
--cc=eberman@codeaurora$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-arm-msm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=lorenzo.pieralisi@arm$(echo .)com \
--cc=psodagud@codeaurora$(echo .)org \
--cc=sudeep.holla@arm$(echo .)com \
--cc=tsoni@codeaurora$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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