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

Commit 97a64420 authored by Yifan Zhang's avatar Yifan Zhang Committed by Will Deacon
Browse files

iommu/arm-smmu: fix pud/pmd entry fill sequence 



The ARM SMMU driver's population of puds and pmds is broken, since we
iterate over the next level of table repeatedly setting the current
level descriptor to point at the pmd being initialised. This is clearly
wrong when dealing with multiple pmds/puds.

This patch fixes the problem by moving the pud/pmd population out of the
loop and instead performing it when we allocate the next level (like we
correctly do for ptes already). The starting address for the next level
is then calculated prior to entering the loop.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarYifan Zhang <zhangyf@marvell.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent b28a960c

drivers/iommu/arm-smmu.c

+10 −4
Original line number Diff line number Diff line
@@ -1320,6 +1320,11 @@ static int arm_smmu_alloc_init_pmd(struct arm_smmu_device *smmu, pud_t *pud, 
		pmd = pmd_alloc_one(NULL, addr);

		if (!pmd)

			return -ENOMEM;



		pud_populate(NULL, pud, pmd);

		arm_smmu_flush_pgtable(smmu, pud, sizeof(*pud));



		pmd += pmd_index(addr);

	} else

#endif

		pmd = pmd_offset(pud, addr);
@@ -1328,8 +1333,6 @@ static int arm_smmu_alloc_init_pmd(struct arm_smmu_device *smmu, pud_t *pud, 
		next = pmd_addr_end(addr, end);

		ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, end, pfn,

					      flags, stage);

		pud_populate(NULL, pud, pmd);

		arm_smmu_flush_pgtable(smmu, pud, sizeof(*pud));

		phys += next - addr;

	} while (pmd++, addr = next, addr < end);
@@ -1349,6 +1352,11 @@ static int arm_smmu_alloc_init_pud(struct arm_smmu_device *smmu, pgd_t *pgd, 
		pud = pud_alloc_one(NULL, addr);

		if (!pud)

			return -ENOMEM;



		pgd_populate(NULL, pgd, pud);

		arm_smmu_flush_pgtable(smmu, pgd, sizeof(*pgd));



		pud += pud_index(addr);

	} else

#endif

		pud = pud_offset(pgd, addr);
@@ -1357,8 +1365,6 @@ static int arm_smmu_alloc_init_pud(struct arm_smmu_device *smmu, pgd_t *pgd, 
		next = pud_addr_end(addr, end);

		ret = arm_smmu_alloc_init_pmd(smmu, pud, addr, next, phys,

					      flags, stage);

		pgd_populate(NULL, pud, pgd);

		arm_smmu_flush_pgtable(smmu, pgd, sizeof(*pgd));

		phys += next - addr;

	} while (pud++, addr = next, addr < end);