aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2015-11-26 12:19:25 -0500
committerChristoffer Dall <christoffer.dall@linaro.org>2016-05-20 09:39:48 -0400
commit140b086dd19771410915a924db2e635c2b51a0f4 (patch)
treef1e99db1df02f242a00e8c347c84b8864cc26eed
parent0919e84c0fc1fc73525fdcedefab89ea8460f697 (diff)
KVM: arm/arm64: vgic-new: Add GICv2 world switch backend
Processing maintenance interrupts and accessing the list registers are dependent on the host's GIC version. Introduce vgic-v2.c to contain GICv2 specific functions. Implement the GICv2 specific code for syncing the emulation state into the VGIC registers. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Eric Auger <eric.auger@linaro.org> Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Eric Auger <eric.auger@linaro.org> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-rw-r--r--include/linux/irqchip/arm-gic.h1
-rw-r--r--virt/kvm/arm/vgic/vgic-v2.c176
-rw-r--r--virt/kvm/arm/vgic/vgic.c6
-rw-r--r--virt/kvm/arm/vgic/vgic.h6
4 files changed, 189 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 9c940263ca23..be0d26f940af 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -76,6 +76,7 @@
76#define GICH_LR_VIRTUALID (0x3ff << 0) 76#define GICH_LR_VIRTUALID (0x3ff << 0)
77#define GICH_LR_PHYSID_CPUID_SHIFT (10) 77#define GICH_LR_PHYSID_CPUID_SHIFT (10)
78#define GICH_LR_PHYSID_CPUID (0x3ff << GICH_LR_PHYSID_CPUID_SHIFT) 78#define GICH_LR_PHYSID_CPUID (0x3ff << GICH_LR_PHYSID_CPUID_SHIFT)
79#define GICH_LR_PRIORITY_SHIFT 23
79#define GICH_LR_STATE (3 << 28) 80#define GICH_LR_STATE (3 << 28)
80#define GICH_LR_PENDING_BIT (1 << 28) 81#define GICH_LR_PENDING_BIT (1 << 28)
81#define GICH_LR_ACTIVE_BIT (1 << 29) 82#define GICH_LR_ACTIVE_BIT (1 << 29)
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c
new file mode 100644
index 000000000000..fb5e65ceffd0
--- /dev/null
+++ b/virt/kvm/arm/vgic/vgic-v2.c
@@ -0,0 +1,176 @@
1/*
2 * Copyright (C) 2015, 2016 ARM Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include <linux/irqchip/arm-gic.h>
18#include <linux/kvm.h>
19#include <linux/kvm_host.h>
20
21#include "vgic.h"
22
23/*
24 * Call this function to convert a u64 value to an unsigned long * bitmask
25 * in a way that works on both 32-bit and 64-bit LE and BE platforms.
26 *
27 * Warning: Calling this function may modify *val.
28 */
29static unsigned long *u64_to_bitmask(u64 *val)
30{
31#if defined(CONFIG_CPU_BIG_ENDIAN) && BITS_PER_LONG == 32
32 *val = (*val >> 32) | (*val << 32);
33#endif
34 return (unsigned long *)val;
35}
36
37void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu)
38{
39 struct vgic_v2_cpu_if *cpuif = &vcpu->arch.vgic_cpu.vgic_v2;
40
41 if (cpuif->vgic_misr & GICH_MISR_EOI) {
42 u64 eisr = cpuif->vgic_eisr;
43 unsigned long *eisr_bmap = u64_to_bitmask(&eisr);
44 int lr;
45
46 for_each_set_bit(lr, eisr_bmap, kvm_vgic_global_state.nr_lr) {
47 u32 intid = cpuif->vgic_lr[lr] & GICH_LR_VIRTUALID;
48
49 WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);
50
51 kvm_notify_acked_irq(vcpu->kvm, 0,
52 intid - VGIC_NR_PRIVATE_IRQS);
53 }
54 }
55
56 /* check and disable underflow maintenance IRQ */
57 cpuif->vgic_hcr &= ~GICH_HCR_UIE;
58
59 /*
60 * In the next iterations of the vcpu loop, if we sync the
61 * vgic state after flushing it, but before entering the guest
62 * (this happens for pending signals and vmid rollovers), then
63 * make sure we don't pick up any old maintenance interrupts
64 * here.
65 */
66 cpuif->vgic_eisr = 0;
67}
68
69void vgic_v2_set_underflow(struct kvm_vcpu *vcpu)
70{
71 struct vgic_v2_cpu_if *cpuif = &vcpu->arch.vgic_cpu.vgic_v2;
72
73 cpuif->vgic_hcr |= GICH_HCR_UIE;
74}
75
76/*
77 * transfer the content of the LRs back into the corresponding ap_list:
78 * - active bit is transferred as is
79 * - pending bit is
80 * - transferred as is in case of edge sensitive IRQs
81 * - set to the line-level (resample time) for level sensitive IRQs
82 */
83void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu)
84{
85 struct vgic_v2_cpu_if *cpuif = &vcpu->arch.vgic_cpu.vgic_v2;
86 int lr;
87
88 for (lr = 0; lr < vcpu->arch.vgic_cpu.used_lrs; lr++) {
89 u32 val = cpuif->vgic_lr[lr];
90 u32 intid = val & GICH_LR_VIRTUALID;
91 struct vgic_irq *irq;
92
93 irq = vgic_get_irq(vcpu->kvm, vcpu, intid);
94
95 spin_lock(&irq->irq_lock);
96
97 /* Always preserve the active bit */
98 irq->active = !!(val & GICH_LR_ACTIVE_BIT);
99
100 /* Edge is the only case where we preserve the pending bit */
101 if (irq->config == VGIC_CONFIG_EDGE &&
102 (val & GICH_LR_PENDING_BIT)) {
103 irq->pending = true;
104
105 if (vgic_irq_is_sgi(intid)) {
106 u32 cpuid = val & GICH_LR_PHYSID_CPUID;
107
108 cpuid >>= GICH_LR_PHYSID_CPUID_SHIFT;
109 irq->source |= (1 << cpuid);
110 }
111 }
112
113 /* Clear soft pending state when level IRQs have been acked */
114 if (irq->config == VGIC_CONFIG_LEVEL &&
115 !(val & GICH_LR_PENDING_BIT)) {
116 irq->soft_pending = false;
117 irq->pending = irq->line_level;
118 }
119
120 spin_unlock(&irq->irq_lock);
121 }
122}
123
124/*
125 * Populates the particular LR with the state of a given IRQ:
126 * - for an edge sensitive IRQ the pending state is cleared in struct vgic_irq
127 * - for a level sensitive IRQ the pending state value is unchanged;
128 * it is dictated directly by the input level
129 *
130 * If @irq describes an SGI with multiple sources, we choose the
131 * lowest-numbered source VCPU and clear that bit in the source bitmap.
132 *
133 * The irq_lock must be held by the caller.
134 */
135void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
136{
137 u32 val = irq->intid;
138
139 if (irq->pending) {
140 val |= GICH_LR_PENDING_BIT;
141
142 if (irq->config == VGIC_CONFIG_EDGE)
143 irq->pending = false;
144
145 if (vgic_irq_is_sgi(irq->intid)) {
146 u32 src = ffs(irq->source);
147
148 BUG_ON(!src);
149 val |= (src - 1) << GICH_LR_PHYSID_CPUID_SHIFT;
150 irq->source &= ~(1 << (src - 1));
151 if (irq->source)
152 irq->pending = true;
153 }
154 }
155
156 if (irq->active)
157 val |= GICH_LR_ACTIVE_BIT;
158
159 if (irq->hw) {
160 val |= GICH_LR_HW;
161 val |= irq->hwintid << GICH_LR_PHYSID_CPUID_SHIFT;
162 } else {
163 if (irq->config == VGIC_CONFIG_LEVEL)
164 val |= GICH_LR_EOI;
165 }
166
167 /* The GICv2 LR only holds five bits of priority. */
168 val |= (irq->priority >> 3) << GICH_LR_PRIORITY_SHIFT;
169
170 vcpu->arch.vgic_cpu.vgic_v2.vgic_lr[lr] = val;
171}
172
173void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr)
174{
175 vcpu->arch.vgic_cpu.vgic_v2.vgic_lr[lr] = 0;
176}
diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
index 08a862a98442..44d2533ac84e 100644
--- a/virt/kvm/arm/vgic/vgic.c
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -400,10 +400,12 @@ retry:
400 400
401static inline void vgic_process_maintenance_interrupt(struct kvm_vcpu *vcpu) 401static inline void vgic_process_maintenance_interrupt(struct kvm_vcpu *vcpu)
402{ 402{
403 vgic_v2_process_maintenance(vcpu);
403} 404}
404 405
405static inline void vgic_fold_lr_state(struct kvm_vcpu *vcpu) 406static inline void vgic_fold_lr_state(struct kvm_vcpu *vcpu)
406{ 407{
408 vgic_v2_fold_lr_state(vcpu);
407} 409}
408 410
409/* Requires the irq_lock to be held. */ 411/* Requires the irq_lock to be held. */
@@ -411,14 +413,18 @@ static inline void vgic_populate_lr(struct kvm_vcpu *vcpu,
411 struct vgic_irq *irq, int lr) 413 struct vgic_irq *irq, int lr)
412{ 414{
413 DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&irq->irq_lock)); 415 DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&irq->irq_lock));
416
417 vgic_v2_populate_lr(vcpu, irq, lr);
414} 418}
415 419
416static inline void vgic_clear_lr(struct kvm_vcpu *vcpu, int lr) 420static inline void vgic_clear_lr(struct kvm_vcpu *vcpu, int lr)
417{ 421{
422 vgic_v2_clear_lr(vcpu, lr);
418} 423}
419 424
420static inline void vgic_set_underflow(struct kvm_vcpu *vcpu) 425static inline void vgic_set_underflow(struct kvm_vcpu *vcpu)
421{ 426{
427 vgic_v2_set_underflow(vcpu);
422} 428}
423 429
424/* Requires the ap_list_lock to be held. */ 430/* Requires the ap_list_lock to be held. */
diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h
index 29b96b96a30b..0db490e491ef 100644
--- a/virt/kvm/arm/vgic/vgic.h
+++ b/virt/kvm/arm/vgic/vgic.h
@@ -22,4 +22,10 @@ struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu,
22 u32 intid); 22 u32 intid);
23bool vgic_queue_irq_unlock(struct kvm *kvm, struct vgic_irq *irq); 23bool vgic_queue_irq_unlock(struct kvm *kvm, struct vgic_irq *irq);
24 24
25void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu);
26void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu);
27void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
28void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr);
29void vgic_v2_set_underflow(struct kvm_vcpu *vcpu);
30
25#endif 31#endif