Now that we only probe host-PCI bridges once, we no longer have to check to
see if we have been probed before by checking for a pciX bus device.
This commit is contained in:
parent
8ff25e9763
commit
b8581e0d56
@ -424,19 +424,9 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
|
||||
static int
|
||||
nexus_pcib_probe(device_t dev)
|
||||
{
|
||||
devclass_t pci_devclass;
|
||||
|
||||
if (pci_cfgregopen() == 0)
|
||||
return ENXIO;
|
||||
/*
|
||||
* Check to see if we haven't already had a PCI bus added
|
||||
* via some other means. If we have, bail since otherwise
|
||||
* we're going to end up duplicating it.
|
||||
*/
|
||||
if ((pci_devclass = devclass_find("pci")) &&
|
||||
devclass_get_device(pci_devclass, device_get_unit(dev)))
|
||||
return ENXIO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -65,15 +65,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno)
|
||||
if (!acpi_DeviceIsPresent(dev))
|
||||
return_VALUE(ENXIO);
|
||||
|
||||
/*
|
||||
* Make sure that this bus hasn't already been found.
|
||||
*/
|
||||
if (devclass_get_device(devclass_find("pci"), busno) != NULL) {
|
||||
device_printf(dev, "duplicate bus number %d - not probing bus\n",
|
||||
busno);
|
||||
return_VALUE(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the PCI interrupt routing table for this bus.
|
||||
*/
|
||||
@ -94,9 +85,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno)
|
||||
|
||||
/*
|
||||
* Now go scan the bus.
|
||||
*
|
||||
* XXX It would be nice to defer this and count on the nexus getting it
|
||||
* after the first pass, but this does not seem to be reliable.
|
||||
*/
|
||||
return_VALUE(bus_generic_attach(dev));
|
||||
}
|
||||
|
@ -424,19 +424,9 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
|
||||
static int
|
||||
nexus_pcib_probe(device_t dev)
|
||||
{
|
||||
devclass_t pci_devclass;
|
||||
|
||||
if (pci_cfgregopen() == 0)
|
||||
return ENXIO;
|
||||
/*
|
||||
* Check to see if we haven't already had a PCI bus added
|
||||
* via some other means. If we have, bail since otherwise
|
||||
* we're going to end up duplicating it.
|
||||
*/
|
||||
if ((pci_devclass = devclass_find("pci")) &&
|
||||
devclass_get_device(pci_devclass, device_get_unit(dev)))
|
||||
return ENXIO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user