svn commit: r242103 - head/sys/mips/cavium

Juli Mallett jmallett at FreeBSD.org
Fri Oct 26 00:04:05 UTC 2012


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))


More information about the svn-src-all mailing list