From: andreas.herrmann@calxeda.com (Andreas Herrmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] iommu/arm-smmu: Check for num_context_irqs > 0 to avoid divide by zero exception
Date: Fri, 27 Sep 2013 11:03:48 +0200 [thread overview]
Message-ID: <20130927090348.GF3315@alberich> (raw)
In-Reply-To: <20130927084154.GB8319@mudshark.cambridge.arm.com>
On Fri, Sep 27, 2013 at 04:41:54AM -0400, Will Deacon wrote:
> On Thu, Sep 26, 2013 at 11:36:16PM +0100, Andreas Herrmann wrote:
> > With the right (or wrong;-) definition of v1 SMMU node in DTB it is
> > possible to trigger a division by zero in arm_smmu_init_domain_context
> > (if number of context irqs is 0):
> >
> > if (smmu->version == 1) {
> > root_cfg->irptndx = atomic_inc_return(&smmu->irptndx);
> > => root_cfg->irptndx %= smmu->num_context_irqs;
> > } else {
> >
> > Avoid this by checking for num_context_irqs > 0 when probing
> > for SMMU devices.
> >
> > Rationale: Assuming that at least one context bank for non-secure
> > usage is provided per SMMU, it follows (from ARM SMMU Architecture
> > Spec) that at least one context interrupt must be available.
>
> One problem with this reasoning is that the interrupt line might just not be
> wired up to the GIC, despite existing on the SMMU. Still, we needn't solve
> that now (let's wait for somebody to build it first...).
>
> > Also remove the line of code that derived num_context_irqs from
> > num_irqs and num_global_irqs. If DT is wrong and interrupt property
> > contains less interrupts than num_global_irqs this would set
> > num_context_irqs to a big u32 value which most likely causes trouble
> > in other parts of the driver.
> >
> > Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com>
> > ---
> > drivers/iommu/arm-smmu.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> > index 4307fbc..de9dd60 100644
> > --- a/drivers/iommu/arm-smmu.c
> > +++ b/drivers/iommu/arm-smmu.c
> > @@ -1822,7 +1822,11 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
> > num_irqs, smmu->num_global_irqs);
> > smmu->num_global_irqs = num_irqs;
> > }
> > - smmu->num_context_irqs = num_irqs - smmu->num_global_irqs;
>
> Why are you deleting this line?
Because I felt it's redundant in some cases and erroneously I thought
it could be bogus if num_irqs < num_global_irqs.
Of course the latter is wrong, as num_global_irqs is corrected two
lines above.
Now I think it's always redundant. num_context_irqs is only
incremented here
if (num_irqs > smmu->num_global_irqs)
smmu->num_context_irqs++;
So either it is still 0 (and no fixup required for num_irqs <
num_global_irqs) or it contains already a positive value based on
(num_irqs - num_global_irqs).
But maybe I've missed something.
(At least I need to fix the commit message wrt to this removal.)
> > +
> > + if (!smmu->num_context_irqs) {
> > + dev_err(dev, "no context interrupt specified in DT\n");
>
> I'd avoid mentioning "DT" in the log message, just in case this ever starts
> probing from something else.
Ok, will fix this.
Andreas
next prev parent reply other threads:[~2013-09-27 9:03 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 22:36 [PATCH 0/9] arm-smmu: Misc changes/Calxeda ECX-2000 support Andreas Herrmann
2013-09-26 22:36 ` [PATCH 1/9] iommu/arm-smmu: Switch to arch_initcall for driver registration Andreas Herrmann
2013-09-27 8:58 ` Will Deacon
2013-09-27 9:24 ` Andreas Herrmann
2013-09-27 10:02 ` [PATCH] iommu/arm-smmu: Switch to subsys_initcall " Andreas Herrmann
2013-09-26 22:36 ` [PATCH 2/9] iommu/arm-smmu: Calculate SMMU_CB_BASE from smmu register values Andreas Herrmann
2013-09-27 9:51 ` Will Deacon
2013-09-27 10:23 ` Andreas Herrmann
2013-09-27 10:51 ` Will Deacon
2013-09-27 11:05 ` Andreas Herrmann
2013-09-27 11:08 ` Will Deacon
2013-09-27 14:33 ` [PATCH] iommu/arm-smmu: Refine check for proper size of mapped region Andreas Herrmann
2013-09-26 22:36 ` [PATCH 3/9] ARM: dma-mapping: Always pass proper prot flags to iommu_map() Andreas Herrmann
2013-09-27 8:35 ` Will Deacon
2013-09-30 13:40 ` Marek Szyprowski
2013-09-26 22:36 ` [PATCH 4/9] iommu/arm-smmu: Check for num_context_irqs > 0 to avoid divide by zero exception Andreas Herrmann
2013-09-27 8:41 ` Will Deacon
2013-09-27 9:03 ` Andreas Herrmann [this message]
2013-09-27 10:23 ` Will Deacon
2013-09-27 10:39 ` Andreas Herrmann
2013-09-27 10:48 ` Will Deacon
2013-09-27 11:07 ` Andreas Herrmann
2013-09-27 14:30 ` [PATCH] " Andreas Herrmann
2013-09-26 22:36 ` [PATCH 5/9] iommu/arm-smmu: Clear global and context bank fault status registers Andreas Herrmann
2013-09-27 8:52 ` Will Deacon
2013-09-30 13:54 ` Andreas Herrmann
2013-09-30 13:56 ` [PATCH] " Andreas Herrmann
2013-09-30 16:06 ` Will Deacon
2013-09-30 17:17 ` Andreas Herrmann
2013-09-30 18:30 ` Will Deacon
2013-09-30 21:06 ` Andreas Herrmann
2013-09-26 22:36 ` [PATCH 6/9] iommu/arm-smmu: Support buggy implemenations where all config accesses are secure Andreas Herrmann
2013-09-27 13:05 ` Will Deacon
2013-09-27 13:48 ` Andreas Herrmann
2013-09-26 22:36 ` [PATCH 7/9] iommu/arm-smmu: Add function that conditionally isolates all masters of all SMMUs Andreas Herrmann
2013-09-27 13:00 ` Will Deacon
2013-10-07 15:42 ` Andreas Herrmann
2013-10-08 10:43 ` Will Deacon
2013-09-26 22:36 ` [PATCH 8/9] iommu/arm-smmu: Introduce a default fault handler Andreas Herrmann
2013-09-27 10:09 ` Will Deacon
2013-09-27 10:45 ` Andreas Herrmann
2013-09-27 21:22 ` [PATCH] iommu/arm-smmu: Print context fault information Andreas Herrmann
2013-09-26 22:36 ` [PATCH 9/9] ARM: dts: Add nodes for SMMUs on Calxeda ECX-2000 Andreas Herrmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130927090348.GF3315@alberich \
--to=andreas.herrmann@calxeda.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).