1 files changed, 20 insertions, 1 deletions

diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
index e480e0af632c..eabd01383cd6 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},
         {},
 };