diff options
author | mux <mux@FreeBSD.org> | 2003-02-26 02:16:06 +0000 |
---|---|---|
committer | mux <mux@FreeBSD.org> | 2003-02-26 02:16:06 +0000 |
commit | 186c547c811f347f945817e5b39472f95b963d42 (patch) | |
tree | 9c7573358232cb47d10993207a2c2e295c7facf2 /sys | |
parent | 193655459bf16415007a77ff9c6199725e0de54d (diff) | |
download | FreeBSD-src-186c547c811f347f945817e5b39472f95b963d42.zip FreeBSD-src-186c547c811f347f945817e5b39472f95b963d42.tar.gz |
Correctly set BUS_SPACE_MAXSIZE in all the busdma backends.
It was bogusly set to 64 * 1024 or 128 * 1024 because it was
bogusly reused in the BUS_DMAMAP_NSEGS definition.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/alpha/alpha/busdma_machdep.c | 2 | ||||
-rw-r--r-- | sys/alpha/include/bus.h | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/busdma_machdep.c | 2 | ||||
-rw-r--r-- | sys/amd64/include/bus_amd64.h | 2 | ||||
-rw-r--r-- | sys/amd64/include/bus_at386.h | 2 | ||||
-rw-r--r-- | sys/i386/i386/busdma_machdep.c | 2 | ||||
-rw-r--r-- | sys/i386/include/bus_at386.h | 2 | ||||
-rw-r--r-- | sys/i386/include/bus_pc98.h | 2 | ||||
-rw-r--r-- | sys/ia64/ia64/busdma_machdep.c | 2 | ||||
-rw-r--r-- | sys/ia64/include/bus.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/bus.h | 2 | ||||
-rw-r--r-- | sys/sparc64/include/bus.h | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c index 169231b..c48016b 100644 --- a/sys/alpha/alpha/busdma_machdep.c +++ b/sys/alpha/alpha/busdma_machdep.c @@ -410,7 +410,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) bus_dmamem_free_size(dmat, vaddr, map, dmat->maxsize); } -#define BUS_DMAMAP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) +#define BUS_DMAMAP_NSEGS ((64 * 1024 / PAGE_SIZE) + 1) /* * Map the buffer buf into bus space using the dmamap map. diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h index 3a87d1a..dd92cf2 100644 --- a/sys/alpha/include/bus.h +++ b/sys/alpha/include/bus.h @@ -82,7 +82,7 @@ typedef u_int32_t bus_space_handle_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFFFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF /* The largest address space known so far is 40 bits */ diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c index 8f5898f..2ce359b 100644 --- a/sys/amd64/amd64/busdma_machdep.c +++ b/sys/amd64/amd64/busdma_machdep.c @@ -391,7 +391,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) bus_dmamem_free_size(dmat, vaddr, map, dmat->maxsize); } -#define BUS_DMAMAP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) +#define BUS_DMAMAP_NSEGS ((64 * 1024) / PAGE_SIZE + 1) /* * Map the buffer buf into bus space using the dmamap map. diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h index b480e04..e2e1a52 100644 --- a/sys/amd64/include/bus_amd64.h +++ b/sys/amd64/include/bus_amd64.h @@ -97,7 +97,7 @@ typedef u_int bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h index b480e04..e2e1a52 100644 --- a/sys/amd64/include/bus_at386.h +++ b/sys/amd64/include/bus_at386.h @@ -97,7 +97,7 @@ typedef u_int bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c index 8f5898f..2ce359b 100644 --- a/sys/i386/i386/busdma_machdep.c +++ b/sys/i386/i386/busdma_machdep.c @@ -391,7 +391,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) bus_dmamem_free_size(dmat, vaddr, map, dmat->maxsize); } -#define BUS_DMAMAP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) +#define BUS_DMAMAP_NSEGS ((64 * 1024) / PAGE_SIZE + 1) /* * Map the buffer buf into bus space using the dmamap map. diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h index b480e04..e2e1a52 100644 --- a/sys/i386/include/bus_at386.h +++ b/sys/i386/include/bus_at386.h @@ -97,7 +97,7 @@ typedef u_int bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h index 319f516..aa9f2b6 100644 --- a/sys/i386/include/bus_pc98.h +++ b/sys/i386/include/bus_pc98.h @@ -58,7 +58,7 @@ typedef u_int bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c index 70b8d4c..fa0b08d 100644 --- a/sys/ia64/ia64/busdma_machdep.c +++ b/sys/ia64/ia64/busdma_machdep.c @@ -380,7 +380,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) free(vaddr, M_DEVBUF); } -#define BUS_DMAMAP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) +#define BUS_DMAMAP_NSEGS ((64 * 1024 / PAGE_SIZE) + 1) /* * Map the buffer buf into bus space using the dmamap map. diff --git a/sys/ia64/include/bus.h b/sys/ia64/include/bus.h index d779da0..7146ac7 100644 --- a/sys/ia64/include/bus.h +++ b/sys/ia64/include/bus.h @@ -97,7 +97,7 @@ typedef u_long bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFFFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h index 79e367a..fb40537 100644 --- a/sys/powerpc/include/bus.h +++ b/sys/powerpc/include/bus.h @@ -76,7 +76,7 @@ #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (128 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h index 361c64d..4a8a5c2 100644 --- a/sys/sparc64/include/bus.h +++ b/sys/sparc64/include/bus.h @@ -110,7 +110,7 @@ typedef u_long bus_size_t; #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (128 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFFFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR 0xFFFFFFFF |