diff options
| author |   Mark Rutland <mark.rutland@arm.com> | 2019-08-09 14:22:43 +0100 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2019-10-14 10:55:14 +0100 |
| commit | a5520eac4d2dafb7a48c1b0f1c486afcebd6fe0d (patch) | |
| tree | 08b387a4747a0229dd02786091fea1ef7e983253 /include/linux/psci.h | |
| parent | arm: spectre-v2: use arm_smccc_1_1_get_conduit() (diff) | |
| download | wireguard-linux-a5520eac4d2dafb7a48c1b0f1c486afcebd6fe0d.tar.xz wireguard-linux-a5520eac4d2dafb7a48c1b0f1c486afcebd6fe0d.zip | |
firmware/psci: use common SMCCC_CONDUIT_*
Now that we have common SMCCC_CONDUIT_* definitions, migrate the PSCI
code over to them, and kill off the old PSCI_CONDUIT_* definitions.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'include/linux/psci.h')
| -rw-r--r-- | include/linux/psci.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index e2bacc6fd2f2..ebe0a881d13d 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -7,6 +7,7 @@ #ifndef __LINUX_PSCI_H #define __LINUX_PSCI_H +#include <linux/arm-smccc.h> #include <linux/init.h> #include <linux/types.h> @@ -18,12 +19,6 @@ bool psci_tos_resident_on(int cpu); int psci_cpu_suspend_enter(u32 state); bool psci_power_state_is_valid(u32 state); -enum psci_conduit { - PSCI_CONDUIT_NONE, - PSCI_CONDUIT_SMC, - PSCI_CONDUIT_HVC, -}; - enum smccc_version { SMCCC_VERSION_1_0, SMCCC_VERSION_1_1, @@ -38,7 +33,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; + enum arm_smccc_conduit conduit; enum smccc_version smccc_version; }; |