mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
[PATCH] powerpc: Fix search for the main interrupt controller
At present, we are not looking at all interrupt controller nodes in the device tree even though the proper node was not found. This is causing the system panic. The attached patch will scan all nodes until it finds the proper interrupt controller type. Signed-off-by: Haren Myneni <haren@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
79e7bac0d6
commit
9da5cad61c
1 changed files with 9 additions and 6 deletions
|
@ -324,15 +324,18 @@ static void __init pSeries_discover_pic(void)
|
|||
ppc64_interrupt_controller = IC_INVALID;
|
||||
for (np = NULL; (np = of_find_node_by_name(np, "interrupt-controller"));) {
|
||||
typep = (char *)get_property(np, "compatible", NULL);
|
||||
if (strstr(typep, "open-pic"))
|
||||
if (strstr(typep, "open-pic")) {
|
||||
ppc64_interrupt_controller = IC_OPEN_PIC;
|
||||
else if (strstr(typep, "ppc-xicp"))
|
||||
break;
|
||||
} else if (strstr(typep, "ppc-xicp")) {
|
||||
ppc64_interrupt_controller = IC_PPC_XIC;
|
||||
else
|
||||
printk("pSeries_discover_pic: failed to recognize"
|
||||
" interrupt-controller\n");
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (ppc64_interrupt_controller == IC_INVALID)
|
||||
printk("pSeries_discover_pic: failed to recognize"
|
||||
" interrupt-controller\n");
|
||||
|
||||
}
|
||||
|
||||
static void pSeries_mach_cpu_die(void)
|
||||
|
|
Loading…
Reference in a new issue