From patchwork Thu Mar 19 19:29:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 46102 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B2E721515 for ; Thu, 19 Mar 2015 19:32:34 +0000 (UTC) Received: by wghl18 with SMTP id l18sf14074627wgh.1 for ; Thu, 19 Mar 2015 12:32:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=heJibdzfRu8oSqzBGkVkhyJxMWeoo35c8GnycOVIR+Q=; b=bDdbkWYg2fmDXdugbILfJyvm+lBDOJVSjOM/qXBNPh5juE75ItEol7s55t53C7sMjo 0cJya6CJxG+6hO3TmZoJXxtH8oetDN+jc+JDwrfQzKzSfb3H9l8EFNeJm6o4l45NwjjD GOiv1sMInMRgKw1GoPO/oNRcBz/Aep/bbdoK+pH9t7Qs7S8D3Iq5miL7DA/A0sGJZQz2 GO0yAUVHQ2FGv/VZyyAtgko0XoG9KS0ctpJYeUY0/n4azsvtNiXMf7HlIcg0W+hMG0lN N2ioSAsUnKk4xD/tP3uALTxMhtouckmjjdJhmyKUc3XmvJOxC2VkHDSt+Qwi9GIS5Wmb MdQA== X-Gm-Message-State: ALoCoQlMpYgAg4D6AXf/nOcx/WPQmt2u3Un3ptxEpd8X41UJpytoPVB27ZIxhz/cBQ+8TbwkOVWd X-Received: by 10.112.41.131 with SMTP id f3mr12593175lbl.20.1426793553445; Thu, 19 Mar 2015 12:32:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.199 with SMTP id x7ls356996lae.0.gmail; Thu, 19 Mar 2015 12:32:33 -0700 (PDT) X-Received: by 10.112.54.165 with SMTP id k5mr70247853lbp.57.1426793553101; Thu, 19 Mar 2015 12:32:33 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id kv4si1693952lbc.20.2015.03.19.12.32.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 12:32:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbcgn8 with SMTP id gn8so60360390lbc.2 for ; Thu, 19 Mar 2015 12:32:33 -0700 (PDT) X-Received: by 10.112.160.65 with SMTP id xi1mr7434781lbb.56.1426793552997; Thu, 19 Mar 2015 12:32:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp597641lbj; Thu, 19 Mar 2015 12:32:32 -0700 (PDT) X-Received: by 10.55.41.231 with SMTP id p100mr144978980qkp.106.1426793550640; Thu, 19 Mar 2015 12:32:30 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id 78si2213460qgk.31.2015.03.19.12.32.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 19 Mar 2015 12:32:30 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYg9T-0004C5-Ee; Thu, 19 Mar 2015 19:30:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYg9R-0004Ba-D2 for xen-devel@lists.xenproject.org; Thu, 19 Mar 2015 19:30:41 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 52/14-31605-0E32B055; Thu, 19 Mar 2015 19:30:40 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-12.tower-31.messagelabs.com!1426793439!13749305!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5235 invoked from network); 19 Mar 2015 19:30:40 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 19 Mar 2015 19:30:40 -0000 Received: by wgra20 with SMTP id a20so71281835wgr.3 for ; Thu, 19 Mar 2015 12:30:39 -0700 (PDT) X-Received: by 10.194.203.98 with SMTP id kp2mr14979723wjc.47.1426793439664; Thu, 19 Mar 2015 12:30:39 -0700 (PDT) Received: from chilopoda.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id hl8sm3203005wjb.38.2015.03.19.12.30.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 12:30:38 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 19 Mar 2015 19:29:28 +0000 Message-Id: <1426793399-6283-3-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1426793399-6283-1-git-send-email-julien.grall@linaro.org> References: <1426793399-6283-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v4 02/33] xen/dts: Allow only IRQ translation that are mapped to main GIC X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Xen is only able to handle one GIC controller. Some platforms may contain other interrupt controllers. Make sure to only translate IRQ mapped into the GIC handled by Xen. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- Changes in v4: - Add Ian's and Stefano's ack Changes in v3: - Patch was previously sent a separate series [1] - Rework the comment in dt_irq_translate. Changelog based on the separate series: Changes in v3: - Add an ASSERT to check that dt_interrupt_controller is not NULL. Changes in v2: - Fix compilation... [1] https://patches.linaro.org/33312/ --- xen/common/device_tree.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index d1c716f..26fa298 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1058,8 +1058,14 @@ int dt_irq_translate(const struct dt_raw_irq *raw, struct dt_irq *out_irq) { ASSERT(dt_irq_xlate != NULL); + ASSERT(dt_interrupt_controller != NULL); - /* TODO: Retrieve the right irq_xlate. This is only work for the gic */ + /* + * TODO: Retrieve the right irq_xlate. This is only works for the primary + * interrupt controller. + */ + if ( raw->controller != dt_interrupt_controller ) + return -EINVAL; return dt_irq_xlate(raw->specifier, raw->size, &out_irq->irq, &out_irq->type);