From owner-svn-src-all@FreeBSD.ORG Tue Oct 29 14:07:36 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D59294A1; Tue, 29 Oct 2013 14:07:36 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B3AA4293A; Tue, 29 Oct 2013 14:07:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TE7aMb089536; Tue, 29 Oct 2013 14:07:36 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TE7VwC089505; Tue, 29 Oct 2013 14:07:31 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201310291407.r9TE7VwC089505@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 29 Oct 2013 14:07:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257338 - in head/sys/mips: adm5120 alchemy atheros cavium idt malta mips nlm rmi rt305x sibyte X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 14:07:37 -0000 Author: nwhitehorn Date: Tue Oct 29 14:07:31 2013 New Revision: 257338 URL: http://svnweb.freebsd.org/changeset/base/257338 Log: 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 Modified: head/sys/mips/adm5120/obio.c head/sys/mips/alchemy/obio.c head/sys/mips/atheros/apb.c head/sys/mips/atheros/ar71xx_ehci.c head/sys/mips/atheros/ar71xx_pci.c head/sys/mips/atheros/ar71xx_spi.c head/sys/mips/atheros/ar71xx_wdog.c head/sys/mips/atheros/ar724x_pci.c head/sys/mips/atheros/if_arge.c head/sys/mips/cavium/ciu.c head/sys/mips/cavium/octeon_ebt3000_cf.c head/sys/mips/cavium/octeon_pmc.c head/sys/mips/cavium/octeon_rnd.c head/sys/mips/cavium/octeon_rtc.c head/sys/mips/idt/obio.c head/sys/mips/malta/gt.c head/sys/mips/mips/tick.c head/sys/mips/nlm/tick.c head/sys/mips/nlm/xlp_pci.c head/sys/mips/rmi/iodi.c head/sys/mips/rmi/tick.c head/sys/mips/rt305x/obio.c head/sys/mips/sibyte/sb_zbbus.c Modified: head/sys/mips/adm5120/obio.c ============================================================================== --- head/sys/mips/adm5120/obio.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/adm5120/obio.c Tue Oct 29 14:07:31 2013 (r257338) @@ -157,7 +157,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/alchemy/obio.c ============================================================================== --- head/sys/mips/alchemy/obio.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/alchemy/obio.c Tue Oct 29 14:07:31 2013 (r257338) @@ -158,7 +158,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NO_WILDCARD); } static int Modified: head/sys/mips/atheros/apb.c ============================================================================== --- head/sys/mips/atheros/apb.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/apb.c Tue Oct 29 14:07:31 2013 (r257338) @@ -103,7 +103,7 @@ static int apb_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ehci.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/ar71xx_ehci.c Tue Oct 29 14:07:31 2013 (r257338) @@ -75,7 +75,7 @@ ar71xx_ehci_probe(device_t self) device_set_desc(self, EHCI_HC_DEVSTR); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/atheros/ar71xx_pci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_pci.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/ar71xx_pci.c Tue Oct 29 14:07:31 2013 (r257338) @@ -371,7 +371,7 @@ static int ar71xx_pci_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/atheros/ar71xx_spi.c ============================================================================== --- head/sys/mips/atheros/ar71xx_spi.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/ar71xx_spi.c Tue Oct 29 14:07:31 2013 (r257338) @@ -92,7 +92,7 @@ static int ar71xx_spi_probe(device_t dev) { device_set_desc(dev, "AR71XX SPI"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/atheros/ar71xx_wdog.c ============================================================================== --- head/sys/mips/atheros/ar71xx_wdog.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/ar71xx_wdog.c Tue Oct 29 14:07:31 2013 (r257338) @@ -92,7 +92,7 @@ ar71xx_wdog_probe(device_t dev) { device_set_desc(dev, "Atheros AR71XX watchdog timer"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void Modified: head/sys/mips/atheros/ar724x_pci.c ============================================================================== --- head/sys/mips/atheros/ar724x_pci.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/ar724x_pci.c Tue Oct 29 14:07:31 2013 (r257338) @@ -349,7 +349,7 @@ static int ar724x_pci_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/atheros/if_arge.c ============================================================================== --- head/sys/mips/atheros/if_arge.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/atheros/if_arge.c Tue Oct 29 14:07:31 2013 (r257338) @@ -262,7 +262,7 @@ arge_probe(device_t dev) { device_set_desc(dev, "Atheros AR71xx built-in ethernet interface"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void Modified: head/sys/mips/cavium/ciu.c ============================================================================== --- head/sys/mips/cavium/ciu.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/cavium/ciu.c Tue Oct 29 14:07:31 2013 (r257338) @@ -109,7 +109,7 @@ ciu_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Central Interrupt Unit"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c ============================================================================== --- head/sys/mips/cavium/octeon_ebt3000_cf.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/cavium/octeon_ebt3000_cf.c Tue Oct 29 14:07:31 2013 (r257338) @@ -599,7 +599,7 @@ static int cf_probe (device_t dev) device_set_desc(dev, "Octeon Compact Flash Driver"); - return (0); + return (BUS_PROBE_NOWILDCARD); } /* ------------------------------------------------------------------- * Modified: head/sys/mips/cavium/octeon_pmc.c ============================================================================== --- head/sys/mips/cavium/octeon_pmc.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/cavium/octeon_pmc.c Tue Oct 29 14:07:31 2013 (r257338) @@ -71,7 +71,7 @@ octeon_pmc_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Performance Counters"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/cavium/octeon_rnd.c ============================================================================== --- head/sys/mips/cavium/octeon_rnd.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/cavium/octeon_rnd.c Tue Oct 29 14:07:31 2013 (r257338) @@ -86,7 +86,7 @@ octeon_rnd_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Random Number Generator"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/cavium/octeon_rtc.c ============================================================================== --- head/sys/mips/cavium/octeon_rtc.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/cavium/octeon_rtc.c Tue Oct 29 14:07:31 2013 (r257338) @@ -81,7 +81,7 @@ octeon_rtc_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Cavium Octeon Realtime Clock"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/idt/obio.c ============================================================================== --- head/sys/mips/idt/obio.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/idt/obio.c Tue Oct 29 14:07:31 2013 (r257338) @@ -108,7 +108,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/malta/gt.c ============================================================================== --- head/sys/mips/malta/gt.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/malta/gt.c Tue Oct 29 14:07:31 2013 (r257338) @@ -51,7 +51,7 @@ static int gt_probe(device_t dev) { device_set_desc(dev, "GT64120 chip"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void Modified: head/sys/mips/mips/tick.c ============================================================================== --- head/sys/mips/mips/tick.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/mips/tick.c Tue Oct 29 14:07:31 2013 (r257338) @@ -313,7 +313,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void Modified: head/sys/mips/nlm/tick.c ============================================================================== --- head/sys/mips/nlm/tick.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/nlm/tick.c Tue Oct 29 14:07:31 2013 (r257338) @@ -318,7 +318,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void Modified: head/sys/mips/nlm/xlp_pci.c ============================================================================== --- head/sys/mips/nlm/xlp_pci.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/nlm/xlp_pci.c Tue Oct 29 14:07:31 2013 (r257338) @@ -383,8 +383,7 @@ xlp_pcib_probe(device_t dev) { device_set_desc(dev, "XLP PCI bus"); - xlp_pcib_init_resources(); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int @@ -524,6 +523,8 @@ xlp_pcib_attach(device_t dev) { int node, link; + xlp_pcib_init_resources(); + /* enable hardware swap on all nodes/links */ for (node = 0; node < XLP_MAX_NODES; node++) for (link = 0; link < 4; link++) Modified: head/sys/mips/rmi/iodi.c ============================================================================== --- head/sys/mips/rmi/iodi.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/rmi/iodi.c Tue Oct 29 14:07:31 2013 (r257338) @@ -190,7 +190,7 @@ static void iodi_identify(driver_t *, de int iodi_probe(device_t dev) { - return 0; + return (BUS_PROBE_NOWILDCARD); } void Modified: head/sys/mips/rmi/tick.c ============================================================================== --- head/sys/mips/rmi/tick.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/rmi/tick.c Tue Oct 29 14:07:31 2013 (r257338) @@ -315,7 +315,7 @@ clock_probe(device_t dev) panic("can't attach more clocks"); device_set_desc(dev, "Generic MIPS32 ticker"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static void Modified: head/sys/mips/rt305x/obio.c ============================================================================== --- head/sys/mips/rt305x/obio.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/rt305x/obio.c Tue Oct 29 14:07:31 2013 (r257338) @@ -148,7 +148,7 @@ static int obio_probe(device_t dev) { - return (0); + return (BUS_PROBE_NOWILDCARD); } static int Modified: head/sys/mips/sibyte/sb_zbbus.c ============================================================================== --- head/sys/mips/sibyte/sb_zbbus.c Tue Oct 29 13:52:05 2013 (r257337) +++ head/sys/mips/sibyte/sb_zbbus.c Tue Oct 29 14:07:31 2013 (r257338) @@ -207,7 +207,7 @@ zbbus_probe(device_t dev) { device_set_desc(dev, "Broadcom/Sibyte ZBbus"); - return (0); + return (BUS_PROBE_NOWILDCARD); } static int