diff options
| author | Joerg Roedel <jroedel@suse.de> | 2018-07-27 14:49:40 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2018-07-27 14:49:40 +0200 |
| commit | d81dc82e0f19a3155935e10b752967335e6cbbef (patch) | |
| tree | d47a1d5f5208c89d62eb783c5a967ea98fd21af3 /drivers/iommu/arm-smmu.c | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
| parent | b63b3439b85609338e4faabd5d2588dbda137e5c (diff) | |
| download | linux-d81dc82e0f19a3155935e10b752967335e6cbbef.tar.bz2 | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index f7a96bcf94a6..5349e22b5c78 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2103,12 +2103,16 @@ 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) { - dev_err(dev, - "found only %d context interrupt(s) but %d required\n", - smmu->num_context_irqs, smmu->num_context_banks); - return -ENODEV; + if (smmu->version == ARM_SMMU_V2) { + if (smmu->num_context_banks > smmu->num_context_irqs) { + dev_err(dev, + "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) { |