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

Commit 4d86ec7a authored by EunBong Song's avatar EunBong Song Committed by Konrad Rzeszutek Wilk
Browse files

swiotlb: replace dma_length with sg_dma_len() macro 



This patch replace dma_length in "lib/swiotlb.c" to sg_dma_len() macro,
because the build error can occur if CONFIG_NEED_SG_DMA_LENGTH is not
set, and CONFIG_SWIOTLB is set.

Singed-off-by: default avatarEunBong Song <eunb.song@samsung.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent cd9151e2

lib/swiotlb.c

+4 −4
Original line number Diff line number Diff line
@@ -870,13 +870,13 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, 
				swiotlb_full(hwdev, sg->length, dir, 0);

				swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,

						       attrs);

				sgl[0].dma_length = 0;

				sg_dma_len(sgl) = 0;

				return 0;

			}

			sg->dma_address = phys_to_dma(hwdev, map);

		} else

			sg->dma_address = dev_addr;

		sg->dma_length = sg->length;

		sg_dma_len(sg) = sg->length;

	}

	return nelems;

}
@@ -904,7 +904,7 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, 
	BUG_ON(dir == DMA_NONE);



	for_each_sg(sgl, sg, nelems, i)

		unmap_single(hwdev, sg->dma_address, sg->dma_length, dir);

		unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir);



}

EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);
@@ -934,7 +934,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl, 


	for_each_sg(sgl, sg, nelems, i)

		swiotlb_sync_single(hwdev, sg->dma_address,

				    sg->dma_length, dir, target);

				    sg_dma_len(sg), dir, target);

}



void