From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 24 17:15:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27ED4106568B;
	Tue, 24 Nov 2009 17:15:23 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 17EE28FC0C;
	Tue, 24 Nov 2009 17:15:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAOHFM1S024800;
	Tue, 24 Nov 2009 17:15:22 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOHFMFj024797;
	Tue, 24 Nov 2009 17:15:22 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241715.nAOHFMFj024797@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 17:15:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199760 - in projects/mips/sys/mips: include mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 17:15:23 -0000

Author: imp
Date: Tue Nov 24 17:15:22 2009
New Revision: 199760
URL: http://svn.freebsd.org/changeset/base/199760

Log:
  Add in Cavium's CID.  Report what the unknown CID is.

Modified:
  projects/mips/sys/mips/include/locore.h
  projects/mips/sys/mips/mips/cpu.c

Modified: projects/mips/sys/mips/include/locore.h
==============================================================================
--- projects/mips/sys/mips/include/locore.h	Tue Nov 24 17:14:23 2009	(r199759)
+++ projects/mips/sys/mips/include/locore.h	Tue Nov 24 17:15:22 2009	(r199760)
@@ -60,6 +60,7 @@ typedef int mips_prid_t;
 				/*	0x09	unannounced */
 				/*	0x0a	unannounced */
 #define     MIPS_PRID_CID_LEXRA		0x0b	/* Lexra */
+#define     MIPS_PRID_CID_CAVIUM	0x0d	/* Cavium */
 #define MIPS_PRID_COPTS(x)	(((x) >> 24) & 0x00ff)	/* Company Options */
 
 #ifdef _KERNEL

Modified: projects/mips/sys/mips/mips/cpu.c
==============================================================================
--- projects/mips/sys/mips/mips/cpu.c	Tue Nov 24 17:14:23 2009	(r199759)
+++ projects/mips/sys/mips/mips/cpu.c	Tue Nov 24 17:15:22 2009	(r199760)
@@ -178,9 +178,12 @@ cpu_identify(void)
 	case MIPS_PRID_CID_LEXRA:
 		printf("Lexra");
 		break;
+	case MIPS_PRID_CID_CAVIUM:
+		printf("Cavium");
+		break;
 	case MIPS_PRID_CID_PREHISTORIC:
 	default:
-		printf("Unknown");
+		printf("Unknown cid %#x", cpuinfo.cpu_vendor);
 		break;
 	}
 	printf(" processor v%d.%d\n", cpuinfo.cpu_rev, cpuinfo.cpu_impl);