Hi,

The following change fixes a bug, which causes releasing incorrect iova space, in the original patch of this mail thread. It fixes compilation error either.

 

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c

index 82d5134..8c16ed7 100644

--- a/arch/arm/mm/dma-mapping.c

+++ b/arch/arm/mm/dma-mapping.c

@@ -900,10 +900,8 @@ static int __iommu_remove_mapping(struct device *dev, dma_addr_t iova, size_t si

        unsigned int count = size >> PAGE_SHIFT;

        int i;

 

-       for (i=0; i<count; i++) {

-               iommu_unmap(mapping->domain, iova, 0);

-               iova += PAGE_SIZE;

-       }

+       for (i=0; i<count; i++)

+               iommu_unmap(mapping->domain, iova + i * PAGE_SIZE, 0);

        __free_iova(mapping, iova, size);

        return 0;

}

@@ -1073,7 +1071,7 @@ int arm_iommu_map_sg(struct device *dev, struct scatterlist *sg, int nents,

                size += sg->length;

        }

        __map_sg_chunk(dev, start, size, &dma->dma_address, dir);

-       d->dma_address += offset;

+       dma->dma_address += offset;