mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
ARM: new VGIC: Add PRIORITY registers handlers
The priority register handlers are shared between the v2 and v3 emulation, so their implementation goes into vgic-mmio.c, to be easily referenced from the v3 emulation as well later. This is based on Linux commit 055658bf48fc, written by Andre Przywara. Signed-off-by: Andre Przywara <andre.przywara@linaro.org> Reviewed-by: Julien Grall <julien.grall@arm.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
1 parent
f1b7167b41
commit
ee13c82228
4 files changed
+57
-1
No files matched your search
@@ -107,7 +107,7 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = {
|
||||
vgic_mmio_read_active, vgic_mmio_write_cactive, 1,
|
||||
VGIC_ACCESS_32bit),
|
||||
REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_IPRIORITYR,
|
||||
vgic_mmio_read_raz, vgic_mmio_write_wi, 8,
|
||||
vgic_mmio_read_priority, vgic_mmio_write_priority, 8,
|
||||
VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),
|
||||
REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ITARGETSR,
|
||||
vgic_mmio_read_raz, vgic_mmio_write_wi, 8,
|
||||
|
||||
@@ -376,6 +376,53 @@ void vgic_mmio_write_sactive(struct vcpu *vcpu,
|
||||
}
|
||||
}
|
||||
|
||||
unsigned long vgic_mmio_read_priority(struct vcpu *vcpu,
|
||||
paddr_t addr, unsigned int len)
|
||||
{
|
||||
uint32_t intid = VGIC_ADDR_TO_INTID(addr, 8);
|
||||
unsigned int i;
|
||||
uint32_t val = 0;
|
||||
|
||||
for ( i = 0; i < len; i++ )
|
||||
{
|
||||
struct vgic_irq *irq = vgic_get_irq(vcpu->domain, vcpu, intid + i);
|
||||
|
||||
val |= (uint32_t)irq->priority << (i * 8);
|
||||
|
||||
vgic_put_irq(vcpu->domain, irq);
|
||||
}
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
/*
|
||||
* We currently don't handle changing the priority of an interrupt that
|
||||
* is already pending on a VCPU. If there is a need for this, we would
|
||||
* need to make this VCPU exit and re-evaluate the priorities, potentially
|
||||
* leading to this interrupt getting presented now to the guest (if it has
|
||||
* been masked by the priority mask before).
|
||||
*/
|
||||
void vgic_mmio_write_priority(struct vcpu *vcpu,
|
||||
paddr_t addr, unsigned int len,
|
||||
unsigned long val)
|
||||
{
|
||||
uint32_t intid = VGIC_ADDR_TO_INTID(addr, 8);
|
||||
unsigned int i;
|
||||
unsigned long flags;
|
||||
|
||||
for ( i = 0; i < len; i++ )
|
||||
{
|
||||
struct vgic_irq *irq = vgic_get_irq(vcpu->domain, vcpu, intid + i);
|
||||
|
||||
spin_lock_irqsave(&irq->irq_lock, flags);
|
||||
/* Narrow the priority range to what we actually support */
|
||||
irq->priority = (val >> (i * 8)) & GENMASK(7, 8 - VGIC_PRI_BITS);
|
||||
spin_unlock_irqrestore(&irq->irq_lock, flags);
|
||||
|
||||
vgic_put_irq(vcpu->domain, irq);
|
||||
}
|
||||
}
|
||||
|
||||
static int match_region(const void *key, const void *elt)
|
||||
{
|
||||
const unsigned int offset = (unsigned long)key;
|
||||
|
||||
@@ -119,6 +119,13 @@ void vgic_mmio_write_sactive(struct vcpu *vcpu,
|
||||
paddr_t addr, unsigned int len,
|
||||
unsigned long val);
|
||||
|
||||
unsigned long vgic_mmio_read_priority(struct vcpu *vcpu,
|
||||
paddr_t addr, unsigned int len);
|
||||
|
||||
void vgic_mmio_write_priority(struct vcpu *vcpu,
|
||||
paddr_t addr, unsigned int len,
|
||||
unsigned long val);
|
||||
|
||||
unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev);
|
||||
|
||||
#endif
|
||||
@@ -25,6 +25,8 @@
|
||||
#define VARIANT_ID_XEN 0x01
|
||||
#define IMPLEMENTER_ARM 0x43b
|
||||
|
||||
#define VGIC_PRI_BITS 5
|
||||
|
||||
#define vgic_irq_is_sgi(intid) ((intid) < VGIC_NR_SGIS)
|
||||
|
||||
static inline bool irq_is_pending(struct vgic_irq *irq)
|
||||
|
||||