lkml.org 
[lkml]   [2011]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 2/9] irq: check domain hwirq range for DT translate
    Benoit,

    On 12/19/2011 06:41 AM, Cousson, Benoit wrote:
    > Hi Rob,
    >
    > While trying your series to take advantage of the generic-irq domain
    > support for OMAP3 INTC, I realized that the following patch is breaking
    > drivers that are using irq_domain_add_simple.
    >
    > The point is that irq_domain_add_simple does not populate hwirq_base or
    > nr_irq, so that test will always fail if the domain is created by the
    > irq_domain_add_simple API.
    >
    > Adding an extra parameter to provide the nr_irq should fix that.
    >
    > The long term fix should be to use the generic-irq for such driver, but
    > this is not the same effort, so it might worth fixing that API for the
    > moment.
    >
    > Regards,
    > Benoit
    >
    > On 12/14/2011 4:28 PM, Rob Herring wrote:
    >> From: Rob Herring<rob.herring@calxeda.com>
    >>
    >> A DT node may have more than 1 domain associated with it, so make sure
    >> the hwirq number is within range when doing DT translation.
    >>
    >> Signed-off-by: Rob Herring<rob.herring@calxeda.com>
    >> Cc: Thomas Gleixner<tglx@linutronix.de>
    >> ---
    >> kernel/irq/irqdomain.c | 3 +++
    >> 1 files changed, 3 insertions(+), 0 deletions(-)
    >>
    >> diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
    >> index 200ce83..ae6441e 100644
    >> --- a/kernel/irq/irqdomain.c
    >> +++ b/kernel/irq/irqdomain.c
    >> @@ -135,6 +135,9 @@ int irq_domain_simple_dt_translate(struct
    >> irq_domain *d,
    >> return -EINVAL;
    >> if (intsize< 1)
    >> return -EINVAL;
    >> + if ((intspec[0]< d->hwirq_base) ||
    >> + (intspec[0]>= d->hwirq_base + d->nr_irq))

    I think this should work:

    if (d->nr_irq && ((intspec[0] < d->hwirq_base) ||
    (intspec[0] >= d->hwirq_base + d->nr_irq)))

    Rob

    >> + return -EINVAL;
    >>
    >> *out_hwirq = intspec[0];
    >> *out_type = IRQ_TYPE_NONE;
    >



    \
     
     \ /
      Last update: 2011-12-19 15:27    [W:0.026 / U:30.588 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site