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

Commit fcdcddbc authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Michal Simek
Browse files

microblaze: Fix sg_dma_len() regression 



The commit "asm-generic: add NEED_SG_DMA_LENGTH to define sg_dma_len()"
18e98307 broke microblaze compilation.

dma_direct_map_sg() sets sg->dma_length, however microblaze doesn't
set NEED_SG_DMA_LENGTH so scatterlist strcutres doesn't include
dma_length.

sg->dma_length is always equal to sg->length on microblaze. So we
don't need to set set dma_length, that is, microblaze can simply use
sg->length.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent ffe57d02

arch/microblaze/kernel/dma.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, 
	/* FIXME this part of code is untested */

	for_each_sg(sgl, sg, nents, i) {

		sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev);

		sg->dma_length = sg->length;

		__dma_sync_page(page_to_phys(sg_page(sg)), sg->offset,

							sg->length, direction);

	}