Date: Tue, 31 Aug 2010 18:48:09 +0000 (UTC) From: Pyun YongHyeon <yongari@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212065 - head/sys/dev/bge Message-ID: <201008311848.o7VIm9SV038599@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yongari Date: Tue Aug 31 18:48:09 2010 New Revision: 212065 URL: http://svn.freebsd.org/changeset/base/212065 Log: Handle PAE case correctly. You cannot effectively specify a 4GB boundary in PAE case so use a 2GB boundary for PAE as suggested by jhb. Pointed out by: jhb Reviewed by: jhb Modified: head/sys/dev/bge/if_bge.c head/sys/dev/bge/if_bgereg.h Modified: head/sys/dev/bge/if_bge.c ============================================================================== --- head/sys/dev/bge/if_bge.c Tue Aug 31 18:11:50 2010 (r212064) +++ head/sys/dev/bge/if_bge.c Tue Aug 31 18:48:09 2010 (r212065) @@ -2272,7 +2272,7 @@ bge_dma_alloc(struct bge_softc *sc) /* Create parent tag for buffers. */ boundary = 0; if ((sc->bge_flags & BGE_FLAG_4G_BNDRY_BUG) != 0) - boundary = BGE_DMA_4G_BNDRY; + boundary = BGE_DMA_BNDRY; error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), 1, boundary, lowaddr, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, Modified: head/sys/dev/bge/if_bgereg.h ============================================================================== --- head/sys/dev/bge/if_bgereg.h Tue Aug 31 18:11:50 2010 (r212064) +++ head/sys/dev/bge/if_bgereg.h Tue Aug 31 18:48:09 2010 (r212065) @@ -2487,10 +2487,14 @@ struct bge_gib { #define BGE_DMA_MAXADDR 0xFFFFFFFFFF #endif +#ifdef PAE +#define BGE_DMA_BNDRY 0x80000000 +#else #if (BUS_SPACE_MAXADDR > 0xFFFFFFFF) -#define BGE_DMA_4G_BNDRY 0x100000000 +#define BGE_DMA_BNDRY 0x100000000 #else -#define BGE_DMA_4G_BNDRY 0 +#define BGE_DMA_BNDRY 0 +#endif #endif /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008311848.o7VIm9SV038599>