From: Julien Grall <julien.grall@linaro.org>
Date: Tue, 22 Apr 2014 12:58:41 +0000 (+0100)
Subject: xen/arm: IRQ Introduce irq_get_domain
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5098
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=229a9df3f216554ce5ec717b9f468ab539716efc;p=xen.git

xen/arm: IRQ Introduce irq_get_domain

This function retrieves a domain from an IRQ. It will be used in several
places (such as do_IRQ) to avoid duplicated code when multiple action will be
supported.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index f3a30bdb1b..26574ca348 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -98,6 +98,18 @@ void __cpuinit init_secondary_IRQ(void)
     BUG_ON(init_local_irq_data() < 0);
 }
 
+static inline struct domain *irq_get_domain(struct irq_desc *desc)
+{
+    ASSERT(spin_is_locked(&desc->lock));
+
+    if ( !(desc->status & IRQ_GUEST) )
+        return dom_xen;
+
+    ASSERT(desc->action != NULL);
+
+    return desc->action->dev_id;
+}
+
 int request_dt_irq(const struct dt_irq *irq,
                    void (*handler)(int, void *, struct cpu_user_regs *),
                    const char *devname, void *dev_id)
@@ -156,7 +168,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq)
 
     if ( desc->status & IRQ_GUEST )
     {
-        struct domain *d = action->dev_id;
+        struct domain *d = irq_get_domain(desc);
 
         desc->handler->end(desc);