Skip to contentSkip to conversation

Additional IRQ handlers in ppc4xx_init_IRQ()

DISCUSSION David Müller (ELSOFT AG) 2 participants 3 messages Oct 23, 2001 – Oct 24, 2001

lore
Share & tools
lore
#0 lore raw

Hello

I have a question regarding the registration of additional IRQ handlers for a PPC405GP based board. The board uses the PIC inside the PIIX4 too, so i have set NR_BOARD_IRQ to 16 in my board specific include file and extended ppc4xx_init_IRQ as follows:

static void __init
ppc4xx_init_IRQ(void)

{
	int i;

	ppc4xx_pic_init();
#if !defined(CONFIG_PIP405) && !defined(CONFIG_MIP405)
	for (i = 0; i < NR_IRQS; i++)
		irq_desc[i].handler = ppc4xx_pic;
#else
/* MPL PIP405 / MIP405 uses PIIX4 PIC too */
	for (i = 0; i < NR_AIC_IRQS; i++)
		irq_desc[i].handler = ppc4xx_pic;
	for (i = NR_AIC_IRQS; i < NR_IRQS; i++)
		irq_desc[i].handler = &i8259_pic;

	i8259_pic_irq_offset = NR_AIC_IRQS;
	i8259_init();
	request_irq(ISA_BRIDGE_INT, pip405_mip405_i8259_action, 0,
		    "i8259 cascade", NULL);
#endif
	return;
}

Perhaps something like the following would be a better solution:

static void __init
ppc4xx_init_IRQ(void)

{
	int i;

	ppc4xx_pic_init();

	for (i = 0; i < NR_IRQS; i++)
		irq_desc[i].handler = ppc4xx_pic;
#if defined(CONFIG_IRQ_FIXUP)
        board_fixup_irq();

#endif

	return;
}

Which is the way to go?

Dave

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

#1 lore raw
Quoted 2 lines · David Müller (ELSOFT AG)

I have a question regarding the registration of additional IRQ handlers for a PPC405GP based board.

Where are Matt's changes for the Tivo? It would address this and give us another example of how this should be structured.

Quoted 1 line

extended ppc4xx_init_IRQ as follows:

This is not an appealing solution. We should change ppc4xx_pic_init() to initialize the internal interrupt controller irq descriptor, and then create a standard board initialization call for board specific changes.

Quoted 7 lines

static void __init
ppc4xx_init_IRQ(void)

{
        int i;

        ppc4xx_pic_init();

+ ppc4xx_pic_board_init();

Quoted 3 lines
        return;
}

The '...board_init()' function can be empty for those boards that don't require any additional controller initialization.

Quoted 2 lines
        for (i = 0; i < NR_IRQS; i++)
                irq_desc[i].handler = ppc4xx_pic;

The NR_IRQS should represent the total number of interrupts across all controllers. The pic_init() should change this loop to initialize either NR_AIC or NR_UIC depending upon a 403 or 405 interrupt controller. No #ifdefs necessary.

Thanks.

	-- Dan

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

#2 lore raw
Quoted 41 lines · Dan Malek
Quoted 3 lines · David Müller (ELSOFT AG)

I have a question regarding the registration of additional IRQ handlers for a PPC405GP based board.

Where are Matt's changes for the Tivo? It would address this and give us another example of how this should be structured.

Quoted 2 lines

extended ppc4xx_init_IRQ as follows:

This is not an appealing solution. We should change ppc4xx_pic_init() to initialize the internal interrupt controller irq descriptor, and then create a standard board initialization call for board specific changes.

Quoted 8 lines

static void __init
ppc4xx_init_IRQ(void)

{
       int i;

       ppc4xx_pic_init();
(quoted diff) +1 -0
+	  ppc4xx_pic_board_init();
Quoted 5 lines
       return;
}

The '...board_init()' function can be empty for those boards that don't require any additional controller initialization.

Quoted 9 lines
Quoted 3 lines
       for (i = 0; i < NR_IRQS; i++)
               irq_desc[i].handler = ppc4xx_pic;

The NR_IRQS should represent the total number of interrupts across all controllers. The pic_init() should change this loop to initialize either NR_AIC or NR_UIC depending upon a 403 or 405 interrupt controller. No #ifdefs necessary.

This seems to be pretty much the same as my second proposal (except for the

#defines) if i understand you correctly.

Dave

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/