From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [RFC 17/19] libxl/arm: Rename set_interrupt_ppi to set_interrupt and handle SPIs Date: Mon, 16 Jun 2014 17:18:04 +0100 Message-ID: <1402935486-29136-18-git-send-email-julien.grall@linaro.org> References: <1402935486-29136-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwZcH-0006vy-4h for xen-devel@lists.xenproject.org; Mon, 16 Jun 2014 16:18:41 +0000 Received: by mail-wi0-f175.google.com with SMTP id r20so4404097wiv.8 for ; Mon, 16 Jun 2014 09:18:39 -0700 (PDT) In-Reply-To: <1402935486-29136-1-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: ian.campbell@citrix.com, Stefano Stabellini , tim@xen.org, Julien Grall , Ian Jackson , stefano.stabellini@citrix.com List-Id: xen-devel@lists.xenproject.org The function will be used later during device passthrough to create interrupts in the device tree. Those interrupts are usually SPIs. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell --- tools/libxl/libxl_arm.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 1edb87a..e19e2f4 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -64,14 +64,20 @@ static void set_cell(be32 **cellp, int size, uint64_t val) (*cellp) += cells; } -static void set_interrupt_ppi(gic_interrupt interrupt, unsigned int irq, - unsigned int cpumask, unsigned int level) +static void set_interrupt(gic_interrupt interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) { be32 *cells = interrupt; + int is_ppi = (irq < 32); + + /* SGIs are not describe in the device tree */ + assert(irq >= 16); + + irq -= (is_ppi) ? 16: 32; /* PPIs start at 16, SPIs at 32 */ /* See linux Documentation/devictree/bindings/arm/gic.txt */ - set_cell(&cells, 1, 1); /* is a PPI */ - set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + set_cell(&cells, 1, is_ppi); /* is a PPI? */ + set_cell(&cells, 1, irq); set_cell(&cells, 1, (cpumask << 8) | level); } @@ -355,12 +361,9 @@ static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ain res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); if (res) return res; - set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, ints, 3); if (res) return res; @@ -398,8 +401,7 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, * - Active-low level-sensitive * - All cpus */ - set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); + set_interrupt(intr, GUEST_EVTCHN_PPI, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(gc, fdt, &intr, 1); if (res) return res; -- 1.7.10.4