[MIPS] kgdb: Remove existing implementation

This patch explicitly removes the kgdb implementation, for mips which
is intended to be followed by a patch that adds a kgdb implementation
for MIPS that makes use of the kgdb core in the kernel.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

5 files changed, 0 insertions, 231 deletions

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index db372a0f106d..a35818ed4263 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -57,30 +57,6 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask);
 extern unsigned long ht_eoi_space;
 #endif
 
-#ifdef CONFIG_KGDB
-#include <asm/gdb-stub.h>
-extern void breakpoint(void);
-static int kgdb_irq;
-#ifdef CONFIG_GDB_CONSOLE
-extern void register_gdb_console(void);
-#endif
-
-/* kgdb is on when configured.  Pass "nokgdb" kernel arg to turn it off */
-static int kgdb_flag = 1;
-static int __init nokgdb(char *str)
-{
-        kgdb_flag = 0;
-        return 1;
-}
-__setup("nokgdb", nokgdb);
-
-/* Default to UART1 */
-int kgdb_port = 1;
-#ifdef CONFIG_SERIAL_SB1250_DUART
-extern char sb1250_duart_present[];
-#endif
-#endif
-
 static struct irq_chip bcm1480_irq_type = {
         .name = "BCM1480-IMR",
         .ack = ack_bcm1480_irq,
@@ -355,61 +331,10 @@ void __init arch_init_irq(void)
          * does its own management of IP7.
          */
 
-#ifdef CONFIG_KGDB
-        imask |= STATUSF_IP6;
-#endif
         /* Enable necessary IPs, disable the rest */
         change_c0_status(ST0_IM, imask);
-
-#ifdef CONFIG_KGDB
-        if (kgdb_flag) {
-                kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
-
-#ifdef CONFIG_SERIAL_SB1250_DUART
-                sb1250_duart_present[kgdb_port] = 0;
-#endif
-                /* Setup uart 1 settings, mapper */
-                /* QQQ FIXME */
-                __raw_writeq(M_DUART_IMR_BRK, IOADDR(A_DUART_IMRREG(kgdb_port)));
-
-                __raw_writeq(IMR_IP6_VAL,
-                             IOADDR(A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H) +
-                             (kgdb_irq << 3)));
-                bcm1480_unmask_irq(0, kgdb_irq);
-
-#ifdef CONFIG_GDB_CONSOLE
-                register_gdb_console();
-#endif
-                printk("Waiting for GDB on UART port %d\n", kgdb_port);
-                set_debug_traps();
-                breakpoint();
-        }
-#endif
-}
-
-#ifdef CONFIG_KGDB
-
-#include <linux/delay.h>
-
-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
-
-static void bcm1480_kgdb_interrupt(void)
-{
-        /*
-         * Clear break-change status (allow some time for the remote
-         * host to stop the break, since we would see another
-         * interrupt on the end-of-break too)
-         */
-        kstat.irqs[smp_processor_id()][kgdb_irq]++;
-        mdelay(500);
-        duart_out(R_DUART_CMD, V_DUART_MISC_CMD_RESET_BREAK_INT |
-                                M_DUART_RX_EN | M_DUART_TX_EN);
-        set_async_breakpoint(&get_irq_regs()->cp0_epc);
 }
 
-#endif  /* CONFIG_KGDB */
-
 extern void bcm1480_mailbox_interrupt(void);
 
 static inline void dispatch_ip2(void)
@@ -462,11 +387,6 @@ asmlinkage void plat_irq_dispatch(void)
                 bcm1480_mailbox_interrupt();
 #endif
 
-#ifdef CONFIG_KGDB
-        else if (pending & CAUSEF_IP6)
-                bcm1480_kgdb_interrupt();               /* KGDB (uart 1) */
-#endif
-
         else if (pending & CAUSEF_IP2)
                 dispatch_ip2();
 }
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index fd9604d5555a..3de30f79db3f 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -59,10 +59,6 @@ int cfe_cons_handle;
 extern unsigned long initrd_start, initrd_end;
 #endif
 
-#ifdef CONFIG_KGDB
-extern int kgdb_port;
-#endif
-
 static void __noreturn cfe_linux_exit(void *arg)
 {
         int warm = *(int *)arg;
@@ -246,9 +242,6 @@ void __init prom_init(void)
         int argc = fw_arg0;
         char **envp = (char **) fw_arg2;
         int *prom_vec = (int *) fw_arg3;
-#ifdef CONFIG_KGDB
-        char *arg;
-#endif
 
         _machine_restart   = cfe_linux_restart;
         _machine_halt      = cfe_linux_halt;
@@ -309,13 +302,6 @@ void __init prom_init(void)
                 }
         }
 
-#ifdef CONFIG_KGDB
-        if ((arg = strstr(arcs_cmdline, "kgdb=duart")) != NULL)
-                kgdb_port = (arg[10] == '0') ? 0 : 1;
-        else
-                kgdb_port = 1;
-#endif
-
 #ifdef CONFIG_BLK_DEV_INITRD
         {
                 char *ptr;
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index eac9065ffe0c..a5158483986e 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -57,16 +57,6 @@ static void sb1250_set_affinity(unsigned int irq, cpumask_t mask);
 extern unsigned long ldt_eoi_space;
 #endif
 
-#ifdef CONFIG_KGDB
-static int kgdb_irq;
-
-/* Default to UART1 */
-int kgdb_port = 1;
-#ifdef CONFIG_SERIAL_SB1250_DUART
-extern char sb1250_duart_present[];
-#endif
-#endif
-
 static struct irq_chip sb1250_irq_type = {
         .name = "SB1250-IMR",
         .ack = ack_sb1250_irq,
@@ -313,55 +303,10 @@ void __init arch_init_irq(void)
          * does its own management of IP7.
          */
 
-#ifdef CONFIG_KGDB
-        imask |= STATUSF_IP6;
-#endif
         /* Enable necessary IPs, disable the rest */
         change_c0_status(ST0_IM, imask);
-
-#ifdef CONFIG_KGDB
-        if (kgdb_flag) {
-                kgdb_irq = K_INT_UART_0 + kgdb_port;
-
-#ifdef CONFIG_SERIAL_SB1250_DUART
-                sb1250_duart_present[kgdb_port] = 0;
-#endif
-                /* Setup uart 1 settings, mapper */
-                __raw_writeq(M_DUART_IMR_BRK,
-                             IOADDR(A_DUART_IMRREG(kgdb_port)));
-
-                __raw_writeq(IMR_IP6_VAL,
-                             IOADDR(A_IMR_REGISTER(0,
-                                                   R_IMR_INTERRUPT_MAP_BASE) +
-                                    (kgdb_irq << 3)));
-                sb1250_unmask_irq(0, kgdb_irq);
-        }
-#endif
-}
-
-#ifdef CONFIG_KGDB
-
-#include <linux/delay.h>
-
-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
-
-static void sb1250_kgdb_interrupt(void)
-{
-        /*
-         * Clear break-change status (allow some time for the remote
-         * host to stop the break, since we would see another
-         * interrupt on the end-of-break too)
-         */
-        kstat_this_cpu.irqs[kgdb_irq]++;
-        mdelay(500);
-        duart_out(R_DUART_CMD, V_DUART_MISC_CMD_RESET_BREAK_INT |
-                                M_DUART_RX_EN | M_DUART_TX_EN);
-        set_async_breakpoint(&get_irq_regs()->cp0_epc);
 }
 
-#endif  /* CONFIG_KGDB */
-
 extern void sb1250_mailbox_interrupt(void);
 
 static inline void dispatch_ip2(void)
@@ -407,11 +352,6 @@ asmlinkage void plat_irq_dispatch(void)
                 sb1250_mailbox_interrupt();
 #endif
 
-#ifdef CONFIG_KGDB
-        else if (pending & CAUSEF_IP6)                  /* KGDB (uart 1) */
-                sb1250_kgdb_interrupt();
-#endif
-
         else if (pending & CAUSEF_IP2)
                 dispatch_ip2();
         else
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile
index 255d692bfa18..f18ba9201bbc 100644
--- a/arch/mips/sibyte/swarm/Makefile
+++ b/arch/mips/sibyte/swarm/Makefile
@@ -1,4 +1,3 @@
 obj-y                           := setup.o rtc_xicor1241.o rtc_m41t81.o
 
 obj-$(CONFIG_I2C_BOARDINFO)     += swarm-i2c.o
-obj-$(CONFIG_KGDB)              += dbg_io.o
diff --git a/arch/mips/sibyte/swarm/dbg_io.c b/arch/mips/sibyte/swarm/dbg_io.c
deleted file mode 100644
index b97ae3048482..000000000000
--- a/arch/mips/sibyte/swarm/dbg_io.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * kgdb debug routines for SiByte boards.
- *
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-/* -------------------- BEGINNING OF CONFIG --------------------- */
-
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/sibyte/sb1250.h>
-#include <asm/sibyte/sb1250_regs.h>
-#include <asm/sibyte/sb1250_uart.h>
-#include <asm/sibyte/sb1250_int.h>
-#include <asm/addrspace.h>
-
-/*
- * We use the second serial port for kgdb traffic.
- *      115200, 8, N, 1.
- */
-
-#define BAUD_RATE               115200
-#define CLK_DIVISOR             V_DUART_BAUD_RATE(BAUD_RATE)
-#define DATA_BITS               V_DUART_BITS_PER_CHAR_8         /* or 7    */
-#define PARITY                  V_DUART_PARITY_MODE_NONE        /* or even */
-#define STOP_BITS               M_DUART_STOP_BIT_LEN_1          /* or 2    */
-
-static int duart_initialized = 0;       /* 0: need to be init'ed by kgdb */
-
-/* -------------------- END OF CONFIG --------------------- */
-extern int kgdb_port;
-
-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
-
-void putDebugChar(unsigned char c);
-unsigned char getDebugChar(void);
-static void
-duart_init(int clk_divisor, int data, int parity, int stop)
-{
-        duart_out(R_DUART_MODE_REG_1, data | parity);
-        duart_out(R_DUART_MODE_REG_2, stop);
-        duart_out(R_DUART_CLK_SEL, clk_divisor);
-
-        duart_out(R_DUART_CMD, M_DUART_RX_EN | M_DUART_TX_EN);  /* enable rx and tx */
-}
-
-void
-putDebugChar(unsigned char c)
-{
-        if (!duart_initialized) {
-                duart_initialized = 1;
-                duart_init(CLK_DIVISOR, DATA_BITS, PARITY, STOP_BITS);
-        }
-        while ((duart_in(R_DUART_STATUS) & M_DUART_TX_RDY) == 0);
-        duart_out(R_DUART_TX_HOLD, c);
-}
-
-unsigned char
-getDebugChar(void)
-{
-        if (!duart_initialized) {
-                duart_initialized = 1;
-                duart_init(CLK_DIVISOR, DATA_BITS, PARITY, STOP_BITS);
-        }
-        while ((duart_in(R_DUART_STATUS) & M_DUART_RX_RDY) == 0) ;
-        return duart_in(R_DUART_RX_HOLD);
-}
-