From owner-p4-projects@FreeBSD.ORG  Fri Jul 12 22:14:39 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id CAE0DCD6; Fri, 12 Jul 2013 22:14:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8D14ECD3
 for <perforce@freebsd.org>; Fri, 12 Jul 2013 22:14:39 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 7E1111224
 for <perforce@freebsd.org>; Fri, 12 Jul 2013 22:14:39 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6CMEdi7096637
 for <perforce@freebsd.org>; Fri, 12 Jul 2013 22:14:39 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6CMEd0O096634
 for perforce@freebsd.org; Fri, 12 Jul 2013 22:14:39 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 12 Jul 2013 22:14:39 GMT
Message-Id: <201307122214.r6CMEd0O096634@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 231114 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
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, 12 Jul 2013 22:14:40 -0000

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

Change 231114 by jhb@jhb_jhbbsd on 2013/07/12 22:13:46

	Always write primary bus numbers for PCI bridges.

Affected files ...

.. //depot/projects/pci/sys/dev/pccbb/pccbb_pci.c#8 edit
.. //depot/projects/pci/sys/dev/pci/pci_pci.c#39 edit

Differences ...

==== //depot/projects/pci/sys/dev/pccbb/pccbb_pci.c#8 (text+ko) ====

@@ -325,6 +325,7 @@
 	sc->bus.sub = pci_read_config(brdev, PCIR_SUBBUS_2, 1);
 	sc->pribus = pcib_get_bus(parent);
 #if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+	pci_write_config(brdev, PCIR_PRIBUS_2, sc->pribus, 1);
 	sc->bus.sec_reg = PCIR_SECBUS_2;
 	sc->bus.sub_reg = PCIR_SUBBUS_2;
 	pcib_setup_secbus(brdev, &sc->bus);

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#39 (text+ko) ====

@@ -948,6 +948,13 @@
     pcib_cfg_save(sc);
 
     /*
+     * The primary bus register should always be the bus of the
+     * parent.
+     */
+    sc->pribus = pci_get_bus(dev);
+    pci_write_config(dev, PCIR_PRIBUS_1, sc->pribus, 1);
+
+    /*
      * Setup sysctl reporting nodes
      */
     sctx = device_get_sysctl_ctx(dev);