Skip to content

Commit 55f67b9

Browse files
haukegregkh
authored andcommitted
MIPS: Lantiq: fix missing xbar kernel panic
commit 6ef90877eee63a0d03e83183bb44b64229b624e6 upstream. Commit 08b3c89 ("MIPS: lantiq: Disable xbar fpi burst mode") accidentally requested the resources from the pmu address region instead of the xbar registers region, but the check for the return value of request_mem_region() was wrong. Commit 98ea51cb0c8c ("MIPS: Lantiq: Fix another request_mem_region() return code check") fixed the check of the return value of request_mem_region() which made the kernel panics. This patch now makes use of the correct memory region for the cross bar. Fixes: 08b3c89 ("MIPS: lantiq: Disable xbar fpi burst mode") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Cc: John Crispin <john@phrozen.org> Cc: james.hogan@imgtec.com Cc: arnd@arndb.de Cc: sergei.shtylyov@cogentembedded.com Cc: john@phrozen.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15751 Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7680190 commit 55f67b9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/mips/lantiq/xway/sysctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ void __init ltq_soc_init(void)
467467

468468
if (!np_xbar)
469469
panic("Failed to load xbar nodes from devicetree");
470-
if (of_address_to_resource(np_pmu, 0, &res_xbar))
470+
if (of_address_to_resource(np_xbar, 0, &res_xbar))
471471
panic("Failed to get xbar resources");
472472
if (request_mem_region(res_xbar.start, resource_size(&res_xbar),
473473
res_xbar.name) < 0)

0 commit comments

Comments
 (0)