From owner-svn-src-all@FreeBSD.ORG  Wed Nov  3 23:29:52 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 C8474106564A;
	Wed,  3 Nov 2010 23:29:52 +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 B7D508FC14;
	Wed,  3 Nov 2010 23:29:52 +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 oA3NTqbH037214;
	Wed, 3 Nov 2010 23:29:52 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA3NTqaw037212;
	Wed, 3 Nov 2010 23:29:52 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201011032329.oA3NTqaw037212@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 3 Nov 2010 23:29:52 +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: r214766 - 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: Wed, 03 Nov 2010 23:29:52 -0000

Author: jmallett
Date: Wed Nov  3 23:29:52 2010
New Revision: 214766
URL: http://svn.freebsd.org/changeset/base/214766

Log:
  Don't attach the PCI bus driver if the board we're being run on has PCIe.  The
  two are mutually-exclusive on Octeon.

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

Modified: head/sys/mips/cavium/octopci.c
==============================================================================
--- head/sys/mips/cavium/octopci.c	Wed Nov  3 23:16:35 2010	(r214765)
+++ head/sys/mips/cavium/octopci.c	Wed Nov  3 23:29:52 2010	(r214766)
@@ -108,6 +108,8 @@ octopci_probe(device_t dev)
 {
 	if (device_get_unit(dev) != 0)
 		return (ENXIO);
+	if (octeon_has_feature(OCTEON_FEATURE_PCIE))
+		return (ENXIO);
 	/* XXX Check sysinfo flag.  */
 	device_set_desc(dev, "Cavium Octeon PCI bridge");
 	return (0);