CNS3xxx: Fix a WARN() related to IRQ allocation.
authorKrzysztof Hałasa <khalasa@piap.pl>
Tue, 4 Mar 2014 10:50:35 +0000 (11:50 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 14:33:20 +0000 (15:33 +0100)
WARNING: at drivers/irqchip/irq-gic.c:952 gic_init_bases+0xe4/0x2b8()
Cannot allocate irq_descs @ IRQ16, assuming pre-allocated
Backtrace:
gic_init_bases    from cns3xxx_init_irq+0x24/0x34
cns3xxx_init_irq  from init_IRQ+0x24/0x2c
init_IRQ          from start_kernel+0x1a8/0x338
start_kernel      from 0x2000806c

The problem is that 64 CNS3xxx CPU interrupts, starting at 32, are
allocated by the ARM platform-independent code (as requested by
machine_desc->nr_irqs = 96), and then the GIC code tries to allocate
them again.

Tested on Gateworks Laguna board, masqueraded as CNS3420VB.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-cns3xxx/cns3420vb.c
arch/arm/mach-cns3xxx/core.c

index ce096d678aa410d68ab1915e500b7c8bdf7a2242..d863d8729edc54c9744cfd4137748727b57673f6 100644 (file)
@@ -246,7 +246,6 @@ static void __init cns3420_map_io(void)
 
 MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
        .atag_offset    = 0x100,
-       .nr_irqs        = NR_IRQS_CNS3XXX,
        .map_io         = cns3420_map_io,
        .init_irq       = cns3xxx_init_irq,
        .init_time      = cns3xxx_timer_init,
index e38b279f402c46977ed90323018044e431ede887..0aaeb8c19c9c90517717d324a057e071c1707e37 100644 (file)
@@ -368,7 +368,6 @@ static const char *cns3xxx_dt_compat[] __initdata = {
 
 DT_MACHINE_START(CNS3XXX_DT, "Cavium Networks CNS3xxx")
        .dt_compat      = cns3xxx_dt_compat,
-       .nr_irqs        = NR_IRQS_CNS3XXX,
        .map_io         = cns3xxx_map_io,
        .init_irq       = cns3xxx_init_irq,
        .init_time      = cns3xxx_timer_init,