diff options
author | tmm <tmm@FreeBSD.org> | 2003-07-10 23:27:35 +0000 |
---|---|---|
committer | tmm <tmm@FreeBSD.org> | 2003-07-10 23:27:35 +0000 |
commit | 5b603201cc2ae0b710ed68f289001529568a6e1b (patch) | |
tree | 11a0e2331c5f4e82b7579e43d973f2f65cedbc72 /sys/sparc64/include/bus.h | |
parent | 6b0bee64fce19f60a859b714ffe17282bcd705e9 (diff) | |
download | FreeBSD-src-5b603201cc2ae0b710ed68f289001529568a6e1b.zip FreeBSD-src-5b603201cc2ae0b710ed68f289001529568a6e1b.tar.gz |
Lock down the IOMMU bus_dma implementation to make it safe to use
without Giant held.
A quick outline of the locking strategy:
Since all IOMMUs are synchronized, there is a single lock, iommu_mtx,
which protects the hardware registers (where needed) and the global and
per-IOMMU software states. As soon as the IOMMUs are divorced, each struct
iommu_state will have its own mutex (and the remaining global state
will be moved into the struct).
The dvma rman has its own internal mutex; the TSB slots may only be
accessed by the owner of the corresponding resource, so neither needs
extra protection.
Since there is a second access path to maps via LRU queues, the consumer-
provided locking is not sufficient; therefore, each map which is on a
queue is additionally protected by iommu_mtx (in part, there is one
member which only the map owner may access). Each map on a queue may
be accessed and removed from or repositioned in a queue in any context as
long as the lock is held; only the owner may insert a map.
To reduce lock contention, some bus_dma functions remove the map from
the queue temporarily (on behalf of the map owner) for some operations and
reinsert it when they are done. Shorter operations and operations which are
not done on behalf of the lock owner are completely covered by the lock.
To facilitate the locking, reorganize the streaming buffer handling;
while being there, fix an old oversight which would cause the streaming
buffer to always be flushed, regardless of whether streaming was enabled
in the TSB entry. The streaming buffer is still disabled for now, since
there are a number of drivers which lack critical bus_dmamp_sync() calls.
Additional testing by: jake
Diffstat (limited to 'sys/sparc64/include/bus.h')
-rw-r--r-- | sys/sparc64/include/bus.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h index 4e0c2b4..f97c13b 100644 --- a/sys/sparc64/include/bus.h +++ b/sys/sparc64/include/bus.h @@ -900,23 +900,14 @@ memsetw(void *d, int val, size_t size) #define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */ #define BUS_DMA_COHERENT 0x004 /* hint: map memory in a coherent way */ -#define BUS_DMA_NOWRITE 0x008 #define BUS_DMA_BUS1 0x010 #define BUS_DMA_BUS2 0x020 #define BUS_DMA_BUS3 0x040 #define BUS_DMA_BUS4 0x080 -/* - * The following flags are from NetBSD, but are not implemented for all - * architetures, and should therefore not be used in MI code. - * Some have different values than under NetBSD. - */ -#define BUS_DMA_STREAMING 0x100 /* hint: sequential, unidirectional */ -#define BUS_DMA_READ 0x200 /* mapping is device -> memory only */ -#define BUS_DMA_WRITE 0x400 /* mapping is memory -> device only */ -#define BUS_DMA_NOCACHE BUS_DMA_BUS1 -/* Don't bother with alignment */ -#define BUS_DMA_DVMA BUS_DMA_BUS2 +/* The following two flags are non-standard. */ +#define BUS_DMA_NOWRITE 0x100 +#define BUS_DMA_NOCACHE 0x200 /* Forwards needed by prototypes below. */ struct mbuf; |