mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-07 15:07:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

irqchip/armada-370-xp: Print error and return error code on initialization failure

Browse Source 
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@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240711160907.31012-11-kabel@kernel.org
This commit is contained in:
Marek Behún
2024-07-11 18:09:07 +02:00
committed by Thomas Gleixner
parent 654caa9db6
commit 1d07c9a3e7
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/irqchip/irq-armada-370-xp.c
View File

@@ -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);