1 files changed, 16 insertions, 1 deletions

diff --git a/include/linux/psci.h b/include/linux/psci.h
index bdea1cb5e1db..8b1b3b5935ab 100644
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -25,7 +25,19 @@ bool psci_tos_resident_on(int cpu);
 int psci_cpu_init_idle(unsigned int cpu);
 int psci_cpu_suspend_enter(unsigned long index);
 
+enum psci_conduit {
+        PSCI_CONDUIT_NONE,
+        PSCI_CONDUIT_SMC,
+        PSCI_CONDUIT_HVC,
+};
+
+enum smccc_version {
+        SMCCC_VERSION_1_0,
+        SMCCC_VERSION_1_1,
+};
+
 struct psci_operations {
+        u32 (*get_version)(void);
         int (*cpu_suspend)(u32 state, unsigned long entry_point);
         int (*cpu_off)(u32 state);
         int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
@@ -33,6 +45,8 @@ struct psci_operations {
         int (*affinity_info)(unsigned long target_affinity,
                         unsigned long lowest_affinity_level);
         int (*migrate_info_type)(void);
+        enum psci_conduit conduit;
+        enum smccc_version smccc_version;
 };
 
 extern struct psci_operations psci_ops;
@@ -46,10 +60,11 @@ static inline int psci_dt_init(void) { return 0; }
 #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI)
 int __init psci_acpi_init(void);
 bool __init acpi_psci_present(void);
-bool __init acpi_psci_use_hvc(void);
+bool acpi_psci_use_hvc(void);
 #else
 static inline int psci_acpi_init(void) { return 0; }
 static inline bool acpi_psci_present(void) { return false; }
+static inline bool acpi_psci_use_hvc(void) {return false; }
 #endif
 
 #endif /* __LINUX_PSCI_H */