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

freebsd11_network: Fix alignment check and print more information on failure.

Browse Source 
We don't care what the virtual address is aligned to, only what the physical
one is. This now matches what FreeBSD does here.
This commit is contained in:
Augustin Cavalier
2018-07-02 22:16:11 -04:00
parent c9af3dafd5
commit c6992970cd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd11_network/fbsd_busdma_x86.c
+7 -6
View File
@@ -166,7 +166,7 @@ run_filter(bus_dma_tag_t dmat, bus_addr_t paddr)
|| (*dmat->filter)(dmat->filterarg, paddr) != 0)) || (*dmat->filter)(dmat->filterarg, paddr) != 0))
retval = 1; retval = 1;
dmat = dmat->parent; dmat = dmat->parent;
} while (retval == 0 && dmat != NULL); } while (retval == 0 && dmat != NULL);
return (retval); return (retval);
} }
@@ -313,7 +313,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
/* Performed initial allocation */ /* Performed initial allocation */
newtag->flags |= BUS_DMA_MIN_ALLOC_COMP; newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
} }
if (error != 0) { if (error != 0) {
free(newtag, M_DEVBUF); free(newtag, M_DEVBUF);
} else { } else {
@@ -501,7 +501,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
} }
} }
/* /*
* XXX: * XXX:
* (dmat->alignment < dmat->maxsize) is just a quick hack; the exact * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact
* alignment guarantees of malloc need to be nailed down, and the * alignment guarantees of malloc need to be nailed down, and the
@@ -528,8 +528,9 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
__func__, dmat, dmat->flags, ENOMEM); __func__, dmat, dmat->flags, ENOMEM);
return (ENOMEM); return (ENOMEM);
} else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { } else if (vtophys(*vaddr) & (dmat->alignment - 1)) {
printf("bus_dmamem_alloc failed to align memory properly.\n"); printf("bus_dmamem_alloc failed to align memory: wanted %#x, got %#x\n",
dmat->alignment, vtophys(vaddr));
} }
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
__func__, dmat, dmat->flags, 0); __func__, dmat, dmat->flags, 0);
@@ -586,7 +587,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
if (map == NULL) if (map == NULL)
map = &nobounce_dmamap; map = &nobounce_dmamap;
if ((map != &nobounce_dmamap && map->pagesneeded == 0) if ((map != &nobounce_dmamap && map->pagesneeded == 0)
&& ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0)) { && ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0)) {
vm_offset_t vendaddr; vm_offset_t vendaddr;