Skip to content

L
linux
Commit 31fba6e7 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files
Options

Blackfin arch: introduce an IM_MEM macro to kgdb 

create an IN_MEM() macro to simplify comparing an address in an on-chip
region of memory and make things readable
Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 89c6c139
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 70 deletions
arch/blackfin/kernel/kgdb.c
View file @ 31fba6e7
...@@ -34,6 +34,15 @@ int gdb_bfin_vector = -1; ...@@ -34,6 +34,15 @@ int gdb_bfin_vector = -1;
#error change the definition of slavecpulocks #error change the definition of slavecpulocks
#endif #endif
#define IN_MEM(addr, size, l1_addr, l1_size) \
({ \
unsigned long __addr = (unsigned long)(addr); \
(__addr >= l1_addr && __addr + (size) <= l1_addr + l1_size); \
})
#define ASYNC_BANK_SIZE \
(ASYNC_BANK0_SIZE + ASYNC_BANK1_SIZE + \
ASYNC_BANK2_SIZE + ASYNC_BANK3_SIZE)
void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
{ {
gdb_regs[BFIN_R0] = regs->r0; gdb_regs[BFIN_R0] = regs->r0;
...@@ -462,55 +471,32 @@ static int validate_memory_access_address(unsigned long addr, int size) ...@@ -462,55 +471,32 @@ static int validate_memory_access_address(unsigned long addr, int size)
return 0; return 0;
if (addr >= SYSMMR_BASE) if (addr >= SYSMMR_BASE)
return 0; return 0;
if (addr >= ASYNC_BANK0_BASE if (IN_MEM(addr, size, ASYNC_BANK0_BASE, ASYNC_BANK_SIZE))
&& addr + size <= ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE)
return 0; return 0;
if (cpu == 0) { if (cpu == 0) {
if (addr >= L1_SCRATCH_START if (IN_MEM(addr, size, L1_SCRATCH_START, L1_SCRATCH_LENGTH))
&& (addr + size <= L1_SCRATCH_START + L1_SCRATCH_LENGTH))
return 0; return 0;
#if L1_CODE_LENGTH != 0 if (IN_MEM(addr, size, L1_CODE_START, L1_CODE_LENGTH))
if (addr >= L1_CODE_START
&& (addr + size <= L1_CODE_START + L1_CODE_LENGTH))
return 0; return 0;
#endif if (IN_MEM(addr, size, L1_DATA_A_START, L1_DATA_A_LENGTH))
#if L1_DATA_A_LENGTH != 0
if (addr >= L1_DATA_A_START
&& (addr + size <= L1_DATA_A_START + L1_DATA_A_LENGTH))
return 0; return 0;
#endif if (IN_MEM(addr, size, L1_DATA_B_START, L1_DATA_B_LENGTH))
#if L1_DATA_B_LENGTH != 0
if (addr >= L1_DATA_B_START
&& (addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH))
return 0; return 0;
#endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
} else if (cpu == 1) { } else if (cpu == 1) {
if (addr >= COREB_L1_SCRATCH_START if (IN_MEM(addr, size, COREB_L1_SCRATCH_START, L1_SCRATCH_LENGTH))
&& (addr + size <= COREB_L1_SCRATCH_START
+ L1_SCRATCH_LENGTH))
return 0; return 0;
# if L1_CODE_LENGTH != 0 if (IN_MEM(addr, size, COREB_L1_CODE_START, L1_CODE_LENGTH))
if (addr >= COREB_L1_CODE_START
&& (addr + size <= COREB_L1_CODE_START + L1_CODE_LENGTH))
return 0; return 0;
# endif if (IN_MEM(addr, size, COREB_L1_DATA_A_START, L1_DATA_A_LENGTH))
# if L1_DATA_A_LENGTH != 0
if (addr >= COREB_L1_DATA_A_START
&& (addr + size <= COREB_L1_DATA_A_START + L1_DATA_A_LENGTH))
return 0; return 0;
# endif if (IN_MEM(addr, size, COREB_L1_DATA_B_START, L1_DATA_B_LENGTH))
# if L1_DATA_B_LENGTH != 0
if (addr >= COREB_L1_DATA_B_START
&& (addr + size <= COREB_L1_DATA_B_START + L1_DATA_B_LENGTH))
return 0; return 0;
# endif
#endif #endif
} }
#if L2_LENGTH != 0 #if L2_LENGTH
if (addr >= L2_START if (IN_MEM(addr, size, L2_START, L2_LENGTH))
&& addr + size <= L2_START + L2_LENGTH)
return 0; return 0;
#endif #endif
...@@ -566,12 +552,9 @@ int kgdb_mem2hex(char *mem, char *buf, int count) ...@@ -566,12 +552,9 @@ int kgdb_mem2hex(char *mem, char *buf, int count)
default: default:
err = EFAULT; err = EFAULT;
} }
} else if ((cpu == 0 && (unsigned int)mem >= L1_CODE_START && } else if ((cpu == 0 && IN_MEM(mem, count, L1_CODE_START, L1_CODE_LENGTH))
(unsigned int)(mem + count) <= L1_CODE_START + L1_CODE_LENGTH)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
|| (cpu == 1 && (unsigned int)mem >= COREB_L1_CODE_START && || (cpu == 1 && IN_MEM(mem, count, COREB_L1_CODE_START, L1_CODE_LENGTH))
(unsigned int)(mem + count) <=
COREB_L1_CODE_START + L1_CODE_LENGTH)
#endif #endif
) { ) {
/* access L1 instruction SRAM*/ /* access L1 instruction SRAM*/
...@@ -642,12 +625,9 @@ int kgdb_ebin2mem(char *buf, char *mem, int count) ...@@ -642,12 +625,9 @@ int kgdb_ebin2mem(char *buf, char *mem, int count)
default: default:
return EFAULT; return EFAULT;
} }
} else if ((cpu == 0 && (unsigned int)mem >= L1_CODE_START && } else if ((cpu == 0 && IN_MEM(mem, count, L1_CODE_START, L1_CODE_LENGTH))
(unsigned int)(mem + count) <= L1_CODE_START + L1_CODE_LENGTH)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
|| (cpu == 1 && (unsigned int)mem >= COREB_L1_CODE_START && || (cpu == 1 && IN_MEM(mem, count, COREB_L1_CODE_START, L1_CODE_LENGTH))
(unsigned int)(mem + count) <=
COREB_L1_CODE_START + L1_CODE_LENGTH)
#endif #endif
) { ) {
/* access L1 instruction SRAM */ /* access L1 instruction SRAM */
...@@ -707,12 +687,9 @@ int kgdb_hex2mem(char *buf, char *mem, int count) ...@@ -707,12 +687,9 @@ int kgdb_hex2mem(char *buf, char *mem, int count)
default: default:
return EFAULT; return EFAULT;
} }
} else if ((cpu == 0 && (unsigned int)mem >= L1_CODE_START && } else if ((cpu == 0 && IN_MEM(mem, count, L1_CODE_START, L1_CODE_LENGTH))
(unsigned int)(mem + count) <= L1_CODE_START + L1_CODE_LENGTH)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
|| (cpu == 1 && (unsigned int)mem >= COREB_L1_CODE_START && || (cpu == 1 && IN_MEM(mem, count, COREB_L1_CODE_START, L1_CODE_LENGTH))
(unsigned int)(mem + count) <=
COREB_L1_CODE_START + L1_CODE_LENGTH)
#endif #endif
) { ) {
/* access L1 instruction SRAM */ /* access L1 instruction SRAM */
...@@ -729,22 +706,16 @@ int kgdb_validate_break_address(unsigned long addr) ...@@ -729,22 +706,16 @@ int kgdb_validate_break_address(unsigned long addr)
if (addr >= 0x1000 && (addr + BREAK_INSTR_SIZE) <= physical_mem_end) if (addr >= 0x1000 && (addr + BREAK_INSTR_SIZE) <= physical_mem_end)
return 0; return 0;
if (addr >= ASYNC_BANK0_BASE if (IN_MEM(addr, BREAK_INSTR_SIZE, ASYNC_BANK0_BASE, ASYNC_BANK_SIZE))
&& addr + BREAK_INSTR_SIZE <= ASYNC_BANK3_BASE + ASYNC_BANK3_BASE)
return 0; return 0;
#if L1_CODE_LENGTH != 0 if (cpu == 0 && IN_MEM(addr, BREAK_INSTR_SIZE, L1_CODE_START, L1_CODE_LENGTH))
if (cpu == 0 && addr >= L1_CODE_START
&& addr + BREAK_INSTR_SIZE <= L1_CODE_START + L1_CODE_LENGTH)
return 0; return 0;
# ifdef CONFIG_SMP #ifdef CONFIG_SMP
else if (cpu == 1 && addr >= COREB_L1_CODE_START else if (cpu == 1 && IN_MEM(addr, BREAK_INSTR_SIZE, COREB_L1_CODE_START, L1_CODE_LENGTH))
&& addr + BREAK_INSTR_SIZE <= COREB_L1_CODE_START + L1_CODE_LENGTH)
return 0; return 0;
# endif
#endif #endif
#if L2_LENGTH != 0 #if L2_LENGTH
if (addr >= L2_START if (IN_MEM(addr, BREAK_INSTR_SIZE, L2_START, L2_LENGTH))
&& addr + BREAK_INSTR_SIZE <= L2_START + L2_LENGTH)
return 0; return 0;
#endif #endif
...@@ -756,13 +727,9 @@ int kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr) ...@@ -756,13 +727,9 @@ int kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr)
int err; int err;
int cpu = raw_smp_processor_id(); int cpu = raw_smp_processor_id();
if ((cpu == 0 && (unsigned int)addr >= L1_CODE_START if ((cpu == 0 && IN_MEM(addr, BREAK_INSTR_SIZE, L1_CODE_START, L1_CODE_LENGTH))
&& (unsigned int)(addr + BREAK_INSTR_SIZE)
<= L1_CODE_START + L1_CODE_LENGTH)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
|| (cpu == 1 && (unsigned int)addr >= COREB_L1_CODE_START || (cpu == 1 && IN_MEM(addr, BREAK_INSTR_SIZE, COREB_L1_CODE_START, L1_CODE_LENGTH))
&& (unsigned int)(addr + BREAK_INSTR_SIZE)
<= COREB_L1_CODE_START + L1_CODE_LENGTH)
#endif #endif
) { ) {
/* access L1 instruction SRAM */ /* access L1 instruction SRAM */
...@@ -788,9 +755,7 @@ int kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr) ...@@ -788,9 +755,7 @@ int kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr)
int kgdb_arch_remove_breakpoint(unsigned long addr, char *bundle) int kgdb_arch_remove_breakpoint(unsigned long addr, char *bundle)
{ {
if ((unsigned int)addr >= L1_CODE_START && if (IN_MEM(addr, BREAK_INSTR_SIZE, L1_CODE_START, L1_CODE_LENGTH)) {
(unsigned int)(addr + BREAK_INSTR_SIZE) <=
L1_CODE_START + L1_CODE_LENGTH) {
/* access L1 instruction SRAM */ /* access L1 instruction SRAM */
if (dma_memcpy((void *)addr, bundle, BREAK_INSTR_SIZE) == NULL) if (dma_memcpy((void *)addr, bundle, BREAK_INSTR_SIZE) == NULL)
return -EFAULT; return -EFAULT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7