From: Bin Wang Date: Fri, 21 Mar 2014 10:06:07 +0000 (+0000) Subject: iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte X-Git-Tag: v3.15-rc2~2^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aca1bc4595c5757f01167ab5bfef2a4f8edfcf4f;p=karo-tx-linux.git iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte 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 Signed-off-by: Will Deacon --- diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 69d001a71b22..647c3c7fd742 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);