From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>,
Li Liu <john.liuli@huawei.com>,
Shannon Zhao <shannon.zhao@linaro.org>
Subject: [PATCH 3.14 12/17] ARM: virt: fix wrong HSCTLR.EE bit setting
Date: Fri, 26 Jun 2015 18:08:34 -0700 [thread overview]
Message-ID: <20150627010820.599133207@linuxfoundation.org> (raw)
In-Reply-To: <20150627010820.231673616@linuxfoundation.org>
3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Liu <john.liuli@huawei.com>
commit af92394efc8be73edd2301fc15f9b57fd430cd18 upstream.
HSCTLR.EE is defined as bit[25] referring to arm manual
DDI0606C.b(p1590).
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Li Liu <john.liuli@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm/kernel/hyp-stub.S | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -134,9 +134,7 @@ ENTRY(__hyp_stub_install_secondary)
mcr p15, 4, r7, c1, c1, 3 @ HSTR
THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE
-#ifdef CONFIG_CPU_BIG_ENDIAN
- orr r7, #(1 << 9) @ HSCTLR.EE
-#endif
+ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE
mcr p15, 4, r7, c1, c0, 0 @ HSCTLR
mrc p15, 4, r7, c1, c1, 1 @ HDCR
next prev parent reply other threads:[~2015-06-27 1:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-27 1:08 [PATCH 3.14 00/17] 3.14.46-stable review Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 01/17] crypto: caam - fix RNG buffer cache alignment Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 02/17] tracing: Have filter check for balanced ops Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 03/17] drm/mgag200: Reject non-character-cell-aligned mode widths Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 04/17] ath3k: Add support of 0489:e076 AR3012 device Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 05/17] ath3k: add support of 13d3:3474 " Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 06/17] pipe: iovec: Fix memory corruption when retrying atomic copy as non-atomic Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 07/17] lpfc: Add iotag memory barrier Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 08/17] arm/arm64: KVM: Fix and refactor unmap_range Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 09/17] ARM: KVM: Unmap IPA on memslot delete/move Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 10/17] ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping Greg Kroah-Hartman
2015-06-27 1:08 ` Greg Kroah-Hartman [this message]
2015-06-27 1:08 ` [PATCH 3.14 13/17] ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 14/17] KVM: ARM/arm64: fix non-const declaration of function returning const Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 15/17] KVM: ARM/arm64: fix broken __percpu annotation Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 16/17] KVM: ARM/arm64: avoid returning negative error code as bool Greg Kroah-Hartman
2015-06-27 1:08 ` [PATCH 3.14 17/17] KVM: vgic: return int instead of bool when checking I/O ranges Greg Kroah-Hartman
2015-06-27 3:12 ` [PATCH 3.14 00/17] 3.14.46-stable review Shuah Khan
2015-06-27 5:41 ` Guenter Roeck
2015-06-27 10:15 ` Sudip Mukherjee
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=20150627010820.599133207@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=john.liuli@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=shannon.zhao@linaro.org \
--cc=stable@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox