Re: mpic discovery on JS20

[Michael Ellerman <michael@ellerman.id.au>]

[-- Attachment #1.1: Type: text/plain, Size: 716 bytes --]

On Thu, 2006-07-20 at 19:16 -0400, Amos Waterland wrote:
> Current Linus and Paulus trees do this on JS20 blades with SLOF:
> 
>  Failed to locate the MPIC interrupt controller
>  PID hash table entries: 4096 (order: 12, 32768 bytes)
>  Maple: Found RTC at IO 0x1070
>  cpu 0x0: Vector: 700 (Program Check) at [c00000007ef83ab0]
>      pc: c00000000002e0c8: .mpic_request_ipis+0x34/0xc8
>      lr: c00000000036b484: .smp_mpic_probe+0x3c/0x58
>      sp: c00000007ef83d30
>     msr: 9000000000029032
>    current = 0xc00000000194d610
>    paca    = 0xc00000000038f180
>      pid   = 1, comm = swapper
>  kernel BUG in mpic_request_ipis at arch/powerpc/sysdev/mpic.c:1132!

Does this help?

cheers


[-- Attachment #1.2: mpic-fixup.patch --]
[-- Type: text/x-patch, Size: 1132 bytes --]

Index: to-merge/arch/powerpc/platforms/maple/setup.c
===================================================================
--- to-merge.orig/arch/powerpc/platforms/maple/setup.c
+++ to-merge/arch/powerpc/platforms/maple/setup.c
@@ -216,6 +216,7 @@ static void __init maple_init_IRQ(void)
 	int naddr, n, i, opplen, has_isus = 0;
 	struct mpic *mpic;
 	unsigned int flags = MPIC_PRIMARY;
+	char *typep;
 
 	/* Locate MPIC in the device-tree. Note that there is a bug
 	 * in Maple device-tree where the type of the controller is
@@ -226,9 +227,19 @@ static void __init maple_init_IRQ(void)
 		break;
 	}
 	if (mpic_node == NULL) {
-		printk(KERN_ERR
-		       "Failed to locate the MPIC interrupt controller\n");
-		return;
+		for_each_node_by_type(np, "interrupt-controller") {
+			typep = (char *)get_property(np, "compatible", NULL);
+			if (strstr(typep, "open-pic")) {
+				mpic_node = np;
+				break;
+			}
+		}
+
+		if (mpic_node == NULL) {
+			printk(KERN_ERR "Failed to locate the MPIC interrupt "
+				"controller\n");
+			return;
+		}
 	}
 
 	/* Find address list in /platform-open-pic */

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 191 bytes --]