iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte

aca1bc45 · Bin Wang <[email protected]> · 2014-03-21 10:06:07 +00:00

kernel panic happened when iommu_unmap a buffer larger than 2MB,
more than expected pmd entries got “invalidated”, due to a wrong range
passed to arm_smmu_alloc_init_pte. it was likely a typo, now we fix
it, passing the correct "end" address to arm_smmu_alloc_init_pte.

Signed-off-by: Bin Wang <[email protected]>
Signed-off-by: Will Deacon <[email protected]>

Commit: aca1bc4595c5757f01167ab5bfef2a4f8edfcf4f
Parents: 16c50dcf

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/iommu/arm-smmu.c	modified	+1	−1	View file

drivers/iommu/arm-smmu.c

View file

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 69d001a..647c3c7 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1381,7 +1381,7 @@ static int arm_smmu_alloc_init_pmd(struct arm_smmu_device *smmu, pud_t *pud,
 
 	do {
 		next = pmd_addr_end(addr, end);
-		ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, end, pfn,
+		ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, next, pfn,
 					      prot, stage);
 		phys += next - addr;
 	} while (pmd++, addr = next, addr < end);