From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 29 Apr 2008 02:33:35 +0100 (BST) Received: from smtp1.dnsmadeeasy.com ([205.234.170.144]:25527 "EHLO smtp1.dnsmadeeasy.com") by ftp.linux-mips.org with ESMTP id S20205963AbYD2Bdd (ORCPT ); Tue, 29 Apr 2008 02:33:33 +0100 Received: from smtp1.dnsmadeeasy.com (localhost [127.0.0.1]) by smtp1.dnsmadeeasy.com (Postfix) with ESMTP id B022E319F4D; Tue, 29 Apr 2008 01:37:31 +0000 (UTC) X-Authenticated-Name: js.dnsmadeeasy X-Transit-System: In case of SPAM please contact abuse@dnsmadeeasy.com Received: from avtrex.com (unknown [67.116.42.147]) by smtp1.dnsmadeeasy.com (Postfix) with ESMTP; Tue, 29 Apr 2008 01:37:31 +0000 (UTC) Received: from dl2.hq2.avtrex.com ([192.168.7.26]) by avtrex.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 28 Apr 2008 18:33:24 -0700 Message-ID: <48167AE4.8050208@avtrex.com> Date: Mon, 28 Apr 2008 18:33:24 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.12 (X11/20080226) MIME-Version: 1.0 To: linux-mips@linux-mips.org Cc: Linux kernel Subject: [PATCH 3/6] Probe watch registers and report configuration. References: <48167832.3090103@avtrex.com> In-Reply-To: <48167832.3090103@avtrex.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 29 Apr 2008 01:33:24.0840 (UTC) FILETIME=[045DB680:01C8A999] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 19046 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ddaney@avtrex.com Precedence: bulk X-list: linux-mips Probe watch registers and report configuration. Probe for watch register characteristics, and report them in /proc/cpuinfo. Signed-off-by: David Daney --- arch/mips/kernel/cpu-probe.c | 4 ++++ arch/mips/kernel/proc.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 89c3304..1563049 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -21,6 +21,7 @@ #include #include #include +#include /* * Not all of the MIPS CPUs have the "wait" instruction available. Moreover, @@ -678,6 +679,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