Skip to contentSkip to conversation

MN10300: Remove remnants of gdbstub

PATCH In review Paul Bolle 1 participant 1 message Sep 18, 2014

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 5/5 MN10300: Remove remnants of gdbstub

---
 arch/mn10300/Kconfig                   |   6 +-
 arch/mn10300/include/asm/exceptions.h  |   7 --
 arch/mn10300/include/asm/gdb-stub.h    | 161 ---------------------------------
 arch/mn10300/kernel/mn10300-serial.c   |  19 +---
 arch/mn10300/kernel/mn10300-serial.h   |   1 -
 arch/mn10300/kernel/mn10300-watchdog.c |   1 -
 arch/mn10300/kernel/process.c          |  11 ---
 arch/mn10300/kernel/profile.c          |   2 -
 arch/mn10300/kernel/traps.c            |   4 +-
 arch/mn10300/mm/fault.c                |   1 -
 arch/mn10300/mm/misalignment.c         |   1 -
 arch/mn10300/unit-asb2303/unit-init.c  |   4 +-
 arch/mn10300/unit-asb2305/unit-init.c  |   4 +-
 arch/mn10300/unit-asb2364/unit-init.c  |   4 +-
 14 files changed, 14 insertions(+), 212 deletions(-)
 delete mode 100644 arch/mn10300/include/asm/gdb-stub.h
arch/mn10300/Kconfig +3 -3
index 4434b54e1d87..e1ba277d0349 100644
@@ -304,7 +304,7 @@ config MN10300_TTYSM0
 	bool "Enable SIF0 (/dev/ttySM0)"
 	depends on MN10300_TTYSM && MN10300_PROC_HAS_TTYSM0
 	help
-	  Enable access to SIF0 through /dev/ttySM0 or gdb-stub
+	  Enable access to SIF0 through /dev/ttySM0
 
 choice
 	prompt "Select the timer to supply the clock for SIF0"
@@ -326,7 +326,7 @@ config MN10300_TTYSM1
 	bool "Enable SIF1 (/dev/ttySM1)"
 	depends on MN10300_TTYSM && MN10300_PROC_HAS_TTYSM1
 	help
-	  Enable access to SIF1 through /dev/ttySM1 or gdb-stub
+	  Enable access to SIF1 through /dev/ttySM1
 
 choice
 	prompt "Select the timer to supply the clock for SIF1"
@@ -357,7 +357,7 @@ config MN10300_TTYSM2
 	bool "Enable SIF2 (/dev/ttySM2)"
 	depends on MN10300_TTYSM && MN10300_PROC_HAS_TTYSM2
 	help
-	  Enable access to SIF2 through /dev/ttySM2 or gdb-stub
+	  Enable access to SIF2 through /dev/ttySM2
 
 choice
 	prompt "Select the timer to supply the clock for SIF2"
arch/mn10300/include/asm/exceptions.h +0 -7
index 95a4d42c3a06..7b7ad89912d8 100644
@@ -13,13 +13,6 @@
 
 #include <linux/linkage.h>
 
-/*
- * define the breakpoint instruction opcode to use
- * - note that the JTAG unit steals 0xFF, so you can't use JTAG and GDBSTUB at
- *   the same time.
- */
-#define GDBSTUB_BKPT		0xFF
-
 #ifndef __ASSEMBLY__
 
 /*
arch/mn10300/include/asm/gdb-stub.h deleted +0 -161

161 lines not on this page · raw message

arch/mn10300/kernel/mn10300-serial.c +3 -16
index bbfccd44b06e..c621351432cc 100644
@@ -850,18 +850,8 @@ static void mn10300_serial_send_xchar(struct uart_port *_port, char ch)
 {
 	struct mn10300_serial_port *port =
 		container_of(_port, struct mn10300_serial_port, uart);
-	unsigned long flags;
 
 	_enter("%s,%02x", port->name, ch);
-
-	if (likely(port->gdbstub)) {
-		port->tx_xchar = ch;
-		if (ch) {
-			spin_lock_irqsave(&port->uart.lock, flags);
-			mn10300_serial_en_tx_intr(port);
-			spin_unlock_irqrestore(&port->uart.lock, flags);
-		}
-	}
 }
 
 /*
@@ -947,10 +937,7 @@ static int mn10300_serial_startup(struct uart_port *_port)
 		container_of(_port, struct mn10300_serial_port, uart);
 	struct mn10300_serial_int *pint;
 
-	_enter("%s{%d}", port->name, port->gdbstub);
-
-	if (unlikely(port->gdbstub))
-		return -EBUSY;
+	_enter("%s", port->name);
 
 	/* allocate an Rx buffer for the virtual DMA handler */
 	port->rx_buffer = kmalloc(MNSC_BUFFER_SIZE, GFP_KERNEL);
@@ -1520,7 +1507,7 @@ static int __init mn10300_serial_init(void)
 	if (!ret) {
 		for (i = 0 ; i < NR_PORTS ; i++) {
 			port = mn10300_serial_ports[i];
-			if (!port || port->gdbstub)
+			if (!port)
 				continue;
 
 			switch (port->clock_src) {
@@ -1660,7 +1647,7 @@ static int __init mn10300_serial_console_setup(struct console *co,
 
 	for (i = 0 ; i < NR_PORTS ; i++) {
 		port = mn10300_serial_ports[i];
-		if (port && !port->gdbstub && port->uart.line == co->index)
+		if (port && port->uart.line == co->index)
 			goto found_device;
 	}
 
arch/mn10300/kernel/mn10300-serial.h +0 -1
index 990a31c45e9f..db451856d342 100644
@@ -70,7 +70,6 @@ struct mn10300_serial_port {
 
 	unsigned short		rx_brk;		/* current break reception status */
 	u16			tx_cts;		/* current CTS status */
-	int			gdbstub;	/* preemptively stolen by GDB stub */
 
 	u8			clock_src;	/* clock source */
 #define MNSCx_CLOCK_SRC_IOCLK	0
arch/mn10300/kernel/mn10300-watchdog.c +0 -1
index 8d34d05d91c0..3fc825cad858 100644
@@ -23,7 +23,6 @@
 #include <asm/rtc-regs.h>
 #include <asm/div64.h>
 #include <asm/smp.h>
-#include <asm/gdb-stub.h>
 #include <proc/clock.h>
 
 static DEFINE_SPINLOCK(watchdog_print_lock);
arch/mn10300/kernel/process.c +0 -11
index 3707da583d05..a46b586ece41 100644
@@ -33,7 +33,6 @@
 #include <asm/mmu_context.h>
 #include <asm/fpu.h>
 #include <asm/reset-regs.h>
-#include <asm/gdb-stub.h>
 #include "internal.h"
 
 /*
@@ -70,10 +69,6 @@ void release_segments(struct mm_struct *mm)
 
 void machine_restart(char *cmd)
 {
-#ifdef CONFIG_KERNEL_DEBUGGER
-	gdbstub_exit(0);
-#endif
-
 #ifdef mn10300_unit_hard_reset
 	mn10300_unit_hard_reset();
 #else
@@ -83,16 +78,10 @@ void machine_restart(char *cmd)
 
 void machine_halt(void)
 {
-#ifdef CONFIG_KERNEL_DEBUGGER
-	gdbstub_exit(0);
-#endif
 }
 
 void machine_power_off(void)
 {
-#ifdef CONFIG_KERNEL_DEBUGGER
-	gdbstub_exit(0);
-#endif
 }
 
 void show_regs(struct pt_regs *regs)
arch/mn10300/kernel/profile.c +0 -2
index 4f342f75d00c..c9793ff37f26 100644
@@ -11,8 +11,6 @@
 
 /*
  * initialise the profiling if enabled
- * - using with gdbstub will give anomalous results
- * - can't be used with gdbstub if running at IRQ priority 0
  */
 static __init int profile_init(void)
 {
arch/mn10300/kernel/traps.c +2 -2
index a7a987c7954f..519a9d946619 100644
@@ -219,7 +219,7 @@ asmlinkage void handle_exception(struct pt_regs *regs, u32 intcode)
  */
 asmlinkage void nmi(struct pt_regs *regs, enum exception_code code)
 {
-	/* see if gdbstub wants to deal with it */
+	/* see if kgdb wants to deal with it */
 	if (debugger_intercept(code, SIGQUIT, 0, regs))
 		return;
 
@@ -501,7 +501,7 @@ asmlinkage void uninitialised_exception(struct pt_regs *regs,
 					enum exception_code code)
 {
 
-	/* see if gdbstub wants to deal with it */
+	/* see if kgdb wants to deal with it */
 	if (debugger_intercept(code, SIGSYS, 0, regs) == 0)
 		return;
 
arch/mn10300/mm/fault.c +0 -1
index 549a13de8cee..8678c5d3a8b8 100644
@@ -29,7 +29,6 @@
 #include <asm/hardirq.h>
 #include <asm/cpu-regs.h>
 #include <asm/debugger.h>
-#include <asm/gdb-stub.h>
 
 /*
  * Unlock any spinlocks which will prevent us from getting the
arch/mn10300/mm/misalignment.c +0 -1
index b9920b1edd5a..1424246dde3a 100644
@@ -31,7 +31,6 @@
 #include <asm/cpu-regs.h>
 #include <asm/busctl-regs.h>
 #include <asm/fpu.h>
-#include <asm/gdb-stub.h>
 #include <asm/asm-offsets.h>
 
 #if 0
arch/mn10300/unit-asb2303/unit-init.c +2 -2
index 834a76aa551a..c8b8c0338410 100644
@@ -21,7 +21,7 @@
 #include <asm/intctl-regs.h>
 
 /*
- * initialise some of the unit hardware before gdbstub is set up
+ * initialise some of the unit hardware
  */
 asmlinkage void __init unit_init(void)
 {
@@ -42,7 +42,7 @@ asmlinkage void __init unit_init(void)
 }
 
 /*
- * initialise the rest of the unit hardware after gdbstub is ready
+ * initialise the rest of the unit hardware
  */
 void __init unit_setup(void)
 {
arch/mn10300/unit-asb2305/unit-init.c +2 -2
index 674f3e960cb2..bf0c327e5bf2 100644
@@ -21,7 +21,7 @@
 #include <unit/serial.h>
 
 /*
- * initialise some of the unit hardware before gdbstub is set up
+ * initialise some of the unit hardware
  */
 asmlinkage void __init unit_init(void)
 {
@@ -32,7 +32,7 @@ asmlinkage void __init unit_init(void)
 }
 
 /*
- * initialise the rest of the unit hardware after gdbstub is ready
+ * initialise the rest of the unit hardware
  */
 void __init unit_setup(void)
 {
arch/mn10300/unit-asb2364/unit-init.c +2 -2
index 6359b41ce7e9..03bcaa8c907e 100644
@@ -30,7 +30,7 @@
 #define LAN_INT_EN		__SYSREG(SMSC911X_BASE + 0x5c, u32)
 
 /*
- * initialise some of the unit hardware before gdbstub is set up
+ * initialise some of the unit hardware
  */
 asmlinkage void __init unit_init(void)
 {
@@ -80,7 +80,7 @@ asmlinkage void __init unit_init(void)
 }
 
 /*
- * initialise the rest of the unit hardware after gdbstub is ready
+ * initialise the rest of the unit hardware
  */
 asmlinkage void __init unit_setup(void)
 {
Signature · 1 line
1.9.3