Re: [PATCH 1/5] gic: prevent gic from crossing NR_IRQ

From: Catalin Marinas
Date: Thu Jan 28 2010 - 08:19:22 EST


On Wed, 2010-01-27 at 22:43 +0000, Russell King - ARM Linux wrote:
> On Wed, Jan 27, 2010 at 11:32:25AM -0800, adharmap@xxxxxxxxxxxxxx wrote:
> > From: Abhijeet Dharmapurikar <adharmap@xxxxxxxxxxx>
> >
> > The gic code tries to initialize interrupts beyond NR_IRQ. Prevent
> > code from doing that.
>
> NAK. This is completely the wrong approach.
>
> /*
> * Find out how many interrupts are supported.
> */
> max_irq = readl(base + GIC_DIST_CTR) & 0x1f;
> max_irq = (max_irq + 1) * 32;
>
> /*
> * The GIC only supports up to 1020 interrupt sources.
> * Limit this to either the architected maximum, or the
> * platform maximum.
> */
> if (max_irq > max(1020, NR_IRQS))
> max_irq = max(1020, NR_IRQS);
> ...
> for (i = irq_start; i < gic_data[gic_nr].irq_offset + max_irq; i++) {
>
> This function is broken if irq_start != 0, and needs fixing - max_irq
> needs to be limited to the _minimum_ of 1020 or NR_IRQS - irq_start.

Actually I think in this case max_irq should be left to whatever the
hardware reads (but not more than 1020) since further down in this
function we configure the IRQs for the GIC and we also want to disable
those beyond NR_IRQS.

The "for" loop for set_irq_chip() should go to the minimum of max_irqs
and NR_IRQS.

--
Catalin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/