Author: adrian
Date: Sun Sep  9 20:13:11 2012
New Revision: 240287
URL: http://svn.freebsd.org/changeset/base/240287

Log:
  MFC r238954 - Restore the PCI bridge configuration upon resume.
  
  This allows my TI1510 cardbus/PCI bridge to work after a suspend/resume,
  without having to unload/reload the cbb driver.
  
  PR:           kern/170058

Modified:
  stable/9/sys/dev/pccbb/pccbb_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/pccbb/pccbb_pci.c
==============================================================================
--- stable/9/sys/dev/pccbb/pccbb_pci.c  Sun Sep  9 20:00:00 2012        
(r240286)
+++ stable/9/sys/dev/pccbb/pccbb_pci.c  Sun Sep  9 20:13:11 2012        
(r240287)
@@ -465,6 +465,11 @@ cbb_chipinit(struct cbb_softc *sc)
        if (pci_read_config(sc->dev, PCIR_LATTIMER, 1) < 0x20)
                pci_write_config(sc->dev, PCIR_LATTIMER, 0x20, 1);
 
+       /* Restore bus configuration */
+       pci_write_config(sc->dev, PCIR_PRIBUS_2, sc->pribus, 1);
+       pci_write_config(sc->dev, PCIR_SECBUS_2, sc->secbus, 1);
+       pci_write_config(sc->dev, PCIR_SUBBUS_2, sc->subbus, 1);
+
        /* Enable memory access */
        PCI_MASK_CONFIG(sc->dev, PCIR_COMMAND,
            | PCIM_CMD_MEMEN
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to