sparc32: page align size in arch_dma_alloc
authorAndreas Larsson <andreas@gaisler.com>
Wed, 8 Sep 2021 07:48:22 +0000 (09:48 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 14 Sep 2021 12:35:17 +0000 (14:35 +0200)
Commit 53b7670e5735 ("sparc: factor the dma coherent mapping into
helper") lost the page align for the calls to dma_make_coherent and
srmmu_unmapiorange. The latter cannot handle a non page aligned len
argument.

Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
arch/sparc/kernel/ioport.c

index 8e1d72a..7ceae24 100644 (file)
@@ -356,7 +356,9 @@ err_nomem:
 void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,
                dma_addr_t dma_addr, unsigned long attrs)
 {
-       if (!sparc_dma_free_resource(cpu_addr, PAGE_ALIGN(size)))
+       size = PAGE_ALIGN(size);
+
+       if (!sparc_dma_free_resource(cpu_addr, size))
                return;
 
        dma_make_coherent(dma_addr, size);