From patchwork Sat Apr 21 13:55:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10354165 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 BE604600F6 for ; Sat, 21 Apr 2018 14:07:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7DC7286A2 for ; Sat, 21 Apr 2018 14:07:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AC63286E1; Sat, 21 Apr 2018 14:07:40 +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 A1368286A2 for ; Sat, 21 Apr 2018 14:07:39 +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=skadsKeKGV8ONw63v3R3d+tBa+21WfvHjaBwpGfCkbM=; b=qaJ6CjBMrg/EgZePGnuF687sxl mfyF98Y8lucnEBU+2SuBWZw/uPkI+BcyyyFUgSeA09UutMQ8ZMxYi/SMByoA5RVDfz2Vb3Gb0mdMM vmWXiKU/VQF9StqGjQGO5RdC3cNqYeMbaZZ8pyCvH4xO3SHj+Ts17HP+fh/mXimdBTiszP4Hvu5gH gzf9/EW2esN2Vsb33jDP60VIeqmTiZKwRApZXqHTvfExTVAtov9fkBrsJFgh+arMbejxpvtH8lTMB iG+bXH5SOMEc9Lnf6aagTJ+SSd8whYYhPGztmtBWsyUuC20WLzH7F6CZCjP9CwUllIbgsVnWBgxTf tuFSzV5Q==; 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 1f9tAo-00024E-PC; Sat, 21 Apr 2018 14:07:30 +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 1f9szn-0003T3-P3 for linux-arm-kernel@lists.infradead.org; Sat, 21 Apr 2018 13:56:17 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id D76BB20828; Sat, 21 Apr 2018 15:55:51 +0200 (CEST) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id D3D6320376; Sat, 21 Apr 2018 15:55:50 +0200 (CEST) From: Miquel Raynal To: Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 12/17] irqchip/irq-mvebu-icu: add support for System Error Interrupts (SEI) Date: Sat, 21 Apr 2018 15:55:32 +0200 Message-Id: <20180421135537.24716-13-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180421135537.24716-1-miquel.raynal@bootlin.com> References: <20180421135537.24716-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180421_065608_177265_7D6B8E3A X-CRM114-Status: GOOD ( 22.70 ) 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 , Andrew Lunn , devicetree@vger.kernel.org, Antoine Tenart , Catalin Marinas , Gregory Clement , Haim Boot , Will Deacon , Maxime Chevallier , Nadav Haklai , Rob Herring , Thomas Petazzoni , Miquel Raynal , Hanna Hawa , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth 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 An SEI driver provides an MSI domain through which it is possible to raise SEIs. Handle the NSR probe function in a more generic way to support other type of interrupts (ie. the SEIs). For clarity we do not use tree IRQ domains for now but linear ones instead, allocating the 207 ICU lines for each interrupt group. Reallocating an ICU slot is prevented by the use of an ICU-wide bitmap. Signed-off-by: Miquel Raynal --- drivers/irqchip/irq-mvebu-icu.c | 132 +++++++++++++++++++++++++++++++++------- 1 file changed, 110 insertions(+), 22 deletions(-) diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c index 1d3cd112619c..862541f2d135 100644 --- a/drivers/irqchip/irq-mvebu-icu.c +++ b/drivers/irqchip/irq-mvebu-icu.c @@ -24,12 +24,17 @@ #include #include "irq-mvebu-gicp.h" +#include "irq-mvebu-sei.h" /* ICU registers */ #define ICU_SETSPI_NSR_AL 0x10 #define ICU_SETSPI_NSR_AH 0x14 #define ICU_CLRSPI_NSR_AL 0x18 #define ICU_CLRSPI_NSR_AH 0x1c +#define ICU_SET_SEI_AL 0x50 +#define ICU_SET_SEI_AH 0x54 +#define ICU_CLR_SEI_AL 0x58 +#define ICU_CLR_SEI_AH 0x5C #define ICU_INT_CFG(x) (0x100 + 4 * (x)) #define ICU_INT_ENABLE BIT(24) #define ICU_IS_EDGE BIT(28) @@ -40,11 +45,29 @@ #define ICU_SATA0_ICU_ID 109 #define ICU_SATA1_ICU_ID 107 +struct mvebu_icu_subset_data { + int (*get_doorbells)(struct device_node *msi_parent_dn, + phys_addr_t *set, phys_addr_t *clr); + unsigned int offset_set_ah; + unsigned int offset_set_al; + unsigned int offset_clr_ah; + unsigned int offset_clr_al; + unsigned int icu_group; +}; + struct mvebu_icu { struct irq_chip irq_chip; struct regmap *regmap; struct device *dev; bool legacy_bindings; + /* Lock on interrupt allocations/releases */ + spinlock_t msi_lock; + DECLARE_BITMAP(msi_bitmap, ICU_MAX_IRQS); +}; + +struct mvebu_icu_msi_data { + struct mvebu_icu *icu; + const struct mvebu_icu_subset_data *subset_data; }; struct mvebu_icu_irq_data { @@ -115,7 +138,8 @@ static int 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); + struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(d); + struct mvebu_icu *icu = msi_data->icu; unsigned int param_count = icu->legacy_bindings ? 3 : 2; /* Check the count of the parameters in dt */ @@ -156,7 +180,9 @@ mvebu_icu_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, int err; unsigned long hwirq; struct irq_fwspec *fwspec = args; - struct mvebu_icu *icu = platform_msi_get_host_data(domain); + struct mvebu_icu_msi_data *msi_data = + platform_msi_get_host_data(domain); + struct mvebu_icu *icu = msi_data->icu; struct mvebu_icu_irq_data *icu_irqd; icu_irqd = kmalloc(sizeof(*icu_irqd), GFP_KERNEL); @@ -170,16 +196,22 @@ mvebu_icu_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, goto free_irqd; } + spin_lock(&icu->msi_lock); + err = bitmap_allocate_region(icu->msi_bitmap, hwirq, 0); + spin_unlock(&icu->msi_lock); + if (err < 0) + goto free_irqd; + if (icu->legacy_bindings) icu_irqd->icu_group = fwspec->param[0]; else - icu_irqd->icu_group = ICU_GRP_NSR; + icu_irqd->icu_group = msi_data->subset_data->icu_group; icu_irqd->icu = icu; err = platform_msi_domain_alloc(domain, virq, nr_irqs); if (err) { dev_err(icu->dev, "failed to allocate ICU interrupt in parent domain\n"); - goto free_irqd; + goto free_bitmap; } /* Make sure there is no interrupt left pending by the firmware */ @@ -198,6 +230,10 @@ mvebu_icu_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, free_msi: platform_msi_domain_free(domain, virq, nr_irqs); +free_bitmap: + spin_lock(&icu->msi_lock); + bitmap_release_region(icu->msi_bitmap, hwirq, 0); + spin_unlock(&icu->msi_lock); free_irqd: kfree(icu_irqd); return err; @@ -207,12 +243,19 @@ static void mvebu_icu_irq_domain_free(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs) { + struct mvebu_icu_msi_data *msi_data = + platform_msi_get_host_data(domain); + struct mvebu_icu *icu = msi_data->icu; struct irq_data *d = irq_get_irq_data(virq); struct mvebu_icu_irq_data *icu_irqd = d->chip_data; kfree(icu_irqd); platform_msi_domain_free(domain, virq, nr_irqs); + + spin_lock(&icu->msi_lock); + bitmap_release_region(icu->msi_bitmap, d->hwirq, 0); + spin_unlock(&icu->msi_lock); } static const struct irq_domain_ops mvebu_icu_domain_ops = { @@ -221,18 +264,33 @@ static const struct irq_domain_ops mvebu_icu_domain_ops = { .free = mvebu_icu_irq_domain_free, }; -static int mvebu_icu_nsr_probe(struct platform_device *pdev) +static int mvebu_icu_subset_probe(struct platform_device *pdev) { + const struct mvebu_icu_subset_data *subset; + struct mvebu_icu_msi_data *msi_data; struct device_node *msi_parent_dn; struct irq_domain *irq_domain; struct mvebu_icu *icu; phys_addr_t set, clr; int ret; + msi_data = devm_kzalloc(&pdev->dev, sizeof(*msi_data), GFP_KERNEL); + if (!msi_data) + return -ENOMEM; + icu = mvebu_dev_get_drvdata(pdev); if (IS_ERR(icu)) return PTR_ERR(icu); + subset = of_device_get_match_data(&pdev->dev); + if (!subset) { + dev_err(&pdev->dev, "Could not retrieve subset data\n"); + return -EINVAL; + } + + msi_data->icu = icu; + msi_data->subset_data = subset; + pdev->dev.msi_domain = of_msi_get_domain(&pdev->dev, pdev->dev.of_node, DOMAIN_BUS_PLATFORM_MSI); if (!pdev->dev.msi_domain) @@ -243,19 +301,19 @@ static int mvebu_icu_nsr_probe(struct platform_device *pdev) return -ENODEV; /* Set Clear/Set ICU NSR SPI message address in AP */ - ret = mvebu_gicp_get_doorbells(msi_parent_dn, &set, &clr); + ret = subset->get_doorbells(msi_parent_dn, &set, &clr); if (ret) return ret; - regmap_write(icu->regmap, ICU_SETSPI_NSR_AH, upper_32_bits(set)); - regmap_write(icu->regmap, ICU_SETSPI_NSR_AL, lower_32_bits(set)); - regmap_write(icu->regmap, ICU_CLRSPI_NSR_AH, upper_32_bits(clr)); - regmap_write(icu->regmap, ICU_CLRSPI_NSR_AL, lower_32_bits(clr)); + regmap_write(icu->regmap, subset->offset_set_ah, upper_32_bits(set)); + regmap_write(icu->regmap, subset->offset_set_al, lower_32_bits(set)); + regmap_write(icu->regmap, subset->offset_clr_ah, upper_32_bits(clr)); + regmap_write(icu->regmap, subset->offset_clr_al, lower_32_bits(clr)); irq_domain = platform_msi_create_device_domain(&pdev->dev, ICU_MAX_IRQS, mvebu_icu_write_msg, &mvebu_icu_domain_ops, - icu); + msi_data); if (!irq_domain) { dev_err(&pdev->dev, "Failed to create ICU MSI domain\n"); return -ENOMEM; @@ -264,19 +322,44 @@ static int mvebu_icu_nsr_probe(struct platform_device *pdev) return 0; } -static const struct of_device_id mvebu_icu_nsr_of_match[] = { - { .compatible = "marvell,cp110-icu-nsr", }, +static const struct mvebu_icu_subset_data mvebu_icu_nsr_subset_data = { + .get_doorbells = mvebu_gicp_get_doorbells, + .offset_set_ah = ICU_SETSPI_NSR_AH, + .offset_set_al = ICU_SETSPI_NSR_AL, + .offset_clr_ah = ICU_CLRSPI_NSR_AH, + .offset_clr_al = ICU_CLRSPI_NSR_AL, + .icu_group = ICU_GRP_NSR, +}; + +static const struct mvebu_icu_subset_data mvebu_icu_sei_subset_data = { + .get_doorbells = mvebu_sei_get_doorbells, + .offset_set_ah = ICU_SET_SEI_AH, + .offset_set_al = ICU_SET_SEI_AL, + .offset_clr_ah = ICU_CLR_SEI_AH, + .offset_clr_al = ICU_CLR_SEI_AL, + .icu_group = ICU_GRP_SEI, +}; + +static const struct of_device_id mvebu_icu_subset_of_match[] = { + { + .compatible = "marvell,cp110-icu-nsr", + .data = &mvebu_icu_nsr_subset_data, + }, + { + .compatible = "marvell,cp110-icu-sei", + .data = &mvebu_icu_sei_subset_data, + }, {}, }; -static struct platform_driver mvebu_icu_nsr_driver = { - .probe = mvebu_icu_nsr_probe, +static struct platform_driver mvebu_icu_subset_drivers = { + .probe = mvebu_icu_subset_probe, .driver = { - .name = "mvebu-icu-nsr", - .of_match_table = mvebu_icu_nsr_of_match, + .name = "mvebu-icu-subset", + .of_match_table = mvebu_icu_subset_of_match, }, }; -builtin_platform_driver(mvebu_icu_nsr_driver); +builtin_platform_driver(mvebu_icu_subset_drivers); static int mvebu_icu_probe(struct platform_device *pdev) { @@ -291,6 +374,8 @@ static int mvebu_icu_probe(struct platform_device *pdev) icu->dev = &pdev->dev; + spin_lock_init(&icu->msi_lock); + icu->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, NULL); if (IS_ERR(icu->regmap)) return PTR_ERR(icu->regmap); @@ -323,7 +408,7 @@ static int mvebu_icu_probe(struct platform_device *pdev) #endif /* - * Clean all ICU interrupts with type SPI_NSR, required to + * Clean all ICU interrupts of type SPI_NSR and SEI, required to * avoid unpredictable SPI assignments done by firmware. */ for (i = 0 ; i < ICU_MAX_IRQS ; i++) { @@ -332,20 +417,23 @@ static int mvebu_icu_probe(struct platform_device *pdev) regmap_read(icu->regmap, ICU_INT_CFG(i), &icu_int); icu_grp = icu_int >> ICU_GROUP_SHIFT; - if (icu_grp == ICU_GRP_NSR) + if (icu_grp == ICU_GRP_NSR || + (icu_grp == ICU_GRP_SEI && !icu->legacy_bindings)) regmap_write(icu->regmap, ICU_INT_CFG(i), 0); } platform_set_drvdata(pdev, icu); if (icu->legacy_bindings) - return mvebu_icu_nsr_probe(pdev); + return mvebu_icu_subset_probe(pdev); else return devm_of_platform_populate(&pdev->dev); } static const struct of_device_id mvebu_icu_of_match[] = { - { .compatible = "marvell,cp110-icu", }, + { + .compatible = "marvell,cp110-icu", + }, {}, };