37fb5ab893
This only removes the patches already applied upstream and makes the rest apply cleanly. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46128
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 7eb68a2a0519a77b93184c695d4d293c92dc2286 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
Date: Wed, 11 Feb 2015 16:40:58 +0100
|
|
Subject: [PATCH] ARM: BCM5301X: Ignore another (BCM4709 specific) fault code
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Broadcom ARM devices seem to generate some fault once per boot. We
|
|
already have an ignoring handler for BCM4707/BCM4708, but BCM4709
|
|
generates different code.
|
|
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/mach-bcm/bcm_5301x.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm/mach-bcm/bcm_5301x.c
|
|
+++ b/arch/arm/mach-bcm/bcm_5301x.c
|
|
@@ -18,15 +18,16 @@ static bool first_fault = true;
|
|
static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
|
|
struct pt_regs *regs)
|
|
{
|
|
- if (fsr == 0x1c06 && first_fault) {
|
|
+ if ((fsr == 0x1406 || fsr == 0x1c06) && first_fault) {
|
|
first_fault = false;
|
|
|
|
/*
|
|
- * These faults with code 0x1c06 happens for no good reason,
|
|
- * possibly left over from the CFE boot loader.
|
|
+ * These faults with codes 0x1406 (BCM4709) or 0x1c06 happens
|
|
+ * for no good reason, possibly left over from the CFE boot
|
|
+ * loader.
|
|
*/
|
|
pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n",
|
|
- addr, fsr);
|
|
+ addr, fsr);
|
|
|
|
/* Returning non-zero causes fault display and panic */
|
|
return 0;
|