AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

MIPS: Add and use watch register field definitions

Browse Source 
The files watch.c and ptrace.c contain various magic masks for
WatchLo/WatchHi register fields. Add some definitions to mipsregs.h for
these registers and make use of them in both watch.c and ptrace.c,
hopefully making them more readable.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Reviewed-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12729/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
James Hogan 2016-03-01 22:19:39 +00:00 committed by Ralf Baechle
parent e233c73378
commit 50af501cd8
3 changed files with 63 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/mips/include/asm/mipsregs.h
View File

@ -648,6 +648,24 @@
/* FTLB probability bits for R6 */ /* FTLB probability bits for R6 */
#define MIPS_CONF7_FTLBP_SHIFT (18) #define MIPS_CONF7_FTLBP_SHIFT (18)
/* WatchLo* register definitions */
#define MIPS_WATCHLO_IRW (_ULCAST_(0x7) << 0)
/* WatchHi* register definitions */
#define MIPS_WATCHHI_M (_ULCAST_(1) << 31)
#define MIPS_WATCHHI_G (_ULCAST_(1) << 30)
#define MIPS_WATCHHI_WM (_ULCAST_(0x3) << 28)
#define MIPS_WATCHHI_WM_R_RVA (_ULCAST_(0) << 28)
#define MIPS_WATCHHI_WM_R_GPA (_ULCAST_(1) << 28)
#define MIPS_WATCHHI_WM_G_GVA (_ULCAST_(2) << 28)
#define MIPS_WATCHHI_EAS (_ULCAST_(0x3) << 24)
#define MIPS_WATCHHI_ASID (_ULCAST_(0xff) << 16)
#define MIPS_WATCHHI_MASK (_ULCAST_(0x1ff) << 3)
#define MIPS_WATCHHI_I (_ULCAST_(1) << 2)
#define MIPS_WATCHHI_R (_ULCAST_(1) << 1)
#define MIPS_WATCHHI_W (_ULCAST_(1) << 0)
#define MIPS_WATCHHI_IRW (_ULCAST_(0x7) << 0)
/* MAAR bit definitions */ /* MAAR bit definitions */
#define MIPS_MAAR_ADDR ((BIT_ULL(BITS_PER_LONG - 12) - 1) << 12) #define MIPS_MAAR_ADDR ((BIT_ULL(BITS_PER_LONG - 12) - 1) << 12)
#define MIPS_MAAR_ADDR_SHIFT 12 #define MIPS_MAAR_ADDR_SHIFT 12

7
arch/mips/kernel/ptrace.c
View File

@ -210,7 +210,8 @@ int ptrace_get_watch_regs(struct task_struct *child,
for (i = 0; i < boot_cpu_data.watch_reg_use_cnt; i++) { for (i = 0; i < boot_cpu_data.watch_reg_use_cnt; i++) {
__put_user(child->thread.watch.mips3264.watchlo[i], __put_user(child->thread.watch.mips3264.watchlo[i],
&addr->WATCH_STYLE.watchlo[i]); &addr->WATCH_STYLE.watchlo[i]);
__put_user(child->thread.watch.mips3264.watchhi[i] & 0xfff, __put_user(child->thread.watch.mips3264.watchhi[i] &
(MIPS_WATCHHI_MASK | MIPS_WATCHHI_IRW),
&addr->WATCH_STYLE.watchhi[i]); &addr->WATCH_STYLE.watchhi[i]);
__put_user(boot_cpu_data.watch_reg_masks[i], __put_user(boot_cpu_data.watch_reg_masks[i],
&addr->WATCH_STYLE.watch_masks[i]); &addr->WATCH_STYLE.watch_masks[i]);
@ -252,12 +253,12 @@ int ptrace_set_watch_regs(struct task_struct *child,
} }
#endif #endif
__get_user(ht[i], &addr->WATCH_STYLE.watchhi[i]); __get_user(ht[i], &addr->WATCH_STYLE.watchhi[i]);
if (ht[i] & ~0xff8) if (ht[i] & ~MIPS_WATCHHI_MASK)
return -EINVAL; return -EINVAL;
} }
/* Install them. */ /* Install them. */
for (i = 0; i < boot_cpu_data.watch_reg_use_cnt; i++) { for (i = 0; i < boot_cpu_data.watch_reg_use_cnt; i++) {
if (lt[i] & 7) if (lt[i] & MIPS_WATCHLO_IRW)
watch_active = 1; watch_active = 1;
child->thread.watch.mips3264.watchlo[i] = lt[i]; child->thread.watch.mips3264.watchlo[i] = lt[i];
/* Set the G bit. */ /* Set the G bit. */

74
arch/mips/kernel/watch.c
View File

@ -25,16 +25,20 @@ void mips_install_watch_registers(struct task_struct *t)
write_c0_watchlo3(watches->watchlo[3]); write_c0_watchlo3(watches->watchlo[3]);
/* Write 1 to the I, R, and W bits to clear them, and /* Write 1 to the I, R, and W bits to clear them, and
1 to G so all ASIDs are trapped. */ 1 to G so all ASIDs are trapped. */
write_c0_watchhi3(0x40000007 | watches->watchhi[3]); write_c0_watchhi3(MIPS_WATCHHI_G | MIPS_WATCHHI_IRW |
watches->watchhi[3]);
case 3: case 3:
write_c0_watchlo2(watches->watchlo[2]); write_c0_watchlo2(watches->watchlo[2]);
write_c0_watchhi2(0x40000007 | watches->watchhi[2]); write_c0_watchhi2(MIPS_WATCHHI_G | MIPS_WATCHHI_IRW |
watches->watchhi[2]);
case 2: case 2:
write_c0_watchlo1(watches->watchlo[1]); write_c0_watchlo1(watches->watchlo[1]);
write_c0_watchhi1(0x40000007 | watches->watchhi[1]); write_c0_watchhi1(MIPS_WATCHHI_G | MIPS_WATCHHI_IRW |
watches->watchhi[1]);
case 1: case 1:
write_c0_watchlo0(watches->watchlo[0]); write_c0_watchlo0(watches->watchlo[0]);
write_c0_watchhi0(0x40000007 | watches->watchhi[0]); write_c0_watchhi0(MIPS_WATCHHI_G | MIPS_WATCHHI_IRW |
watches->watchhi[0]);
} }
} }
@ -51,22 +55,26 @@ void mips_read_watch_registers(void)
default: default:
BUG(); BUG();
case 4: case 4:
watches->watchhi[3] = (read_c0_watchhi3() & 0x0fff); watches->watchhi[3] = (read_c0_watchhi3() &
(MIPS_WATCHHI_MASK | MIPS_WATCHHI_IRW));
case 3: case 3:
watches->watchhi[2] = (read_c0_watchhi2() & 0x0fff); watches->watchhi[2] = (read_c0_watchhi2() &
(MIPS_WATCHHI_MASK | MIPS_WATCHHI_IRW));
case 2: case 2:
watches->watchhi[1] = (read_c0_watchhi1() & 0x0fff); watches->watchhi[1] = (read_c0_watchhi1() &
(MIPS_WATCHHI_MASK | MIPS_WATCHHI_IRW));
case 1: case 1:
watches->watchhi[0] = (read_c0_watchhi0() & 0x0fff); watches->watchhi[0] = (read_c0_watchhi0() &
(MIPS_WATCHHI_MASK | MIPS_WATCHHI_IRW));
} }
if (current_cpu_data.watch_reg_use_cnt == 1 && if (current_cpu_data.watch_reg_use_cnt == 1 &&
(watches->watchhi[0] & 7) == 0) { (watches->watchhi[0] & MIPS_WATCHHI_IRW) == 0) {
/* Pathological case of release 1 architecture that /* Pathological case of release 1 architecture that
* doesn't set the condition bits. We assume that * doesn't set the condition bits. We assume that
* since we got here, the watch condition was met and * since we got here, the watch condition was met and
* signal that the conditions requested in watchlo * signal that the conditions requested in watchlo
* were met. */ * were met. */
watches->watchhi[0] |= (watches->watchlo[0] & 7); watches->watchhi[0] |= (watches->watchlo[0] & MIPS_WATCHHI_IRW);
} }
} }
@ -109,86 +117,86 @@ void mips_probe_watch_registers(struct cpuinfo_mips *c)
* Check which of the I,R and W bits are supported, then * Check which of the I,R and W bits are supported, then
* disable the register. * disable the register.
*/ */
write_c0_watchlo0(7); write_c0_watchlo0(MIPS_WATCHLO_IRW);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchlo0(); t = read_c0_watchlo0();
write_c0_watchlo0(0); write_c0_watchlo0(0);
c->watch_reg_masks[0] = t & 7; c->watch_reg_masks[0] = t & MIPS_WATCHLO_IRW;
/* Write the mask bits and read them back to determine which /* Write the mask bits and read them back to determine which
* can be used. */ * can be used. */
c->watch_reg_count = 1; c->watch_reg_count = 1;
c->watch_reg_use_cnt = 1; c->watch_reg_use_cnt = 1;
t = read_c0_watchhi0(); t = read_c0_watchhi0();
write_c0_watchhi0(t | 0xff8); write_c0_watchhi0(t | MIPS_WATCHHI_MASK);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchhi0(); t = read_c0_watchhi0();
c->watch_reg_masks[0] |= (t & 0xff8); c->watch_reg_masks[0] |= (t & MIPS_WATCHHI_MASK);
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
write_c0_watchlo1(7); write_c0_watchlo1(MIPS_WATCHLO_IRW);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchlo1(); t = read_c0_watchlo1();
write_c0_watchlo1(0); write_c0_watchlo1(0);
c->watch_reg_masks[1] = t & 7; c->watch_reg_masks[1] = t & MIPS_WATCHLO_IRW;
c->watch_reg_count = 2; c->watch_reg_count = 2;
c->watch_reg_use_cnt = 2; c->watch_reg_use_cnt = 2;
t = read_c0_watchhi1(); t = read_c0_watchhi1();
write_c0_watchhi1(t | 0xff8); write_c0_watchhi1(t | MIPS_WATCHHI_MASK);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchhi1(); t = read_c0_watchhi1();
c->watch_reg_masks[1] |= (t & 0xff8); c->watch_reg_masks[1] |= (t & MIPS_WATCHHI_MASK);
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
write_c0_watchlo2(7); write_c0_watchlo2(MIPS_WATCHLO_IRW);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchlo2(); t = read_c0_watchlo2();
write_c0_watchlo2(0); write_c0_watchlo2(0);
c->watch_reg_masks[2] = t & 7; c->watch_reg_masks[2] = t & MIPS_WATCHLO_IRW;
c->watch_reg_count = 3; c->watch_reg_count = 3;
c->watch_reg_use_cnt = 3; c->watch_reg_use_cnt = 3;
t = read_c0_watchhi2(); t = read_c0_watchhi2();
write_c0_watchhi2(t | 0xff8); write_c0_watchhi2(t | MIPS_WATCHHI_MASK);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchhi2(); t = read_c0_watchhi2();
c->watch_reg_masks[2] |= (t & 0xff8); c->watch_reg_masks[2] |= (t & MIPS_WATCHHI_MASK);
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
write_c0_watchlo3(7); write_c0_watchlo3(MIPS_WATCHLO_IRW);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchlo3(); t = read_c0_watchlo3();
write_c0_watchlo3(0); write_c0_watchlo3(0);
c->watch_reg_masks[3] = t & 7; c->watch_reg_masks[3] = t & MIPS_WATCHLO_IRW;
c->watch_reg_count = 4; c->watch_reg_count = 4;
c->watch_reg_use_cnt = 4; c->watch_reg_use_cnt = 4;
t = read_c0_watchhi3(); t = read_c0_watchhi3();
write_c0_watchhi3(t | 0xff8); write_c0_watchhi3(t | MIPS_WATCHHI_MASK);
back_to_back_c0_hazard(); back_to_back_c0_hazard();
t = read_c0_watchhi3(); t = read_c0_watchhi3();
c->watch_reg_masks[3] |= (t & 0xff8); c->watch_reg_masks[3] |= (t & MIPS_WATCHHI_MASK);
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
/* We use at most 4, but probe and report up to 8. */ /* We use at most 4, but probe and report up to 8. */
c->watch_reg_count = 5; c->watch_reg_count = 5;
t = read_c0_watchhi4(); t = read_c0_watchhi4();
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
c->watch_reg_count = 6; c->watch_reg_count = 6;
t = read_c0_watchhi5(); t = read_c0_watchhi5();
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
c->watch_reg_count = 7; c->watch_reg_count = 7;
t = read_c0_watchhi6(); t = read_c0_watchhi6();
if ((t & 0x80000000) == 0) if ((t & MIPS_WATCHHI_M) == 0)
return; return;
c->watch_reg_count = 8; c->watch_reg_count = 8;