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/lnc | |
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/lnc')
-rw-r--r-- | sys/dev/lnc/if_lnc_cbus.c | 2 | ||||
-rw-r--r-- | sys/dev/lnc/if_lnc_isa.c | 2 | ||||
-rw-r--r-- | sys/dev/lnc/if_lnc_pci.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c index 5fae93e..7de87dd 100644 --- a/sys/dev/lnc/if_lnc_cbus.c +++ b/sys/dev/lnc/if_lnc_cbus.c @@ -215,6 +215,8 @@ lnc_isa_attach(device_t dev) 1, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ 0, /* flags */ + busdma_lock_mutex, /* lockfunc */ + &Giant, /* lockarg */ &sc->dmat); if (err) { diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c index cd643b3..9182623 100644 --- a/sys/dev/lnc/if_lnc_isa.c +++ b/sys/dev/lnc/if_lnc_isa.c @@ -212,6 +212,8 @@ lnc_isa_attach(device_t dev) 1, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ 0, /* flags */ + busdma_lock_mutex, /* lockfunc */ + &Giant, /* lockarg */ &sc->dmat); if (err) { diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c index c129e2e..fafb4cc 100644 --- a/sys/dev/lnc/if_lnc_pci.c +++ b/sys/dev/lnc/if_lnc_pci.c @@ -154,6 +154,8 @@ lnc_pci_attach(device_t dev) 1, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ 0, /* flags */ + busdma_lock_mutex, /* lockfunc */ + &Giant, /* lockarg */ &sc->dmat); if (err) { |