MIPS: Don't BUG_ON when no IPI domain is found

Commit fbde2d7d8290 ("MIPS: Add generic SMP IPI support") introduced
code that BUG_ON's in the case of a kernel that supports IPI domains but
does not have one at runtime. This case is possible on Malta where for
IPIs we may use either the GIC (which has an IPI IRQ domain
implementation) or core-local software interrupts between VPEs (which do
not currently have an IPI IRQ domain implementation). We can not know
which will be used until runtime when we know whether a GIC is actually
present, and if we run on a system with multiple VPEs and no GIC then
the BUG_ON is hit.

Commit 19fb5818ed60 ("IPS: Fix broken malta qemu") worked around this
for the single-core single-VPE case typically seen using QEMU, but does
not catch the multi-VPE case. This patch removes the insufficient CPU
presence check that was added and works around the bug differently,
effectively reverting that commit.

A simple way to reproduce this bug is by using QEMU, which partially
implements the MT ASE but does not implement the GIC as of version 2.5.
Using "-cpu 34Kf -smp 2" will present a system with 2 VPEs in one core &
no GIC, hitting the BUG_ON.

Given that we're post-merge-window on the way to v4.6, avoid this by
just returning from mips_smp_ipi_init when no IPI IRQ domain is found.
Ideally at some point all IPI implementations would be converted to the
same IPI IRQ domain interface & we'd be able to restore the check.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Qais Yousef <qsyousef@gmail.com>
Fixes: fbde2d7d8290 ("MIPS: Add generic SMP IPI support")
Fixes: 19fb5818ed60 ("IPS: Fix broken malta qemu")
Reverts: 19fb5818ed60 ("IPS: Fix broken malta qemu")
Cc: Qais Yousef <qsyousef@gmail.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Alex Smith <alex.smith@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13007/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 27cb638f082414048b6655eb04fc36b3b064eec1..f9d01e953acb8b8c2042d932b4a2159d09769350 100644 (file)
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -243,18 +243,6 @@ static int __init mips_smp_ipi_init(void)
        struct irq_domain *ipidomain;
        struct device_node *node;
 
-       /*
-        * In some cases like qemu-malta, it is desired to try SMP with
-        * a single core. Qemu-malta has no GIC, so an attempt to set any IPIs
-        * would cause a BUG_ON() to be triggered since there's no ipidomain.
-        *
-        * Since for a single core system IPIs aren't required really, skip the
-        * initialisation which should generally keep any such configurations
-        * happy and only fail hard when trying to truely run SMP.
-        */
-       if (cpumask_weight(cpu_possible_mask) == 1)
-               return 0;
-
        node = of_irq_find_parent(of_root);
        ipidomain = irq_find_matching_host(node, DOMAIN_BUS_IPI);
 
@@ -266,7 +254,17 @@ static int __init mips_smp_ipi_init(void)
        if (node && !ipidomain)
                ipidomain = irq_find_matching_host(NULL, DOMAIN_BUS_IPI);
 
-       BUG_ON(!ipidomain);
+       /*
+        * There are systems which only use IPI domains some of the time,
+        * depending upon configuration we don't know until runtime. An
+        * example is Malta where we may compile in support for GIC & the
+        * MT ASE, but run on a system which has multiple VPEs in a single
+        * core and doesn't include a GIC. Until all IPI implementations
+        * have been converted to use IPI domains the best we can do here
+        * is to return & hope some other code sets up the IPIs.
+        */
+       if (!ipidomain)
+               return 0;
 
        call_virq = irq_reserve_ipi(ipidomain, cpu_possible_mask);
        BUG_ON(!call_virq);