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/en | |
| 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/en')
| -rw-r--r-- | sys/dev/en/midway.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index 86a60c9..bc6bcde 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -2706,7 +2706,8 @@ en_dmaprobe(struct en_softc *sc) */ err = bus_dma_tag_create(NULL, MIDDMA_MAXBURST, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - 3 * MIDDMA_MAXBURST, 1, 3 * MIDDMA_MAXBURST, 0, &tag); + 3 * MIDDMA_MAXBURST, 1, 3 * MIDDMA_MAXBURST, 0, busdma_lock_mutex, + &Giant, &tag); if (err) panic("%s: cannot create test DMA tag %d", __func__, err); @@ -2918,7 +2919,8 @@ en_attach(struct en_softc *sc) if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - EN_TXSZ * 1024, EN_MAX_DMASEG, EN_TXSZ * 1024, 0, &sc->txtag)) + EN_TXSZ * 1024, EN_MAX_DMASEG, EN_TXSZ * 1024, 0, busdma_lock_mutex, + &Giant, &sc->txtag)) goto fail; sc->map_zone = uma_zcreate("en dma maps", sizeof(struct en_map), |
