[<prev] [next>] [day] [month] [year] [list]
Message-ID: <172233959751.2215.191449091213078719.tip-bot2@tip-bot2>
Date: Tue, 30 Jul 2024 11:39:57 -0000
From: tip-bot2 for Marek Behún <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: kabel@...nel.org, Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
linux-kernel@...r.kernel.org, maz@...nel.org
Subject: [tip: irq/core] irqchip/armada-370-xp: Print error and return error
code on initialization failure
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 1d07c9a3e71c97ee1bbc1f119e104bf3746c51f7
Gitweb: https://git.kernel.org/tip/1d07c9a3e71c97ee1bbc1f119e104bf3746c51f7
Author: Marek Behún <kabel@...nel.org>
AuthorDate: Thu, 11 Jul 2024 18:09:07 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Tue, 30 Jul 2024 13:35:49 +02:00
irqchip/armada-370-xp: Print error and return error code on initialization failure
Print error and return error code on main / IPI / MSI domain
initialization failure. Use WARN_ON() instead of BUG_ON().
Signed-off-by: Marek Behún <kabel@...nel.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lore.kernel.org/all/20240711160907.31012-11-kabel@kernel.org
---
drivers/irqchip/irq-armada-370-xp.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 9c66c25..b11612a 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -464,20 +464,23 @@ static void mpic_ipi_resume(void)
}
}
-static __init void mpic_ipi_init(struct device_node *node)
+static __init int mpic_ipi_init(struct device_node *node)
{
int base_ipi;
mpic_ipi_domain = irq_domain_create_linear(of_node_to_fwnode(node), IPI_DOORBELL_END,
&mpic_ipi_domain_ops, NULL);
if (WARN_ON(!mpic_ipi_domain))
- return;
+ return -ENOMEM;
irq_domain_update_bus_token(mpic_ipi_domain, DOMAIN_BUS_IPI);
base_ipi = irq_domain_alloc_irqs(mpic_ipi_domain, IPI_DOORBELL_END, NUMA_NO_NODE, NULL);
if (WARN_ON(!base_ipi))
- return;
+ return -ENOMEM;
+
set_smp_ipi_range(base_ipi, IPI_DOORBELL_END);
+
+ return 0;
}
static int mpic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force)
@@ -803,7 +806,11 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par
writel(i, main_int_base + MPIC_INT_CLEAR_ENABLE);
mpic_domain = irq_domain_add_linear(node, nr_irqs, &mpic_irq_ops, NULL);
- BUG_ON(!mpic_domain);
+ if (!mpic_domain) {
+ pr_err("%pOF: Unable to add IRQ domain\n", node);
+ return -ENOMEM;
+ }
+
irq_domain_update_bus_token(mpic_domain, DOMAIN_BUS_WIRED);
/*
@@ -816,13 +823,22 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par
mpic_perf_init();
mpic_smp_cpu_init();
- mpic_msi_init(node, phys_base);
+ err = mpic_msi_init(node, phys_base);
+ if (err) {
+ pr_err("%pOF: Unable to initialize MSI domain\n", node);
+ return err;
+ }
if (parent_irq <= 0) {
irq_set_default_host(mpic_domain);
set_handle_irq(mpic_handle_irq);
#ifdef CONFIG_SMP
- mpic_ipi_init(node);
+ err = mpic_ipi_init(node);
+ if (err) {
+ pr_err("%pOF: Unable to initialize IPI domain\n", node);
+ return err;
+ }
+
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_XP_STARTING,
"irqchip/armada/ipi:starting",
mpic_starting_cpu, NULL);
Powered by blists - more mailing lists