firmware/psci: Expose PSCI conduit

In order to call into the firmware to apply workarounds, it is
useful to find out whether we're using HVC or SMC. Let's expose
this through the psci_ops.

Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/psci.h b/include/linux/psci.h
index f724fd8c78e8..f2679e5faa4f 100644
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -25,6 +25,12 @@ 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,
+};
+
 struct psci_operations {
         u32 (*get_version)(void);
         int (*cpu_suspend)(u32 state, unsigned long entry_point);
@@ -34,6 +40,7 @@ struct psci_operations {
         int (*affinity_info)(unsigned long target_affinity,
                         unsigned long lowest_affinity_level);
         int (*migrate_info_type)(void);
+        enum psci_conduit conduit;
 };
 
 extern struct psci_operations psci_ops;