Commit 464d88e8 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Greg Kroah-Hartman

MIPS: Lantiq: fix missing xbar kernel panic

commit 6ef90877 upstream.

Commit 08b3c894 ("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 98ea51cb ("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: 08b3c894 ("MIPS: lantiq: Disable xbar fpi burst mode")
Signed-off-by: default avatarHauke 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/15751Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 187b9576
...@@ -467,7 +467,7 @@ void __init ltq_soc_init(void) ...@@ -467,7 +467,7 @@ void __init ltq_soc_init(void)
if (!np_xbar) if (!np_xbar)
panic("Failed to load xbar nodes from devicetree"); panic("Failed to load xbar nodes from devicetree");
if (of_address_to_resource(np_pmu, 0, &res_xbar)) if (of_address_to_resource(np_xbar, 0, &res_xbar))
panic("Failed to get xbar resources"); panic("Failed to get xbar resources");
if (request_mem_region(res_xbar.start, resource_size(&res_xbar), if (request_mem_region(res_xbar.start, resource_size(&res_xbar),
res_xbar.name) < 0) res_xbar.name) < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment