From befb477022d2bbc3cb95c1a156e3b5a73694b77c Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Tue, 29 Jul 2014 02:36:09 +0000 Subject: [PATCH] Propagate any alignment restriction from the parent tag to a new tag, keeping the more restrictive of the two values. Reviewed by: cognet --- sys/arm/arm/busdma_machdep-v6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c index 8161a061ce26..656d9b80b38e 100644 --- a/sys/arm/arm/busdma_machdep-v6.c +++ b/sys/arm/arm/busdma_machdep-v6.c @@ -446,6 +446,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, 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;