[32/52] arm/arm64: KVM: Add PSCI_VERSION helper

Message ID	1519633227-29832-33-git-send-email-alex.shi@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Alex Shi <alex.shi@linaro.org> To: Marc Zyngier <marc.zyngier@arm.com>, Will Deacon <will.deacon@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, stable@vger.kernel.org, Christoffer Dall <christoffer.dall@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>, Russell King <linux@armlinux.org.uk>, Mark Rutland <mark.rutland@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, linux-arm-kernel@lists.infradead.org (moderated list:KERNEL VIRTUAL MACHINE (KVM) FOR ARM), kvmarm@lists.cs.columbia.edu (open list:KERNEL VIRTUAL MACHINE (KVM) FOR ARM), kvm@vger.kernel.org (open list:KERNEL VIRTUAL MACHINE (KVM)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 32/52] arm/arm64: KVM: Add PSCI_VERSION helper Date: Mon, 26 Feb 2018 16:20:06 +0800 Message-Id: <1519633227-29832-33-git-send-email-alex.shi@linaro.org> In-Reply-To: <1519633227-29832-1-git-send-email-alex.shi@linaro.org> References: <1519633227-29832-1-git-send-email-alex.shi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [02/52] arm64: alternatives: apply boot time fixups via the linear mapping [03/52] arm64: barrier: Add CSDB macros to control data-value prediction [04/52] arm64: Implement array_index_mask_nospec() [05/52] arm64: move TASK_* definitions to <asm/processor.h> [08/52] arm64: uaccess: consistently check object sizes [09/52] arm64: Make USER_DS an inclusive limit [10/52] arm64: Use pointer masking to limit uaccess speculation [11/52] arm64: syscallno is secretly an int, make it official [12/52] arm64: entry: Ensure branch through syscall table is bounded under speculation [13/52] arm64: uaccess: Prevent speculative use of the current addr_limit [14/52] arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_user [15/52] arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user [16/52] arm64: futex: Mask __user pointers prior to dereference [17/52] drivers/firmware: Expose psci_get_version through psci_ops structure [18/52] arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early [19/52] arm64: cpu_errata: Allow an erratum to be match for all revisions of a core [22/52] arm64: Move post_ttbr_update_workaround to C code [23/52] arm64: Add skeleton to harden the branch predictor against aliasing attacks [24/52] arm64: Move BP hardening to check_and_switch_context [29/52] arm64: Implement branch predictor hardening for affected Cortex-A CPUs [31/52] arm/arm64: KVM: Consolidate the PSCI include files [32/52] arm/arm64: KVM: Add PSCI_VERSION helper [36/52] arm64: KVM: Make PSCI_VERSION a fast path [39/52] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling [40/52] firmware/psci: Expose PSCI conduit [41/52] firmware/psci: Expose SMCCC version through psci_ops [42/52] arm/arm64: smccc: Make function identifiers an unsigned quantity [43/52] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive [44/52] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support [45/52] arm64: Kill PSCI_GET_VERSION as a variant-2 workaround [46/52] arm: Add BTB invalidation on switch_mm for Cortex-A9, A12 and A17 [48/52] arm: KVM: Invalidate BTB on guest exit for Cortex-A12/A17

Message ID

1519633227-29832-33-git-send-email-alex.shi@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Alex Shi <alex.shi@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>, Will Deacon <will.deacon@arm.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>, 
	Catalin Marinas <catalin.marinas@arm.com>, stable@vger.kernel.org,
	Christoffer Dall <christoffer.dall@linaro.org>, Paolo Bonzini
	<pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?=
	<rkrcmar@redhat.com>,         Russell King <linux@armlinux.org.uk>,
	Mark Rutland <mark.rutland@arm.com>, 
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	linux-arm-kernel@lists.infradead.org (moderated list:KERNEL VIRTUAL
	MACHINE (KVM) FOR ARM), kvmarm@lists.cs.columbia.edu (open
	list:KERNEL VIRTUAL MACHINE (KVM)         FOR ARM),
	kvm@vger.kernel.org (open list:KERNEL VIRTUAL MACHINE (KVM)), 
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 32/52] arm/arm64: KVM: Add PSCI_VERSION helper
Date: Mon, 26 Feb 2018 16:20:06 +0800
Message-Id: <1519633227-29832-33-git-send-email-alex.shi@linaro.org>
In-Reply-To: <1519633227-29832-1-git-send-email-alex.shi@linaro.org>
References: <1519633227-29832-1-git-send-email-alex.shi@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Alex Shi Feb. 26, 2018, 8:20 a.m. UTC

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>


Conflicts:
	mv change form virt/kvm/arm/psci.c to arch/arm/kvm/psci.c
---
 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(-)

-- 
2.7.4

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

[32/52] arm/arm64: KVM: Add PSCI_VERSION helper

Commit Message

Patch