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

Commit 5db5fe25 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: io-pgtable-arm: Fix arm_lpae_split_blk_unmap cornercase" into msm-4.8

parents 9adf1144 781558f3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static int arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,
	blk_start = iova & ~(blk_size - 1);
	blk_end = blk_start + blk_size;
	blk_paddr = iopte_to_pfn(*ptep, data) << data->pg_shift;
	size = ARM_LPAE_BLOCK_SIZE(lvl + 1, data);
	size = iommu_pgsize(data->iop.cfg.pgsize_bitmap, iova, size);

	for (; blk_start < blk_end; blk_start += size, blk_paddr += size) {
		arm_lpae_iopte *tablep;