From patchwork Wed May 8 02:33:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 16747 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4D4FB238FD for ; Wed, 8 May 2013 02:35:09 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ht11sf1681260vcb.9 for ; Tue, 07 May 2013 19:34:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=rEuzIJYJtHSelJkDrv6e+QDpyZhU2/Wlt5PhwqOTjxI=; b=Q8sWo4gE5DeFnYPQBDp23f0XmWNvx6/ckhi8xpgdfgVM58pwlUF0NCxhkujjQdA/Wt bO6fXvIu/NYBU5EUsdcct00txWXC14c5IuppgZ+5IcclJqKvgP4rrBOTJed2b9IUF4+d Dg4p/MQkjZvpqQsMrs47goEWrlUIPTh3/0TV4YYfHiJsyWwiSLCh/bVMN5W1VkRmnxBd YTuxKaG1eZQooB3Tl3ZJBm4o1wiyOvlp0/7gHptaHtgdKVqEEJ0j3ugBNXpwEKHCdQIo X1cFq9NvmwT/KxuuRFom/s4MjVeDe5xhSCYwSz2ecw/15f9qYDIJonfWCgVg+SFUqiJp Y3eQ== X-Received: by 10.224.215.194 with SMTP id hf2mr6531032qab.0.1367980489167; Tue, 07 May 2013 19:34:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.2 with SMTP id do2ls688542qeb.62.gmail; Tue, 07 May 2013 19:34:48 -0700 (PDT) X-Received: by 10.52.37.4 with SMTP id u4mr2768729vdj.54.1367980488919; Tue, 07 May 2013 19:34:48 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id un20si14136191veb.20.2013.05.07.19.34.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 19:34:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id m17so1231552vca.31 for ; Tue, 07 May 2013 19:34:48 -0700 (PDT) X-Received: by 10.58.227.104 with SMTP id rz8mr3064365vec.22.1367980488709; Tue, 07 May 2013 19:34:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp131010veb; Tue, 7 May 2013 19:34:48 -0700 (PDT) X-Received: by 10.180.91.131 with SMTP id ce3mr6980923wib.5.1367980487222; Tue, 07 May 2013 19:34:47 -0700 (PDT) Received: from mail-wg0-x22c.google.com (mail-wg0-x22c.google.com [2a00:1450:400c:c00::22c]) by mx.google.com with ESMTPS id h2si1326195wiv.95.2013.05.07.19.34.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 19:34:47 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22c is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=2a00:1450:400c:c00::22c; Received: by mail-wg0-f44.google.com with SMTP id z12so1308973wgg.11 for ; Tue, 07 May 2013 19:34:46 -0700 (PDT) X-Received: by 10.194.92.197 with SMTP id co5mr7161682wjb.41.1367980486835; Tue, 07 May 2013 19:34:46 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id v6sm6823630wiy.11.2013.05.07.19.34.45 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 19:34:46 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: Stefano.Stabellini@eu.citrix.com, patches@linaro.org, ian.campbell@citrix.com, Julien Grall Subject: [PATCH V2 12/33] xen/arm: Introduce gic_irq_xlate Date: Wed, 8 May 2013 03:33:32 +0100 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-Gm-Message-State: ALoCoQlMKWBskDS5r6WJpPsLZuP/1H9LKLARn520YuHN371JpCe3tGy8Jf7OpROETiSr7ZXo+36X X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This function translates an interrupt specifier to an IRQ number and IRQ type (ie: level trigger, edge trigger,...). It's GIC specific. Signed-off-by: Julien Grall Changes in v2: - Use DT_IRQ_TYPE_SENSE_MASK instead of IRQ_TYPE_SENSE_MASK Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 20 ++++++++++++++++++++ xen/arch/arm/setup.c | 1 + xen/include/asm-arm/gic.h | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index b9fbe3d..78fc144 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -329,6 +329,26 @@ static void __cpuinit gic_hyp_disable(void) GICH[GICH_HCR] = 0; } +int gic_irq_xlate(const u32 *intspec, unsigned int intsize, + unsigned int *out_hwirq, + unsigned int *out_type) +{ + if ( intsize < 3 ) + return -EINVAL; + + /* Get the interrupt number and add 16 to skip over SGIs */ + *out_hwirq = intspec[1] + 16; + + /* For SPIs, we need to add 16 more to get the GIC irq ID number */ + if ( !intspec[0] ) + *out_hwirq += 16; + + if ( out_type ) + *out_type = intspec[2] & DT_IRQ_TYPE_SENSE_MASK; + + return 0; +} + /* Set up the GIC */ void __init gic_init(void) { diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 07c0444..e4228f7 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -430,6 +430,7 @@ void __init start_xen(unsigned long boot_phys_offset, setup_mm(fdt_paddr, fdt_size); dt_unflatten_host_device_tree(); + dt_irq_xlate = gic_irq_xlate; #ifdef EARLY_UART_ADDRESS /* TODO Need to get device tree or command line for UART address */ diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 78dd21a..6ff217c 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -189,6 +189,10 @@ extern void send_SGI_allbutself(enum gic_sgi sgi); /* print useful debug info */ extern void gic_dump_info(struct vcpu *v); +/* IRQ translation function for the device tree */ +int gic_irq_xlate(const u32 *intspec, unsigned int intsize, + unsigned int *out_hwirq, unsigned int *out_type); + #endif /* __ASSEMBLY__ */ #endif