svn commit: r199919 - stable/7/sys/dev/msk

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 19:16:16 2009
New Revision: 199919
URL: http://svn.freebsd.org/changeset/base/199919

Log:
  MFC 197591.
    Add workaround for Yukon XL which has hardware bug that can't flush
    FIFO.

Modified:
  stable/7/sys/dev/msk/if_msk.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/msk/if_msk.c
==============================================================================
--- stable/7/sys/dev/msk/if_msk.c	Sun Nov 29 19:15:08 2009	(r199918)
+++ stable/7/sys/dev/msk/if_msk.c	Sun Nov 29 19:16:16 2009	(r199919)
@@ -3799,9 +3799,14 @@ msk_init_locked(struct msk_if_softc *sc_
 	/* Set receive filter. */
 	msk_rxfilter(sc_if);
 
-	/* Flush Rx MAC FIFO on any flow control or error. */
-	CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_FL_MSK),
-	    GMR_FS_ANY_ERR);
+	if (sc->msk_hw_id == CHIP_ID_YUKON_XL) {
+		/* Clear flush mask - HW bug. */
+		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_FL_MSK), 0);
+	} else {
+		/* Flush Rx MAC FIFO on any flow control or error. */
+		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_FL_MSK),
+		    GMR_FS_ANY_ERR);
+	}
 
 	/*
 	 * Set Rx FIFO flush threshold to 64 bytes + 1 FIFO word