lkml.org 
[lkml]   [2018]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 32/45] arm/arm64: KVM: Add PSCI_VERSION helper
    Date
    From: Marc Zyngier <marc.zyngier@arm.com>

    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: Christoffer Dall <christoffer.dall@linaro.org>
    Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Alex Shi <alex.shi@linaro.org>
    ---
    arch/arm/kvm/psci.c | 2 +-
    include/kvm/arm_psci.h | 6 ++++--
    include/uapi/linux/psci.h | 3 +++
    3 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
    index 18f9e9d..4adfa28 100644
    --- a/arch/arm/kvm/psci.c
    +++ b/arch/arm/kvm/psci.c
    @@ -219,7 +219,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:
    diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h
    index 2042bb9..5659343 100644
    --- a/include/kvm/arm_psci.h
    +++ b/include/kvm/arm_psci.h
    @@ -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);
    diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
    index 3d7a0fc..39930ca 100644
    --- a/include/uapi/linux/psci.h
    +++ b/include/uapi/linux/psci.h
    @@ -87,6 +87,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
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-03-01 14:04    [W:3.137 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site