diff options
| author | scottl <scottl@FreeBSD.org> | 2003-07-01 15:52:06 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2003-07-01 15:52:06 +0000 |
| commit | 4d495abb9d6f6e6d703264c4133ce1f0c4e7df92 (patch) | |
| tree | 1bbd76935b6d5917753df7328c69bd2f3c75f15a /sys/dev/em | |
| parent | 40bbdc533036dcf851a5b4c44f1b64b82b887a5a (diff) | |
| download | FreeBSD-src-4d495abb9d6f6e6d703264c4133ce1f0c4e7df92.zip FreeBSD-src-4d495abb9d6f6e6d703264c4133ce1f0c4e7df92.tar.gz | |
Mega busdma API commit.
Add two new arguments to bus_dma_tag_create(): lockfunc and lockfuncarg.
Lockfunc allows a driver to provide a function for managing its locking
semantics while using busdma. At the moment, this is used for the
asynchronous busdma_swi and callback mechanism. Two lockfunc implementations
are provided: busdma_lock_mutex() performs standard mutex operations on the
mutex that is specified from lockfuncarg. dftl_lock() is a panic
implementation and is defaulted to when NULL, NULL are passed to
bus_dma_tag_create(). The only time that NULL, NULL should ever be used is
when the driver ensures that bus_dmamap_load() will not be deferred.
Drivers that do not provide their own locking can pass
busdma_lock_mutex,&Giant args in order to preserve the former behaviour.
sparc64 and powerpc do not provide real busdma_swi functions, so this is
largely a noop on those platforms. The busdma_swi on is64 is not properly
locked yet, so warnings will be emitted on this platform when busdma
callback deferrals happen.
If anyone gets panics or warnings from dflt_lock() being called, please
let me know right away.
Reviewed by: tmm, gibbs
Diffstat (limited to 'sys/dev/em')
| -rw-r--r-- | sys/dev/em/if_em.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index ce1c55a..ceb4e1f 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -1804,6 +1804,8 @@ em_dma_malloc(struct adapter *adapter, bus_size_t size, 1, /* nsegments */ size, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &dma->dma_tag); if (r != 0) { printf("em%d: em_dma_malloc: bus_dma_tag_create failed; " @@ -1908,6 +1910,8 @@ em_setup_transmit_structures(struct adapter * adapter) EM_MAX_SCATTER, /* nsegments */ MCLBYTES * 8, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &adapter->txtag)) { printf("em%d: Unable to allocate TX DMA tag\n", adapter->unit); return (ENOMEM); @@ -2283,6 +2287,8 @@ em_allocate_receive_structures(struct adapter * adapter) 1, /* nsegments */ MCLBYTES, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &adapter->rxtag); if (error != 0) { printf("em%d: em_allocate_receive_structures: " |
