diff options
| author | Bin Wang <binw@marvell.com> | 2014-03-21 11:06:07 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-04-15 13:23:11 +0200 |
| commit | aca1bc4595c5757f01167ab5bfef2a4f8edfcf4f (patch) | |
| tree | 2b3939f00cfe54397d3a9f39731d01c601f43e53 | |
| parent | iommu/arm-smmu: Return 0 on unmap failure (diff) | |
| download | linux-aca1bc4595c5757f01167ab5bfef2a4f8edfcf4f.tar.xz linux-aca1bc4595c5757f01167ab5bfef2a4f8edfcf4f.zip | |
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>
| -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, 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); |