1 files changed, 16 insertions, 5 deletions

diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
index 3b6a0cf25c7d..cce901a510fa 100644
--- a/arch/arm/kvm/psci.c
+++ b/arch/arm/kvm/psci.c
@@ -182,6 +182,22 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
         case PSCI_0_2_FN64_AFFINITY_INFO:
                 val = kvm_psci_vcpu_affinity_info(vcpu);
                 break;
+        case PSCI_0_2_FN_MIGRATE:
+        case PSCI_0_2_FN64_MIGRATE:
+                val = PSCI_RET_NOT_SUPPORTED;
+                break;
+        case PSCI_0_2_FN_MIGRATE_INFO_TYPE:
+                /*
+                 * Trusted OS is MP hence does not require migration
+                 * or
+                 * Trusted OS is not present
+                 */
+                val = PSCI_0_2_TOS_MP;
+                break;
+        case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU:
+        case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU:
+                val = PSCI_RET_NOT_SUPPORTED;
+                break;
         case PSCI_0_2_FN_SYSTEM_OFF:
                 kvm_psci_system_off(vcpu);
                 /*
@@ -207,12 +223,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
                 ret = 0;
                 break;
         case PSCI_0_2_FN_CPU_SUSPEND:
-        case PSCI_0_2_FN_MIGRATE:
-        case PSCI_0_2_FN_MIGRATE_INFO_TYPE:
-        case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU:
         case PSCI_0_2_FN64_CPU_SUSPEND:
-        case PSCI_0_2_FN64_MIGRATE:
-        case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU:
                 val = PSCI_RET_NOT_SUPPORTED;
                 break;
         default: