[v2] drivers: firmware: psci: add support for warm reset
diff mbox series

Message ID 20190403185123.15873-1-aaro.koskinen@iki.fi
State New
Headers show
Series
  • [v2] drivers: firmware: psci: add support for warm reset
Related show

Commit Message

Aaro Koskinen April 3, 2019, 6:51 p.m. UTC
From: Aaro Koskinen <aaro.koskinen@nokia.com>

Add support for warm reset using SYSTEM_RESET2 introduced in PSCI
1.1 specification.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
---

	v2: Added #define PSCI_1_1_SYSTEM_RESET_WARM. 
	    Refactored psci_probe.

	v1: https://marc.info/?l=linux-arm-kernel&m=155431514204495&w=2

 drivers/firmware/psci.c   | 42 ++++++++++++++++++++++++++++++++++-----
 include/uapi/linux/psci.h |  6 ++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

Comments

Sai Prakash Ranjan April 5, 2019, 3:28 a.m. UTC | #1
On 2019-04-04 00:21, Aaro Koskinen wrote:
> From: Aaro Koskinen <aaro.koskinen@nokia.com>
> 
> Add support for warm reset using SYSTEM_RESET2 introduced in PSCI
> 1.1 specification.
> 

There is already a patch sent by Sudeep for this support.

- 
https://lore.kernel.org/lkml/1525257003-8608-1-git-send-email-sudeep.holla@arm.com/
Aaro Koskinen April 5, 2019, 9:42 a.m. UTC | #2
Hi,

On Fri, Apr 05, 2019 at 08:58:30AM +0530, saiprakash.ranjan@codeaurora.org wrote:
> On 2019-04-04 00:21, Aaro Koskinen wrote:
> >From: Aaro Koskinen <aaro.koskinen@nokia.com>
> >
> >Add support for warm reset using SYSTEM_RESET2 introduced in PSCI
> >1.1 specification.
> >
> 
> There is already a patch sent by Sudeep for this support.
> 
> - https://lore.kernel.org/lkml/1525257003-8608-1-git-send-email-sudeep.holla@arm.com/

OK, I have missed that. Sudeep, are you planning to send a new version
of this patch? Looks like the last was sent almost a year ago.

A.
Sudeep Holla April 10, 2019, 11:42 a.m. UTC | #3
On Fri, Apr 05, 2019 at 12:42:43PM +0300, Aaro Koskinen wrote:
> Hi,
>
> On Fri, Apr 05, 2019 at 08:58:30AM +0530, saiprakash.ranjan@codeaurora.org wrote:
> > On 2019-04-04 00:21, Aaro Koskinen wrote:
> > >From: Aaro Koskinen <aaro.koskinen@nokia.com>
> > >
> > >Add support for warm reset using SYSTEM_RESET2 introduced in PSCI
> > >1.1 specification.
> > >
> >
> > There is already a patch sent by Sudeep for this support.
> >
> > - https://lore.kernel.org/lkml/1525257003-8608-1-git-send-email-sudeep.holla@arm.com/
>
> OK, I have missed that. Sudeep, are you planning to send a new version
> of this patch? Looks like the last was sent almost a year ago.
>

Sure I can, if there's a requirement and someone can test it.

--
Regards,
Sudeep
Koskinen, Aaro (Nokia - FI/Espoo) April 10, 2019, 12:19 p.m. UTC | #4
Hi,

From: Sudeep Holla [sudeep.holla@arm.com]:
> On Fri, Apr 05, 2019 at 12:42:43PM +0300, Aaro Koskinen wrote:
> > On Fri, Apr 05, 2019 at 08:58:30AM +0530, saiprakash.ranjan@codeaurora.org wrote:
> > > There is already a patch sent by Sudeep for this support.
> > >
> > > - https://lore.kernel.org/lkml/1525257003-8608-1-git-send-email-sudeep.holla@arm.com/
> >
> > OK, I have missed that. Sudeep, are you planning to send a new version
> > of this patch? Looks like the last was sent almost a year ago.
> >
>
> Sure I can, if there's a requirement and someone can test it.

Yes, I use this feature.

A.

Patch
diff mbox series

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index c80ec1d03274..004a394de2c3 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -73,6 +73,7 @@  enum psci_function {
 	PSCI_FN_CPU_ON,
 	PSCI_FN_CPU_OFF,
 	PSCI_FN_MIGRATE,
+	PSCI_FN_SYSTEM_RESET2,
 	PSCI_FN_MAX,
 };
 
@@ -256,6 +257,15 @@  static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
 	invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
 }
 
+static void psci_sys_reset2(enum reboot_mode reboot_mode, const char *cmd)
+{
+	if (reboot_mode == REBOOT_WARM)
+		invoke_psci_fn(psci_function_id[PSCI_FN_SYSTEM_RESET2],
+			       PSCI_1_1_SYSTEM_RESET_WARM, 0, 0);
+	else
+		psci_sys_reset(reboot_mode, cmd);
+}
+
 static void psci_sys_poweroff(void)
 {
 	invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0);
@@ -564,6 +574,20 @@  static void __init psci_0_2_set_functions(void)
 	pm_power_off = psci_sys_poweroff;
 }
 
+static void __init psci_1_1_set_functions(void)
+{
+	int sys_reset2;
+	int feature;
+
+	sys_reset2 = PSCI_FN_NATIVE(1_1, SYSTEM_RESET2);
+	feature	= psci_features(sys_reset2);
+
+	if (feature != PSCI_RET_NOT_SUPPORTED) {
+		psci_function_id[PSCI_FN_SYSTEM_RESET2] = sys_reset2;
+		arm_pm_restart = psci_sys_reset2;
+	}
+}
+
 /*
  * Probe function for PSCI firmware versions >= 0.2
  */
@@ -584,11 +608,19 @@  static int __init psci_probe(void)
 
 	psci_init_migrate();
 
-	if (PSCI_VERSION_MAJOR(ver) >= 1) {
-		psci_init_smccc();
-		psci_init_cpu_suspend();
-		psci_init_system_suspend();
-	}
+	if (ver < PSCI_VERSION(1, 0))
+		return 0;
+
+	/* PSCI 1.0 setup */
+	psci_init_smccc();
+	psci_init_cpu_suspend();
+	psci_init_system_suspend();
+
+	if (ver < PSCI_VERSION(1, 1))
+		return 0;
+
+	/* PSCI 1.1 setup */
+	psci_1_1_set_functions();
 
 	return 0;
 }
diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index b3bcabe380da..bf5a90c05e79 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -52,6 +52,12 @@ 
 
 #define PSCI_1_0_FN64_SYSTEM_SUSPEND		PSCI_0_2_FN64(14)
 
+#define PSCI_1_1_FN_SYSTEM_RESET2		PSCI_0_2_FN(18)
+#define PSCI_1_1_FN64_SYSTEM_RESET2		PSCI_0_2_FN64(18)
+
+/* PSCI v1.1 parameter values for SYSTEM_RESET2 */
+#define PSCI_1_1_SYSTEM_RESET_WARM		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