From 7986a38d8f888f4ce67c28cddd1d46fa2cd441b1 Mon Sep 17 00:00:00 2001 From: mmel Date: Sun, 10 Feb 2019 18:28:37 +0000 Subject: [PATCH] Fix bug introduced by r343962. DMAMAP_DMAMEM_ALLOC is property of dmamap, not dmatag. MFC after: 1 week Reported by: ian Pointy hat: mmel --- sys/arm/arm/busdma_machdep-v6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c index ce7e8acdfea..e54f3c0c7ca 100644 --- a/sys/arm/arm/busdma_machdep-v6.c +++ b/sys/arm/arm/busdma_machdep-v6.c @@ -350,13 +350,13 @@ might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t addr, bus_size_t size) { - KASSERT(dmat->flags & DMAMAP_DMAMEM_ALLOC || + KASSERT(map->flags & DMAMAP_DMAMEM_ALLOC || dmat->alignment <= PAGE_SIZE, ("%s: unsupported alignment (0x%08lx) for buffer not " "allocated by bus_dmamem_alloc()", __func__, dmat->alignment)); - return (!(dmat->flags & DMAMAP_DMAMEM_ALLOC) && + return (!(map->flags & DMAMAP_DMAMEM_ALLOC) && ((dmat->flags & BUS_DMA_EXCL_BOUNCE) || alignment_bounce(dmat, addr) || cacheline_bounce(map, addr, size))); -- 2.45.0