Author: jmallett
Date: Thu Nov 1 20:39:39 2012
New Revision: 242454
URL: http://svn.freebsd.org/changeset/base/242454
Log:
Don't disable PCIe just because the host is not a PCI host; the latter flag
only applies to non-PCIe systems. If PCIe is in target mode, it will simply
and gracefully fail to attach of its own accord.
Modified:
head/sys/mips/cavium/octopci.c
Modified: head/sys/mips/cavium/octopci.c
==============================================================================
--- head/sys/mips/cavium/octopci.c Thu Nov 1 20:09:48 2012
(r242453)
+++ head/sys/mips/cavium/octopci.c Thu Nov 1 20:39:39 2012
(r242454)
@@ -104,10 +104,6 @@ static uint64_t octopci_cs_addr(unsigned
static void
octopci_identify(driver_t *drv, device_t parent)
{
- /* 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))
BUS_ADD_CHILD(parent, 0, "pcib", 1);
@@ -121,6 +117,10 @@ octopci_probe(device_t dev)
return (0);
}
+ /* Check whether we are a PCI host. */
+ if ((cvmx_sysinfo_get()->bootloader_config_flags &
CVMX_BOOTINFO_CFG_FLAG_PCI_HOST) == 0)
+ return (ENXIO);
+
if (device_get_unit(dev) != 0)
return (ENXIO);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
