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

Commit 4efa1a86 authored by Marc Zyngier's avatar Marc Zyngier Committed by Greg Kroah-Hartman
Browse files

arm/arm64: KVM: Add PSCI_VERSION helper 




Commit d0a144f12a7c upstream.

As we're about to trigger a PSCI version explosion, it doesn't
hurt to introduce a PSCI_VERSION helper that is going to be
used everywhere.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 591862b5

include/kvm/arm_psci.h

+4 −2
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
#ifndef __KVM_ARM_PSCI_H__

#define __KVM_ARM_PSCI_H__



#define KVM_ARM_PSCI_0_1	1

#define KVM_ARM_PSCI_0_2	2

#include <uapi/linux/psci.h>



#define KVM_ARM_PSCI_0_1	PSCI_VERSION(0, 1)

#define KVM_ARM_PSCI_0_2	PSCI_VERSION(0, 2)



int kvm_psci_version(struct kvm_vcpu *vcpu);

int kvm_psci_call(struct kvm_vcpu *vcpu);

include/uapi/linux/psci.h

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ 
		(((ver) & PSCI_VERSION_MAJOR_MASK) >> PSCI_VERSION_MAJOR_SHIFT)

#define PSCI_VERSION_MINOR(ver)			\

		((ver) & PSCI_VERSION_MINOR_MASK)

#define PSCI_VERSION(maj, min)						\

	((((maj) << PSCI_VERSION_MAJOR_SHIFT) & PSCI_VERSION_MAJOR_MASK) | \

	 ((min) & PSCI_VERSION_MINOR_MASK))



/* PSCI features decoding (>=1.0) */

#define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT	1

virt/kvm/arm/psci.c

+1 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


#include <kvm/arm_psci.h>



#include <uapi/linux/psci.h>



/*

 * This is an implementation of the Power State Coordination Interface

 * as described in ARM document number ARM DEN 0022A.
@@ -222,7 +220,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) 
		 * Bits[31:16] = Major Version = 0

		 * Bits[15:0] = Minor Version = 2

		 */

		val = 2;

		val = KVM_ARM_PSCI_0_2;

		break;

	case PSCI_0_2_FN_CPU_SUSPEND:

	case PSCI_0_2_FN64_CPU_SUSPEND: