Devices that rely on hints or identify routines for discovery need to

return BUS_PROBE_NOWILDCARD from their probe routines to avoid claiming
wildcard devices on their parent bus. Do a sweep through the MIPS tree.

MFC after: 2 weeks
This commit is contained in:
Nathan Whitehorn 2013-10-29 14:07:31 +00:00
parent f0919d9edf
commit 5543a1b98e
23 changed files with 25 additions and 24 deletions

View File

@ -157,7 +157,7 @@ static int
obio_probe(device_t dev) obio_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -158,7 +158,7 @@ static int
obio_probe(device_t dev) obio_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NO_WILDCARD);
} }
static int static int

View File

@ -103,7 +103,7 @@ static int
apb_probe(device_t dev) apb_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -75,7 +75,7 @@ ar71xx_ehci_probe(device_t self)
device_set_desc(self, EHCI_HC_DEVSTR); device_set_desc(self, EHCI_HC_DEVSTR);
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -371,7 +371,7 @@ static int
ar71xx_pci_probe(device_t dev) ar71xx_pci_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -92,7 +92,7 @@ static int
ar71xx_spi_probe(device_t dev) ar71xx_spi_probe(device_t dev)
{ {
device_set_desc(dev, "AR71XX SPI"); device_set_desc(dev, "AR71XX SPI");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -92,7 +92,7 @@ ar71xx_wdog_probe(device_t dev)
{ {
device_set_desc(dev, "Atheros AR71XX watchdog timer"); device_set_desc(dev, "Atheros AR71XX watchdog timer");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static void static void

View File

@ -349,7 +349,7 @@ static int
ar724x_pci_probe(device_t dev) ar724x_pci_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -262,7 +262,7 @@ arge_probe(device_t dev)
{ {
device_set_desc(dev, "Atheros AR71xx built-in ethernet interface"); device_set_desc(dev, "Atheros AR71xx built-in ethernet interface");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static void static void

View File

@ -109,7 +109,7 @@ ciu_probe(device_t dev)
return (ENXIO); return (ENXIO);
device_set_desc(dev, "Cavium Octeon Central Interrupt Unit"); device_set_desc(dev, "Cavium Octeon Central Interrupt Unit");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -599,7 +599,7 @@ static int cf_probe (device_t dev)
device_set_desc(dev, "Octeon Compact Flash Driver"); device_set_desc(dev, "Octeon Compact Flash Driver");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
/* ------------------------------------------------------------------- * /* ------------------------------------------------------------------- *

View File

@ -71,7 +71,7 @@ octeon_pmc_probe(device_t dev)
return (ENXIO); return (ENXIO);
device_set_desc(dev, "Cavium Octeon Performance Counters"); device_set_desc(dev, "Cavium Octeon Performance Counters");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -86,7 +86,7 @@ octeon_rnd_probe(device_t dev)
return (ENXIO); return (ENXIO);
device_set_desc(dev, "Cavium Octeon Random Number Generator"); device_set_desc(dev, "Cavium Octeon Random Number Generator");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -81,7 +81,7 @@ octeon_rtc_probe(device_t dev)
return (ENXIO); return (ENXIO);
device_set_desc(dev, "Cavium Octeon Realtime Clock"); device_set_desc(dev, "Cavium Octeon Realtime Clock");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -108,7 +108,7 @@ static int
obio_probe(device_t dev) obio_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -51,7 +51,7 @@ static int
gt_probe(device_t dev) gt_probe(device_t dev)
{ {
device_set_desc(dev, "GT64120 chip"); device_set_desc(dev, "GT64120 chip");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static void static void

View File

@ -313,7 +313,7 @@ clock_probe(device_t dev)
panic("can't attach more clocks"); panic("can't attach more clocks");
device_set_desc(dev, "Generic MIPS32 ticker"); device_set_desc(dev, "Generic MIPS32 ticker");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static void static void

View File

@ -318,7 +318,7 @@ clock_probe(device_t dev)
panic("can't attach more clocks"); panic("can't attach more clocks");
device_set_desc(dev, "Generic MIPS32 ticker"); device_set_desc(dev, "Generic MIPS32 ticker");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static void static void

View File

@ -383,8 +383,7 @@ xlp_pcib_probe(device_t dev)
{ {
device_set_desc(dev, "XLP PCI bus"); device_set_desc(dev, "XLP PCI bus");
xlp_pcib_init_resources(); return (BUS_PROBE_NOWILDCARD);
return (0);
} }
static int static int
@ -524,6 +523,8 @@ xlp_pcib_attach(device_t dev)
{ {
int node, link; int node, link;
xlp_pcib_init_resources();
/* enable hardware swap on all nodes/links */ /* enable hardware swap on all nodes/links */
for (node = 0; node < XLP_MAX_NODES; node++) for (node = 0; node < XLP_MAX_NODES; node++)
for (link = 0; link < 4; link++) for (link = 0; link < 4; link++)

View File

@ -190,7 +190,7 @@ static void iodi_identify(driver_t *, device_t);
int int
iodi_probe(device_t dev) iodi_probe(device_t dev)
{ {
return 0; return (BUS_PROBE_NOWILDCARD);
} }
void void

View File

@ -315,7 +315,7 @@ clock_probe(device_t dev)
panic("can't attach more clocks"); panic("can't attach more clocks");
device_set_desc(dev, "Generic MIPS32 ticker"); device_set_desc(dev, "Generic MIPS32 ticker");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static void static void

View File

@ -148,7 +148,7 @@ static int
obio_probe(device_t dev) obio_probe(device_t dev)
{ {
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int

View File

@ -207,7 +207,7 @@ zbbus_probe(device_t dev)
{ {
device_set_desc(dev, "Broadcom/Sibyte ZBbus"); device_set_desc(dev, "Broadcom/Sibyte ZBbus");
return (0); return (BUS_PROBE_NOWILDCARD);
} }
static int static int