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

Commit 2a396c83 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: dma-mapping: map_page map to nearest page" into msm-4.9

parents 8cc210dd aeff2c19

arch/arm/mm/dma-mapping.c

+8 −3
Original line number Diff line number Diff line
@@ -1925,7 +1925,11 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p 
{

	struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);

	dma_addr_t dma_addr;

	int ret, prot, len = PAGE_ALIGN(size + offset);

	int ret, prot, len, start_offset, map_offset;



	map_offset = offset & ~PAGE_MASK;

	start_offset = offset & PAGE_MASK;

	len = PAGE_ALIGN(map_offset + size);



	dma_addr = __alloc_iova(mapping, len);

	if (dma_addr == DMA_ERROR_CODE)
@@ -1933,11 +1937,12 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p 


	prot = __dma_direction_to_prot(dir);



	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot);

	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page) +

			start_offset, len, prot);

	if (ret < 0)

		goto fail;



	return dma_addr + offset;

	return dma_addr + map_offset;

fail:

	__free_iova(mapping, dma_addr, len);

	return DMA_ERROR_CODE;

arch/arm64/mm/dma-mapping.c

+8 −4
Original line number Diff line number Diff line
@@ -1743,7 +1743,11 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, 
{

	struct dma_iommu_mapping *mapping = dev->archdata.mapping;

	dma_addr_t dma_addr;

	int ret, prot, len = PAGE_ALIGN(size + offset);

	int ret, prot, len, start_offset, map_offset;



	map_offset = offset & ~PAGE_MASK;

	start_offset = offset & PAGE_MASK;

	len = PAGE_ALIGN(map_offset + size);



	dma_addr = __alloc_iova(mapping, len);

	if (dma_addr == DMA_ERROR_CODE)
@@ -1753,12 +1757,12 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, 
	prot = __get_iommu_pgprot(attrs, prot,

				  is_dma_coherent(dev, attrs));



	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len,

			prot);

	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page) +

			start_offset, len, prot);

	if (ret < 0)

		goto fail;



	return dma_addr + offset;

	return dma_addr + map_offset;

fail:

	__free_iova(mapping, dma_addr, len);

	return DMA_ERROR_CODE;