Commit d1e20222 authored Jul 19, 2018 by Vivek Gautam Committed by Will Deacon Jul 26, 2018

iommu/arm-smmu: Error out only if not enough context interrupts



Currently we check if the number of context banks is not equal to
num_context_interrupts. However, there are booloaders such as, one
on sdm845 that reserves few context banks and thus kernel views
less than the total available context banks.
So, although the hardware definition in device tree would mention
the correct number of context interrupts, this number can be
greater than the number of context banks visible to smmu in kernel.
We should therefore error out only when the number of context banks
is greater than the available number of context interrupts.

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Suggested-by: Tomasz Figa <tfiga@chromium.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
[will: drop useless printk]
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 29859aeb

drivers/iommu/arm-smmu.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -2103,14 +2103,18 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
		if (err)
		return err;

		if (smmu->version == ARM_SMMU_V2 &&
		smmu->num_context_banks != smmu->num_context_irqs) {
		if (smmu->version == ARM_SMMU_V2) {
		if (smmu->num_context_banks > smmu->num_context_irqs) {
		dev_err(dev,
		"found only %d context interrupt(s) but %d required\n",
		"found only %d context irq(s) but %d required\n",
		smmu->num_context_irqs, smmu->num_context_banks);
		return -ENODEV;
		}

		/* Ignore superfluous interrupts */
		smmu->num_context_irqs = smmu->num_context_banks;
		}

		for (i = 0; i < smmu->num_global_irqs; ++i) {
		err = devm_request_irq(smmu->dev, smmu->irqs[i],
		arm_smmu_global_fault,

Admin message