Author: yongari
Date: Wed Oct 10 02:35:10 2012
New Revision: 241391
URL: http://svn.freebsd.org/changeset/base/241391

Log:
  Do not force PCIe 1.0a mode in device reset on BCM5717 and newer
  controllers. BCM5785 does not require PCI 1.0a mode as well during
  reset.

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c   Wed Oct 10 02:21:36 2012        (r241390)
+++ head/sys/dev/bge/if_bge.c   Wed Oct 10 02:35:10 2012        (r241391)
@@ -3604,8 +3604,11 @@ bge_reset(struct bge_softc *sc)
 
        /* XXX: Broadcom Linux driver. */
        if (sc->bge_flags & BGE_FLAG_PCIE) {
-               if (CSR_READ_4(sc, 0x7E2C) == 0x60)     /* PCIE 1.0 */
-                       CSR_WRITE_4(sc, 0x7E2C, 0x20);
+               if (sc->bge_asicrev != BGE_ASICREV_BCM5785 &&
+                   (sc->bge_flags & BGE_FLAG_5717_PLUS) == 0) {
+                       if (CSR_READ_4(sc, 0x7E2C) == 0x60)     /* PCIE 1.0 */
+                               CSR_WRITE_4(sc, 0x7E2C, 0x20);
+               }
                if (sc->bge_chipid != BGE_CHIPID_BCM5750_A0) {
                        /* Prevent PCIE link training during global reset */
                        CSR_WRITE_4(sc, BGE_MISC_CFG, 1 << 29);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to