On Thu, Feb 01, 2018 at 11:46:44AM +0000, Marc Zyngier wrote: > 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.d...@linaro.org> > Signed-off-by: Marc Zyngier <marc.zyng...@arm.com> > --- > include/kvm/arm_psci.h | 6 ++++-- > include/uapi/linux/psci.h | 3 +++ > virt/kvm/arm/psci.c | 4 +--- > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h > index 2042bb909474..5659343580a3 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 760e52a9640f..b3bcabe380da 100644 > --- a/include/uapi/linux/psci.h > +++ b/include/uapi/linux/psci.h > @@ -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 > diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c > index b322e46fd142..999f94d6bb98 100644 > --- a/virt/kvm/arm/psci.c > +++ b/virt/kvm/arm/psci.c > @@ -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: > -- > 2.14.2 > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
