MIPS: Octeon: Remove checks for CONFIG_CAVIUM_GDB

Three checks for CONFIG_CAVIUM_GDB were added in v2.6.29. But the
Kconfig symbol CAVIUM_GDB was never added to the tree. Remove these
checks.

Also remove the last reference to octeon_get_boot_debug_flag(). There is
no definition of that function anyway.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Tested-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>)
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/6976/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 953ca85f84fa0fab2dfe718d7e73113f28aab22b..989781fbae7678d2ff7eb03e915af54c163fab73 100644 (file)
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -729,17 +729,6 @@ void __init prom_init(void)
        octeon_write_lcd("Linux");
 #endif
 
-#ifdef CONFIG_CAVIUM_GDB
-       /*
-        * When debugging the linux kernel, force the cores to enter
-        * the debug exception handler to break in.
-        */
-       if (octeon_get_boot_debug_flag()) {
-               cvmx_write_csr(CVMX_CIU_DINT, 1 << cvmx_get_core_num());
-               cvmx_read_csr(CVMX_CIU_DINT);
-       }
-#endif
-
        octeon_setup_delays();
 
        /*

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 67a078ffc4641a16c659c93bb049e3c3fb8193ba..78e1abebc854574c2e8420890c5b7d27ba7accd8 100644 (file)
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -218,15 +218,6 @@ void octeon_prepare_cpus(unsigned int max_cpus)
  */
 static void octeon_smp_finish(void)
 {
-#ifdef CONFIG_CAVIUM_GDB
-       unsigned long tmp;
-       /* Pulse MCD0 signal on Ctrl-C to stop all the cores. Also set the MCD0
-          to be not masked by this core so we know the signal is received by
-          someone */
-       asm volatile ("dmfc0 %0, $22\n"
-                     "ori   %0, %0, 0x9100\n" "dmtc0 %0, $22\n" : "=r" (tmp));
-#endif
-
        octeon_user_io_init();
 
        /* to generate the first CPU timer interrupt */
@@ -239,14 +230,6 @@ static void octeon_smp_finish(void)
  */
 static void octeon_cpus_done(void)
 {
-#ifdef CONFIG_CAVIUM_GDB
-       unsigned long tmp;
-       /* Pulse MCD0 signal on Ctrl-C to stop all the cores. Also set the MCD0
-          to be not masked by this core so we know the signal is received by
-          someone */
-       asm volatile ("dmfc0 %0, $22\n"
-                     "ori   %0, %0, 0x9100\n" "dmtc0 %0, $22\n" : "=r" (tmp));
-#endif
 }
 
 #ifdef CONFIG_HOTPLUG_CPU

diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index f5d77b91537fc0b67558d2d444b46f527cc382f8..d781f9e668844315e537959a3beeb5c38fda5137 100644 (file)
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -211,7 +211,6 @@ union octeon_cvmemctl {
 
 extern void octeon_write_lcd(const char *s);
 extern void octeon_check_cpu_bist(void);
-extern int octeon_get_boot_debug_flag(void);
 extern int octeon_get_boot_uart(void);
 
 struct uart_port;