Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Wed, 13 May 2009
 16:02:08 -0700
Received: from psmtp.com ([64.18.0.91]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Wed, 13 May 2009 16:02:08 -0700
Received: from source ([213.58.128.207]) by exprod5mx268.postini.com
 ([64.18.4.11]) with SMTP;	Wed, 13 May 2009 16:02:07 PDT
Received: from localhost.localdomain ([127.0.0.1]:37319 "EHLO
	ftp.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S20025894AbZEMXCG (ORCPT	<rfc822;andy.sharp@onstor.com>); Thu, 14
 May 2009 00:02:06 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 14 May 2009 00:01:49
 +0100 (BST)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:7634 "EHLO
	mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)	by ftp.linux-mips.org with
 ESMTP id S20026376AbZEMXAz (ORCPT	<rfc822;linux-mips@linux-mips.org>); Thu,
 14 May 2009 00:00:55 +0100
Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by
 mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503)	id <B4a0b51170003>;
 Wed, 13 May 2009 19:00:39 -0400
Received: from exch4.caveonetworks.com ([192.168.16.23]) by
 exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Wed, 13 May
 2009 16:00:07 -0700
Received: from dd1.caveonetworks.com ([64.169.86.201]) by
 exch4.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);	 Wed, 13 May 2009 16:00:07 -0700
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n4DMxx8D014557;	Wed, 13
 May 2009 15:59:59 -0700
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id n4DMxulU014555;	Wed, 13 May 2009 15:59:56 -0700
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Wed, 13 May 2009 15:59:55 -0700
Subject: [PATCH 1/2] MIPS: Allow CPU specific overriding of CP0 hwrena impl
 bits.
Thread-Topic: [PATCH 1/2] MIPS: Allow CPU specific overriding of CP0 hwrena
 impl bits.
Thread-Index: AcnUHtdnPe6KEyVOQcOi4i+lzwLyTg==
Message-ID: <1242255596-14531-1-git-send-email-ddaney@caviumnetworks.com>
References: <4A0B5077.2010600@caviumnetworks.com>
In-Reply-To: <4A0B5077.2010600@caviumnetworks.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 13 May 2009 23:00:07.0090 (UTC)
 FILETIME=[8F0D7120:01C9D41E]
x-ems-stamp: nbvFv+2FAh9Y5AdAOp1j1Q==
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-neptune: 0/0/0.00/0
x-pstn-levels: (S:84.73501/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-list: linux-mips
x-archive-position: 22713
x-ecartis-version: Ecartis v1.0.0
x-original-sender: ddaney@caviumnetworks.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Some CPUs have implementation dependent rdhwr registers.  Allow them
to be enabled on a per CPU basis.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/include/asm/cpu-features.h |    4 ++++
 arch/mips/kernel/traps.c             |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/c=
pu-features.h
index 1cba4b2..8ab1d12 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -234,4 +234,8 @@
 #define cpu_scache_line_size()	cpu_data[0].scache.linesz
 #endif
=20
+#ifndef cpu_hwrena_impl_bits
+#define cpu_hwrena_impl_bits		0
+#endif
+
 #endif /* __ASM_CPU_FEATURES_H */
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c3cc42e..efcb509 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1541,7 +1541,7 @@ void __cpuinit per_cpu_trap_init(void)
 			 status_set);
=20
 	if (cpu_has_mips_r2) {
-		unsigned int enable =3D 0x0000000f;
+		unsigned int enable =3D 0x0000000f | cpu_hwrena_impl_bits;
=20
 		if (!noulri && cpu_has_userlocal)
 			enable |=3D (1 << 29);
--=20
1.6.0.6


