[AVR32] Clean up OCD register usage

Generate a new set of OCD register definitions in asm/ocd.h and rename
__mfdr() and __mtdr() to ocd_read() and ocd_write() respectively.

The bitfield definitions are a lot more complete now, and they are
entirely based on bit numbers, not masks. This is because OCD
registers are frequently accessed from assembly code, where bit
numbers are a lot more useful (can be fed directly to sbr, bfins,
etc.)

Bitfields that consist of more than one bit have two definitions:
_START, which indicates the number of the first bit, and _SIZE, which
indicates the number of bits. These directly correspond to the
parameters taken by the bfextu, bfexts and bfins instructions.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/avr32/kernel/kprobes.c b/arch/avr32/kernel/kprobes.c
index 20b1c9d8f945..799ba89b07a8 100644
--- a/arch/avr32/kernel/kprobes.c
+++ b/arch/avr32/kernel/kprobes.c
@@ -70,9 +70,9 @@ static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
 
         BUG_ON(!(sysreg_read(SR) & SYSREG_BIT(SR_D)));
 
-        dc = __mfdr(DBGREG_DC);
-        dc |= DC_SS;
-        __mtdr(DBGREG_DC, dc);
+        dc = ocd_read(DC);
+        dc |= 1 << OCD_DC_SS_BIT;
+        ocd_write(DC, dc);
 
         /*
          * We must run the instruction from its original location
@@ -91,9 +91,9 @@ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 
         pr_debug("resuming execution at PC=%08lx\n", regs->pc);
 
-        dc = __mfdr(DBGREG_DC);
-        dc &= ~DC_SS;
-        __mtdr(DBGREG_DC, dc);
+        dc = ocd_read(DC);
+        dc &= ~(1 << OCD_DC_SS_BIT);
+        ocd_write(DC, dc);
 
         *p->addr = BREAKPOINT_INSTRUCTION;
         flush_icache_range((unsigned long)p->addr,
@@ -261,7 +261,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 int __init arch_init_kprobes(void)
 {
         printk("KPROBES: Enabling monitor mode (MM|DBE)...\n");
-        __mtdr(DBGREG_DC, DC_MM | DC_DBE);
+        ocd_write(DC, (1 << OCD_DC_MM_BIT) | (1 << OCD_DC_DBE_BIT));
 
         /* TODO: Register kretprobe trampoline */
         return 0;