d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Streamline busdma a bit. Inline _bus_dmamap_load_buffer, optimize some

Browse Source 
tests, replace a passed td with a passed pmap to eliminate some deferences.
This commit is contained in:
Scott Long 2004-11-02 23:52:58 +00:00
parent 182327bd35
commit 9a2050f9b4
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/i386/i386/busdma_machdep.c
View File

@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mbuf.h> #include <sys/mbuf.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/ktr.h>
#include <vm/vm.h> #include <vm/vm.h>
#include <vm/vm_page.h> #include <vm/vm_page.h>
@ -534,11 +535,11 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
* the starting segment on entrace, and the ending segment on exit. * the starting segment on entrace, and the ending segment on exit.
* first indicates if this is the first invocation of this function. * first indicates if this is the first invocation of this function.
*/ */
static int static __inline int
_bus_dmamap_load_buffer(bus_dma_tag_t dmat, _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
bus_dmamap_t map, bus_dmamap_t map,
void *buf, bus_size_t buflen, void *buf, bus_size_t buflen,
struct thread *td, pmap_t pmap,
int flags, int flags,
bus_addr_t *lastaddrp, bus_addr_t *lastaddrp,
int *segp, int *segp,
@ -551,23 +552,22 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
bus_addr_t paddr; bus_addr_t paddr;
int needbounce = 0; int needbounce = 0;
int seg; int seg;
pmap_t pmap;
segs = dmat->segments; segs = dmat->segments;
if (map == NULL) if (map == NULL)
map = &nobounce_dmamap; map = &nobounce_dmamap;
if (td != NULL) if ((map != &nobounce_dmamap && map->pagesneeded == 0)
pmap = vmspace_pmap(td->td_proc->p_vmspace); && (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)
else || dmat->boundary > 0 || dmat->alignment > 1)) {
pmap = NULL;
if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)
|| dmat->boundary > 0 || dmat->alignment > 1)
&& map != &nobounce_dmamap && map->pagesneeded == 0) {
vm_offset_t vendaddr; vm_offset_t vendaddr;
CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
"alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem),
dmat->boundary, dmat->alignment);
CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d",
map, &nobounce_dmamap, map->pagesneeded);
/* /*
* Count the number of bounce pages * Count the number of bounce pages
* needed in order to complete this transfer * needed in order to complete this transfer
@ -583,10 +583,9 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
} }
vaddr += PAGE_SIZE; vaddr += PAGE_SIZE;
} }
CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
} }
vaddr = (vm_offset_t)buf;
/* Reserve Necessary Bounce Pages */ /* Reserve Necessary Bounce Pages */
if (map->pagesneeded != 0) { if (map->pagesneeded != 0) {
mtx_lock(&bounce_lock); mtx_lock(&bounce_lock);
@ -610,6 +609,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
mtx_unlock(&bounce_lock); mtx_unlock(&bounce_lock);
} }
vaddr = (vm_offset_t)buf;
lastaddr = *lastaddrp; lastaddr = *lastaddrp;
bmask = ~(dmat->boundary - 1); bmask = ~(dmat->boundary - 1);
@ -773,17 +773,18 @@ bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map,
int nsegs, error, first, i; int nsegs, error, first, i;
bus_size_t resid; bus_size_t resid;
struct iovec *iov; struct iovec *iov;
struct thread *td = NULL; pmap_t pmap;
flags |= BUS_DMA_NOWAIT; flags |= BUS_DMA_NOWAIT;
resid = uio->uio_resid; resid = uio->uio_resid;
iov = uio->uio_iov; iov = uio->uio_iov;
if (uio->uio_segflg == UIO_USERSPACE) { if (uio->uio_segflg == UIO_USERSPACE) {
td = uio->uio_td; KASSERT(uio->uio_td != NULL,
KASSERT(td != NULL,
("bus_dmamap_load_uio: USERSPACE but no proc")); ("bus_dmamap_load_uio: USERSPACE but no proc"));
} pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace);
} else
pmap = NULL;
nsegs = 0; nsegs = 0;
error = 0; error = 0;
@ -800,7 +801,7 @@ bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map,
if (minlen > 0) { if (minlen > 0) {
error = _bus_dmamap_load_buffer(dmat, map, error = _bus_dmamap_load_buffer(dmat, map,
addr, minlen, addr, minlen,
td, flags, &lastaddr, &nsegs, first); pmap, flags, &lastaddr, &nsegs, first);
first = 0; first = 0;
resid -= minlen; resid -= minlen;