Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d779882 authored by Andreas Larsson's avatar Andreas Larsson Committed by Greg Kroah-Hartman
Browse files

sparc32: page align size in arch_dma_alloc 



[ Upstream commit 59583f747664046aaae5588d56d5954fab66cce8 ]

Commit 53b7670e ("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: default avatarAndreas Larsson <andreas@gaisler.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec49f3f7

arch/sparc/kernel/ioport.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -356,7 +356,9 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, 
void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,

void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,

		dma_addr_t dma_addr, unsigned long attrs)

		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;

		return;





	dma_make_coherent(dma_addr, size);

	dma_make_coherent(dma_addr, size);