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/sym/sym_hipd.c | |
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/sym/sym_hipd.c')
-rw-r--r-- | sys/dev/sym/sym_hipd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 619f7d0..084179e 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -89,6 +89,8 @@ #include <sys/malloc.h> #include <sys/endian.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #ifdef FreeBSD_Bus_Io_Abstraction #include <sys/module.h> #include <sys/bus.h> @@ -783,7 +785,8 @@ static m_pool_s *___cre_dma_pool(bus_dma_tag_t dev_dmat) BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR_32BIT, NULL, NULL, MEMO_CLUSTER_SIZE, 1, - MEMO_CLUSTER_SIZE, 0, &mp->dmat)) { + MEMO_CLUSTER_SIZE, 0, + busdma_lock_mutex, &Giant, &mp->dmat)) { mp->getp = ___dma_getp; #ifdef MEMO_FREE_UNUSED mp->freep = ___dma_freep; @@ -9130,7 +9133,8 @@ sym_pci_attach2(pcici_t pci_tag, int unit) BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, SYM_CONF_MAX_SG, - (1<<24), 0, &np->data_dmat)) { + (1<<24), 0, busdma_lock_mutex, &Giant, + &np->data_dmat)) { device_printf(dev, "failed to create DMA tag.\n"); goto attach_failed; } |