From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/15] irqchip: arm-gic: Define additional MMIO offsets and masks
Date: Sat, 28 Dec 2013 11:15:38 +0000 [thread overview]
Message-ID: <1388229347-24185-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1388229347-24185-1-git-send-email-marc.zyngier@arm.com>
From: Christoffer Dall <christoffer.dall@linaro.org>
Define CPU interface offsets for the GICC_ABPR, GICC_APR, and GICC_IIDR
registers. Define distributor registers for the GICD_SPENDSGIR and the
GICD_CPENDSGIR. KVM/ARM needs to know about these definitions to fully
support save/restore of the VGIC.
Also define some masks and shifts for the various GICH_VMCR fields.
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
include/linux/irqchip/arm-gic.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index cac496b..0ceb389 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -17,6 +17,9 @@
#define GIC_CPU_EOI 0x10
#define GIC_CPU_RUNNINGPRI 0x14
#define GIC_CPU_HIGHPRI 0x18
+#define GIC_CPU_ALIAS_BINPOINT 0x1c
+#define GIC_CPU_ACTIVEPRIO 0xd0
+#define GIC_CPU_IDENT 0xfc
#define GIC_DIST_CTRL 0x000
#define GIC_DIST_CTR 0x004
@@ -56,6 +59,15 @@
#define GICH_LR_ACTIVE_BIT (1 << 29)
#define GICH_LR_EOI (1 << 19)
+#define GICH_VMCR_CTRL_SHIFT 0
+#define GICH_VMCR_CTRL_MASK (0x21f << GICH_VMCR_CTRL_SHIFT)
+#define GICH_VMCR_PRIMASK_SHIFT 27
+#define GICH_VMCR_PRIMASK_MASK (0x1f << GICH_VMCR_PRIMASK_SHIFT)
+#define GICH_VMCR_BINPOINT_SHIFT 21
+#define GICH_VMCR_BINPOINT_MASK (0x7 << GICH_VMCR_BINPOINT_SHIFT)
+#define GICH_VMCR_ALIAS_BINPOINT_SHIFT 18
+#define GICH_VMCR_ALIAS_BINPOINT_MASK (0x7 << GICH_VMCR_ALIAS_BINPOINT_SHIFT)
+
#define GICH_MISR_EOI (1 << 0)
#define GICH_MISR_U (1 << 1)
--
1.8.5.1
next prev parent reply other threads:[~2013-12-28 11:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-28 11:15 [PULL 00/15] KVM/{arm,arm64} updates for 3.14 Marc Zyngier
2013-12-28 11:15 ` [PATCH 01/15] arm/arm64: KVM: arch_timer: Initialize cntvoff at kvm_init Marc Zyngier
2013-12-28 11:15 ` [PATCH 02/15] ARM/KVM: save and restore generic timer registers Marc Zyngier
2013-12-28 11:15 ` [PATCH 03/15] ARM: KVM: Allow creating the VGIC after VCPUs Marc Zyngier
2013-12-28 11:15 ` [PATCH 04/15] KVM: arm-vgic: Support KVM_CREATE_DEVICE for VGIC Marc Zyngier
2013-12-28 11:15 ` [PATCH 05/15] KVM: arm-vgic: Set base addr through device API Marc Zyngier
2013-12-28 11:15 ` Marc Zyngier [this message]
2013-12-28 11:15 ` [PATCH 07/15] KVM: arm-vgic: Make vgic mmio functions more generic Marc Zyngier
2013-12-28 11:15 ` [PATCH 08/15] arm/arm64: kvm: Set vcpu->cpu to -1 on vcpu_put Marc Zyngier
2013-12-28 11:15 ` [PATCH 09/15] KVM: arm-vgic: Add vgic reg access from dev attr Marc Zyngier
2013-12-28 11:15 ` [PATCH 10/15] KVM: arm-vgic: Support unqueueing of LRs to the dist Marc Zyngier
2013-12-28 11:15 ` [PATCH 11/15] KVM: arm-vgic: Add GICD_SPENDSGIR and GICD_CPENDSGIR handlers Marc Zyngier
2013-12-28 11:15 ` [PATCH 12/15] KVM: arm-vgic: Support CPU interface reg access Marc Zyngier
2013-12-28 11:15 ` [PATCH 13/15] arm64: KVM: Add Kconfig option for max VCPUs per-Guest Marc Zyngier
2013-12-28 11:15 ` [PATCH 14/15] arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host Marc Zyngier
2013-12-28 11:15 ` [PATCH 15/15] arm64: KVM: Force undefined exception for Guest SMC intructions Marc Zyngier
2013-12-31 19:25 ` [PULL 00/15] KVM/{arm,arm64} updates for 3.14 Marcelo Tosatti
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=1388229347-24185-7-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).