[2/3] arm64/kvm: use ESR_ELx_EC to extract EC

Message ID	1464694383-31700-3-git-send-email-mark.rutland@arm.com
State	Accepted
Commit	561454e25dfa27aeac9e9d05f88ce7cb43d02d71
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; From: Mark Rutland <mark.rutland@arm.com> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] arm64/kvm: use ESR_ELx_EC to extract EC Date: Tue, 31 May 2016 12:33:02 +0100 Message-Id: <1464694383-31700-3-git-send-email-mark.rutland@arm.com> In-Reply-To: <1464694383-31700-1-git-send-email-mark.rutland@arm.com> References: <1464694383-31700-1-git-send-email-mark.rutland@arm.com> summary: Content analysis details: (-8.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.101.70 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Precedence: list Cc: mark.rutland@arm.com, marc.zyngier@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, kvmarm@lists.cs.columbia.edu, james.morse@arm.com, shijie.huang@arm.com, dave.martin@arm.com, christoffer.dall@linaro.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org

Message ID

1464694383-31700-3-git-send-email-mark.rutland@arm.com

State

Accepted

Commit

561454e25dfa27aeac9e9d05f88ce7cb43d02d71

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org
	designates 2001:1868:205::9 as permitted sender)
	client-ip=2001:1868:205::9; 
From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] arm64/kvm: use ESR_ELx_EC to extract EC
Date: Tue, 31 May 2016 12:33:02 +0100
Message-Id: <1464694383-31700-3-git-send-email-mark.rutland@arm.com>
In-Reply-To: <1464694383-31700-1-git-send-email-mark.rutland@arm.com>
References: <1464694383-31700-1-git-send-email-mark.rutland@arm.com>
Precedence: list
Cc: mark.rutland@arm.com, marc.zyngier@arm.com, catalin.marinas@arm.com,
	will.deacon@arm.com, kvmarm@lists.cs.columbia.edu, james.morse@arm.com,
	shijie.huang@arm.com, dave.martin@arm.com, christoffer.dall@linaro.org
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org

Commit Message

Mark Rutland May 31, 2016, 11:33 a.m. UTC

Now that we have a helper to extract the EC from an ESR_ELx value, make
use of this in the arm64 KVM code for simplicity and consistency. There
should be no functional changes as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Dave P Martin <dave.martin@arm.com>
Cc: Huang Shijie <shijie.huang@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
---
 arch/arm64/include/asm/kvm_emulate.h | 2 +-
 arch/arm64/kvm/handle_exit.c         | 4 ++--
 arch/arm64/kvm/hyp/switch.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

-- 
1.9.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Comments

Christoffer Dall May 31, 2016, 2:35 p.m. UTC | #1

On Tue, May 31, 2016 at 12:33:02PM +0100, Mark Rutland wrote:
> Now that we have a helper to extract the EC from an ESR_ELx value, make

> use of this in the arm64 KVM code for simplicity and consistency. There

> should be no functional changes as a result of this patch.

> 

> Signed-off-by: Mark Rutland <mark.rutland@arm.com>

> Cc: Catalin Marinas <catalin.marinas@arm.com>

> Cc: Christoffer Dall <christoffer.dall@linaro.org>

> Cc: Dave P Martin <dave.martin@arm.com>

> Cc: Huang Shijie <shijie.huang@arm.com>

> Cc: James Morse <james.morse@arm.com>

> Cc: Marc Zyngier <marc.zyngier@arm.com>

> Cc: Will Deacon <will.deacon@arm.com>

> Cc: kvmarm@lists.cs.columbia.edu


Acked-by: Christoffer Dall <christoffer.dall@linaro.org>


> ---

>  arch/arm64/include/asm/kvm_emulate.h | 2 +-

>  arch/arm64/kvm/handle_exit.c         | 4 ++--

>  arch/arm64/kvm/hyp/switch.c          | 2 +-

>  3 files changed, 4 insertions(+), 4 deletions(-)

> 

> diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h

> index 40bc168..4cdeae3 100644

> --- a/arch/arm64/include/asm/kvm_emulate.h

> +++ b/arch/arm64/include/asm/kvm_emulate.h

> @@ -210,7 +210,7 @@ static inline bool kvm_vcpu_trap_il_is32bit(const struct kvm_vcpu *vcpu)

>  

>  static inline u8 kvm_vcpu_trap_get_class(const struct kvm_vcpu *vcpu)

>  {

> -	return kvm_vcpu_get_hsr(vcpu) >> ESR_ELx_EC_SHIFT;

> +	return ESR_ELx_EC(kvm_vcpu_get_hsr(vcpu));

>  }

>  

>  static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu)

> diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c

> index 3246c4a..fa96fe2 100644

> --- a/arch/arm64/kvm/handle_exit.c

> +++ b/arch/arm64/kvm/handle_exit.c

> @@ -106,7 +106,7 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run)

>  	run->exit_reason = KVM_EXIT_DEBUG;

>  	run->debug.arch.hsr = hsr;

>  

> -	switch (hsr >> ESR_ELx_EC_SHIFT) {

> +	switch (ESR_ELx_EC(hsr)) {

>  	case ESR_ELx_EC_WATCHPT_LOW:

>  		run->debug.arch.far = vcpu->arch.fault.far_el2;

>  		/* fall through */

> @@ -149,7 +149,7 @@ static exit_handle_fn arm_exit_handlers[] = {

>  static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)

>  {

>  	u32 hsr = kvm_vcpu_get_hsr(vcpu);

> -	u8 hsr_ec = hsr >> ESR_ELx_EC_SHIFT;

> +	u8 hsr_ec = ESR_ELx_EC(hsr);

>  

>  	if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) ||

>  	    !arm_exit_handlers[hsr_ec]) {

> diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c

> index 437cfad..4373997 100644

> --- a/arch/arm64/kvm/hyp/switch.c

> +++ b/arch/arm64/kvm/hyp/switch.c

> @@ -198,7 +198,7 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)

>  static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu)

>  {

>  	u64 esr = read_sysreg_el2(esr);

> -	u8 ec = esr >> ESR_ELx_EC_SHIFT;

> +	u8 ec = ESR_ELx_EC(esr);

>  	u64 hpfar, far;

>  

>  	vcpu->arch.fault.esr_el2 = esr;

> -- 

> 1.9.1

> 


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 40bc168..4cdeae3 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -210,7 +210,7 @@  static inline bool kvm_vcpu_trap_il_is32bit(const struct kvm_vcpu *vcpu)
 
 static inline u8 kvm_vcpu_trap_get_class(const struct kvm_vcpu *vcpu)
 {
-	return kvm_vcpu_get_hsr(vcpu) >> ESR_ELx_EC_SHIFT;
+	return ESR_ELx_EC(kvm_vcpu_get_hsr(vcpu));
 }
 
 static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu)
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 3246c4a..fa96fe2 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -106,7 +106,7 @@  static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run)
 	run->exit_reason = KVM_EXIT_DEBUG;
 	run->debug.arch.hsr = hsr;
 
-	switch (hsr >> ESR_ELx_EC_SHIFT) {
+	switch (ESR_ELx_EC(hsr)) {
 	case ESR_ELx_EC_WATCHPT_LOW:
 		run->debug.arch.far = vcpu->arch.fault.far_el2;
 		/* fall through */
@@ -149,7 +149,7 @@  static exit_handle_fn arm_exit_handlers[] = {
 static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)
 {
 	u32 hsr = kvm_vcpu_get_hsr(vcpu);
-	u8 hsr_ec = hsr >> ESR_ELx_EC_SHIFT;
+	u8 hsr_ec = ESR_ELx_EC(hsr);
 
 	if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) ||
 	    !arm_exit_handlers[hsr_ec]) {
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
index 437cfad..4373997 100644
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -198,7 +198,7 @@  static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
 static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu)
 {
 	u64 esr = read_sysreg_el2(esr);
-	u8 ec = esr >> ESR_ELx_EC_SHIFT;
+	u8 ec = ESR_ELx_EC(esr);
 	u64 hpfar, far;
 
 	vcpu->arch.fault.esr_el2 = esr;

[2/3] arm64/kvm: use ESR_ELx_EC to extract EC

Commit Message

Comments

Patch