All of lore.kernel.org
 help / color / mirror / Atom feed
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 17/19] arm64: KVM: move hcr_el2 setting into vgic-v2-switch.S
Date: Thu, 20 Mar 2014 11:53:04 +0000	[thread overview]
Message-ID: <1395316386-12617-18-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1395316386-12617-1-git-send-email-marc.zyngier@arm.com>

GICv3 requires the hcr_el2 switch to be tightly coupled with some
of the interrupt controller's register switch.

In order to have similar code paths, start moving the hcr_el2
manipulation code to the GICv2 switch code.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/kvm/hyp.S            | 7 -------
 arch/arm64/kvm/vgic-v2-switch.S | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index aed72d0..92b9120 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -335,11 +335,6 @@
 .endm
 
 .macro activate_traps
-	ldr	x2, [x0, #VCPU_IRQ_LINES]
-	ldr	x1, [x0, #VCPU_HCR_EL2]
-	orr	x2, x2, x1
-	msr	hcr_el2, x2
-
 	ldr	x2, =(CPTR_EL2_TTA)
 	msr	cptr_el2, x2
 
@@ -353,8 +348,6 @@
 .endm
 
 .macro deactivate_traps
-	mov	x2, #HCR_RW
-	msr	hcr_el2, x2
 	msr	cptr_el2, xzr
 	msr	hstr_el2, xzr
 
diff --git a/arch/arm64/kvm/vgic-v2-switch.S b/arch/arm64/kvm/vgic-v2-switch.S
index c5dc777..d36cd7a 100644
--- a/arch/arm64/kvm/vgic-v2-switch.S
+++ b/arch/arm64/kvm/vgic-v2-switch.S
@@ -85,6 +85,9 @@ CPU_BE(	rev	w5, w5 )
 	sub	w4, w4, #1
 	cbnz	w4, 1b
 2:
+	mov	x2, #HCR_RW
+	msr	hcr_el2, x2
+	isb
 .endm
 
 /*
@@ -92,6 +95,11 @@ CPU_BE(	rev	w5, w5 )
  * x0: Register pointing to VCPU struct
  */
 .macro restore_vgic_v2_state
+	ldr	x2, [x0, #VCPU_IRQ_LINES]
+	ldr	x1, [x0, #VCPU_HCR_EL2]
+	orr	x2, x2, x1
+	msr	hcr_el2, x2
+
 	/* Get VGIC VCTRL base into x2 */
 	ldr	x2, [x0, #VCPU_KVM]
 	kern_hyp_va	x2
-- 
1.8.3.4

  parent reply	other threads:[~2014-03-20 11:53 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-20 11:52 [PATCH v2 00/19] arm64: GICv3 support Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 01/19] ARM: GIC: move some bits of GICv2 to a library-type file Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 02/19] arm64: initial support for GICv3 Marc Zyngier
     [not found]   ` <CAMDttNew0S7xVVKge7AAR3W6bdQzKdvN9Z7cHPDUCq=jZ98q1A@mail.gmail.com>
2014-03-24 11:10     ` Marc Zyngier
     [not found]       ` <CABg9mcucJ_UouRbJ_Urirz6ita5uUvYuQkmeA1-Df00KSjFcnA@mail.gmail.com>
2014-03-25  7:33         ` Marc Zyngier
2014-03-25 10:13         ` Marc Zyngier
     [not found]           ` <CABg9mcsWrjsBaDbk0fdJPJdzhQ6jmgZOkDNG0_r7ZbWzcCdb0A@mail.gmail.com>
2014-03-25 19:29             ` Marc Zyngier
2014-03-24 19:03   ` Sudeep Holla
2014-03-24 19:07     ` Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 03/19] arm64: GICv3 device tree binding documentation Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 04/19] arm64: boot protocol documentation update for GICv3 Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 05/19] KVM: arm/arm64: vgic: move GICv2 registers to their own structure Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 06/19] KVM: ARM: vgic: introduce vgic_ops and LR manipulation primitives Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 07/19] KVM: ARM: vgic: abstract access to the ELRSR bitmap Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 08/19] KVM: ARM: vgic: abstract EISR bitmap access Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 09/19] KVM: ARM: vgic: abstract MISR decoding Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 10/19] KVM: ARM: vgic: move underflow handling to vgic_ops Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 11/19] KVM: ARM: vgic: abstract VMCR access Marc Zyngier
2014-03-20 11:52 ` [PATCH v2 12/19] KVM: ARM: vgic: introduce vgic_enable Marc Zyngier
2014-03-20 11:53 ` [PATCH v2 13/19] KVM: ARM: introduce vgic_params structure Marc Zyngier
2014-03-20 11:53 ` [PATCH v2 14/19] KVM: ARM: vgic: split GICv2 backend from the main vgic code Marc Zyngier
2014-03-20 11:53 ` [PATCH v2 15/19] arm64: KVM: remove __kvm_hyp_code_{start, end} from hyp.S Marc Zyngier
2014-03-20 11:53 ` [PATCH v2 16/19] arm64: KVM: split GICv2 world switch from hyp code Marc Zyngier
2014-03-20 11:53 ` Marc Zyngier [this message]
2014-03-20 11:53 ` [PATCH v2 18/19] KVM: ARM: vgic: add the GICv3 backend Marc Zyngier
2014-03-20 11:53 ` [PATCH v2 19/19] arm64: KVM: vgic: add GICv3 world switch Marc Zyngier

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=1395316386-12617-18-git-send-email-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=linux-arm-kernel@lists.infradead.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 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.