svn commit: r343965 - head/sys/arm/arm

Michal Meloun mmel at FreeBSD.org
Sun Feb 10 18:28:38 UTC 2019


Author: mmel
Date: Sun Feb 10 18:28:37 2019
New Revision: 343965
URL: https://svnweb.freebsd.org/changeset/base/343965

Log:
  Fix bug introduced by r343962.
  DMAMAP_DMAMEM_ALLOC is property of dmamap, not dmatag.
  
  MFC after:	1 week
  Reported by:	ian
  Pointy hat:	mmel

Modified:
  head/sys/arm/arm/busdma_machdep-v6.c

Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c	Sun Feb 10 17:19:45 2019	(r343964)
+++ head/sys/arm/arm/busdma_machdep-v6.c	Sun Feb 10 18:28:37 2019	(r343965)
@@ -350,13 +350,13 @@ might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus
     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)));


More information about the svn-src-head mailing list