| From 154d7249a6ca1e2c4d3e86cac8950c6bcabbaa22 Mon Sep 17 00:00:00 2001 |
| From: Hauke Mehrtens <hauke@hauke-m.de> |
| Date: Wed, 15 Mar 2017 23:26:42 +0100 |
| Subject: [PATCH] MIPS: Lantiq: fix missing xbar kernel panic |
| |
| commit 6ef90877eee63a0d03e83183bb44b64229b624e6 upstream. |
| |
| Commit 08b3c894e565 ("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: 08b3c894e565 ("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: <stable@vger.kernel.org> # 4.4.x- |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c |
| index 9a61671c00a7..90565477dfbd 100644 |
| --- a/arch/mips/lantiq/xway/sysctrl.c |
| +++ b/arch/mips/lantiq/xway/sysctrl.c |
| @@ -467,7 +467,7 @@ void __init ltq_soc_init(void) |
| |
| if (!np_xbar) |
| 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"); |
| if (request_mem_region(res_xbar.start, resource_size(&res_xbar), |
| res_xbar.name) < 0) |
| -- |
| 2.12.0 |
| |
