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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
