[POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA

The SPU code will crash if CONFIG_NUMA is not set and SPUs are found on
a non-0 node. This workaround will ignore those SPEs and just print an
message in the kernel log.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index ccfd0c4db87441398bbd9519f5780dcfc3354d76..d0fb959e3ef113b117d4972c373067baab96aa29 100644 (file)
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -781,6 +781,17 @@ static int __init create_spu(struct device_node *spe)
        if (!spu)
                goto out;
 
+       spu->node = find_spu_node_id(spe);
+       if (spu->node >= MAX_NUMNODES) {
+               printk(KERN_WARNING "SPE %s on node %d ignored,"
+                      " node number too big\n", spe->full_name, spu->node);
+               printk(KERN_WARNING "Check if CONFIG_NUMA is enabled.\n");
+               return -ENODEV;
+       }
+       spu->nid = of_node_to_nid(spe);
+       if (spu->nid == -1)
+               spu->nid = 0;
+
        ret = spu_map_device(spu, spe);
        /* try old method */
        if (ret)
@@ -788,10 +799,6 @@ static int __init create_spu(struct device_node *spe)
        if (ret)
                goto out_free;
 
-       spu->node = find_spu_node_id(spe);
-       spu->nid = of_node_to_nid(spe);
-       if (spu->nid == -1)
-               spu->nid = 0;
        ret = spu_map_interrupts(spu, spe);
        if (ret)
                ret = spu_map_interrupts_old(spu, spe);