From 4d495abb9d6f6e6d703264c4133ce1f0c4e7df92 Mon Sep 17 00:00:00 2001 From: scottl Date: Tue, 1 Jul 2003 15:52:06 +0000 Subject: 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 --- sys/dev/ata/ata-dma.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sys/dev/ata/ata-dma.c') diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index 805a04a..a2f108e 100644 --- a/sys/dev/ata/ata-dma.c +++ b/sys/dev/ata/ata-dma.c @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include #include #include @@ -96,7 +98,8 @@ ata_dmaalloc(struct ata_channel *ch) if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAXCTLDMASZ, ATA_DMA_ENTRIES, - BUS_SPACE_MAXSIZE_32BIT, 0, &ch->dma->dmatag)) { + BUS_SPACE_MAXSIZE_32BIT, 0, busdma_lock_mutex, + &Giant, &ch->dma->dmatag)) { printf("DMA tag allocation failed, disabling DMA\n"); } } @@ -105,7 +108,8 @@ ata_dmaalloc(struct ata_channel *ch) BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAXTABSZ, 1, MAXTABSZ, - BUS_DMA_ALLOCNOW, &ch->dma->cdmatag))) + BUS_DMA_ALLOCNOW, busdma_lock_mutex, + &Giant, &ch->dma->cdmatag))) return error; } if (!ch->dma->ddmatag) { @@ -113,7 +117,8 @@ ata_dmaalloc(struct ata_channel *ch) BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, ATA_DMA_ENTRIES, MAXSEGSZ, - BUS_DMA_ALLOCNOW, &ch->dma->ddmatag))) + BUS_DMA_ALLOCNOW, busdma_lock_mutex, + &Giant, &ch->dma->ddmatag))) return error; } if (!ch->dma->mdmatab) { -- cgit v1.1