diff options
| author |   Andreas Larsson <andreas@gaisler.com> | 2021-09-08 09:48:22 +0200 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2021-09-14 14:35:17 +0200 |
| commit | 59583f747664046aaae5588d56d5954fab66cce8 (patch) | |
| tree | 9be928e3365f052c7bce4adb7e361de57bf3566b /arch | |
| parent | dma-debug: prevent an error message from causing runtime problems (diff) | |
| download | linux-dev-59583f747664046aaae5588d56d5954fab66cce8.tar.xz linux-dev-59583f747664046aaae5588d56d5954fab66cce8.zip | |
sparc32: page align size in arch_dma_alloc
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 8e1d72a16759..7ceae24b0ca9 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -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); |