imx: mx7: psci: implement MIGRATE_INFO_TYPE
authorStefan Agner <stefan.agner@toradex.com>
Sun, 24 Jun 2018 19:09:58 +0000 (21:09 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 23 Jul 2018 08:54:32 +0000 (10:54 +0200)
Implement MIGRATE_INFO_TYPE. This informs Linux that no migration
for the trusted operating system is necessary:
  [    0.000000] psci: Trusted OS migration not required

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
arch/arm/mach-imx/mx7/psci-mx7.c

index cd72449d9b5d2cd3ade0df20fdb4614ea4fe646c..aae96c553f0ae566bf7722776a44980ef334d010 100644 (file)
@@ -201,6 +201,12 @@ __secure s32 psci_affinity_info(u32 __always_unused function_id,
        return psci_state[cpu];
 }
 
+__secure s32 psci_migrate_info_type(u32 function_id)
+{
+       /* Trusted OS is either not present or does not require migration */
+       return 2;
+}
+
 __secure s32 psci_features(u32 __always_unused function_id, u32 psci_fid)
 {
        switch (psci_fid) {
@@ -208,6 +214,7 @@ __secure s32 psci_features(u32 __always_unused function_id, u32 psci_fid)
        case ARM_PSCI_0_2_FN_CPU_OFF:
        case ARM_PSCI_0_2_FN_CPU_ON:
        case ARM_PSCI_0_2_FN_AFFINITY_INFO:
+       case ARM_PSCI_0_2_FN_MIGRATE_INFO_TYPE:
        case ARM_PSCI_0_2_FN_SYSTEM_OFF:
        case ARM_PSCI_0_2_FN_SYSTEM_RESET:
        case ARM_PSCI_1_0_FN_PSCI_FEATURES: