summaryrefslogtreecommitdiffstats
path: root/sys/powerpc
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2004-04-01 07:34:36 +0000
committergrehan <grehan@FreeBSD.org>2004-04-01 07:34:36 +0000
commitd768acf3fe5ef57f3892d4a9b34ff8dba228d649 (patch)
tree10aae5a1284a8e6dcb111a9c466d530f054a5878 /sys/powerpc
parent7996fbe9e39de14e3445f782657c725cacb69cc3 (diff)
downloadFreeBSD-src-d768acf3fe5ef57f3892d4a9b34ff8dba228d649.zip
FreeBSD-src-d768acf3fe5ef57f3892d4a9b34ff8dba228d649.tar.gz
Match the specific MPC106 host bridge PCI ID rather than all
generic host bridges: this avoids a race with the UniNorth generic match.
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/powermac/grackle.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index be70a35..9db68f0 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -513,18 +513,15 @@ grackle_disable_config(struct grackle_softc *sc)
/*
* Driver to swallow Grackle host bridges from the PCI bus side.
- * Same as the UniNorth 'swallower', so whoever probes first will win out.
- * Maybe the UniNorth/Grackle code should be consolidated.
*/
static int
grackle_hb_probe(device_t dev)
{
- if (pci_get_class(dev) == PCIC_BRIDGE &&
- pci_get_subclass(dev) == PCIS_BRIDGE_HOST) {
- device_set_desc(dev, "Host to PCI bridge");
+ if (pci_get_devid(dev) == 0x00021057) {
+ device_set_desc(dev, "Grackle Host to PCI bridge");
device_quiet(dev);
- return (-10000);
+ return (0);
}
return (ENXIO);
OpenPOWER on IntegriCloud