Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc/booke: Introduce new CONFIG options for advanced debug registers

Browse source 
powerpc/booke: Introduce new CONFIG options for advanced debug registers

From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>

Introduce new config options to simplify the ifdefs pertaining to the
advanced debug registers for booke and 40x processors:

CONFIG_PPC_ADV_DEBUG_REGS - boolean: true for dac-based processors
CONFIG_PPC_ADV_DEBUG_IACS - number of IAC registers
CONFIG_PPC_ADV_DEBUG_DACS - number of DAC registers
CONFIG_PPC_ADV_DEBUG_DVCS - number of DVC registers
CONFIG_PPC_ADV_DEBUG_DAC_RANGE - DAC ranges supported

Beginning conservatively, since I only have the facilities to test 440
hardware.  I believe all 40x and booke platforms support at least 2 IAC
and 2 DAC registers.  For 440, 4 IAC and 2 DVC registers are enabled, as
well as the DAC ranges.

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Acked-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Dave Kleikamp 2010-02-08 11:50:57 +00:00 committed by Benjamin Herrenschmidt
parent 789c299ca2
commit 172ae2e7f8
8 changed files with 50 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/powerpc/Kconfig
View file

@ -240,6 +240,33 @@ config PPC_OF_PLATFORM_PCI
config ARCH_SUPPORTS_DEBUG_PAGEALLOC config ARCH_SUPPORTS_DEBUG_PAGEALLOC
def_bool y def_bool y
config PPC_ADV_DEBUG_REGS
bool
depends on 40x || BOOKE
default y
config PPC_ADV_DEBUG_IACS
int
depends on PPC_ADV_DEBUG_REGS
default 4 if 44x
default 2
config PPC_ADV_DEBUG_DACS
int
depends on PPC_ADV_DEBUG_REGS
default 2
config PPC_ADV_DEBUG_DVCS
int
depends on PPC_ADV_DEBUG_REGS
default 2 if 44x
default 0
config PPC_ADV_DEBUG_DAC_RANGE
bool
depends on PPC_ADV_DEBUG_REGS && 44x
default y
source "init/Kconfig" source "init/Kconfig"
source "kernel/Kconfig.freezer" source "kernel/Kconfig.freezer"

2
arch/powerpc/kernel/kgdb.c
View file

@ -333,7 +333,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
atomic_set(&kgdb_cpu_doing_single_step, -1); atomic_set(&kgdb_cpu_doing_single_step, -1);
/* set the trace bit if we're stepping */ /* set the trace bit if we're stepping */
if (remcom_in_buffer[0] == 's') { if (remcom_in_buffer[0] == 's') {
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
mtspr(SPRN_DBCR0, mtspr(SPRN_DBCR0,
mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM); mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM);
linux_regs->msr |= MSR_DE; linux_regs->msr |= MSR_DE;

4
arch/powerpc/kernel/kprobes.c
View file

@ -36,7 +36,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
#ifdef CONFIG_BOOKE #ifdef CONFIG_PPC_ADV_DEBUG_REGS
#define MSR_SINGLESTEP (MSR_DE) #define MSR_SINGLESTEP (MSR_DE)
#else #else
#define MSR_SINGLESTEP (MSR_SE) #define MSR_SINGLESTEP (MSR_SE)
@ -110,7 +110,7 @@ static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
* like Decrementer or External Interrupt */ * like Decrementer or External Interrupt */
regs->msr &= ~MSR_EE; regs->msr &= ~MSR_EE;
regs->msr |= MSR_SINGLESTEP; regs->msr |= MSR_SINGLESTEP;
#ifdef CONFIG_BOOKE #ifdef CONFIG_PPC_ADV_DEBUG_REGS
regs->msr &= ~MSR_CE; regs->msr &= ~MSR_CE;
mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM); mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM);
#endif #endif

10
arch/powerpc/kernel/process.c
View file

@ -258,7 +258,7 @@ void do_dabr(struct pt_regs *regs, unsigned long address,
return; return;
/* Clear the DAC and struct entries. One shot trigger */ /* Clear the DAC and struct entries. One shot trigger */
#if defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~(DBSR_DAC1R | DBSR_DAC1W mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~(DBSR_DAC1R | DBSR_DAC1W
| DBCR0_IDM)); | DBCR0_IDM));
#endif #endif
@ -284,7 +284,7 @@ int set_dabr(unsigned long dabr)
return ppc_md.set_dabr(dabr); return ppc_md.set_dabr(dabr);
/* XXX should we have a CPU_FTR_HAS_DABR ? */ /* XXX should we have a CPU_FTR_HAS_DABR ? */
#if defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
mtspr(SPRN_DAC1, dabr); mtspr(SPRN_DAC1, dabr);
#elif defined(CONFIG_PPC_BOOK3S) #elif defined(CONFIG_PPC_BOOK3S)
mtspr(SPRN_DABR, dabr); mtspr(SPRN_DABR, dabr);
@ -371,7 +371,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
#if defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
/* If new thread DAC (HW breakpoint) is the same then leave it */ /* If new thread DAC (HW breakpoint) is the same then leave it */
if (new->thread.dabr) if (new->thread.dabr)
set_dabr(new->thread.dabr); set_dabr(new->thread.dabr);
@ -514,7 +514,7 @@ void show_regs(struct pt_regs * regs)
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
trap = TRAP(regs); trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600) if (trap == 0x300 || trap == 0x600)
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr); printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);
#else #else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
@ -560,7 +560,7 @@ void flush_thread(void)
current->thread.dabr = 0; current->thread.dabr = 0;
set_dabr(0); set_dabr(0);
#if defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
current->thread.dbcr0 &= ~(DBSR_DAC1R | DBSR_DAC1W); current->thread.dbcr0 &= ~(DBSR_DAC1R | DBSR_DAC1W);
#endif #endif
} }

18
arch/powerpc/kernel/ptrace.c
View file

@ -46,7 +46,7 @@
/* /*
* Set of msr bits that gdb can change on behalf of a process. * Set of msr bits that gdb can change on behalf of a process.
*/ */
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
#define MSR_DEBUGCHANGE 0 #define MSR_DEBUGCHANGE 0
#else #else
#define MSR_DEBUGCHANGE (MSR_SE | MSR_BE) #define MSR_DEBUGCHANGE (MSR_SE | MSR_BE)
@ -703,7 +703,7 @@ void user_enable_single_step(struct task_struct *task)
struct pt_regs *regs = task->thread.regs; struct pt_regs *regs = task->thread.regs;
if (regs != NULL) { if (regs != NULL) {
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
task->thread.dbcr0 &= ~DBCR0_BT; task->thread.dbcr0 &= ~DBCR0_BT;
task->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC; task->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC;
regs->msr |= MSR_DE; regs->msr |= MSR_DE;
@ -720,7 +720,7 @@ void user_enable_block_step(struct task_struct *task)
struct pt_regs *regs = task->thread.regs; struct pt_regs *regs = task->thread.regs;
if (regs != NULL) { if (regs != NULL) {
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
task->thread.dbcr0 &= ~DBCR0_IC; task->thread.dbcr0 &= ~DBCR0_IC;
task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT; task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT;
regs->msr |= MSR_DE; regs->msr |= MSR_DE;
@ -737,7 +737,7 @@ void user_disable_single_step(struct task_struct *task)
struct pt_regs *regs = task->thread.regs; struct pt_regs *regs = task->thread.regs;
if (regs != NULL) { if (regs != NULL) {
#if defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
/* If DAC don't clear DBCRO_IDM or MSR_DE */ /* If DAC don't clear DBCRO_IDM or MSR_DE */
if (task->thread.dabr) if (task->thread.dabr)
task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT); task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT);
@ -745,9 +745,6 @@ void user_disable_single_step(struct task_struct *task)
task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM); task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM);
regs->msr &= ~MSR_DE; regs->msr &= ~MSR_DE;
} }
#elif defined(CONFIG_40x)
task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM);
regs->msr &= ~MSR_DE;
#else #else
regs->msr &= ~(MSR_SE | MSR_BE); regs->msr &= ~(MSR_SE | MSR_BE);
#endif #endif
@ -769,7 +766,7 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
if ((data & ~0x7UL) >= TASK_SIZE) if ((data & ~0x7UL) >= TASK_SIZE)
return -EIO; return -EIO;
#ifndef CONFIG_BOOKE #ifndef CONFIG_PPC_ADV_DEBUG_REGS
/* For processors using DABR (i.e. 970), the bottom 3 bits are flags. /* For processors using DABR (i.e. 970), the bottom 3 bits are flags.
* It was assumed, on previous implementations, that 3 bits were * It was assumed, on previous implementations, that 3 bits were
@ -790,8 +787,7 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
/* Move contents to the DABR register */ /* Move contents to the DABR register */
task->thread.dabr = data; task->thread.dabr = data;
#endif #else /* CONFIG_PPC_ADV_DEBUG_REGS */
#if defined(CONFIG_BOOKE)
/* As described above, it was assumed 3 bits were passed with the data /* As described above, it was assumed 3 bits were passed with the data
* address, but we will assume only the mode bits will be passed * address, but we will assume only the mode bits will be passed
@ -824,7 +820,7 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
task->thread.dbcr0 |= DBSR_DAC1W; task->thread.dbcr0 |= DBSR_DAC1W;
task->thread.regs->msr |= MSR_DE; task->thread.regs->msr |= MSR_DE;
#endif #endif /* CONFIG_PPC_ADV_DEBUG_REGS */
return 0; return 0;
} }

2
arch/powerpc/kernel/signal.c
View file

@ -147,7 +147,7 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)
*/ */
if (current->thread.dabr) { if (current->thread.dabr) {
set_dabr(current->thread.dabr); set_dabr(current->thread.dabr);
#if defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
mtspr(SPRN_DBCR0, current->thread.dbcr0); mtspr(SPRN_DBCR0, current->thread.dbcr0);
#endif #endif
} }

8
arch/powerpc/kernel/signal_32.c
View file

@ -1078,7 +1078,7 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
int i; int i;
unsigned char tmp; unsigned char tmp;
unsigned long new_msr = regs->msr; unsigned long new_msr = regs->msr;
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
unsigned long new_dbcr0 = current->thread.dbcr0; unsigned long new_dbcr0 = current->thread.dbcr0;
#endif #endif
@ -1087,7 +1087,7 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
return -EFAULT; return -EFAULT;
switch (op.dbg_type) { switch (op.dbg_type) {
case SIG_DBG_SINGLE_STEPPING: case SIG_DBG_SINGLE_STEPPING:
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
if (op.dbg_value) { if (op.dbg_value) {
new_msr |= MSR_DE; new_msr |= MSR_DE;
new_dbcr0 |= (DBCR0_IDM | DBCR0_IC); new_dbcr0 |= (DBCR0_IDM | DBCR0_IC);
@ -1103,7 +1103,7 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
#endif #endif
break; break;
case SIG_DBG_BRANCH_TRACING: case SIG_DBG_BRANCH_TRACING:
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
return -EINVAL; return -EINVAL;
#else #else
if (op.dbg_value) if (op.dbg_value)
@ -1124,7 +1124,7 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
failure is a problem, anyway, and it's very unlikely unless failure is a problem, anyway, and it's very unlikely unless
the user is really doing something wrong. */ the user is really doing something wrong. */
regs->msr = new_msr; regs->msr = new_msr;
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
current->thread.dbcr0 = new_dbcr0; current->thread.dbcr0 = new_dbcr0;
#endif #endif

6
arch/powerpc/kernel/traps.c
View file

@ -299,7 +299,7 @@ static inline int check_io_access(struct pt_regs *regs)
return 0; return 0;
} }
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
/* On 4xx, the reason for the machine check or program exception /* On 4xx, the reason for the machine check or program exception
is in the ESR. */ is in the ESR. */
#define get_reason(regs) ((regs)->dsisr) #define get_reason(regs) ((regs)->dsisr)
@ -1033,7 +1033,7 @@ void SoftwareEmulation(struct pt_regs *regs)
} }
#endif /* CONFIG_8xx */ #endif /* CONFIG_8xx */
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_ADV_DEBUG_REGS
void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status) void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
{ {
@ -1102,7 +1102,7 @@ void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
do_dabr(regs, mfspr(SPRN_DAC1), debug_status); do_dabr(regs, mfspr(SPRN_DAC1), debug_status);
} }
} }
#endif /* CONFIG_4xx || CONFIG_BOOKE */ #endif /* CONFIG_PPC_ADV_DEBUG_REGS */
#if !defined(CONFIG_TAU_INT) #if !defined(CONFIG_TAU_INT)
void TAUException(struct pt_regs *regs) void TAUException(struct pt_regs *regs)