diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2012-03-01 19:43:28 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2012-03-01 19:43:28 +0000 |
| commit | d4f6035bf093edb31070e49d0be6cdf625064923 (patch) | |
| tree | bdbacffbecae2ca6570da6c00629c5fe445e3f94 /sys | |
| parent | 2f121f392b1aad76e7662cb626ccd7cc4e605570 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/busdma_machdep.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/busdma_machdep.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c index fae6ef36687b..1c808093c720 100644 --- a/sys/amd64/amd64/busdma_machdep.c +++ b/sys/amd64/amd64/busdma_machdep.c @@ -216,6 +216,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_dma_tag_t newtag; int error = 0; + /* Always enforce at least a 4GB boundary. */ + if (boundary == 0 || boundary > ((bus_addr_t)1 << 32)) + boundary = (bus_size_t)1 << 32; + /* Basic sanity checking */ if (boundary != 0 && boundary < maxsegsz) maxsegsz = boundary; diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c index 86921269acd3..4f44e988708a 100644 --- a/sys/i386/i386/busdma_machdep.c +++ b/sys/i386/i386/busdma_machdep.c @@ -226,6 +226,12 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_dma_tag_t newtag; int error = 0; +#if defined(PAE) + /* Need at least a 4GB boundary, PAE limitations require 2GB */ + if (boundary == 0 || boundary > ((bus_addr_t)1 << 31)) + boundary = (bus_size_t)1 << 31; +#endif + /* Basic sanity checking */ if (boundary != 0 && boundary < maxsegsz) maxsegsz = boundary; |