#include <linux/of.h>
 #include <linux/bitops.h>
 #include <linux/pm.h>
+#include <linux/kernel.h>
+#include <linux/kdebug.h>
+#include <linux/notifier.h>
 
 #ifdef CONFIG_ARM
 #include <asm/bug.h>
        return IRQ_HANDLED;
 }
 
+/*
+ * Dump out gisb errors on die or panic.
+ */
+static int dump_gisb_error(struct notifier_block *self, unsigned long v,
+                          void *p);
+
+static struct notifier_block gisb_die_notifier = {
+       .notifier_call = dump_gisb_error,
+};
+
+static struct notifier_block gisb_panic_notifier = {
+       .notifier_call = dump_gisb_error,
+};
+
+static int dump_gisb_error(struct notifier_block *self, unsigned long v,
+                          void *p)
+{
+       struct brcmstb_gisb_arb_device *gdev;
+       const char *reason = "panic";
+
+       if (self == &gisb_die_notifier)
+               reason = "die";
+
+       /* iterate over each GISB arb registered handlers */
+       list_for_each_entry(gdev, &brcmstb_gisb_arb_device_list, next)
+               brcmstb_gisb_arb_decode_addr(gdev, reason);
+
+       return NOTIFY_DONE;
+}
+
 static DEVICE_ATTR(gisb_arb_timeout, S_IWUSR | S_IRUGO,
                gisb_arb_get_timeout, gisb_arb_set_timeout);
 
        board_be_handler = brcmstb_bus_error_handler;
 #endif
 
+       if (list_is_singular(&brcmstb_gisb_arb_device_list)) {
+               register_die_notifier(&gisb_die_notifier);
+               atomic_notifier_chain_register(&panic_notifier_list,
+                                              &gisb_panic_notifier);
+       }
+
        dev_info(&pdev->dev, "registered mem: %p, irqs: %d, %d\n",
                        gdev->base, timeout_irq, tea_irq);