This portion of the patch add probing for the watch registers. The probing
code is in watch.c, here we add a call to that code.
Also /proc/cpu info is modified to print out the watch register information.
Signed-off-by: David Daney <ddaney@xxxxxxxxxx>
---
arch/mips/kernel/cpu-probe.c | 3 +++
arch/mips/kernel/proc.c | 10 ++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 89c3304..c3308d3 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -678,6 +678,9 @@ static void __cpuinit decode_configs(struct cpuinfo_mips *c)
static inline void cpu_probe_mips(struct cpuinfo_mips *c)
{
decode_configs(c);
+#if defined(CONFIG_HARDWARE_WATCHPOINTS)
+ mips_probe_watch_registers(c);
+#endif
switch (c->processor_id & 0xff00) {
case PRID_IMP_4KC:
c->cputype = CPU_4KC;
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 36f0653..e2f716c 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -50,8 +50,18 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "tlb_entries\t\t: %d\n", cpu_data[n].tlbsize);
seq_printf(m, "extra interrupt vector\t: %s\n",
cpu_has_divec ? "yes" : "no");
+#ifdef CONFIG_HARDWARE_WATCHPOINTS
+ seq_printf(m, "hardware watchpoint\t: %s",
+ cpu_has_watch ? "yes" : "no\n");
+ if (cpu_has_watch)
+ seq_printf(m, ", count: %d, address mask: 0x%04x, irw mask 0x%02x\n",
+ cpu_data[n].watch_reg_count,
+ cpu_data[n].watch_reg_mask,
+ cpu_data[n].watch_reg_irw);
+#else
seq_printf(m, "hardware watchpoint\t: %s\n",
cpu_has_watch ? "yes" : "no");
+#endif
seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",
cpu_has_mips16 ? " mips16" : "",
cpu_has_mdmx ? " mdmx" : "",
--
1.5.5
