UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

of/irq: Fix pSeries boot failure 

of_irq_parse_raw() needs to return the correct interrupt controller
node when an interrupt-map property doesn't exist.

It allows of_irq_parse_raw() to return the node pointer of the interrupt
controller, rather than the parent bus. This allows ics_rtas_host_match()
to detect that the controller is a legacy 8259 and avoid using xics.
This avoids an RTAS assertion/crash during early kernel bootstrapping.

Signed-off-by: Jeremy Linton <lintonrjeremy@gmail.com>
Reviewed-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Jeremy Linton 2015-06-29 18:50:55 -05:00 committed by Grant Likely
parent becfc3c86d
commit d23b251669
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/of/irq.c
View File

@ -252,8 +252,6 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
* Successfully parsed an interrrupt-map translation; copy new * Successfully parsed an interrrupt-map translation; copy new
* interrupt specifier into the out_irq structure * interrupt specifier into the out_irq structure
*/ */
out_irq->np = newpar;
match_array = imap - newaddrsize - newintsize; match_array = imap - newaddrsize - newintsize;
for (i = 0; i < newintsize; i++) for (i = 0; i < newintsize; i++)
out_irq->args[i] = be32_to_cpup(imap - newintsize + i); out_irq->args[i] = be32_to_cpup(imap - newintsize + i);
@ -262,6 +260,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
skiplevel: skiplevel:
/* Iterate again with new parent */ /* Iterate again with new parent */
out_irq->np = newpar;
pr_debug(" -> new parent: %s\n", of_node_full_name(newpar)); pr_debug(" -> new parent: %s\n", of_node_full_name(newpar));
of_node_put(ipar); of_node_put(ipar);
ipar = newpar; ipar = newpar;