From mboxrd@z Thu Jan 1 00:00:00 1970 From: vijay.kilari@gmail.com Subject: [PATCH for-4.5 v11 1/7] xen/arm: Calculate irq rank from irq number Date: Fri, 12 Sep 2014 16:39:43 +0530 Message-ID: <1410520189-9086-2-git-send-email-vijay.kilari@gmail.com> References: <1410520189-9086-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: In-Reply-To: <1410520189-9086-1-git-send-email-vijay.kilari@gmail.com> 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 irq rank calculated is not generic and assumes hardware register size value which does not work for future GIC versions like V3. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/vgic.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 1372ffc..c6e9479 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,6 +31,16 @@ #include #include +static inline struct vgic_irq_rank *vgic_get_rank(struct vcpu *v, int rank) +{ + if ( rank == 0 ) + return v->arch.vgic.private_irqs; + else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) + return &v->domain->arch.vgic.shared_irqs[rank - 1]; + else + return NULL; +} + /* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. @@ -40,17 +50,14 @@ struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, { int rank = REG_RANK_NR(b, (n >> s)); - if ( rank == 0 ) - return v->arch.vgic.private_irqs; - else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) - return &v->domain->arch.vgic.shared_irqs[rank - 1]; - else - return NULL; + return vgic_get_rank(v, rank); } struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq, DABT_WORD); + int rank = irq/32; + + return vgic_get_rank(v, rank); } int domain_vgic_init(struct domain *d) -- 1.7.9.5