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

[Ian Lepore]

Author: ian
Date: Tue Jul 29 02:36:09 2014
New Revision: 269210
URL: http://svnweb.freebsd.org/changeset/base/269210

Log:
  Propagate any alignment restriction from the parent tag to a new tag,
  keeping the more restrictive of the two values.
  
  Reviewed by:	cognet

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	Tue Jul 29 02:36:02 2014	(r269209)
+++ head/sys/arm/arm/busdma_machdep-v6.c	Tue Jul 29 02:36:09 2014	(r269210)
@@ -446,6 +446,7 @@ bus_dma_tag_create(bus_dma_tag_t parent,
 	if (parent != NULL) {
 		newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
 		newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
+		newtag->alignment = MAX(parent->alignment, newtag->alignment);
 		newtag->flags |= parent->flags & BUS_DMA_COULD_BOUNCE;
 		if (newtag->boundary == 0)
 			newtag->boundary = parent->boundary;