Commit c87abd75 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Cleanup TX39/TX49 irq code 



Cleanup jmr3927, tx4927 and tx4938 irq codes, using common IRQ_CPU,
I8259 and IRQ_TXX9 irq routines.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8420fd00

arch/mips/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ config TOSHIBA_JMR3927 
	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_TX3927

	select IRQ_TXX9

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX39XX

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -540,7 +541,9 @@ config TOSHIBA_RBTX4927 
	select DMA_NONCOHERENT

	select HAS_TXX9_SERIAL

	select HW_HAS_PCI

	select I8259

	select IRQ_CPU

	select IRQ_TXX9

	select I8259 if TOSHIBA_FPCIB0

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX49XX

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -560,7 +563,8 @@ config TOSHIBA_RBTX4938 
	select GENERIC_ISA_DMA

	select HAS_TXX9_SERIAL

	select HW_HAS_PCI

	select I8259

	select IRQ_CPU

	select IRQ_TXX9

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX49XX

	select SYS_SUPPORTS_32BIT_KERNEL

arch/mips/jmr3927/rbhma3100/irq.c

+3 −45
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
#error JMR3927_IRQ_END > NR_IRQS

#endif



#define irc_dlevel	0

#define irc_elevel	1



static unsigned char irc_level[TX3927_NUM_IR] = {

	5, 5, 5, 5, 5, 5,	/* INT[5:0] */

	7, 7,			/* SIO */
@@ -80,34 +77,6 @@ static void unmask_irq_ioc(unsigned int irq) 
	(void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);

}



static void mask_irq_irc(unsigned int irq)

{

	unsigned int irq_nr = irq - JMR3927_IRQ_IRC;

	volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];

	if (irq_nr & 1)

		*ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8);

	else

		*ilrp = (*ilrp & 0xff00) | irc_dlevel;

	/* update IRCSR */

	tx3927_ircptr->imr = 0;

	tx3927_ircptr->imr = irc_elevel;

	/* flush write buffer */

	(void)tx3927_ircptr->ssr;

}



static void unmask_irq_irc(unsigned int irq)

{

	unsigned int irq_nr = irq - JMR3927_IRQ_IRC;

	volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];

	if (irq_nr & 1)

		*ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8);

	else

		*ilrp = (*ilrp & 0xff00) | irc_level[irq_nr];

	/* update IRCSR */

	tx3927_ircptr->imr = 0;

	tx3927_ircptr->imr = irc_elevel;

}



asmlinkage void plat_irq_dispatch(void)

{

	unsigned long cp0_cause = read_c0_cause();
@@ -168,10 +137,6 @@ void __init arch_init_irq(void) 
	/* clear PCI Reset interrupts */

	jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);



	/* enable interrupt control */

	tx3927_ircptr->cer = TX3927_IRCER_ICE;

	tx3927_ircptr->imr = irc_elevel;



	jmr3927_irq_init();



	/* setup IOC interrupt 1 (PCI, MODEM) */
@@ -193,20 +158,13 @@ static struct irq_chip jmr3927_irq_ioc = { 
	.unmask = unmask_irq_ioc,

};



static struct irq_chip jmr3927_irq_irc = {

	.name = "jmr3927_irc",

	.ack = mask_irq_irc,

	.mask = mask_irq_irc,

	.mask_ack = mask_irq_irc,

	.unmask = unmask_irq_irc,

};



static void __init jmr3927_irq_init(void)

{

	u32 i;



	for (i = JMR3927_IRQ_IRC; i < JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC; i++)

		set_irq_chip_and_handler(i, &jmr3927_irq_irc, handle_level_irq);

	txx9_irq_init(TX3927_IRC_REG);

	for (i = 0; i < TXx9_MAX_IR; i++)

		txx9_irq_set_pri(i, irc_level[i]);

	for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)

		set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq);

}

arch/mips/jmr3927/rbhma3100/setup.c

+0 −13
Original line number Diff line number Diff line
@@ -290,19 +290,6 @@ static void __init tx3927_setup(void) 
	       tx3927_ccfgptr->crir,

	       tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg);



	/* IRC */

	/* disable interrupt control */

	tx3927_ircptr->cer = 0;

	/* mask all IRC interrupts */

	tx3927_ircptr->imr = 0;

	for (i = 0; i < TX3927_NUM_IR / 2; i++) {

		tx3927_ircptr->ilr[i] = 0;

	}

	/* setup IRC interrupt mode (Low Active) */

	for (i = 0; i < TX3927_NUM_IR / 8; i++) {

		tx3927_ircptr->cr[i] = 0;

	}



	/* TMR */

	/* disable all timers */

	for (i = 0; i < TX3927_NR_TMR; i++) {

arch/mips/tx4927/common/tx4927_irq.c

+10 −385
Original line number Diff line number Diff line
@@ -23,398 +23,20 @@ 
 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  675 Mass Ave, Cambridge, MA 02139, USA.

 */

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/kernel_stat.h>

#include <linux/module.h>

#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/types.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/timex.h>

#include <linux/slab.h>

#include <linux/random.h>

#include <linux/irq.h>

#include <linux/bitops.h>

#include <asm/bootinfo.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/irq_cpu.h>

#include <asm/mipsregs.h>

#include <asm/system.h>

#include <asm/tx4927/tx4927.h>

#ifdef CONFIG_TOSHIBA_RBTX4927

#include <asm/tx4927/toshiba_rbtx4927.h>

#endif



/*

 * DEBUG

 */



#undef TX4927_IRQ_DEBUG



#ifdef TX4927_IRQ_DEBUG

#define TX4927_IRQ_NONE        0x00000000



#define TX4927_IRQ_INFO        ( 1 <<  0 )

#define TX4927_IRQ_WARN        ( 1 <<  1 )

#define TX4927_IRQ_EROR        ( 1 <<  2 )



#define TX4927_IRQ_INIT        ( 1 <<  5 )

#define TX4927_IRQ_NEST1       ( 1 <<  6 )

#define TX4927_IRQ_NEST2       ( 1 <<  7 )

#define TX4927_IRQ_NEST3       ( 1 <<  8 )

#define TX4927_IRQ_NEST4       ( 1 <<  9 )



#define TX4927_IRQ_CP0_INIT     ( 1 << 10 )

#define TX4927_IRQ_CP0_ENABLE   ( 1 << 13 )

#define TX4927_IRQ_CP0_DISABLE  ( 1 << 14 )



#define TX4927_IRQ_PIC_INIT     ( 1 << 20 )

#define TX4927_IRQ_PIC_ENABLE   ( 1 << 23 )

#define TX4927_IRQ_PIC_DISABLE  ( 1 << 24 )



#define TX4927_IRQ_ALL         0xffffffff

#endif



#ifdef TX4927_IRQ_DEBUG

static const u32 tx4927_irq_debug_flag = (TX4927_IRQ_NONE

					  | TX4927_IRQ_INFO

					  | TX4927_IRQ_WARN | TX4927_IRQ_EROR

//                                       | TX4927_IRQ_CP0_INIT

//                                       | TX4927_IRQ_CP0_ENABLE

//                                       | TX4927_IRQ_CP0_ENDIRQ

//                                       | TX4927_IRQ_PIC_INIT

//                                       | TX4927_IRQ_PIC_ENABLE

//                                       | TX4927_IRQ_PIC_DISABLE

//                                       | TX4927_IRQ_INIT

//                                       | TX4927_IRQ_NEST1

//                                       | TX4927_IRQ_NEST2

//                                       | TX4927_IRQ_NEST3

//                                       | TX4927_IRQ_NEST4

    );

#endif



#ifdef TX4927_IRQ_DEBUG

#define TX4927_IRQ_DPRINTK(flag,str...) \

        if ( (tx4927_irq_debug_flag) & (flag) ) \

        { \

           char tmp[100]; \

           sprintf( tmp, str ); \

           printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \

        }

#else

#define TX4927_IRQ_DPRINTK(flag,str...)

#endif



/*

 * Forwad definitions for all pic's

 */



static void tx4927_irq_cp0_enable(unsigned int irq);

static void tx4927_irq_cp0_disable(unsigned int irq);



static void tx4927_irq_pic_enable(unsigned int irq);

static void tx4927_irq_pic_disable(unsigned int irq);



/*

 * Kernel structs for all pic's

 */



#define TX4927_CP0_NAME "TX4927-CP0"

static struct irq_chip tx4927_irq_cp0_type = {

	.name		= TX4927_CP0_NAME,

	.ack		= tx4927_irq_cp0_disable,

	.mask		= tx4927_irq_cp0_disable,

	.mask_ack	= tx4927_irq_cp0_disable,

	.unmask		= tx4927_irq_cp0_enable,

};



#define TX4927_PIC_NAME "TX4927-PIC"

static struct irq_chip tx4927_irq_pic_type = {

	.name		= TX4927_PIC_NAME,

	.ack		= tx4927_irq_pic_disable,

	.mask		= tx4927_irq_pic_disable,

	.mask_ack	= tx4927_irq_pic_disable,

	.unmask		= tx4927_irq_pic_enable,

};



#define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }

static struct irqaction tx4927_irq_pic_action =

TX4927_PIC_ACTION(TX4927_PIC_NAME);



#define CCP0_STATUS 12

#define CCP0_CAUSE 13



/*

 * Functions for cp0

 */



#define tx4927_irq_cp0_mask(irq) ( 1 << ( irq-TX4927_IRQ_CP0_BEG+8 ) )



static void

tx4927_irq_cp0_modify(unsigned cp0_reg, unsigned clr_bits, unsigned set_bits)

{

	unsigned long val = 0;



	switch (cp0_reg) {

	case CCP0_STATUS:

		val = read_c0_status();

		break;



	case CCP0_CAUSE:

		val = read_c0_cause();

		break;



	}



	val &= (~clr_bits);

	val |= (set_bits);



	switch (cp0_reg) {

	case CCP0_STATUS:{

			write_c0_status(val);

			break;

		}

	case CCP0_CAUSE:{

			write_c0_cause(val);

			break;

		}

	}

}



static void __init tx4927_irq_cp0_init(void)

{

	int i;



	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_INIT, "beg=%d end=%d\n",

			   TX4927_IRQ_CP0_BEG, TX4927_IRQ_CP0_END);



	for (i = TX4927_IRQ_CP0_BEG; i <= TX4927_IRQ_CP0_END; i++)

		set_irq_chip_and_handler(i, &tx4927_irq_cp0_type,

					 handle_level_irq);

}



static void tx4927_irq_cp0_enable(unsigned int irq)

{

	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d \n", irq);



	tx4927_irq_cp0_modify(CCP0_STATUS, 0, tx4927_irq_cp0_mask(irq));

}



static void tx4927_irq_cp0_disable(unsigned int irq)

{

	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d \n", irq);



	tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0);

}



/*

 * Functions for pic

 */

u32 tx4927_irq_pic_addr(int irq)

{

	/* MVMCP -- need to formulize this */

	irq -= TX4927_IRQ_PIC_BEG;

	switch (irq) {

	case 17:

	case 16:

	case 1:

	case 0:

		return (0xff1ff610);



	case 19:

	case 18:

	case 3:

	case 2:

		return (0xff1ff614);



	case 21:

	case 20:

	case 5:

	case 4:

		return (0xff1ff618);



	case 23:

	case 22:

	case 7:

	case 6:

		return (0xff1ff61c);



	case 25:

	case 24:

	case 9:

	case 8:

		return (0xff1ff620);



	case 27:

	case 26:

	case 11:

	case 10:

		return (0xff1ff624);



	case 29:

	case 28:

	case 13:

	case 12:

		return (0xff1ff628);



	case 31:

	case 30:

	case 15:

	case 14:

		return (0xff1ff62c);



	}

	return (0);

}



u32 tx4927_irq_pic_mask(int irq)

{

	/* MVMCP -- need to formulize this */

	irq -= TX4927_IRQ_PIC_BEG;

	switch (irq) {

	case 31:

	case 29:

	case 27:

	case 25:

	case 23:

	case 21:

	case 19:

	case 17:{

			return (0x07000000);

		}

	case 30:

	case 28:

	case 26:

	case 24:

	case 22:

	case 20:

	case 18:

	case 16:{

			return (0x00070000);

		}

	case 15:

	case 13:

	case 11:

	case 9:

	case 7:

	case 5:

	case 3:

	case 1:{

			return (0x00000700);

		}

	case 14:

	case 12:

	case 10:

	case 8:

	case 6:

	case 4:

	case 2:

	case 0:{

			return (0x00000007);

		}

	}

	return (0x00000000);

}



static void tx4927_irq_pic_modify(unsigned pic_reg, unsigned clr_bits,

	unsigned set_bits)

{

	unsigned long val = 0;



	val = TX4927_RD(pic_reg);

	val &= (~clr_bits);

	val |= (set_bits);

	TX4927_WR(pic_reg, val);

}



static void __init tx4927_irq_pic_init(void)

{

	int i;



	TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_INIT, "beg=%d end=%d\n",

			   TX4927_IRQ_PIC_BEG, TX4927_IRQ_PIC_END);



	for (i = TX4927_IRQ_PIC_BEG; i <= TX4927_IRQ_PIC_END; i++)

		set_irq_chip_and_handler(i, &tx4927_irq_pic_type,

					 handle_level_irq);



	setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);



	TX4927_WR(0xff1ff640, 0x6);	/* irq level mask -- only accept hightest */

	TX4927_WR(0xff1ff600, TX4927_RD(0xff1ff600) | 0x1);	/* irq enable */

}



static void tx4927_irq_pic_enable(unsigned int irq)

{

	TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENABLE, "irq=%d\n", irq);



	tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq), 0,

			      tx4927_irq_pic_mask(irq));

}



static void tx4927_irq_pic_disable(unsigned int irq)

{

	TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_DISABLE, "irq=%d\n", irq);



	tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq),

			      tx4927_irq_pic_mask(irq), 0);

}



/*

 * Main init functions

 */

void __init tx4927_irq_init(void)

{

	TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "-\n");



	TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_cp0_init()\n");

	tx4927_irq_cp0_init();



	TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_pic_init()\n");

	tx4927_irq_pic_init();



	TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "+\n");

}



static int tx4927_irq_nested(void)

{

	int sw_irq = 0;

	u32 level2;



	TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "-\n");



	level2 = TX4927_RD(0xff1ff6a0);

	TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=level2a=0x%x\n", level2);



	if ((level2 & 0x10000) == 0) {

		level2 &= 0x1f;

		TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=level2b=0x%x\n", level2);



		sw_irq = TX4927_IRQ_PIC_BEG + level2;

		TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=sw_irq=%d\n", sw_irq);



		if (sw_irq == 27) {

			TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq-%d\n",

					   sw_irq);



#ifdef CONFIG_TOSHIBA_RBTX4927

			{

				sw_irq = toshiba_rbtx4927_irq_nested(sw_irq);

			}

#endif



			TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq+%d\n",

					   sw_irq);

		}

	}



	TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=sw_irq=%d\n", sw_irq);



	TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "+\n");



	return (sw_irq);

	mips_cpu_irq_init();

	txx9_irq_init(TX4927_IRC_REG);

	set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);

}



asmlinkage void plat_irq_dispatch(void)
@@ -424,9 +46,12 @@ asmlinkage void plat_irq_dispatch(void) 
	if (pending & STATUSF_IP7)			/* cpu timer */

		do_IRQ(TX4927_IRQ_CPU_TIMER);

	else if (pending & STATUSF_IP2) {		/* tx4927 pic */

		unsigned int irq = tx4927_irq_nested();



		if (unlikely(irq == 0)) {

		int irq = txx9_irq();

#ifdef CONFIG_TOSHIBA_RBTX4927

		if (irq == TX4927_IRQ_NEST_EXT_ON_PIC)

			irq = toshiba_rbtx4927_irq_nested(irq);

#endif

		if (unlikely(irq < 0)) {

			spurious_interrupt();

			return;

		}

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c

+9 −162
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB 
#include <linux/bootmem.h>

#include <linux/blkdev.h>

#ifdef CONFIG_TOSHIBA_FPCIB0

#include <asm/i8259.h>

#include <asm/tx4927/smsc_fdc37m81x.h>

#endif

#include <asm/tx4927/toshiba_rbtx4927.h>
@@ -151,11 +152,6 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB 
#define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE    ( 1 << 13 )

#define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE   ( 1 << 14 )



#define TOSHIBA_RBTX4927_IRQ_ISA_INIT      ( 1 << 20 )

#define TOSHIBA_RBTX4927_IRQ_ISA_ENABLE    ( 1 << 23 )

#define TOSHIBA_RBTX4927_IRQ_ISA_DISABLE   ( 1 << 24 )

#define TOSHIBA_RBTX4927_IRQ_ISA_MASK      ( 1 << 25 )



#define TOSHIBA_RBTX4927_SETUP_ALL         0xffffffff

#endif
@@ -167,10 +163,6 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = 
//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_INIT

//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE

//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE

//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_INIT

//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE

//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE

//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_MASK

    );

#endif
@@ -196,33 +188,14 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = 
#define TOSHIBA_RBTX4927_IRQ_IOC_BEG  ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG)	/* 56 */

#define TOSHIBA_RBTX4927_IRQ_IOC_END  ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END)	/* 63 */





#define TOSHIBA_RBTX4927_IRQ_ISA_BEG MI8259_IRQ_ISA_BEG

#define TOSHIBA_RBTX4927_IRQ_ISA_END MI8259_IRQ_ISA_END

#define TOSHIBA_RBTX4927_IRQ_ISA_MID ((TOSHIBA_RBTX4927_IRQ_ISA_BEG+TOSHIBA_RBTX4927_IRQ_ISA_END+1)/2)





#define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC

#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2)

#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA (TOSHIBA_RBTX4927_IRQ_ISA_BEG+2)



extern int tx4927_using_backplane;



#ifdef CONFIG_TOSHIBA_FPCIB0

extern void enable_8259A_irq(unsigned int irq);

extern void disable_8259A_irq(unsigned int irq);

extern void mask_and_ack_8259A(unsigned int irq);

#endif



static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);

static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);



#ifdef CONFIG_TOSHIBA_FPCIB0

static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq);

static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq);

static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq);

#endif



#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"

static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {

	.name = TOSHIBA_RBTX4927_IOC_NAME,
@@ -235,18 +208,6 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { 
#define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006





#ifdef CONFIG_TOSHIBA_FPCIB0

#define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"

static struct irq_chip toshiba_rbtx4927_irq_isa_type = {

	.name = TOSHIBA_RBTX4927_ISA_NAME,

	.ack = toshiba_rbtx4927_irq_isa_mask_and_ack,

	.mask = toshiba_rbtx4927_irq_isa_disable,

	.mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack,

	.unmask = toshiba_rbtx4927_irq_isa_enable,

};

#endif





u32 bit2num(u32 num)

{

	u32 i;
@@ -271,31 +232,10 @@ int toshiba_rbtx4927_irq_nested(int sw_irq) 
		}

	}

#ifdef CONFIG_TOSHIBA_FPCIB0

	{

	if (tx4927_using_backplane) {

			u32 level4;

			u32 level5;

			outb(0x0A, 0x20);

			level4 = inb(0x20) & 0xff;

			if (level4) {

				sw_irq =

				    TOSHIBA_RBTX4927_IRQ_ISA_BEG +

				    bit2num(level4);

				if (sw_irq !=

				    TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA) {

					goto RETURN;

				}

			}



			outb(0x0A, 0xA0);

			level5 = inb(0xA0) & 0xff;

			if (level5) {

				sw_irq =

				    TOSHIBA_RBTX4927_IRQ_ISA_MID +

				    bit2num(level5);

				goto RETURN;

			}

		}

		int irq = i8259_irq();

		if (irq >= 0)

			sw_irq = irq;

	}

#endif
@@ -307,12 +247,6 @@ int toshiba_rbtx4927_irq_nested(int sw_irq) 
#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL }

static struct irqaction toshiba_rbtx4927_irq_ioc_action =

TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);

#ifdef CONFIG_TOSHIBA_FPCIB0

static struct irqaction toshiba_rbtx4927_irq_isa_master =

TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/M");

static struct irqaction toshiba_rbtx4927_irq_isa_slave =

TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/S");

#endif





/**********************************************************************************/
@@ -378,92 +312,6 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq) 
}





/**********************************************************************************/

/* Functions for isa                                                              */

/**********************************************************************************/





#ifdef CONFIG_TOSHIBA_FPCIB0

static void __init toshiba_rbtx4927_irq_isa_init(void)

{

	int i;



	TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_INIT,

				     "beg=%d end=%d\n",

				     TOSHIBA_RBTX4927_IRQ_ISA_BEG,

				     TOSHIBA_RBTX4927_IRQ_ISA_END);



	for (i = TOSHIBA_RBTX4927_IRQ_ISA_BEG;

	     i <= TOSHIBA_RBTX4927_IRQ_ISA_END; i++)

		set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_isa_type,

					 handle_level_irq);



	setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,

		  &toshiba_rbtx4927_irq_isa_master);

	setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA,

		  &toshiba_rbtx4927_irq_isa_slave);



	/* make sure we are looking at IRR (not ISR) */

	outb(0x0A, 0x20);

	outb(0x0A, 0xA0);

}

#endif





#ifdef CONFIG_TOSHIBA_FPCIB0

static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq)

{

	TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_ENABLE,

				     "irq=%d\n", irq);



	if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG

	    || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {

		TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,

					     "bad irq=%d\n", irq);

		panic("\n");

	}



	enable_8259A_irq(irq);

}

#endif





#ifdef CONFIG_TOSHIBA_FPCIB0

static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq)

{

	TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_DISABLE,

				     "irq=%d\n", irq);



	if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG

	    || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {

		TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,

					     "bad irq=%d\n", irq);

		panic("\n");

	}



	disable_8259A_irq(irq);

}

#endif





#ifdef CONFIG_TOSHIBA_FPCIB0

static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq)

{

	TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_MASK,

				     "irq=%d\n", irq);



	if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG

	    || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {

		TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,

					     "bad irq=%d\n", irq);

		panic("\n");

	}



	mask_and_ack_8259A(irq);

}

#endif





void __init arch_init_irq(void)

{

	extern void tx4927_irq_init(void);
@@ -471,12 +319,11 @@ void __init arch_init_irq(void) 
	tx4927_irq_init();

	toshiba_rbtx4927_irq_ioc_init();

#ifdef CONFIG_TOSHIBA_FPCIB0

	{

		if (tx4927_using_backplane) {

			toshiba_rbtx4927_irq_isa_init();

		}

	}

	if (tx4927_using_backplane)

		init_i8259_irqs();

#endif

	/* Onboard 10M Ether: High Active */

	set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);



	wbflush();

}