svn commit: r226822 - stable/9/sys/dev/dc

[Pyun YongHyeon]

Author: yongari
Date: Thu Oct 27 02:36:13 2011
New Revision: 226822
URL: http://svn.freebsd.org/changeset/base/226822

Log:
  MFC r226695-226696:
  r226695:
    Fix a regression introduced in r218832. For TX status check, driver
    should use a TX list DMA tag.
  
  r226696:
    Add missing bus_dmamap_sync() in setup frame transmit.
  
  Approved by:  re (kensmith)

Modified:
  stable/9/sys/dev/dc/if_dc.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/dc/if_dc.c
==============================================================================
--- stable/9/sys/dev/dc/if_dc.c Wed Oct 26 23:52:02 2011        (r226821)
+++ stable/9/sys/dev/dc/if_dc.c Thu Oct 27 02:36:13 2011        (r226822)
@@ -1136,6 +1136,8 @@ dc_setfilt_21143(struct dc_softc *sc)
        sp[41] = DC_SP_MAC(eaddr[2]);
 
        sframe->dc_status = htole32(DC_TXSTAT_OWN);
+       bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+           BUS_DMASYNC_PREWRITE);
        bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
        CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -1342,6 +1344,8 @@ dc_setfilt_xircom(struct dc_softc *sc)
        DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_TX_ON);
        DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_RX_ON);
        sframe->dc_status = htole32(DC_TXSTAT_OWN);
+       bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+           BUS_DMASYNC_PREWRITE);
        bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
        CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -2970,7 +2974,7 @@ dc_txeof(struct dc_softc *sc)
         * Go through our tx list and free mbufs for those
         * frames that have been transmitted.
         */
-       bus_dmamap_sync(sc->dc_rx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
+       bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
            BUS_DMASYNC_POSTWRITE);
        setup = 0;
        for (idx = sc->dc_cdata.dc_tx_cons; idx != sc->dc_cdata.dc_tx_prod;
_______________________________________________
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"