svn commit: r284455 - stable/10/sys/sparc64/pci

[Ed Maste]

Author: emaste
Date: Tue Jun 16 18:39:11 2015
New Revision: 284455
URL: https://svnweb.freebsd.org/changeset/base/284455

Log:
  MFC r281930 by jhb:
  
      Update this driver to not save copies of registers that are no longer
      used after r281874.  While here, also update it to always write the
      parent's PCI bus number to the primary bus register.

Modified:
  stable/10/sys/sparc64/pci/apb.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sparc64/pci/apb.c
==============================================================================
--- stable/10/sys/sparc64/pci/apb.c	Tue Jun 16 17:55:20 2015	(r284454)
+++ stable/10/sys/sparc64/pci/apb.c	Tue Jun 16 18:39:11 2015	(r284455)
@@ -171,20 +171,14 @@ apb_attach(device_t dev)
 	 * Get current bridge configuration.
 	 */
 	sc->sc_bsc.ops_pcib_sc.domain = pci_get_domain(dev);
-	sc->sc_bsc.ops_pcib_sc.secstat =
-	    pci_read_config(dev, PCIR_SECSTAT_1, 2);
-	sc->sc_bsc.ops_pcib_sc.command =
-	    pci_read_config(dev, PCIR_COMMAND, 2);
-	sc->sc_bsc.ops_pcib_sc.pribus =
-	    pci_read_config(dev, PCIR_PRIBUS_1, 1);
+	sc->sc_bsc.ops_pcib_sc.pribus = pci_get_bus(dev);
+	pci_write_config(dev, PCIR_PRIBUS_1, sc->sc_bsc.ops_pcib_sc.pribus, 1);
 	sc->sc_bsc.ops_pcib_sc.bus.sec =
 	    pci_read_config(dev, PCIR_SECBUS_1, 1);
 	sc->sc_bsc.ops_pcib_sc.bus.sub =
 	    pci_read_config(dev, PCIR_SUBBUS_1, 1);
 	sc->sc_bsc.ops_pcib_sc.bridgectl =
 	    pci_read_config(dev, PCIR_BRIDGECTL_1, 2);
-	sc->sc_bsc.ops_pcib_sc.seclat =
-	    pci_read_config(dev, PCIR_SECLAT_1, 1);
 	sc->sc_iomap = pci_read_config(dev, APBR_IOMAP, 1);
 	sc->sc_memmap = pci_read_config(dev, APBR_MEMMAP, 1);