From mboxrd@z Thu Jan 1 00:00:00 1970 From: vijay.kilari@gmail.com Subject: [PATCH] xen/arm: Use REG_RANK_INDEX macro Date: Thu, 18 Sep 2014 17:43:46 +0530 Message-ID: <1411042429-17108-1-git-send-email-vijay.kilari@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian.Campbell@citrix.com, julien.grall@linaro.org, stefano.stabellini@eu.citrix.com, stefano.stabellini@citrix.com, tim@xen.org, xen-devel@lists.xen.org Cc: Prasun.Kapoor@caviumnetworks.com, Vijaya Kumar K , manish.jaggi@caviumnetworks.com, vijay.kilari@gmail.com List-Id: xen-devel@lists.xenproject.org From: Vijaya Kumar K Use REG_RANK_INDEX macro to compute index to access vgic ipriority[] and itargets[] for a given irq. Signed-off-by: Vijaya Kumar K --- xen/arch/arm/vgic-v2.c | 7 +++++-- xen/arch/arm/vgic-v3.c | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index ad7e661..1369f78 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -510,7 +510,9 @@ static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - target = vgic_byte_read(rank->v2.itargets[(irq%32)/4], 0, irq % 4); + target = vgic_byte_read(rank->v2.itargets[REG_RANK_INDEX(8, + irq, DABT_WORD)], 0, irq & 0x3); + /* 1-N SPI should be delivered as pending to all the vcpus in the * mask, but here we just return the first vcpu for simplicity and * because it would be too slow to do otherwise. */ @@ -526,7 +528,8 @@ static int vgic_v2_get_irq_priority(struct vcpu *v, unsigned int irq) struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - priority = vgic_byte_read(rank->ipriority[(irq%32)/4], 0, irq % 4); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, + irq, DABT_WORD)], 0, irq & 0x3); return priority; } diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c65a56a..ac8cf07 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -940,7 +940,8 @@ static int vgic_v3_get_irq_priority(struct vcpu *v, unsigned int irq) struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - priority = vgic_byte_read(rank->ipriority[(irq%32)/4], 0, irq % 4); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, + irq, DABT_WORD)], 0, irq & 0x3); return priority; } -- 1.7.9.5