Commit c55af7f7 authored Oct 01, 2013 by Andreas Herrmann Committed by Will Deacon Oct 09, 2013

iommu/arm-smmu: Refine check for proper size of mapped region



There is already a check to print a warning if the size of SMMU
address space (calculated from SMMU register values) is greater than
the size of the mapped memory region (e.g. passed via DT to the
driver).

Adapt this check to print also a warning in case the mapped region is
larger than the SMMU address space.

Such a mismatch could be intentional (to fix wrong register values).
If its not intentional (e.g. due to wrong DT information) this will
very likely cause a malfunction of the driver as SMMU_CB_BASE is
derived from the size of the mapped region. The warning helps to
identify the root cause in this case.

Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent b1950b27

drivers/iommu/arm-smmu.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1700,13 +1700,12 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
		id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID1);
		smmu->pagesize = (id & ID1_PAGESIZE) ? SZ_64K : SZ_4K;

		/* Check that we ioremapped enough */
		/* Check for size mismatch of SMMU address space from mapped region */
		size = 1 << (((id >> ID1_NUMPAGENDXB_SHIFT) & ID1_NUMPAGENDXB_MASK) + 1);
		size *= (smmu->pagesize << 1);
		if (smmu->size < size)
		dev_warn(smmu->dev,
		"device is 0x%lx bytes but only mapped 0x%lx!\n",
		size, smmu->size);
		if (smmu->size != size)
		dev_warn(smmu->dev, "SMMU address space size (0x%lx) differs "
		"from mapped region size (0x%lx)!\n", size, smmu->size);

		smmu->num_s2_context_banks = (id >> ID1_NUMS2CB_SHIFT) &
		ID1_NUMS2CB_MASK;

Admin message