2 files changed, 25 insertions, 1 deletions

diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
index eabd01383cd6..fe090ef43d28 100644
--- a/drivers/firmware/psci/psci.c
+++ b/drivers/firmware/psci/psci.c
@@ -88,6 +88,7 @@ static u32 psci_function_id[PSCI_FN_MAX];
                                 PSCI_1_0_EXT_POWER_STATE_TYPE_MASK)
 
 static u32 psci_cpu_suspend_feature;
+static bool psci_system_reset2_supported;
 
 static inline bool psci_has_ext_power_state(void)
 {
@@ -258,7 +259,17 @@ static int get_set_conduit_method(struct device_node *np)
 
 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);
+        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);
+        } else {
+                invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
+        }
 }
 
 static void psci_sys_poweroff(void)
@@ -460,6 +471,16 @@ static const struct platform_suspend_ops psci_suspend_ops = {
         .enter          = psci_system_suspend_enter,
 };
 
+static void __init psci_init_system_reset2(void)
+{
+        int ret;
+
+        ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2));
+
+        if (ret != PSCI_RET_NOT_SUPPORTED)
+                psci_system_reset2_supported = true;
+}
+
 static void __init psci_init_system_suspend(void)
 {
         int ret;
@@ -597,6 +618,7 @@ static int __init psci_probe(void)
                 psci_init_smccc();
                 psci_init_cpu_suspend();
                 psci_init_system_suspend();
+                psci_init_system_reset2();
         }
 
         return 0;
diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index 581f72085c33..2fcad1dd0b0e 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -50,8 +50,10 @@
 #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_1_FN_SYSTEM_RESET2               PSCI_0_2_FN(18)
 
 #define PSCI_1_0_FN64_SYSTEM_SUSPEND            PSCI_0_2_FN64(14)
+#define PSCI_1_1_FN64_SYSTEM_RESET2             PSCI_0_2_FN64(18)
 
 /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
 #define PSCI_0_2_POWER_STATE_ID_MASK            0xffff