Skip to contentSkip to conversation

MN10300: Remove all checks for CONFIG_GDBSTUB

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

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 3/5 MN10300: Remove all checks for CONFIG_GDBSTUB

The Kconfig symbol GDBSTUB was removed. Now remove the checks for its macro and all dead code hidden behind them.

---
 arch/mn10300/kernel/Makefile           |    1 -
 arch/mn10300/kernel/entry.S            |   21 -
 arch/mn10300/kernel/gdb-low.S          |  115 --
 arch/mn10300/kernel/gdb-stub.c         | 1923 --------------------------------
 arch/mn10300/kernel/head.S             |   10 -
 arch/mn10300/kernel/mn10300-watchdog.c |   13 +-
 arch/mn10300/kernel/smp-low.S          |    4 -
 arch/mn10300/kernel/smp.c              |    7 -
 arch/mn10300/mm/fault.c                |    8 -
 arch/mn10300/mm/tlb-mn10300.S          |   14 -
 10 files changed, 1 insertion(+), 2115 deletions(-)
 delete mode 100644 arch/mn10300/kernel/gdb-low.S
 delete mode 100644 arch/mn10300/kernel/gdb-stub.c
arch/mn10300/kernel/Makefile +0 -1
index 561029f7fa44..ce9f01778a86 100644
@@ -17,7 +17,6 @@ obj-$(CONFIG_MN10300_WD_TIMER) += mn10300-watchdog.o mn10300-watchdog-low.o
 
 obj-$(CONFIG_MN10300_TTYSM) += mn10300-serial.o mn10300-serial-low.o \
 			       mn10300-debug.o
-obj-$(CONFIG_GDBSTUB) += gdb-stub.o gdb-low.o
 obj-$(CONFIG_GDBSTUB_ON_TTYSx) += gdb-io-serial.o gdb-io-serial-low.o
 obj-$(CONFIG_GDBSTUB_ON_TTYSMx) += gdb-io-ttysm.o gdb-io-ttysm-low.o
 
arch/mn10300/kernel/entry.S +0 -21
index 177d61de51c9..f015df03d268 100644
@@ -27,10 +27,6 @@
 #include <asm/asm-offsets.h>
 #include <asm/frame.inc>
 
-#if defined(CONFIG_SMP) && defined(CONFIG_GDBSTUB)
-#include <asm/gdb-stub.h>
-#endif /* CONFIG_SMP && CONFIG_GDBSTUB */
-
 #ifdef CONFIG_PREEMPT
 #define preempt_stop		LOCAL_IRQ_DISABLE
 #else
@@ -368,23 +364,6 @@ __common_exception_nonmi:
 	mov	-1,d0
 	mov	d0,(REG_ORIG_D0,fp)
 
-#ifdef CONFIG_GDBSTUB
-#ifdef CONFIG_SMP
-	call	gdbstub_busy_check[],0
-	and	d0,d0			# check return value
-	beq	2f
-#else  /* CONFIG_SMP */
-	btst	0x01,(gdbstub_busy)
-	beq	2f
-#endif /* CONFIG_SMP */
-	and	~EPSW_IE,epsw
-	mov	fp,d0
-	mov	a2,d1
-	call	gdbstub_exception[],0	# gdbstub itself caused an exception
-	bra	restore_all
-2:
-#endif /* CONFIG_GDBSTUB */
-
 	mov	fp,d0			# arg 0: stacked register file
 	mov	a2,d1			# arg 1: exception number
 	lsr	1,a2
arch/mn10300/kernel/gdb-low.S deleted +0 -115

115 lines not on this page · raw message

arch/mn10300/kernel/gdb-stub.c deleted +0 -1923

1,923 lines not on this page · raw message

arch/mn10300/kernel/head.S +0 -10
index 73e00fc78072..d1bf8ce82f22 100644
@@ -289,16 +289,6 @@ wait_on_secondary_boot:
 	bne	loop_request_boot_secondary
 #endif /* CONFIG_SMP */
 
-#ifdef CONFIG_GDBSTUB
-	call	gdbstub_init[],0
-
-#ifdef CONFIG_GDBSTUB_IMMEDIATE
-	.globl	__gdbstub_pause
-__gdbstub_pause:
-	bra	__gdbstub_pause
-#endif
-#endif
-
 	jmp	start_kernel
 	.size	_start,.-_start
 
arch/mn10300/kernel/mn10300-watchdog.c +1 -12
index a2d8e6938d67..8d34d05d91c0 100644
@@ -148,12 +148,7 @@ void watchdog_interrupt(struct pt_regs *regs, enum exception_code excep)
 
 		sum = irq_stat[cpu].__irq_count;
 
-		if ((last_irq_sums[cpu] == sum)
-#if defined(CONFIG_GDBSTUB) && defined(CONFIG_SMP)
-			&& !(CHK_GDBSTUB_BUSY()
-			     || atomic_read(&cpu_doing_single_step))
-#endif
-			) {
+		if (last_irq_sums[cpu] == sum) {
 			/*
 			 * Ayiee, looks like this CPU is stuck ...
 			 * wait a few IRQs (5 seconds) before doing the oops ...
@@ -184,12 +179,6 @@ void watchdog_interrupt(struct pt_regs *regs, enum exception_code excep)
 				console_silent();
 				spin_unlock(&watchdog_print_lock);
 				bust_spinlocks(0);
-#ifdef CONFIG_GDBSTUB
-				if (CHK_GDBSTUB_BUSY_AND_ACTIVE())
-					gdbstub_exception(regs, excep);
-				else
-					gdbstub_intercept(regs, excep);
-#endif
 				do_exit(SIGSEGV);
 			}
 		} else {
arch/mn10300/kernel/smp-low.S +0 -4
index 71f1b2faaa0b..953238822dcd 100644
@@ -43,11 +43,7 @@ mn10300_low_ipi_handler:
 	/* OTHERS */
 	mov	(sp),d0
 	add	4,sp
-#ifdef CONFIG_GDBSTUB
-	jmp	gdbstub_io_rx_handler
-#else
 	jmp	end
-#endif
 
 ###############################################################################
 #
arch/mn10300/kernel/smp.c +0 -7
index f984193718b1..b0848bd10ad2 100644
@@ -471,13 +471,6 @@ void stop_this_cpu(void *unused)
 	static volatile int stopflag;
 	unsigned long flags;
 
-#ifdef CONFIG_GDBSTUB
-	/* In case of single stepping smp_send_stop by other CPU,
-	 * clear procindebug to avoid deadlock.
-	 */
-	atomic_set(&procindebug[smp_processor_id()], 0);
-#endif	/* CONFIG_GDBSTUB */
-
 	flags = arch_local_cli_save();
 	set_cpu_online(smp_processor_id(), false);
 
arch/mn10300/mm/fault.c +0 -8
index 3516cbdf1ee9..549a13de8cee 100644
@@ -126,14 +126,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,
 	int fault;
 	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
-#ifdef CONFIG_GDBSTUB
-	/* handle GDB stub causing a fault */
-	if (gdbstub_busy) {
-		gdbstub_exception(regs, TBR & TBR_INT_CODE);
-		return;
-	}
-#endif
-
 #if 0
 	printk(KERN_DEBUG "--- do_page_fault(%p,%s:%04lx,%08lx)\n",
 	       regs,
arch/mn10300/mm/tlb-mn10300.S +0 -14
index b9940177d81b..f8a3bd554ad3 100644
@@ -27,15 +27,11 @@
 ###############################################################################
 	.type	itlb_miss,@function
 ENTRY(itlb_miss)
-#ifdef CONFIG_GDBSTUB
-	movm	[d2,d3,a2],(sp)
-#else
 	or	EPSW_nAR,epsw		# switch D0-D3 & A0-A3 to the alternate
 					# register bank
 	nop
 	nop
 	nop
-#endif
 
 #if defined(CONFIG_ERRATUM_NEED_TO_RELOAD_MMUCTR)
 	mov	(MMUCTR),d2
@@ -71,9 +67,6 @@ ENTRY(itlb_miss)
 	and	~xPTEL2_UNUSED1,d2
 itlb_miss_set:
 	mov	d2,(IPTEL2)		# change the TLB
-#ifdef CONFIG_GDBSTUB
-	movm	(sp),[d2,d3,a2]
-#endif
 	rti
 
 itlb_miss_fault:
@@ -90,15 +83,11 @@ itlb_miss_fault:
 ###############################################################################
 	.type	dtlb_miss,@function
 ENTRY(dtlb_miss)
-#ifdef CONFIG_GDBSTUB
-	movm	[d2,d3,a2],(sp)
-#else
 	or	EPSW_nAR,epsw		# switch D0-D3 & A0-A3 to the alternate
 					# register bank
 	nop
 	nop
 	nop
-#endif
 
 #if defined(CONFIG_ERRATUM_NEED_TO_RELOAD_MMUCTR)
 	mov	(MMUCTR),d2
@@ -134,9 +123,6 @@ ENTRY(dtlb_miss)
 	and	~xPTEL2_UNUSED1,d2
 dtlb_miss_set:
 	mov	d2,(DPTEL2)		# change the TLB
-#ifdef CONFIG_GDBSTUB
-	movm	(sp),[d2,d3,a2]
-#endif
 	rti
 
 dtlb_miss_fault:
Signature · 1 line
1.9.3