Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK

This code was useful during early port development when our icache code
wasn't solid, but that ship has sailed long ago, and no code calls this
function anymore (irq_panic).  So punt it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug
index d1825cb247685dacb6175f58829bec48edb6c03f..acb83799a215f89ce870493ab90976ea79cadf46 100644 (file)
--- a/arch/blackfin/Kconfig.debug
+++ b/arch/blackfin/Kconfig.debug
@@ -102,17 +102,6 @@ config DEBUG_DOUBLEFAULT_RESET
 
 endchoice
 
-config DEBUG_ICACHE_CHECK
-       bool "Check Instruction cache coherency"
-       depends on DEBUG_KERNEL
-       depends on DEBUG_HWERR
-       help
-         Say Y here if you are getting weird unexplained errors. This will
-         ensure that icache is what SDRAM says it should be by doing a
-         byte wise comparison between SDRAM and instruction cache. This
-         also relocates the irq_panic() function to L1 memory, (which is
-         un-cached).
-
 config DEBUG_HUNT_FOR_ZERO
        bool "Catch NULL pointer reads/writes"
        default y

diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 814cb483853bba6ea743285e65bbcabb161dd554..ff299f24aba0703fe8751004de6ed7345ee8777a 100644 (file)
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -11,4 +11,3 @@ obj-$(CONFIG_CPU_FREQ)    += cpufreq.o
 obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o
 obj-$(CONFIG_SMP)         += smp.o
 obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
-obj-$(CONFIG_DEBUG_ICACHE_CHECK) += irqpanic.o

diff --git a/arch/blackfin/mach-common/irqpanic.c b/arch/blackfin/mach-common/irqpanic.c
deleted file mode 100644 (file)
index c649624..0000000
--- a/arch/blackfin/mach-common/irqpanic.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * panic kernel with dump information
- *
- * Copyright 2005-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/module.h>
-#include <linux/kernel_stat.h>
-#include <linux/sched.h>
-#include <asm/blackfin.h>
-
-#define L1_ICACHE_START 0xffa10000
-#define L1_ICACHE_END   0xffa13fff
-
-/*
- * irq_panic - calls panic with string setup
- */
-__attribute__ ((l1_text))
-asmlinkage void irq_panic(int reason, struct pt_regs *regs)
-{
-       unsigned int cmd, tag, ca, cache_hi, cache_lo, *pa;
-       unsigned short i, j, die;
-       unsigned int bad[10][6];
-
-       /* check entire cache for coherency
-        * Since printk is in cacheable memory,
-        * don't call it until you have checked everything
-       */
-
-       die = 0;
-       i = 0;
-
-       /* check icache */
-
-       for (ca = L1_ICACHE_START; ca <= L1_ICACHE_END && i < 10; ca += 32) {
-
-               /* Grab various address bits for the itest_cmd fields                      */
-               cmd = (((ca & 0x3000) << 4) |   /* ca[13:12] for SBNK[1:0]             */
-                      ((ca & 0x0c00) << 16) |  /* ca[11:10] for WAYSEL[1:0]           */
-                      ((ca & 0x3f8)) | /* ca[09:03] for SET[4:0] and DW[1:0]  */
-                      0);      /* Access Tag, Read access             */
-
-               SSYNC();
-               bfin_write_ITEST_COMMAND(cmd);
-               SSYNC();
-               tag = bfin_read_ITEST_DATA0();
-               SSYNC();
-
-               /* if tag is marked as valid, check it */
-               if (tag & 1) {
-                       /* The icache is arranged in 4 groups of 64-bits */
-                       for (j = 0; j < 32; j += 8) {
-                               cmd = ((((ca + j) & 0x3000) << 4) |     /* ca[13:12] for SBNK[1:0]             */
-                                      (((ca + j) & 0x0c00) << 16) |    /* ca[11:10] for WAYSEL[1:0]           */
-                                      (((ca + j) & 0x3f8)) |   /* ca[09:03] for SET[4:0] and DW[1:0]  */
-                                      4);      /* Access Data, Read access             */
-
-                               SSYNC();
-                               bfin_write_ITEST_COMMAND(cmd);
-                               SSYNC();
-
-                               cache_hi = bfin_read_ITEST_DATA1();
-                               cache_lo = bfin_read_ITEST_DATA0();
-
-                               pa = ((unsigned int *)((tag & 0xffffcc00) |
-                                                      ((ca + j) & ~(0xffffcc00))));
-
-                               /*
-                                * Debugging this, enable
-                                *
-                                * printk("addr: %08x %08x%08x | %08x%08x\n",
-                                *  ((unsigned int *)((tag & 0xffffcc00)  | ((ca+j) & ~(0xffffcc00)))),
-                                *   cache_hi, cache_lo, *(pa+1), *pa);
-                                */
-
-                               if (cache_hi != *(pa + 1) || cache_lo != *pa) {
-                                       /* Since icache is not working, stay out of it, by not printing */
-                                       die = 1;
-                                       bad[i][0] = (ca + j);
-                                       bad[i][1] = cache_hi;
-                                       bad[i][2] = cache_lo;
-                                       bad[i][3] = ((tag & 0xffffcc00) |
-                                               ((ca + j) & ~(0xffffcc00)));
-                                       bad[i][4] = *(pa + 1);
-                                       bad[i][5] = *(pa);
-                                       i++;
-                               }
-                       }
-               }
-       }
-       if (die) {
-               printk(KERN_EMERG "icache coherency error\n");
-               for (j = 0; j <= i; j++) {
-                       printk(KERN_EMERG
-                           "cache address   : %08x  cache value : %08x%08x\n",
-                            bad[j][0], bad[j][1], bad[j][2]);
-                       printk(KERN_EMERG
-                           "physical address: %08x  SDRAM value : %08x%08x\n",
-                            bad[j][3], bad[j][4], bad[j][5]);
-               }
-               panic("icache coherency error");
-       } else
-               printk(KERN_EMERG "icache checked, and OK\n");
-}