From: Christoffer Dall <christoffer.dall@linaro.org>
To: Matt Evans <matt.evans@arm.com>
Cc: marc.zyngier@arm.com, nd@arm.com, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] kvm: arm64: Fix EC field in inject_abt64
Date: Wed, 18 May 2016 21:53:47 +0200 [thread overview]
Message-ID: <20160518195347.GA26840@cbox> (raw)
In-Reply-To: <5739C320.6010602@arm.com>
On Mon, May 16, 2016 at 01:54:56PM +0100, Matt Evans wrote:
> The EC field of the constructed ESR is conditionally modified by ORing in
> ESR_ELx_EC_DABT_LOW for a data abort. However, ESR_ELx_EC_SHIFT is missing
> from this condition.
>
> Signed-off-by: Matt Evans <matt.evans@arm.com>
> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
> Cc: <stable@vger.kernel.org>
> ---
> arch/arm64/kvm/inject_fault.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
> index 4d1ac81..e9e0e6d 100644
> --- a/arch/arm64/kvm/inject_fault.c
> +++ b/arch/arm64/kvm/inject_fault.c
> @@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
> esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);
>
> if (!is_iabt)
> - esr |= ESR_ELx_EC_DABT_LOW;
> + esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
>
> vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
> }
> --
> 1.9.1
>
Applied to queue.
Thanks!
-Christoffer
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] kvm: arm64: Fix EC field in inject_abt64
Date: Wed, 18 May 2016 21:53:47 +0200 [thread overview]
Message-ID: <20160518195347.GA26840@cbox> (raw)
In-Reply-To: <5739C320.6010602@arm.com>
On Mon, May 16, 2016 at 01:54:56PM +0100, Matt Evans wrote:
> The EC field of the constructed ESR is conditionally modified by ORing in
> ESR_ELx_EC_DABT_LOW for a data abort. However, ESR_ELx_EC_SHIFT is missing
> from this condition.
>
> Signed-off-by: Matt Evans <matt.evans@arm.com>
> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
> Cc: <stable@vger.kernel.org>
> ---
> arch/arm64/kvm/inject_fault.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
> index 4d1ac81..e9e0e6d 100644
> --- a/arch/arm64/kvm/inject_fault.c
> +++ b/arch/arm64/kvm/inject_fault.c
> @@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
> esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);
>
> if (!is_iabt)
> - esr |= ESR_ELx_EC_DABT_LOW;
> + esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
>
> vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
> }
> --
> 1.9.1
>
Applied to queue.
Thanks!
-Christoffer
next prev parent reply other threads:[~2016-05-18 19:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-16 12:54 [PATCH] kvm: arm64: Fix EC field in inject_abt64 Matt Evans
2016-05-16 12:54 ` Matt Evans
2016-05-18 19:53 ` Christoffer Dall [this message]
2016-05-18 19:53 ` Christoffer Dall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160518195347.GA26840@cbox \
--to=christoffer.dall@linaro.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.com \
--cc=matt.evans@arm.com \
--cc=nd@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.