1 files changed, 33 insertions, 0 deletions

diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
index ef9740a20883..edff69761e04 100644
--- a/arch/arm/mach-bcm/bcm_5301x.c
+++ b/arch/arm/mach-bcm/bcm_5301x.c
@@ -9,8 +9,40 @@
 #include <asm/hardware/cache-l2x0.h>
 
 #include <asm/mach/arch.h>
+#include <asm/siginfo.h>
+#include <asm/signal.h>
 
 
+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) {
+                first_fault = false;
+
+                /*
+                 * These faults with code 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);
+
+                /* Returning non-zero causes fault display and panic */
+                return 0;
+        }
+
+        /* Others should cause a fault */
+        return 1;
+}
+
+static void __init bcm5301x_init_early(void)
+{
+        /* Install our hook */
+        hook_fault_code(16 + 6, bcm5301x_abort_handler, SIGBUS, BUS_OBJERR,
+                        "imprecise external abort");
+}
+
 static void __init bcm5301x_dt_init(void)
 {
         l2x0_of_init(0, ~0UL);
@@ -23,6 +55,7 @@ static const char __initconst *bcm5301x_dt_compat[] = {
 };
 
 DT_MACHINE_START(BCM5301X, "BCM5301X")
+        .init_early     = bcm5301x_init_early,
         .init_machine   = bcm5301x_dt_init,
         .dt_compat      = bcm5301x_dt_compat,
 MACHINE_END