From nobody Sun Feb 8 21:06:47 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3346191F89; Tue, 20 Aug 2024 14:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724165676; cv=none; b=YkHHE/sHX1d/eYtFjyhiOpeH1Oo9E7HmT+4uUmf8ENndqmJ02iMS2inBXI9LPqiDpyeav75bLbNuxrlCTLJG9+dI7ePPOPe2OeMkofIvZ42k7OUV8he/t7yYHKA6GyWlYfyatLAce4WBPqiHVp4M3RBysKrkOfCPi5al1/xreVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724165676; c=relaxed/simple; bh=igLHxAa+rJVh4KC/6DDQmCSZFQ4OZ+ZUoe9DbzPHTAk=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Ax99Rl5lmUbsFrSmbHLBKfCVqxMVf/d8nANt9wXCwz4h0FfMFzWmRG1qumtWks/cWkwpxXYu3Rb1pRaKjn5+liHPIIJTnPGb/OWuvQf3eBuRz5+kKMCp5XaDYw+5ZUhCSV3zfY6lVjXYx3LVYQtvsV6b8jVzNJuYCEQ+jq+/Crg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=bCZXTTBb; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=nnMCdK8Z; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bCZXTTBb"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="nnMCdK8Z" Date: Tue, 20 Aug 2024 14:54:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1724165672; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UIA/OQxse/9HKaQBEsedEJ8y/J74hdcei3i79bJ+0h8=; b=bCZXTTBbVLDjcjbZDYMsrT93NROJAXoI/akDqai3AQ72AEFcYEO67872SqujehqhmDJYU8 tDyQb3FP1DHMVg4Nrf1Hf110X0ANfKo5XkB3nyET7tyfqX6GI95dAgaWFVRPxG/aNMV27H 8xHBVPs9nI4JES/EJWs6CWyW6sZs2ddeLK9C1UdvzhxwzzHucs0ZV/Euz/iaMZmOyivKW3 lHtTBrt3si/ON0gVvu7/83oq72y3ggQcpB991tbgSw4rcgcnjN8az9stTyF70WhC/HR/Vn mFJv999Bc0RZAq+OzmoBwKbRJVcMriEJytnBi+7Xn3WydN5Jz1dObgTdiIgz8w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1724165672; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UIA/OQxse/9HKaQBEsedEJ8y/J74hdcei3i79bJ+0h8=; b=nnMCdK8ZwIHs7DPsMaEKTgNJ1dgcVpsZx/rkRXKJAuSw+PaU2o79QkaS92Ec/zFLIOw3IO k9CjthLITqnc2qAQ== From: "tip-bot2 for Anup Patel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/urgent] irqchip/sifive-plic: Probe plic driver early for Allwinner D1 platform Cc: Thomas Gleixner , Anup Patel , Samuel Holland , Emil Renner Berthing , Charlie Jenkins , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20240820034850.3189912-1-apatel@ventanamicro.com> References: <20240820034850.3189912-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <172416567231.2215.161052933321300291.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/urgent branch of tip: Commit-ID: 4d936f10ff80274841537a26d1fbfe9984de0ef9 Gitweb: https://git.kernel.org/tip/4d936f10ff80274841537a26d1fbfe998= 4de0ef9 Author: Anup Patel AuthorDate: Tue, 20 Aug 2024 09:18:50 +05:30 Committer: Thomas Gleixner CommitterDate: Tue, 20 Aug 2024 16:45:20 +02:00 irqchip/sifive-plic: Probe plic driver early for Allwinner D1 platform The latest Linux RISC-V no longer boots on the Allwinner D1 platform because the sun4i_timer driver fails to get an interrupt from PLIC due to the recent conversion of the PLIC to a platform driver. Converting the sun4i timer to a platform driver does not work either because the D1 does not have a SBI timer available so early boot hangs. See the 'Closes:' link for deeper analysis. The real fix requires enabling the SBI time extension in the platform firmware (OpenSBI) and convert sun4i_timer into platform driver. Unfortunately, the real fix involves changing multiple places and can't be achieved in a short duration and aside of that requires users to update firmware. As a work-around, retrofit PLIC probing such that the PLIC is probed early only for the Allwinner D1 platform and probed as a regular platform driver for rest of the RISC-V platforms. In the process, partially revert some of the previous changes because the PLIC device pointer is not available in all probing paths. Fixes: e306a894bd51 ("irqchip/sifive-plic: Chain to parent IRQ after handle= rs are ready") Fixes: 8ec99b033147 ("irqchip/sifive-plic: Convert PLIC driver into a platf= orm driver") Suggested-by: Thomas Gleixner Signed-off-by: Anup Patel Signed-off-by: Thomas Gleixner Tested-by: Samuel Holland Tested-by: Emil Renner Berthing Tested-by: Charlie Jenkins Reviewed-by: Samuel Holland Reviewed-by: Charlie Jenkins Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20240820034850.3189912-1-apatel@ventanami= cro.com Closes: https://lore.kernel.org/lkml/20240814145642.344485-1-emil.renner.be= rthing@canonical.com/ --- drivers/irqchip/irq-sifive-plic.c | 115 +++++++++++++++++------------ 1 file changed, 71 insertions(+), 44 deletions(-) diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive= -plic.c index 9e22f7e..4d9ea71 100644 --- a/drivers/irqchip/irq-sifive-plic.c +++ b/drivers/irqchip/irq-sifive-plic.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 SiFive * Copyright (C) 2018 Christoph Hellwig */ +#define pr_fmt(fmt) "riscv-plic: " fmt #include #include #include @@ -63,7 +64,7 @@ #define PLIC_QUIRK_EDGE_INTERRUPT 0 =20 struct plic_priv { - struct device *dev; + struct fwnode_handle *fwnode; struct cpumask lmask; struct irq_domain *irqdomain; void __iomem *regs; @@ -378,8 +379,8 @@ static void plic_handle_irq(struct irq_desc *desc) int err =3D generic_handle_domain_irq(handler->priv->irqdomain, hwirq); if (unlikely(err)) { - dev_warn_ratelimited(handler->priv->dev, - "can't find mapping for hwirq %lu\n", hwirq); + pr_warn_ratelimited("%pfwP: can't find mapping for hwirq %lu\n", + handler->priv->fwnode, hwirq); } } =20 @@ -408,7 +409,8 @@ static int plic_starting_cpu(unsigned int cpu) enable_percpu_irq(plic_parent_irq, irq_get_trigger_type(plic_parent_irq)); else - dev_warn(handler->priv->dev, "cpu%d: parent irq not available\n", cpu); + pr_warn("%pfwP: cpu%d: parent irq not available\n", + handler->priv->fwnode, cpu); plic_set_threshold(handler, PLIC_ENABLE_THRESHOLD); =20 return 0; @@ -424,38 +426,36 @@ static const struct of_device_id plic_match[] =3D { {} }; =20 -static int plic_parse_nr_irqs_and_contexts(struct platform_device *pdev, +static int plic_parse_nr_irqs_and_contexts(struct fwnode_handle *fwnode, u32 *nr_irqs, u32 *nr_contexts) { - struct device *dev =3D &pdev->dev; int rc; =20 /* * Currently, only OF fwnode is supported so extend this * function for ACPI support. */ - if (!is_of_node(dev->fwnode)) + if (!is_of_node(fwnode)) return -EINVAL; =20 - rc =3D of_property_read_u32(to_of_node(dev->fwnode), "riscv,ndev", nr_irq= s); + rc =3D of_property_read_u32(to_of_node(fwnode), "riscv,ndev", nr_irqs); if (rc) { - dev_err(dev, "riscv,ndev property not available\n"); + pr_err("%pfwP: riscv,ndev property not available\n", fwnode); return rc; } =20 - *nr_contexts =3D of_irq_count(to_of_node(dev->fwnode)); + *nr_contexts =3D of_irq_count(to_of_node(fwnode)); if (WARN_ON(!(*nr_contexts))) { - dev_err(dev, "no PLIC context available\n"); + pr_err("%pfwP: no PLIC context available\n", fwnode); return -EINVAL; } =20 return 0; } =20 -static int plic_parse_context_parent(struct platform_device *pdev, u32 con= text, +static int plic_parse_context_parent(struct fwnode_handle *fwnode, u32 con= text, u32 *parent_hwirq, int *parent_cpu) { - struct device *dev =3D &pdev->dev; struct of_phandle_args parent; unsigned long hartid; int rc; @@ -464,10 +464,10 @@ static int plic_parse_context_parent(struct platform_= device *pdev, u32 context, * Currently, only OF fwnode is supported so extend this * function for ACPI support. */ - if (!is_of_node(dev->fwnode)) + if (!is_of_node(fwnode)) return -EINVAL; =20 - rc =3D of_irq_parse_one(to_of_node(dev->fwnode), context, &parent); + rc =3D of_irq_parse_one(to_of_node(fwnode), context, &parent); if (rc) return rc; =20 @@ -480,48 +480,55 @@ static int plic_parse_context_parent(struct platform_= device *pdev, u32 context, return 0; } =20 -static int plic_probe(struct platform_device *pdev) +static int plic_probe(struct fwnode_handle *fwnode) { int error =3D 0, nr_contexts, nr_handlers =3D 0, cpu, i; - struct device *dev =3D &pdev->dev; unsigned long plic_quirks =3D 0; struct plic_handler *handler; u32 nr_irqs, parent_hwirq; struct plic_priv *priv; irq_hw_number_t hwirq; + void __iomem *regs; =20 - if (is_of_node(dev->fwnode)) { + if (is_of_node(fwnode)) { const struct of_device_id *id; =20 - id =3D of_match_node(plic_match, to_of_node(dev->fwnode)); + id =3D of_match_node(plic_match, to_of_node(fwnode)); if (id) plic_quirks =3D (unsigned long)id->data; + + regs =3D of_iomap(to_of_node(fwnode), 0); + if (!regs) + return -ENOMEM; + } else { + return -ENODEV; } =20 - error =3D plic_parse_nr_irqs_and_contexts(pdev, &nr_irqs, &nr_contexts); + error =3D plic_parse_nr_irqs_and_contexts(fwnode, &nr_irqs, &nr_contexts); if (error) - return error; + goto fail_free_regs; =20 - priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; + priv =3D kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) { + error =3D -ENOMEM; + goto fail_free_regs; + } =20 - priv->dev =3D dev; + priv->fwnode =3D fwnode; priv->plic_quirks =3D plic_quirks; priv->nr_irqs =3D nr_irqs; + priv->regs =3D regs; =20 - priv->regs =3D devm_platform_ioremap_resource(pdev, 0); - if (WARN_ON(!priv->regs)) - return -EIO; - - priv->prio_save =3D devm_bitmap_zalloc(dev, nr_irqs, GFP_KERNEL); - if (!priv->prio_save) - return -ENOMEM; + priv->prio_save =3D bitmap_zalloc(nr_irqs, GFP_KERNEL); + if (!priv->prio_save) { + error =3D -ENOMEM; + goto fail_free_priv; + } =20 for (i =3D 0; i < nr_contexts; i++) { - error =3D plic_parse_context_parent(pdev, i, &parent_hwirq, &cpu); + error =3D plic_parse_context_parent(fwnode, i, &parent_hwirq, &cpu); if (error) { - dev_warn(dev, "hwirq for context%d not found\n", i); + pr_warn("%pfwP: hwirq for context%d not found\n", fwnode, i); continue; } =20 @@ -543,7 +550,7 @@ static int plic_probe(struct platform_device *pdev) } =20 if (cpu < 0) { - dev_warn(dev, "Invalid cpuid for context %d\n", i); + pr_warn("%pfwP: Invalid cpuid for context %d\n", fwnode, i); continue; } =20 @@ -554,7 +561,7 @@ static int plic_probe(struct platform_device *pdev) */ handler =3D per_cpu_ptr(&plic_handlers, cpu); if (handler->present) { - dev_warn(dev, "handler already present for context %d.\n", i); + pr_warn("%pfwP: handler already present for context %d.\n", fwnode, i); plic_set_threshold(handler, PLIC_DISABLE_THRESHOLD); goto done; } @@ -568,8 +575,8 @@ static int plic_probe(struct platform_device *pdev) i * CONTEXT_ENABLE_SIZE; handler->priv =3D priv; =20 - handler->enable_save =3D devm_kcalloc(dev, DIV_ROUND_UP(nr_irqs, 32), - sizeof(*handler->enable_save), GFP_KERNEL); + handler->enable_save =3D kcalloc(DIV_ROUND_UP(nr_irqs, 32), + sizeof(*handler->enable_save), GFP_KERNEL); if (!handler->enable_save) goto fail_cleanup_contexts; done: @@ -581,7 +588,7 @@ done: nr_handlers++; } =20 - priv->irqdomain =3D irq_domain_add_linear(to_of_node(dev->fwnode), nr_irq= s + 1, + priv->irqdomain =3D irq_domain_add_linear(to_of_node(fwnode), nr_irqs + 1, &plic_irqdomain_ops, priv); if (WARN_ON(!priv->irqdomain)) goto fail_cleanup_contexts; @@ -619,13 +626,13 @@ done: } } =20 - dev_info(dev, "mapped %d interrupts with %d handlers for %d contexts.\n", - nr_irqs, nr_handlers, nr_contexts); + pr_info("%pfwP: mapped %d interrupts with %d handlers for %d contexts.\n", + fwnode, nr_irqs, nr_handlers, nr_contexts); return 0; =20 fail_cleanup_contexts: for (i =3D 0; i < nr_contexts; i++) { - if (plic_parse_context_parent(pdev, i, &parent_hwirq, &cpu)) + if (plic_parse_context_parent(fwnode, i, &parent_hwirq, &cpu)) continue; if (parent_hwirq !=3D RV_IRQ_EXT || cpu < 0) continue; @@ -634,17 +641,37 @@ fail_cleanup_contexts: handler->present =3D false; handler->hart_base =3D NULL; handler->enable_base =3D NULL; + kfree(handler->enable_save); handler->enable_save =3D NULL; handler->priv =3D NULL; } - return -ENOMEM; + bitmap_free(priv->prio_save); +fail_free_priv: + kfree(priv); +fail_free_regs: + iounmap(regs); + return error; +} + +static int plic_platform_probe(struct platform_device *pdev) +{ + return plic_probe(pdev->dev.fwnode); } =20 static struct platform_driver plic_driver =3D { .driver =3D { .name =3D "riscv-plic", .of_match_table =3D plic_match, + .suppress_bind_attrs =3D true, }, - .probe =3D plic_probe, + .probe =3D plic_platform_probe, }; builtin_platform_driver(plic_driver); + +static int __init plic_early_probe(struct device_node *node, + struct device_node *parent) +{ + return plic_probe(&node->fwnode); +} + +IRQCHIP_DECLARE(riscv, "allwinner,sun20i-d1-plic", plic_early_probe);