From patchwork Mon Jun 20 11:02:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9187183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CEDCE60871 for ; Mon, 20 Jun 2016 11:04:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA69923B24 for ; Mon, 20 Jun 2016 11:04:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF13026A4D; Mon, 20 Jun 2016 11:04:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 484A3267F1 for ; Mon, 20 Jun 2016 11:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932410AbcFTLEL (ORCPT ); Mon, 20 Jun 2016 07:04:11 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:33548 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932424AbcFTLDy (ORCPT ); Mon, 20 Jun 2016 07:03:54 -0400 Received: by mail-lf0-f46.google.com with SMTP id f6so35276478lfg.0 for ; Mon, 20 Jun 2016 04:03:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AuFp76TkcB4Ip9+7ZOt+dJJL5aYEe4fvYTWaaXEZyWc=; b=CqcbbUAPz7HHdPhxKlYtvmDbCjkzc2wFbzDeXFVAC3fF3embbV8nMwseXTwd7PiQdS i2D/G8ku935z8YjbgSpFLKeE+/qX1tPAyaUGucrfG2buwYMF+owNyhYjnKZYg0BshRyb a9Kc7WoAY0emFTtjEUVEShyzitIfSK83nyGJ4pG31h315+mvP64JnzffE24DIaBP48Ek rt6AmWrAHX4mciIjP3xEnHS0SOCCLDvmVWIpYDbVD9tACrAlmw8D1TngxWAXJZ6Wz/d0 7tPahKjNnMXGQMKxxj1F9qICiZE7Nu+ZpD2VoqQjOrX/JE7C3ugE4l+JgmyTfYuy5Zds hgig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AuFp76TkcB4Ip9+7ZOt+dJJL5aYEe4fvYTWaaXEZyWc=; b=LY/sIHVJt/EXRKOC3aEk0lcGjVOaFgFlHSRmFJ4haLKxJC7I+fIoIoopF/sNVRh2LW S6LmLUNO5ExJUYKUTDH0fG42LukKp9Ki8xcQrAs6rtkIMctikQnd3QnG8g7tql2YfJek djT67ES81+lBJXtT8DuU8qq/JI2+8OM30Th7zxcGP7AiQOuC5h1bnqxOwOQf0Q5ep3ij S/6AaTpUX7qcI9lQ8B6Y2UboQFOXpl8oCVy1DaD91nejtTqyBHI/OtXB4yzY78kcNFTk 2gPe4rFwWkWgUheZZT6zXu2ASaZYxyrOpDf/EbRdIK4vsOntWEWgnAFfNh1exqeEN1RQ MczQ== X-Gm-Message-State: ALyK8tLAnoGjGlHTDz3NPmPve5/lTX7+5XH7mL1xe0t9kTPtKWRYH0ncmD/qv8mHnIWDIA== X-Received: by 10.46.9.215 with SMTP id 206mr3806808ljj.63.1466420631949; Mon, 20 Jun 2016 04:03:51 -0700 (PDT) Received: from tn-HP-4.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id e10sm44291lbr.36.2016.06.20.04.03.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Jun 2016 04:03:51 -0700 (PDT) From: Tomasz Nowicki To: marc.zyngier@arm.com, tglx@linutronix.de, jason@lakedaemon.net, rjw@rjwysocki.net, bhelgaas@google.com, lorenzo.pieralisi@arm.com, robert.richter@caviumnetworks.com, shijie.huang@arm.com, Suravee.Suthikulpanit@amd.com, hanjun.guo@linaro.org Cc: al.stone@linaro.org, mw@semihalf.com, graeme.gregory@linaro.org, Catalin.Marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ddaney.cavm@gmail.com, okaya@codeaurora.org, andrea.gallo@linaro.org, linux-pci@vger.kernel.org, Tomasz Nowicki Subject: [PATCH V7 4/8] irqchip/gicv3-its: Cleanup for ITS domain initialization Date: Mon, 20 Jun 2016 13:02:17 +0200 Message-Id: <1466420541-20101-5-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466420541-20101-1-git-send-email-tn@semihalf.com> References: <1466420541-20101-1-git-send-email-tn@semihalf.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no point to initialize ITS without having msi-controller property in corresponding DT node. However, its_probe is checking msi-controller presence at the end, so we can save our time and do that check prior to its_probe call. Also, for the code clarity purpose, we put domain initialization to separate function. Signed-off-by: Tomasz Nowicki Acked-by: Marc Zyngier Reviewed-by: Hanjun Guo --- drivers/irqchip/irq-gic-v3-its.c | 57 ++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 7ceaba8..bd43de1 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1609,13 +1609,37 @@ static void its_enable_quirks(struct its_node *its) gic_enable_quirks(iidr, its_quirks, its); } +static int its_init_domain(struct device_node *node, struct its_node *its, + struct irq_domain *parent) +{ + struct irq_domain *inner_domain; + struct msi_domain_info *info; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) + return -ENOMEM; + + inner_domain = irq_domain_add_tree(node, &its_domain_ops, its); + if (!inner_domain) { + kfree(info); + return -ENOMEM; + } + + inner_domain->parent = parent; + inner_domain->bus_token = DOMAIN_BUS_NEXUS; + info->ops = &its_msi_domain_ops; + info->data = its; + inner_domain->host_data = info; + + return 0; +} + static int __init its_probe(struct device_node *node, struct irq_domain *parent) { struct resource res; struct its_node *its; void __iomem *its_base; - struct irq_domain *inner_domain; u32 val; u64 baser, tmp; int err; @@ -1707,28 +1731,9 @@ static int __init its_probe(struct device_node *node, writeq_relaxed(0, its->base + GITS_CWRITER); writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR); - if (of_property_read_bool(node, "msi-controller")) { - struct msi_domain_info *info; - - info = kzalloc(sizeof(*info), GFP_KERNEL); - if (!info) { - err = -ENOMEM; - goto out_free_tables; - } - - inner_domain = irq_domain_add_tree(node, &its_domain_ops, its); - if (!inner_domain) { - err = -ENOMEM; - kfree(info); - goto out_free_tables; - } - - inner_domain->parent = parent; - inner_domain->bus_token = DOMAIN_BUS_NEXUS; - info->ops = &its_msi_domain_ops; - info->data = its; - inner_domain->host_data = info; - } + err = its_init_domain(node, its, parent); + if (err) + goto out_free_tables; spin_lock(&its_lock); list_add(&its->entry, &its_nodes); @@ -1779,6 +1784,12 @@ int __init its_init(struct device_node *node, struct rdists *rdists, for (np = of_find_matching_node(node, its_device_id); np; np = of_find_matching_node(np, its_device_id)) { + if (!of_property_read_bool(np, "msi-controller")) { + pr_warn("%s: no msi-controller property, ITS ignored\n", + np->full_name); + continue; + } + its_probe(np, parent_domain); }