From owner-svn-src-head@FreeBSD.ORG  Fri Oct 26 00:04:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AAE8DAB6;
 Fri, 26 Oct 2012 00:04:05 +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 929358FC14;
 Fri, 26 Oct 2012 00:04:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9Q045S0077174;
 Fri, 26 Oct 2012 00:04:05 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9Q045Ss077172;
 Fri, 26 Oct 2012 00:04:05 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201210260004.q9Q045Ss077172@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 26 Oct 2012 00:04:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242103 - head/sys/mips/cavium
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Oct 2012 00:04:05 -0000

Author: jmallett
Date: Fri Oct 26 00:04:05 2012
New Revision: 242103
URL: http://svn.freebsd.org/changeset/base/242103

Log:
  Don't attach if the bootloader has not indicated that we're a PCI host.  This
  fixes booting on systems which are PCI targets.

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

Modified: head/sys/mips/cavium/octopci.c
==============================================================================
--- head/sys/mips/cavium/octopci.c	Thu Oct 25 23:18:05 2012	(r242102)
+++ head/sys/mips/cavium/octopci.c	Fri Oct 26 00:04:05 2012	(r242103)
@@ -104,7 +104,9 @@ static uint64_t	octopci_cs_addr(unsigned
 static void
 octopci_identify(driver_t *drv, device_t parent)
 {
-	/* XXX Check sysinfo flag.  */
+	/* Check whether we are a PCI host.  */
+	if ((cvmx_sysinfo_get()->bootloader_config_flags & CVMX_BOOTINFO_CFG_FLAG_PCI_HOST) == 0)
+		return;
 
 	BUS_ADD_CHILD(parent, 0, "pcib", 0);
 	if (octeon_has_feature(OCTEON_FEATURE_PCIE))