Date: Wed, 7 Oct 2009 14:34:08 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 169295 for review Message-ID: <200910071434.n97EY8gG078038@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=169295 Change 169295 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:33:39 Integrate TrustedBSD capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.228 2009/10/07 13:12:43 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.229 2009/10/07 14:29:48 stas Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1789,7 +1789,7 @@ /* Enable host coalescing bug fix. */ if (BGE_IS_5755_PLUS(sc)) - val |= 1 << 29; + val |= BGE_WDMAMODE_STATUS_TAG_FIX; /* Turn on write DMA state machine */ CSR_WRITE_4(sc, BGE_WDMA_MODE, val); ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.84 2009/10/07 13:12:43 stas Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.85 2009/10/07 14:29:48 stas Exp $ */ /* @@ -1431,6 +1431,7 @@ #define BGE_WDMAMODE_PCI_FIFOOREAD_ATTN 0x00000100 #define BGE_WDMAMODE_LOCREAD_TOOBIG 0x00000200 #define BGE_WDMAMODE_ALL_ATTNS 0x000003FC +#define BGE_WDMAMODE_STATUS_TAG_FIX 0x20000000 /* Write DMA status register */ #define BGE_WDMASTAT_PCI_TGT_ABRT_ATTN 0x00000004
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910071434.n97EY8gG078038>