Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bab0b430 authored by Anup Patel's avatar Anup Patel Committed by Christoffer Dall
Browse files

ARM/ARM64: KVM: Emulate PSCI v0.2 MIGRATE_INFO_TYPE and related functions 



This patch adds emulation of PSCI v0.2 MIGRATE, MIGRATE_INFO_TYPE, and
MIGRATE_INFO_UP_CPU function calls for KVM ARM/ARM64.

KVM ARM/ARM64 being a hypervisor (and not a Trusted OS), we cannot provide
this functions hence we emulate these functions in following way:
1. MIGRATE - Returns "Not Supported"
2. MIGRATE_INFO_TYPE - Return 2 i.e. Trusted OS is not present
3. MIGRATE_INFO_UP_CPU - Returns "Not Supported"

Signed-off-by: default avatarAnup Patel <anup.patel@linaro.org>
Signed-off-by: default avatarPranavkumar Sawargaonkar <pranavkumar@linaro.org>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent e6bc13c8

arch/arm/kvm/psci.c

+16 −5
Original line number Diff line number Diff line
@@ -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: