From owner-p4-projects@FreeBSD.ORG  Fri Oct 10 19:40:35 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 40B1659E; Fri, 10 Oct 2014 19:40:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 038E459C
 for <perforce@freebsd.org>; Fri, 10 Oct 2014 19:40:35 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E455D94B
 for <perforce@freebsd.org>; Fri, 10 Oct 2014 19:40:34 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s9AJeYUv041329
 for <perforce@freebsd.org>; Fri, 10 Oct 2014 19:40:34 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s9AJeYBX041326
 for perforce@freebsd.org; Fri, 10 Oct 2014 19:40:34 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 10 Oct 2014 19:40:34 GMT
Message-Id: <201410101940.s9AJeYBX041326@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1201462 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Oct 2014 19:40:35 -0000

http://p4web.freebsd.org/@@1201462?ac=10

Change 1201462 by jhb@jhb_pippin on 2014/10/10 19:40:28

	This should probe earlier as well.

Affected files ...

.. //depot/projects/multipass/sys/x86/pci/qpi.c#4 edit

Differences ...

==== //depot/projects/multipass/sys/x86/pci/qpi.c#4 (text+ko) ====

@@ -75,7 +75,7 @@
                 return;
 
 	/* Add a qpi bus device. */
-	if (BUS_ADD_CHILD(parent, 20, "qpi", -1) == NULL)
+	if (BUS_ADD_CHILD(parent, 0, "qpi", -1) == NULL)
 		panic("Failed to add qpi bus");
 }
 
@@ -204,7 +204,8 @@
 static devclass_t qpi_devclass;
 
 DEFINE_CLASS_0(qpi, qpi_driver, qpi_methods, 0);
-DRIVER_MODULE(qpi, nexus, qpi_driver, qpi_devclass, 0, 0);
+EARLY_DRIVER_MODULE(qpi, nexus, qpi_driver, qpi_devclass, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
 
 static int
 qpi_pcib_probe(device_t dev)
@@ -301,4 +302,5 @@
 static devclass_t qpi_pcib_devclass;
 
 DEFINE_CLASS_0(pcib, qpi_pcib_driver, qpi_pcib_methods, 0);
-DRIVER_MODULE(pcib, qpi, qpi_pcib_driver, qpi_pcib_devclass, 0, 0);
+EARLY_DRIVER_MODULE(pcib, qpi, qpi_pcib_driver, qpi_pcib_devclass, 0, 0,
+    BUS_PASS_BUS);