[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v7a 07/14] xen/arm: prefix byte_read and byte_write functions with vgic
From: Vijaya Kumar K <Vijaya.Kumar@xxxxxxxxxxxxxxxxxx> prefix byte_read and byte_write vgic functions with vgic_ to make these function vgic specific. Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@xxxxxxxxxxxxxxxxxx> Acked-by: Julien Grall <julien.grall@xxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- xen/arch/arm/vgic.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 088ded3..d01f1d9 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -180,7 +180,7 @@ int vcpu_vgic_free(struct vcpu *v) #define vgic_lock_rank(v, r) spin_lock(&(r)->lock) #define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) -static uint32_t byte_read(uint32_t val, int sign, int offset) +static uint32_t vgic_byte_read(uint32_t val, int sign, int offset) { int byte = offset & 0x3; @@ -192,7 +192,7 @@ static uint32_t byte_read(uint32_t val, int sign, int offset) return val; } -static void byte_write(uint32_t *reg, uint32_t var, int offset) +static void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) { int byte = offset & 0x3; @@ -267,7 +267,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -276,7 +276,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->ipend, dabt.sign, offset); + *r = vgic_byte_read(rank->ipend, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -306,7 +306,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)]; if ( dabt.size == 0 ) - *r = byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -318,7 +318,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)]; if ( dabt.size == 0 ) - *r = byte_read(*r, dabt.sign, offset); + *r = vgic_byte_read(*r, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -346,7 +346,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -355,7 +355,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); - *r = byte_read(rank->pendsgi, dabt.sign, offset); + *r = vgic_byte_read(rank->pendsgi, dabt.sign, offset); vgic_unlock_rank(v, rank); return 1; @@ -618,8 +618,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size == 2 ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = *r; else - byte_write(&rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)], - *r, offset); + { + tr = REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR); + vgic_byte_write(&rank->itargets[tr], *r, offset); + } vgic_unlock_rank(v, rank); return 1; @@ -631,8 +633,10 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size == 2 ) rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)] = *r; else - byte_write(&rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR)], - *r, offset); + { + tr = REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR); + vgic_byte_write(&rank->ipriority[tr], *r, offset); + } vgic_unlock_rank(v, rank); return 1; @@ -757,7 +761,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } - priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq)], 0, irq & 0x3); n->irq = irq; set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |