From f6b1c44d1f70d5f298b911f2c1dcd802b0d11339 Mon Sep 17 00:00:00 2001 From: Scott Long 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/tx/if_tx.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sys/dev/tx') diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index f4bf1706c291..cdd584413154 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -280,7 +280,7 @@ epic_attach(dev) /* Allocate DMA tags. */ error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES * EPIC_MAX_FRAGS, - EPIC_MAX_FRAGS, MCLBYTES, 0, &sc->mtag); + EPIC_MAX_FRAGS, MCLBYTES, 0, busdma_lock_mutex, &Giant, &sc->mtag); if (error) { device_printf(dev, "couldn't allocate dma tag\n"); goto fail; @@ -289,7 +289,8 @@ epic_attach(dev) error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct epic_rx_desc) * RX_RING_SIZE, - 1, sizeof(struct epic_rx_desc) * RX_RING_SIZE, 0, &sc->rtag); + 1, sizeof(struct epic_rx_desc) * RX_RING_SIZE, 0, busdma_lock_mutex, + &Giant, &sc->rtag); if (error) { device_printf(dev, "couldn't allocate dma tag\n"); goto fail; @@ -298,7 +299,8 @@ epic_attach(dev) error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct epic_tx_desc) * TX_RING_SIZE, - 1, sizeof(struct epic_tx_desc) * TX_RING_SIZE, 0, &sc->ttag); + 1, sizeof(struct epic_tx_desc) * TX_RING_SIZE, 0, + busdma_lock_mutex, &Giant, &sc->ttag); if (error) { device_printf(dev, "couldn't allocate dma tag\n"); goto fail; @@ -307,7 +309,8 @@ epic_attach(dev) error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct epic_frag_list) * TX_RING_SIZE, - 1, sizeof(struct epic_frag_list) * TX_RING_SIZE, 0, &sc->ftag); + 1, sizeof(struct epic_frag_list) * TX_RING_SIZE, 0, + busdma_lock_mutex, &Giant, &sc->ftag); if (error) { device_printf(dev, "couldn't allocate dma tag\n"); goto fail; -- cgit v1.3