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, 3 Dec 2008
 15:47:13 -0800
Received: from dalesmta2-3.messageone.com ([129.41.169.249]) by
 mail.onstor.com with Microsoft SMTPSVC(6.0.3790.3959);	 Wed, 3 Dec 2008
 15:47:13 -0800
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])	by
 dalesmta2-3.messageone.com (8.13.8/8.13.8) with ESMTP id mB3NlBwI028181	for
 <andy.sharp@onstor.com>; Wed, 3 Dec 2008 17:47:12 -0600
Received: from localhost.localdomain ([127.0.0.1]:22500 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S24087246AbYLCXrB
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Wed, 3 Dec 2008 23:47:01 +0000
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 03 Dec 2008 23:46:44
 +0000 (GMT)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:6551 "EHLO
	mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP	id
 S24087245AbYLCXpA (ORCPT <rfc822;linux-mips@linux-mips.org>);	Wed, 3 Dec 2008
 23:45:00 +0000
Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by
 mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503)	id <B493719e70003>;
 Wed, 03 Dec 2008 18:44:39 -0500
Received: from exch4.caveonetworks.com ([192.168.16.23]) by
 exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Wed, 3 Dec
 2008 15:44:38 -0800
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, 3 Dec 2008 15:44:37 -0800
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id mB3NiXSG015610;	Wed, 3
 Dec 2008 15:44:33 -0800
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id mB3NiXWH015609;	Wed, 3 Dec 2008 15:44:33 -0800
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Wed, 3 Dec 2008 15:44:16 -0800
Subject: [PATCH 06/21] MIPS: Add Cavium OCTEON specific register definitions
 to mipsregs.h
Thread-Topic: [PATCH 06/21] MIPS: Add Cavium OCTEON specific register
 definitions to mipsregs.h
Thread-Index: AclVoXegwGJOu5rIQGCd2Y5nsGAihQ==
Message-ID: <1228347871-15563-6-git-send-email-ddaney@caviumnetworks.com>
References: <493718EA.40703@caviumnetworks.com>
In-Reply-To: <493718EA.40703@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: 03 Dec 2008 23:44:38.0008 (UTC)
 FILETIME=[1A896F80:01C955A1]
errors-to: linux-mips-bounce@linux-mips.org
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: lp3ljoD/+dwYjZzMyKZhYg==
x-messageone-virus-version: vendor=fsecure
 engine=4.65.7400:2.4.4,1.2.40,4.0.164
 definitions=2008-12-03_13:2008-11-24,2008-12-03,2008-12-03 signatures=0
x-messageone-virus-scanned: Clean
x-messageone-envelope-sender: linux-mips-bounce@linux-mips.org
x-messageone-spam-details: rule=m773emszm_notspam policy=m773emszm score=1
 spamscore=1 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam
 adjust=0 reason=mlx engine=3.1.0-0810130000 definitions=main-0812030160
x-messageone-spam-score: 1
x-messageone-spam-bar: *
x-list: linux-mips
x-archive-position: 21510
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

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/include/asm/mipsregs.h |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsr=
egs.h
index 9316324..207d098 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -1000,6 +1000,26 @@ do {									\
 #define read_c0_ebase()		__read_32bit_c0_register($15, 1)
 #define write_c0_ebase(val)	__write_32bit_c0_register($15, 1, val)
=20
+
+/* Cavium OCTEON (cnMIPS) */
+#define read_c0_cvmcount()	__read_ulong_c0_register($9, 6)
+#define write_c0_cvmcount(val)	__write_ulong_c0_register($9, 6, val)
+
+#define read_c0_cvmctl()	__read_64bit_c0_register($9, 7)
+#define write_c0_cvmctl(val)	__write_64bit_c0_register($9, 7, val)
+
+#define read_c0_cvmmemctl()	__read_64bit_c0_register($11, 7)
+#define write_c0_cvmmemctl(val)	__write_64bit_c0_register($11, 7, val)
+/*
+ * The cacheerr registers are not standardized.  On OCTEON, they are
+ * 64 bits wide.
+ */
+#define read_octeon_c0_icacheerr()	__read_64bit_c0_register($27, 0)
+#define write_octeon_c0_icacheerr(val)	__write_64bit_c0_register($27, 0, v=
al)
+
+#define read_octeon_c0_dcacheerr()	__read_64bit_c0_register($27, 1)
+#define write_octeon_c0_dcacheerr(val)	__write_64bit_c0_register($27, 1, v=
al)
+
 /*
  * Macros to access the floating point coprocessor control registers
  */
--=20
1.5.6.5


