i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd_network: Clean up bus_dma restrictions implementation.

Browse Source 
* Remove support for filters (again): they are deprecated in FreeBSD
   and no driver we have uses them. This allows the loop in the
   _validate_address function to be dropped entirely.

 * Clean up parent tag handling logic.
This commit is contained in:
Augustin Cavalier
2022-06-21 12:24:04 -04:00
parent e866d6e941
commit 2c81f88085
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/bus_dma.cpp
+16 -30
View File
@@ -36,9 +36,6 @@ struct bus_dma_tag {
phys_addr_t lowaddr; phys_addr_t lowaddr;
phys_addr_t highaddr; phys_addr_t highaddr;
bus_dma_filter_t* filter;
void* filterarg;
phys_size_t maxsize; phys_size_t maxsize;
uint32 maxsegments; uint32 maxsegments;
phys_size_t maxsegsz; phys_size_t maxsegsz;
@@ -96,23 +93,25 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t bounda
void* filterarg, bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, void* filterarg, bus_size_t maxsize, int nsegments, bus_size_t maxsegsz,
int flags, bus_dma_lock_t* lockfunc, void* lockfuncarg, bus_dma_tag_t* dmat) int flags, bus_dma_lock_t* lockfunc, void* lockfuncarg, bus_dma_tag_t* dmat)
{ {
if (boundary != 0 && boundary < maxsegsz) if (maxsegsz == 0)
maxsegsz = boundary; return EINVAL;
if (filter != NULL) {
*dmat = NULL; panic("bus_dma_tag_create: error: filters not supported!");
return EOPNOTSUPP;
}
bus_dma_tag_t newtag = (bus_dma_tag_t)kernel_malloc(sizeof(*newtag), bus_dma_tag_t newtag = (bus_dma_tag_t)kernel_malloc(sizeof(*newtag),
M_DEVBUF, M_ZERO | M_NOWAIT); M_DEVBUF, M_ZERO | M_NOWAIT);
if (newtag == NULL) if (newtag == NULL)
return ENOMEM; return ENOMEM;
newtag->parent = parent; if (boundary != 0 && boundary < maxsegsz)
maxsegsz = boundary;
newtag->alignment = alignment; newtag->alignment = alignment;
newtag->boundary = boundary; newtag->boundary = boundary;
newtag->lowaddr = lowaddr; newtag->lowaddr = lowaddr;
newtag->highaddr = highaddr; newtag->highaddr = highaddr;
newtag->filter = filter;
newtag->filterarg = filterarg;
newtag->maxsize = maxsize; newtag->maxsize = maxsize;
newtag->maxsegments = nsegments; newtag->maxsegments = nsegments;
newtag->maxsegsz = maxsegsz; newtag->maxsegsz = maxsegsz;
@@ -122,7 +121,8 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t bounda
// lockfunc is only needed if callbacks will be invoked asynchronously. // lockfunc is only needed if callbacks will be invoked asynchronously.
if (newtag->parent != NULL) { if (parent != NULL) {
newtag->parent = parent;
atomic_add(&parent->ref_count, 1); atomic_add(&parent->ref_count, 1);
newtag->lowaddr = max_c(parent->lowaddr, newtag->lowaddr); newtag->lowaddr = max_c(parent->lowaddr, newtag->lowaddr);
@@ -132,12 +132,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_addr_t bounda
if (newtag->boundary == 0) { if (newtag->boundary == 0) {
newtag->boundary = parent->boundary; newtag->boundary = parent->boundary;
} else if (parent->boundary != 0) { } else if (parent->boundary != 0) {
newtag->boundary = min_c(parent->boundary, newtag->boundary); newtag->boundary = MIN(parent->boundary, newtag->boundary);
}
if (newtag->filter == NULL) {
newtag->filter = parent->filter;
newtag->filterarg = parent->filterarg;
} }
} }
@@ -312,19 +307,10 @@ bus_dmamem_free(bus_dma_tag_t dmat, void* vaddr, bus_dmamap_t map)
static bool static bool
_validate_address(bus_dma_tag_t dmat, bus_addr_t paddr, bool validate_alignment = true) _validate_address(bus_dma_tag_t dmat, bus_addr_t paddr, bool validate_alignment = true)
{ {
do { if (paddr > dmat->lowaddr && paddr <= dmat->highaddr)
if (dmat->filter != NULL) { return false;
if ((*dmat->filter)(dmat->filterarg, paddr) != 0) if (validate_alignment && !vm_addr_align_ok(paddr, dmat->alignment))
return false; return false;
} else {
if (paddr > dmat->lowaddr && paddr <= dmat->highaddr)
return false;
if (validate_alignment && !vm_addr_align_ok(paddr, dmat->alignment))
return false;
}
dmat = dmat->parent;
} while (dmat != NULL);
return true; return true;
} }