[PATCH] arm: Fix GIC distributor initialisation

[Catalin Marinas]

On 19 November 2010 14:50, Pawel Moll <pawel.moll at arm.com> wrote:
> The code checking interrupt limits was "slightly" wrong, using
> max() instead of min() value. This hasn't been noticed before
> because max_irq was never really higher then NR_IRQS...
>
> Signed-off-by: Pawel Moll <pawel.moll at arm.com>
> ---
>  arch/arm/common/gic.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
> index 772f95f..35a2a0b 100644
> --- a/arch/arm/common/gic.c
> +++ b/arch/arm/common/gic.c
> @@ -235,8 +235,8 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
>         * Limit this to either the architected maximum, or the
>         * platform maximum.
>         */
> -       if (max_irq > max(1020, NR_IRQS))
> -               max_irq = max(1020, NR_IRQS);
> +       if (max_irq > min(1020, NR_IRQS))
> +               max_irq = min(1020, NR_IRQS);

With this change and the GIC supports more than NR_IRQs, we don't
disable all the interrupts on the GIC further down in this function.

We probably need to have separate variables for the number of hardware
interrupts and another one based on min(max_hw_irq, NR_IRQS).

-- 
Catalin