summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/psci.h
diff options
context:
space:
mode:
authorMarc Zyngier2018-02-06 18:56:09 +0100
committerCatalin Marinas2018-02-06 23:53:56 +0100
commitd0a144f12a7ca8368933eae6583c096c363ec506 (patch)
tree9cfb945f9b554eba767ec62bd61d901beb596f0f /include/uapi/linux/psci.h
parentarm/arm64: KVM: Consolidate the PSCI include files (diff)
downloadkernel-qcow2-linux-d0a144f12a7ca8368933eae6583c096c363ec506.tar.gz
kernel-qcow2-linux-d0a144f12a7ca8368933eae6583c096c363ec506.tar.xz
kernel-qcow2-linux-d0a144f12a7ca8368933eae6583c096c363ec506.zip
arm/arm64: KVM: Add PSCI_VERSION helper
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>
Diffstat (limited to 'include/uapi/linux/psci.h')
-rw-r--r--include/uapi/linux/psci.h3
1 files changed, 3 insertions, 0 deletions
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