Merge tag 'stackleak-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / include / linux / psci.h

diff --git a/include/linux/psci.h b/include/linux/psci.h
index f724fd8c78e82699884864c39d2a7712c5893ca7..8b1b3b5935ab0fff113f7b270115461ceecd7e42 100644 (file)
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -25,6 +25,17 @@ 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);
@@ -34,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;