From owner-svn-src-all@FreeBSD.ORG  Tue Nov 30 01:27:55 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 012C8106566B;
	Tue, 30 Nov 2010 01:27:55 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E33C68FC17;
	Tue, 30 Nov 2010 01:27:54 +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 oAU1RsFi011356;
	Tue, 30 Nov 2010 01:27:54 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAU1RsaB011354;
	Tue, 30 Nov 2010 01:27:54 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201011300127.oAU1RsaB011354@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 30 Nov 2010 01:27:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216069 - head/sys/mips/cavium
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Nov 2010 01:27:55 -0000

Author: jmallett
Date: Tue Nov 30 01:27:54 2010
New Revision: 216069
URL: http://svn.freebsd.org/changeset/base/216069

Log:
  Display some Octeon 2 features and a feature for distinguishing between PCIe
  implementations.

Modified:
  head/sys/mips/cavium/octeon_machdep.c

Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c	Mon Nov 29 22:20:44 2010	(r216068)
+++ head/sys/mips/cavium/octeon_machdep.c	Tue Nov 30 01:27:54 2010	(r216069)
@@ -97,7 +97,9 @@ static const struct octeon_feature_descr
 	{ OCTEON_FEATURE_SAAD,			"SAAD" },
 	{ OCTEON_FEATURE_ZIP,			"ZIP" },
 	{ OCTEON_FEATURE_CRYPTO,		"CRYPTO" },
+	{ OCTEON_FEATURE_DORM_CRYPTO,		"DORM_CRYPTO" },
 	{ OCTEON_FEATURE_PCIE,			"PCIE" },
+	{ OCTEON_FEATURE_SRIO,			"SRIO" },
 	{ OCTEON_FEATURE_KEY_MEMORY,		"KEY_MEMORY" },
 	{ OCTEON_FEATURE_LED_CONTROLLER,	"LED_CONTROLLER" },
 	{ OCTEON_FEATURE_TRA,			"TRA" },
@@ -107,6 +109,7 @@ static const struct octeon_feature_descr
 	{ OCTEON_FEATURE_NO_WPTR,		"NO_WPTR" },
 	{ OCTEON_FEATURE_DFA,			"DFA" },
 	{ OCTEON_FEATURE_MDIO_CLAUSE_45,	"MDIO_CLAUSE_45" },
+	{ OCTEON_FEATURE_NPEI,			"NPEI" },
 	{ 0,					NULL }
 };