diff options
author | Bin Wang <binw@marvell.com> | 2014-03-21 06:06:07 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2014-04-15 07:23:11 -0400 |
commit | aca1bc4595c5757f01167ab5bfef2a4f8edfcf4f (patch) | |
tree | 2b3939f00cfe54397d3a9f39731d01c601f43e53 /drivers/iommu | |
parent | 16c50dcfc4c186ed09a4d80fbd511492d024a1c5 (diff) |
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 <binw@marvell.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
1381 | 1381 | ||
1382 | do { | 1382 | do { |
1383 | next = pmd_addr_end(addr, end); | 1383 | next = pmd_addr_end(addr, end); |
1384 | ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, end, pfn, | 1384 | ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, next, pfn, |
1385 | prot, stage); | 1385 | prot, stage); |
1386 | phys += next - addr; | 1386 | phys += next - addr; |
1387 | } while (pmd++, addr = next, addr < end); | 1387 | } while (pmd++, addr = next, addr < end); |