svn commit: r226804 - head/sys/dev/bge

[Pyun YongHyeon]

Author: yongari
Date: Wed Oct 26 18:05:46 2011
New Revision: 226804
URL: http://svn.freebsd.org/changeset/base/226804

Log:
  Make CPMU handle GPHY power down control on controllers that have
  CPMU capability.

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 26 17:43:27 2011	(r226803)
+++ head/sys/dev/bge/if_bge.c	Wed Oct 26 18:05:46 2011	(r226804)
@@ -3446,7 +3446,8 @@ bge_reset(struct bge_softc *sc)
 	 * Set GPHY Power Down Override to leave GPHY
 	 * powered up in D0 uninitialized.
 	 */
-	if (BGE_IS_5705_PLUS(sc))
+	if (BGE_IS_5705_PLUS(sc) &&
+	    (sc->bge_flags & BGE_FLAG_CPMU_PRESENT) == 0)
 		reset |= BGE_MISCCFG_GPHY_PD_OVERRIDE;
 
 	/* Issue global reset */