From patchwork Fri Jun 22 15:14:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10482419 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 84BCB60388 for ; Fri, 22 Jun 2018 15:20:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75D7C28D28 for ; Fri, 22 Jun 2018 15:20:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72EC728F5D; Fri, 22 Jun 2018 15:20:30 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 06D2828D28 for ; Fri, 22 Jun 2018 15:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mp6CFZ8xAVdVSRocxBQyzKl/Axwlwdsenr0iPjCjdyo=; b=ixi29pdAk1WEr9nKPubb7qJUMw +WvT/9hKCxyK4QmhOKqHRCZDI1LeU0CmB6BILNdlFXKiE32TI7kKdVUoKREao2/ee315e9BzXmPTh /q4wqEainS0LqexGMFGB2FrTP2L4dI2idzCwNJppDyiYsx2G5vwIsv+WAjRVPZ1kgBLB3F8Lg2xv0 aGBZ90qBb+3r7i7QURP8yywYZhaqwQ7L0MEluSytAAwqqo7yjHTdE44JELU9Ca5JslYYK/71cstPr +dEuDqJHWlXsEvhK5HrUPr1JrCDG9nfg6Cc/f2407PQz7E78OIw4RQnYF6fZmQQmCuvTxlmZmSX53 DXwuSxFw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWNrD-0004hQ-5j; Fri, 22 Jun 2018 15:20:15 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWNmG-0000bd-Ij for linux-arm-kernel@lists.infradead.org; Fri, 22 Jun 2018 15:15:24 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 886AE20CF8; Fri, 22 Jun 2018 17:14:55 +0200 (CEST) Received: from localhost.localdomain (AAubervilliers-681-1-50-153.w90-88.abo.wanadoo.fr [90.88.168.153]) by mail.bootlin.com (Postfix) with ESMTPSA id 6DBB120DBE; Fri, 22 Jun 2018 17:14:37 +0200 (CEST) From: Miquel Raynal To: Thomas Gleixner , Jason Cooper , Marc Zyngier , Catalin Marinas , Will Deacon , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH v3 09/17] irqchip/irq-mvebu-icu: support ICU subnodes Date: Fri, 22 Jun 2018 17:14:24 +0200 Message-Id: <20180622151432.1566-10-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180622151432.1566-1-miquel.raynal@bootlin.com> References: <20180622151432.1566-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180622_081509_370496_A11E7DF0 X-CRM114-Status: GOOD ( 20.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Haim Boot , Antoine Tenart , Hanna Hawa , Maxime Chevallier , Nadav Haklai , Rob Herring , Thomas Petazzoni , Miquel Raynal , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The ICU can handle several type of interrupt, each of them being handled differently on AP side. On CP side, the ICU should be able to make the distinction between each interrupt group by pointing to the right parent. This is done through the introduction of new bindings, presenting the ICU node as the parent of multiple ICU sub-nodes, each of them being an interrupt type with a different interrupt parent. ICU interrupt 'clients' now directly point to the right sub-node, avoiding the need for the extra ICU_GRP_* parameter. ICU subnodes are probed automatically with devm_platform_populate(). If the node as no child, the probe function for NSRs will still be called 'manually' in order to preserve backward compatibility with DT using the old binding. Signed-off-by: Miquel Raynal --- drivers/irqchip/irq-mvebu-icu.c | 88 ++++++++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c index 24d45186eb6b..f7c2ede9c222 100644 --- a/drivers/irqchip/irq-mvebu-icu.c +++ b/drivers/irqchip/irq-mvebu-icu.c @@ -43,6 +43,7 @@ struct mvebu_icu { struct regmap *regmap; struct device *dev; atomic_t initialized; + bool legacy_bindings; }; struct mvebu_icu_irq_data { @@ -51,6 +52,30 @@ struct mvebu_icu_irq_data { unsigned int type; }; +static struct mvebu_icu *mvebu_icu_dev_get_drvdata(struct platform_device *pdev) +{ + struct mvebu_icu *icu; + + /* + * Device data being populated means we should be using legacy bindings. + * Using the _parent_ device data means we should be using new bindings. + */ + icu = dev_get_drvdata(&pdev->dev); + if (icu) { + if (!icu->legacy_bindings) + return ERR_PTR(-EINVAL); + } else { + icu = dev_get_drvdata(pdev->dev.parent); + if (!icu) + return ERR_PTR(-ENODEV); + + if (icu->legacy_bindings) + return ERR_PTR(-EINVAL); + } + + return icu; +} + static void mvebu_icu_init(struct mvebu_icu *icu, struct msi_msg *msg) { if (atomic_cmpxchg(&icu->initialized, false, true)) @@ -107,24 +132,28 @@ mvebu_icu_irq_domain_translate(struct irq_domain *d, struct irq_fwspec *fwspec, unsigned long *hwirq, unsigned int *type) { struct mvebu_icu *icu = platform_msi_get_host_data(d); - unsigned int icu_group; + unsigned int param_count = icu->legacy_bindings ? 3 : 2; /* Check the count of the parameters in dt */ - if (WARN_ON(fwspec->param_count < 3)) { + if (WARN_ON(fwspec->param_count != param_count)) { dev_err(icu->dev, "wrong ICU parameter count %d\n", fwspec->param_count); return -EINVAL; } - /* Only ICU group type is handled */ - icu_group = fwspec->param[0]; - if (icu_group != ICU_GRP_NSR && icu_group != ICU_GRP_SR && - icu_group != ICU_GRP_SEI && icu_group != ICU_GRP_REI) { - dev_err(icu->dev, "wrong ICU group type %x\n", icu_group); - return -EINVAL; + if (icu->legacy_bindings) { + *hwirq = fwspec->param[1]; + *type = fwspec->param[2]; + if (fwspec->param[0] != ICU_GRP_NSR) { + dev_err(icu->dev, "wrong ICU group type %x\n", + fwspec->param[0]); + return -EINVAL; + } + } else { + *hwirq = fwspec->param[0]; + *type = fwspec->param[1]; } - *hwirq = fwspec->param[1]; if (*hwirq >= ICU_MAX_IRQS) { dev_err(icu->dev, "invalid interrupt number %ld\n", *hwirq); return -EINVAL; @@ -157,7 +186,10 @@ mvebu_icu_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, goto free_irqd; } - icu_irqd->icu_group = fwspec->param[0]; + if (icu->legacy_bindings) + icu_irqd->icu_group = fwspec->param[0]; + else + icu_irqd->icu_group = ICU_GRP_NSR; icu_irqd->icu = icu; err = platform_msi_domain_alloc(domain, virq, nr_irqs); @@ -211,9 +243,9 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev) struct irq_domain *irq_domain; struct mvebu_icu *icu; - icu = dev_get_drvdata(&pdev->dev); - if (!icu) - return -ENODEV; + icu = mvebu_icu_dev_get_drvdata(pdev); + if (IS_ERR(icu)) + return PTR_ERR(icu); pdev->dev.msi_domain = of_msi_get_domain(&pdev->dev, pdev->dev.of_node, DOMAIN_BUS_PLATFORM_MSI); @@ -236,6 +268,22 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev) return 0; } +static const struct of_device_id mvebu_icu_subset_of_match[] = { + { + .compatible = "marvell,cp110-icu-nsr", + }, + {}, +}; + +static struct platform_driver mvebu_icu_subset_driver = { + .probe = mvebu_icu_subset_probe, + .driver = { + .name = "mvebu-icu-subset", + .of_match_table = mvebu_icu_subset_of_match, + }, +}; +builtin_platform_driver(mvebu_icu_subset_driver); + static struct regmap_config mvebu_icu_regmap_config = { .reg_bits = 32, .val_bits = 32, @@ -275,6 +323,15 @@ static int mvebu_icu_probe(struct platform_device *pdev) if (!icu->irq_chip.name) return -ENOMEM; + /* + * Legacy bindings: ICU is one node with one MSI parent: force manually + * the probe of the NSR interrupts side. + * New bindings: ICU node has children, one per interrupt controller + * having its own MSI parent: call platform_populate(). + */ + if (!of_get_child_count(pdev->dev.of_node)) + icu->legacy_bindings = true; + icu->irq_chip.irq_mask = irq_chip_mask_parent; icu->irq_chip.irq_unmask = irq_chip_unmask_parent; icu->irq_chip.irq_eoi = irq_chip_eoi_parent; @@ -299,7 +356,10 @@ static int mvebu_icu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, icu); - return mvebu_icu_subset_probe(pdev); + if (icu->legacy_bindings) + return mvebu_icu_subset_probe(pdev); + else + return devm_of_platform_populate(&pdev->dev); } static const struct of_device_id mvebu_icu_of_match[] = {