Commit 97dcb82d authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle

[MIPS] Define MIPS_CPU_IRQ_BASE in generic header

The irq_base for {mips,rm7k,rm9k}_cpu_irq_init() are constant on all
platforms and are same value on most platforms (0 or 16, depends on
CONFIG_I8259).  Define them in asm-mips/mach-generic/irq.h and make
them customizable.  This will save a few cycle on each CPU interrupt.

A good side effect is removing some dependencies to MALTA in generic
SMTC code.

Although MIPS_CPU_IRQ_BASE is customizable, this patch changes irq
mappings on DDB5477, EMMA2RH and MIPS_SIM, since really customizing
them might cause some header dependency problem and there seems no
good reason to customize it.  So currently only VR41XX is using custom
MIPS_CPU_IRQ_BASE value, which is 0 regardless of CONFIG_I8259.

Testing this patch on those platforms is greatly appreciated.  Thank
you.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b6ec8f06
...@@ -47,9 +47,9 @@ extern asmlinkage void excite_handle_int(void); ...@@ -47,9 +47,9 @@ extern asmlinkage void excite_handle_int(void);
*/ */
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
mips_cpu_irq_init(0); mips_cpu_irq_init();
rm7k_cpu_irq_init(8); rm7k_cpu_irq_init();
rm9k_cpu_irq_init(12); rm9k_cpu_irq_init();
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
excite_kgdb_init(); excite_kgdb_init();
......
...@@ -104,7 +104,7 @@ void __init arch_init_irq(void) ...@@ -104,7 +104,7 @@ void __init arch_init_irq(void)
GT_WRITE(GT_INTRMASK_OFS, 0); GT_WRITE(GT_INTRMASK_OFS, 0);
init_i8259_irqs(); /* 0 ... 15 */ init_i8259_irqs(); /* 0 ... 15 */
mips_cpu_irq_init(COBALT_CPU_IRQ); /* 16 ... 23 */ mips_cpu_irq_init(); /* 16 ... 23 */
/* /*
* Mask all cpu interrupts * Mask all cpu interrupts
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/irq_cpu.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/debug.h> #include <asm/debug.h>
...@@ -73,7 +74,6 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger) ...@@ -73,7 +74,6 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger)
} }
extern void vrc5477_irq_init(u32 base); extern void vrc5477_irq_init(u32 base);
extern void mips_cpu_irq_init(u32 base);
static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL }; static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };
void __init arch_init_irq(void) void __init arch_init_irq(void)
...@@ -125,7 +125,7 @@ void __init arch_init_irq(void) ...@@ -125,7 +125,7 @@ void __init arch_init_irq(void)
/* init all controllers */ /* init all controllers */
init_i8259_irqs(); init_i8259_irqs();
mips_cpu_irq_init(CPU_IRQ_BASE); mips_cpu_irq_init();
vrc5477_irq_init(VRC5477_IRQ_BASE); vrc5477_irq_init(VRC5477_IRQ_BASE);
......
...@@ -234,7 +234,7 @@ static void __init dec_init_kn01(void) ...@@ -234,7 +234,7 @@ static void __init dec_init_kn01(void)
memcpy(&cpu_mask_nr_tbl, &kn01_cpu_mask_nr_tbl, memcpy(&cpu_mask_nr_tbl, &kn01_cpu_mask_nr_tbl,
sizeof(kn01_cpu_mask_nr_tbl)); sizeof(kn01_cpu_mask_nr_tbl));
mips_cpu_irq_init(DEC_CPU_IRQ_BASE); mips_cpu_irq_init();
} /* dec_init_kn01 */ } /* dec_init_kn01 */
...@@ -309,7 +309,7 @@ static void __init dec_init_kn230(void) ...@@ -309,7 +309,7 @@ static void __init dec_init_kn230(void)
memcpy(&cpu_mask_nr_tbl, &kn230_cpu_mask_nr_tbl, memcpy(&cpu_mask_nr_tbl, &kn230_cpu_mask_nr_tbl,
sizeof(kn230_cpu_mask_nr_tbl)); sizeof(kn230_cpu_mask_nr_tbl));
mips_cpu_irq_init(DEC_CPU_IRQ_BASE); mips_cpu_irq_init();
} /* dec_init_kn230 */ } /* dec_init_kn230 */
...@@ -403,7 +403,7 @@ static void __init dec_init_kn02(void) ...@@ -403,7 +403,7 @@ static void __init dec_init_kn02(void)
memcpy(&asic_mask_nr_tbl, &kn02_asic_mask_nr_tbl, memcpy(&asic_mask_nr_tbl, &kn02_asic_mask_nr_tbl,
sizeof(kn02_asic_mask_nr_tbl)); sizeof(kn02_asic_mask_nr_tbl));
mips_cpu_irq_init(DEC_CPU_IRQ_BASE); mips_cpu_irq_init();
init_kn02_irqs(KN02_IRQ_BASE); init_kn02_irqs(KN02_IRQ_BASE);
} /* dec_init_kn02 */ } /* dec_init_kn02 */
...@@ -504,7 +504,7 @@ static void __init dec_init_kn02ba(void) ...@@ -504,7 +504,7 @@ static void __init dec_init_kn02ba(void)
memcpy(&asic_mask_nr_tbl, &kn02ba_asic_mask_nr_tbl, memcpy(&asic_mask_nr_tbl, &kn02ba_asic_mask_nr_tbl,
sizeof(kn02ba_asic_mask_nr_tbl)); sizeof(kn02ba_asic_mask_nr_tbl));
mips_cpu_irq_init(DEC_CPU_IRQ_BASE); mips_cpu_irq_init();
init_ioasic_irqs(IO_IRQ_BASE); init_ioasic_irqs(IO_IRQ_BASE);
} /* dec_init_kn02ba */ } /* dec_init_kn02ba */
...@@ -601,7 +601,7 @@ static void __init dec_init_kn02ca(void) ...@@ -601,7 +601,7 @@ static void __init dec_init_kn02ca(void)
memcpy(&asic_mask_nr_tbl, &kn02ca_asic_mask_nr_tbl, memcpy(&asic_mask_nr_tbl, &kn02ca_asic_mask_nr_tbl,
sizeof(kn02ca_asic_mask_nr_tbl)); sizeof(kn02ca_asic_mask_nr_tbl));
mips_cpu_irq_init(DEC_CPU_IRQ_BASE); mips_cpu_irq_init();
init_ioasic_irqs(IO_IRQ_BASE); init_ioasic_irqs(IO_IRQ_BASE);
} /* dec_init_kn02ca */ } /* dec_init_kn02ca */
...@@ -702,7 +702,7 @@ static void __init dec_init_kn03(void) ...@@ -702,7 +702,7 @@ static void __init dec_init_kn03(void)
memcpy(&asic_mask_nr_tbl, &kn03_asic_mask_nr_tbl, memcpy(&asic_mask_nr_tbl, &kn03_asic_mask_nr_tbl,
sizeof(kn03_asic_mask_nr_tbl)); sizeof(kn03_asic_mask_nr_tbl));
mips_cpu_irq_init(DEC_CPU_IRQ_BASE); mips_cpu_irq_init();
init_ioasic_irqs(IO_IRQ_BASE); init_ioasic_irqs(IO_IRQ_BASE);
} /* dec_init_kn03 */ } /* dec_init_kn03 */
......
...@@ -106,7 +106,7 @@ void __init arch_init_irq(void) ...@@ -106,7 +106,7 @@ void __init arch_init_irq(void)
emma2rh_irq_init(EMMA2RH_IRQ_BASE); emma2rh_irq_init(EMMA2RH_IRQ_BASE);
emma2rh_sw_irq_init(EMMA2RH_SW_IRQ_BASE); emma2rh_sw_irq_init(EMMA2RH_SW_IRQ_BASE);
emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE); emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE);
mips_cpu_irq_init(CPU_IRQ_BASE); mips_cpu_irq_init();
/* setup cascade interrupts */ /* setup cascade interrupts */
setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_SW_CASCADE, &irq_cascade); setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_SW_CASCADE, &irq_cascade);
......
...@@ -90,6 +90,6 @@ void __init arch_init_irq(void) ...@@ -90,6 +90,6 @@ void __init arch_init_irq(void)
clear_c0_status(ST0_IM); clear_c0_status(ST0_IM);
local_irq_disable(); local_irq_disable();
mips_cpu_irq_init(0); mips_cpu_irq_init();
rm7k_cpu_irq_init(8); rm7k_cpu_irq_init();
} }
...@@ -63,7 +63,7 @@ void gt64120_init_pic(void) ...@@ -63,7 +63,7 @@ void gt64120_init_pic(void)
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
/* IRQ 0 - 7 are for MIPS common irq_cpu controller */ /* IRQ 0 - 7 are for MIPS common irq_cpu controller */
mips_cpu_irq_init(0); mips_cpu_irq_init();
gt64120_init_pic(); gt64120_init_pic();
} }
...@@ -17,16 +17,14 @@ ...@@ -17,16 +17,14 @@
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/system.h> #include <asm/system.h>
static int irq_base;
static inline void unmask_rm7k_irq(unsigned int irq) static inline void unmask_rm7k_irq(unsigned int irq)
{ {
set_c0_intcontrol(0x100 << (irq - irq_base)); set_c0_intcontrol(0x100 << (irq - RM7K_CPU_IRQ_BASE));
} }
static inline void mask_rm7k_irq(unsigned int irq) static inline void mask_rm7k_irq(unsigned int irq)
{ {
clear_c0_intcontrol(0x100 << (irq - irq_base)); clear_c0_intcontrol(0x100 << (irq - RM7K_CPU_IRQ_BASE));
} }
static struct irq_chip rm7k_irq_controller = { static struct irq_chip rm7k_irq_controller = {
...@@ -37,8 +35,9 @@ static struct irq_chip rm7k_irq_controller = { ...@@ -37,8 +35,9 @@ static struct irq_chip rm7k_irq_controller = {
.unmask = unmask_rm7k_irq, .unmask = unmask_rm7k_irq,
}; };
void __init rm7k_cpu_irq_init(int base) void __init rm7k_cpu_irq_init(void)
{ {
int base = RM7K_CPU_IRQ_BASE;
int i; int i;
clear_c0_intcontrol(0x00000f00); /* Mask all */ clear_c0_intcontrol(0x00000f00); /* Mask all */
...@@ -46,6 +45,4 @@ void __init rm7k_cpu_irq_init(int base) ...@@ -46,6 +45,4 @@ void __init rm7k_cpu_irq_init(int base)
for (i = base; i < base + 4; i++) for (i = base; i < base + 4; i++)
set_irq_chip_and_handler(i, &rm7k_irq_controller, set_irq_chip_and_handler(i, &rm7k_irq_controller,
handle_level_irq); handle_level_irq);
irq_base = base;
} }
...@@ -18,16 +18,14 @@ ...@@ -18,16 +18,14 @@
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/system.h> #include <asm/system.h>
static int irq_base;
static inline void unmask_rm9k_irq(unsigned int irq) static inline void unmask_rm9k_irq(unsigned int irq)
{ {
set_c0_intcontrol(0x1000 << (irq - irq_base)); set_c0_intcontrol(0x1000 << (irq - RM9K_CPU_IRQ_BASE));
} }
static inline void mask_rm9k_irq(unsigned int irq) static inline void mask_rm9k_irq(unsigned int irq)
{ {
clear_c0_intcontrol(0x1000 << (irq - irq_base)); clear_c0_intcontrol(0x1000 << (irq - RM9K_CPU_IRQ_BASE));
} }
static inline void rm9k_cpu_irq_enable(unsigned int irq) static inline void rm9k_cpu_irq_enable(unsigned int irq)
...@@ -93,8 +91,9 @@ unsigned int rm9000_perfcount_irq; ...@@ -93,8 +91,9 @@ unsigned int rm9000_perfcount_irq;
EXPORT_SYMBOL(rm9000_perfcount_irq); EXPORT_SYMBOL(rm9000_perfcount_irq);
void __init rm9k_cpu_irq_init(int base) void __init rm9k_cpu_irq_init(void)
{ {
int base = RM9K_CPU_IRQ_BASE;
int i; int i;
clear_c0_intcontrol(0x0000f000); /* Mask all */ clear_c0_intcontrol(0x0000f000); /* Mask all */
...@@ -106,6 +105,4 @@ void __init rm9k_cpu_irq_init(int base) ...@@ -106,6 +105,4 @@ void __init rm9k_cpu_irq_init(int base)
rm9000_perfcount_irq = base + 1; rm9000_perfcount_irq = base + 1;
set_irq_chip_and_handler(rm9000_perfcount_irq, &rm9k_perfcounter_irq, set_irq_chip_and_handler(rm9000_perfcount_irq, &rm9k_perfcounter_irq,
handle_level_irq); handle_level_irq);
irq_base = base;
} }
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* Don't even think about using this on SMP. You have been warned. * Don't even think about using this on SMP. You have been warned.
* *
* This file exports one global function: * This file exports one global function:
* void mips_cpu_irq_init(int irq_base); * void mips_cpu_irq_init(void);
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -36,17 +36,15 @@ ...@@ -36,17 +36,15 @@
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/system.h> #include <asm/system.h>
static int mips_cpu_irq_base;
static inline void unmask_mips_irq(unsigned int irq) static inline void unmask_mips_irq(unsigned int irq)
{ {
set_c0_status(0x100 << (irq - mips_cpu_irq_base)); set_c0_status(0x100 << (irq - MIPS_CPU_IRQ_BASE));
irq_enable_hazard(); irq_enable_hazard();
} }
static inline void mask_mips_irq(unsigned int irq) static inline void mask_mips_irq(unsigned int irq)
{ {
clear_c0_status(0x100 << (irq - mips_cpu_irq_base)); clear_c0_status(0x100 << (irq - MIPS_CPU_IRQ_BASE));
irq_disable_hazard(); irq_disable_hazard();
} }
...@@ -70,7 +68,7 @@ static unsigned int mips_mt_cpu_irq_startup(unsigned int irq) ...@@ -70,7 +68,7 @@ static unsigned int mips_mt_cpu_irq_startup(unsigned int irq)
{ {
unsigned int vpflags = dvpe(); unsigned int vpflags = dvpe();
clear_c0_cause(0x100 << (irq - mips_cpu_irq_base)); clear_c0_cause(0x100 << (irq - MIPS_CPU_IRQ_BASE));
evpe(vpflags); evpe(vpflags);
unmask_mips_mt_irq(irq); unmask_mips_mt_irq(irq);
...@@ -84,7 +82,7 @@ static unsigned int mips_mt_cpu_irq_startup(unsigned int irq) ...@@ -84,7 +82,7 @@ static unsigned int mips_mt_cpu_irq_startup(unsigned int irq)
static void mips_mt_cpu_irq_ack(unsigned int irq) static void mips_mt_cpu_irq_ack(unsigned int irq)
{ {
unsigned int vpflags = dvpe(); unsigned int vpflags = dvpe();
clear_c0_cause(0x100 << (irq - mips_cpu_irq_base)); clear_c0_cause(0x100 << (irq - MIPS_CPU_IRQ_BASE));
evpe(vpflags); evpe(vpflags);
mask_mips_mt_irq(irq); mask_mips_mt_irq(irq);
} }
...@@ -99,8 +97,9 @@ static struct irq_chip mips_mt_cpu_irq_controller = { ...@@ -99,8 +97,9 @@ static struct irq_chip mips_mt_cpu_irq_controller = {
.eoi = unmask_mips_mt_irq, .eoi = unmask_mips_mt_irq,
}; };
void __init mips_cpu_irq_init(int irq_base) void __init mips_cpu_irq_init(void)
{ {
int irq_base = MIPS_CPU_IRQ_BASE;
int i; int i;
/* Mask interrupts. */ /* Mask interrupts. */
...@@ -118,6 +117,4 @@ void __init mips_cpu_irq_init(int irq_base) ...@@ -118,6 +117,4 @@ void __init mips_cpu_irq_init(int irq_base)
for (i = irq_base + 2; i < irq_base + 8; i++) for (i = irq_base + 2; i < irq_base + 8; i++)
set_irq_chip_and_handler(i, &mips_cpu_irq_controller, set_irq_chip_and_handler(i, &mips_cpu_irq_controller,
handle_level_irq); handle_level_irq);
mips_cpu_irq_base = irq_base;
} }
...@@ -63,7 +63,7 @@ extern void *vpe_get_shared(int index); ...@@ -63,7 +63,7 @@ extern void *vpe_get_shared(int index);
static void rtlx_dispatch(void) static void rtlx_dispatch(void)
{ {
do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ); do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_RTLX_IRQ);
} }
...@@ -491,7 +491,7 @@ static struct irqaction rtlx_irq = { ...@@ -491,7 +491,7 @@ static struct irqaction rtlx_irq = {
.name = "RTLX", .name = "RTLX",
}; };
static int rtlx_irq_num = MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ; static int rtlx_irq_num = MIPS_CPU_IRQ_BASE + MIPS_CPU_RTLX_IRQ;
static char register_chrdev_failed[] __initdata = static char register_chrdev_failed[] __initdata =
KERN_ERR "rtlx_module_init: unable to register device\n"; KERN_ERR "rtlx_module_init: unable to register device\n";
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/mips_mt.h> #include <asm/mips_mt.h>
#include <asm/mips-boards/maltaint.h> /* This is f*cking wrong */
#define MIPS_CPU_IPI_RESCHED_IRQ 0 #define MIPS_CPU_IPI_RESCHED_IRQ 0
#define MIPS_CPU_IPI_CALL_IRQ 1 #define MIPS_CPU_IPI_CALL_IRQ 1
...@@ -108,12 +107,12 @@ void __init sanitize_tlb_entries(void) ...@@ -108,12 +107,12 @@ void __init sanitize_tlb_entries(void)
static void ipi_resched_dispatch(void) static void ipi_resched_dispatch(void)
{ {
do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_IPI_RESCHED_IRQ); do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_RESCHED_IRQ);
} }
static void ipi_call_dispatch(void) static void ipi_call_dispatch(void)
{ {
do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_IPI_CALL_IRQ); do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_CALL_IRQ);
} }
static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id) static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id)
...@@ -270,8 +269,8 @@ void __init plat_prepare_cpus(unsigned int max_cpus) ...@@ -270,8 +269,8 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
set_vi_handler(MIPS_CPU_IPI_CALL_IRQ, ipi_call_dispatch); set_vi_handler(MIPS_CPU_IPI_CALL_IRQ, ipi_call_dispatch);
} }
cpu_ipi_resched_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_RESCHED_IRQ; cpu_ipi_resched_irq = MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_RESCHED_IRQ;
cpu_ipi_call_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_CALL_IRQ; cpu_ipi_call_irq = MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_CALL_IRQ;
setup_irq(cpu_ipi_resched_irq, &irq_resched); setup_irq(cpu_ipi_resched_irq, &irq_resched);
setup_irq(cpu_ipi_call_irq, &irq_call); setup_irq(cpu_ipi_call_irq, &irq_call);
......
...@@ -26,16 +26,6 @@ ...@@ -26,16 +26,6 @@
* This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set. * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set.
*/ */
/*
* MIPSCPU_INT_BASE is identically defined in both
* asm-mips/mips-boards/maltaint.h and asm-mips/mips-boards/simint.h,
* but as yet there's no properly organized include structure that
* will ensure that the right *int.h file will be included for a
* given platform build.
*/
#define MIPSCPU_INT_BASE 16
#define MIPS_CPU_IPI_IRQ 1 #define MIPS_CPU_IPI_IRQ 1
#define LOCK_MT_PRA() \ #define LOCK_MT_PRA() \
...@@ -921,7 +911,7 @@ void smtc_timer_broadcast(int vpe) ...@@ -921,7 +911,7 @@ void smtc_timer_broadcast(int vpe)
* interrupts. * interrupts.
*/ */
static int cpu_ipi_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_IRQ; static int cpu_ipi_irq = MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_IRQ;
static irqreturn_t ipi_interrupt(int irq, void *dev_idm) static irqreturn_t ipi_interrupt(int irq, void *dev_idm)
{ {
......
...@@ -238,7 +238,7 @@ void __init arch_init_irq(void) ...@@ -238,7 +238,7 @@ void __init arch_init_irq(void)
init_atlas_irqs(ATLAS_INT_BASE); init_atlas_irqs(ATLAS_INT_BASE);
if (!cpu_has_veic) if (!cpu_has_veic)
mips_cpu_irq_init(MIPSCPU_INT_BASE); mips_cpu_irq_init();
switch(mips_revision_corid) { switch(mips_revision_corid) {
case MIPS_REVISION_CORID_CORE_MSC: case MIPS_REVISION_CORID_CORE_MSC:
......
...@@ -310,7 +310,7 @@ void __init arch_init_irq(void) ...@@ -310,7 +310,7 @@ void __init arch_init_irq(void)
init_i8259_irqs(); init_i8259_irqs();
if (!cpu_has_veic) if (!cpu_has_veic)
mips_cpu_irq_init (MIPSCPU_INT_BASE); mips_cpu_irq_init();
switch(mips_revision_corid) { switch(mips_revision_corid) {
case MIPS_REVISION_CORID_CORE_MSC: case MIPS_REVISION_CORID_CORE_MSC:
......
...@@ -113,5 +113,5 @@ asmlinkage void plat_irq_dispatch(void) ...@@ -113,5 +113,5 @@ asmlinkage void plat_irq_dispatch(void)
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
mips_cpu_irq_init(MIPSCPU_INT_BASE); mips_cpu_irq_init();
} }
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <asm/mips-boards/simint.h> #include <asm/mips-boards/simint.h>
#include <asm/irq_cpu.h>
extern void mips_cpu_irq_init(int);
static inline int clz(unsigned long x) static inline int clz(unsigned long x)
{ {
...@@ -86,5 +84,5 @@ asmlinkage void plat_irq_dispatch(void) ...@@ -86,5 +84,5 @@ asmlinkage void plat_irq_dispatch(void)
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
mips_cpu_irq_init(MIPSCPU_INT_BASE); mips_cpu_irq_init();
} }
...@@ -82,8 +82,8 @@ void __init arch_init_irq(void) ...@@ -82,8 +82,8 @@ void __init arch_init_irq(void)
*/ */
clear_c0_status(ST0_IM); clear_c0_status(ST0_IM);
mips_cpu_irq_init(0); mips_cpu_irq_init();
rm7k_cpu_irq_init(8); rm7k_cpu_irq_init();
/* set up the cascading interrupts */ /* set up the cascading interrupts */
setup_irq(8, &cascade_mv64340); setup_irq(8, &cascade_mv64340);
......
...@@ -65,7 +65,7 @@ void __init arch_init_irq(void) ...@@ -65,7 +65,7 @@ void __init arch_init_irq(void)
*/ */
clear_c0_status(ST0_IM | ST0_BEV); clear_c0_status(ST0_IM | ST0_BEV);
rm7k_cpu_irq_init(8); rm7k_cpu_irq_init();
/* set up the cascading interrupts */ /* set up the cascading interrupts */
setup_irq(8, &cascade_mv64340); /* unmask intControl IM8, IRQ 9 */ setup_irq(8, &cascade_mv64340); /* unmask intControl IM8, IRQ 9 */
......
...@@ -94,7 +94,7 @@ void __init arch_init_irq(void) ...@@ -94,7 +94,7 @@ void __init arch_init_irq(void)
*/ */
clear_c0_status(ST0_IM); clear_c0_status(ST0_IM);
mips_cpu_irq_init(0); mips_cpu_irq_init();
/* set up the cascading interrupts */ /* set up the cascading interrupts */
setup_irq(3, &cascade_fpga); setup_irq(3, &cascade_fpga);
......
...@@ -94,8 +94,8 @@ void __init arch_init_irq(void) ...@@ -94,8 +94,8 @@ void __init arch_init_irq(void)
clear_c0_status(ST0_IM); clear_c0_status(ST0_IM);
local_irq_disable(); local_irq_disable();
mips_cpu_irq_init(0); mips_cpu_irq_init();
rm7k_cpu_irq_init(8); rm7k_cpu_irq_init();
gt64240_irq_init(); gt64240_irq_init();
} }
...@@ -148,9 +148,9 @@ void __init arch_init_irq(void) ...@@ -148,9 +148,9 @@ void __init arch_init_irq(void)
{ {
clear_c0_status(ST0_IM); clear_c0_status(ST0_IM);
mips_cpu_irq_init(0); mips_cpu_irq_init();
rm7k_cpu_irq_init(8); rm7k_cpu_irq_init();
rm9k_cpu_irq_init(12); rm9k_cpu_irq_init();
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
/* At this point, initialize the second serial port */ /* At this point, initialize the second serial port */
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/irq_cpu.h>
#include <asm/sgi/ioc.h> #include <asm/sgi/ioc.h>
#include <asm/sgi/hpc3.h> #include <asm/sgi/hpc3.h>
...@@ -253,8 +254,6 @@ asmlinkage void plat_irq_dispatch(void) ...@@ -253,8 +254,6 @@ asmlinkage void plat_irq_dispatch(void)
indy_8254timer_irq(); indy_8254timer_irq();
} }
extern void mips_cpu_irq_init(unsigned int irq_base);
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
int i; int i;
...@@ -316,7 +315,7 @@ void __init arch_init_irq(void) ...@@ -316,7 +315,7 @@ void __init arch_init_irq(void)
sgint->cmeimask1 = 0; sgint->cmeimask1 = 0;
/* init CPU irqs */ /* init CPU irqs */
mips_cpu_irq_init(SGINT_CPU); mips_cpu_irq_init();
for (i = SGINT_LOCAL0; i < SGI_INTERRUPTS; i++) { for (i = SGINT_LOCAL0; i < SGI_INTERRUPTS; i++) {
struct irq_chip *handler; struct irq_chip *handler;
......
...@@ -117,5 +117,5 @@ asmlinkage void plat_irq_dispatch(void) ...@@ -117,5 +117,5 @@ asmlinkage void plat_irq_dispatch(void)
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
mips_cpu_irq_init(MIPS_CPU_IRQ_BASE); mips_cpu_irq_init();
} }
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#ifndef __ASM_DDB5XXX_DDB5477_H #ifndef __ASM_DDB5XXX_DDB5477_H
#define __ASM_DDB5XXX_DDB5477_H #define __ASM_DDB5XXX_DDB5477_H
#include <irq.h>
/* /*
* This contains macros that are specific to DDB5477 or renamed from * This contains macros that are specific to DDB5477 or renamed from
...@@ -257,8 +258,8 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq); ...@@ -257,8 +258,8 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq);
#define DDB_IRQ_BASE 0 #define DDB_IRQ_BASE 0
#define I8259_IRQ_BASE DDB_IRQ_BASE #define I8259_IRQ_BASE DDB_IRQ_BASE
#define VRC5477_IRQ_BASE (I8259_IRQ_BASE + NUM_I8259_IRQ) #define CPU_IRQ_BASE MIPS_CPU_IRQ_BASE
#define CPU_IRQ_BASE (VRC5477_IRQ_BASE + NUM_VRC5477_IRQ) #define VRC5477_IRQ_BASE (CPU_IRQ_BASE + NUM_CPU_IRQ)
/* /*
* vrc5477 irq defs * vrc5477 irq defs
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#ifndef __ASM_DEC_INTERRUPTS_H #ifndef __ASM_DEC_INTERRUPTS_H
#define __ASM_DEC_INTERRUPTS_H #define __ASM_DEC_INTERRUPTS_H
#include <irq.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
#define DEC_CPU_INR_SW1 1 /* software #1 */ #define DEC_CPU_INR_SW1 1 /* software #1 */
#define DEC_CPU_INR_SW0 0 /* software #0 */ #define DEC_CPU_INR_SW0 0 /* software #0 */
#define DEC_CPU_IRQ_BASE 0 /* first IRQ assigned to CPU */ #define DEC_CPU_IRQ_BASE MIPS_CPU_IRQ_BASE /* first IRQ assigned to CPU */
#define DEC_CPU_IRQ_NR(n) ((n) + DEC_CPU_IRQ_BASE) #define DEC_CPU_IRQ_NR(n) ((n) + DEC_CPU_IRQ_BASE)
#define DEC_CPU_IRQ_MASK(n) (1 << ((n) + CAUSEB_IP)) #define DEC_CPU_IRQ_MASK(n) (1 << ((n) + CAUSEB_IP))
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef __ASM_EMMA2RH_EMMA2RH_H #ifndef __ASM_EMMA2RH_EMMA2RH_H
#define __ASM_EMMA2RH_EMMA2RH_H #define __ASM_EMMA2RH_EMMA2RH_H
#include <irq.h>
/* /*
* EMMA2RH registers * EMMA2RH registers
*/ */
...@@ -104,7 +106,8 @@ ...@@ -104,7 +106,8 @@
#define NUM_EMMA2RH_IRQ 96 #define NUM_EMMA2RH_IRQ 96
#define CPU_EMMA2RH_CASCADE 2 #define CPU_EMMA2RH_CASCADE 2
#define EMMA2RH_IRQ_BASE 0 #define CPU_IRQ_BASE MIPS_CPU_IRQ_BASE
#define EMMA2RH_IRQ_BASE (CPU_IRQ_BASE + NUM_CPU_IRQ)
/* /*
* emma2rh irq defs * emma2rh irq defs
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#define EMMA2RH_SW_IRQ_BASE (EMMA2RH_IRQ_BASE + NUM_EMMA2RH_IRQ) #define EMMA2RH_SW_IRQ_BASE (EMMA2RH_IRQ_BASE + NUM_EMMA2RH_IRQ)
#define EMMA2RH_GPIO_IRQ_BASE (EMMA2RH_SW_IRQ_BASE + NUM_EMMA2RH_IRQ_SW) #define EMMA2RH_GPIO_IRQ_BASE (EMMA2RH_SW_IRQ_BASE + NUM_EMMA2RH_IRQ_SW)
#define CPU_IRQ_BASE (EMMA2RH_GPIO_IRQ_BASE + NUM_EMMA2RH_IRQ_GPIO)
#define EMMA2RH_SW_IRQ_INT0 (0+EMMA2RH_SW_IRQ_BASE) #define EMMA2RH_SW_IRQ_INT0 (0+EMMA2RH_SW_IRQ_BASE)
#define EMMA2RH_SW_IRQ_INT1 (1+EMMA2RH_SW_IRQ_BASE) #define EMMA2RH_SW_IRQ_INT1 (1+EMMA2RH_SW_IRQ_BASE)
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#ifndef _ASM_IRQ_CPU_H #ifndef _ASM_IRQ_CPU_H
#define _ASM_IRQ_CPU_H #define _ASM_IRQ_CPU_H
extern void mips_cpu_irq_init(int irq_base); extern void mips_cpu_irq_init(void);
extern void rm7k_cpu_irq_init(int irq_base); extern void rm7k_cpu_irq_init(void);
extern void rm9k_cpu_irq_init(int irq_base); extern void rm9k_cpu_irq_init(void);
#endif /* _ASM_IRQ_CPU_H */ #endif /* _ASM_IRQ_CPU_H */
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#ifndef __ASM_COBALT_H #ifndef __ASM_COBALT_H
#define __ASM_COBALT_H #define __ASM_COBALT_H
#include <irq.h>
/* /*
* i8259 legacy interrupts used on Cobalt: * i8259 legacy interrupts used on Cobalt:
* *
...@@ -25,7 +27,7 @@ ...@@ -25,7 +27,7 @@
/* /*
* CPU IRQs are 16 ... 23 * CPU IRQs are 16 ... 23
*/ */
#define COBALT_CPU_IRQ 16 #define COBALT_CPU_IRQ MIPS_CPU_IRQ_BASE
#define COBALT_GALILEO_IRQ (COBALT_CPU_IRQ + 2) #define COBALT_GALILEO_IRQ (COBALT_CPU_IRQ + 2)
#define COBALT_SCC_IRQ (COBALT_CPU_IRQ + 3) /* pre-production has 85C30 */ #define COBALT_SCC_IRQ (COBALT_CPU_IRQ + 3) /* pre-production has 85C30 */
......
...@@ -10,4 +10,6 @@ ...@@ -10,4 +10,6 @@
#define NR_IRQS 256 #define NR_IRQS 256
#include_next <irq.h>
#endif /* __ASM_MACH_EMMA2RH_IRQ_H */ #endif /* __ASM_MACH_EMMA2RH_IRQ_H */
...@@ -8,6 +8,32 @@ ...@@ -8,6 +8,32 @@
#ifndef __ASM_MACH_GENERIC_IRQ_H #ifndef __ASM_MACH_GENERIC_IRQ_H
#define __ASM_MACH_GENERIC_IRQ_H #define __ASM_MACH_GENERIC_IRQ_H
#ifndef NR_IRQS
#define NR_IRQS 128 #define NR_IRQS 128
#endif
#ifdef CONFIG_IRQ_CPU
#ifndef MIPS_CPU_IRQ_BASE
#ifdef CONFIG_I8259
#define MIPS_CPU_IRQ_BASE 16
#else
#define MIPS_CPU_IRQ_BASE 0
#endif /* CONFIG_I8259 */
#endif
#ifdef CONFIG_IRQ_CPU_RM7K
#ifndef RM7K_CPU_IRQ_BASE
#define RM7K_CPU_IRQ_BASE (MIPS_CPU_IRQ_BASE+8)
#endif
#endif
#ifdef CONFIG_IRQ_CPU_RM9K
#ifndef RM9K_CPU_IRQ_BASE
#define RM9K_CPU_IRQ_BASE (MIPS_CPU_IRQ_BASE+12)
#endif
#endif
#endif /* CONFIG_IRQ_CPU */
#endif /* __ASM_MACH_GENERIC_IRQ_H */ #endif /* __ASM_MACH_GENERIC_IRQ_H */
...@@ -4,4 +4,6 @@ ...@@ -4,4 +4,6 @@
#define NR_IRQS 256 #define NR_IRQS 256
#include_next <irq.h>
#endif /* __ASM_MACH_MIPS_IRQ_H */ #endif /* __ASM_MACH_MIPS_IRQ_H */
#ifndef __ASM_MACH_VR41XX_IRQ_H
#define __ASM_MACH_VR41XX_IRQ_H
#include <asm/vr41xx/irq.h> /* for MIPS_CPU_IRQ_BASE */
#include_next <irq.h>
#endif /* __ASM_MACH_VR41XX_IRQ_H */
...@@ -26,10 +26,12 @@ ...@@ -26,10 +26,12 @@
#ifndef _MIPS_ATLASINT_H #ifndef _MIPS_ATLASINT_H
#define _MIPS_ATLASINT_H #define _MIPS_ATLASINT_H
#include <irq.h>
/* /*
* Interrupts 0..7 are used for Atlas CPU interrupts (nonEIC mode) * Interrupts 0..7 are used for Atlas CPU interrupts (nonEIC mode)
*/ */
#define MIPSCPU_INT_BASE 0 #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE
/* CPU interrupt offsets */ /* CPU interrupt offsets */
#define MIPSCPU_INT_SW0 0 #define MIPSCPU_INT_SW0 0
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef _MIPS_MALTAINT_H #ifndef _MIPS_MALTAINT_H
#define _MIPS_MALTAINT_H #define _MIPS_MALTAINT_H
#include <irq.h>
/* /*
* Interrupts 0..15 are used for Malta ISA compatible interrupts * Interrupts 0..15 are used for Malta ISA compatible interrupts
*/ */
...@@ -33,7 +35,7 @@ ...@@ -33,7 +35,7 @@
/* /*
* Interrupts 16..23 are used for Malta CPU interrupts (nonEIC mode) * Interrupts 16..23 are used for Malta CPU interrupts (nonEIC mode)
*/ */
#define MIPSCPU_INT_BASE 16 #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE
/* CPU interrupt offsets */ /* CPU interrupt offsets */
#define MIPSCPU_INT_SW0 0 #define MIPSCPU_INT_SW0 0
......
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
#ifndef _MIPS_SEADINT_H #ifndef _MIPS_SEADINT_H
#define _MIPS_SEADINT_H #define _MIPS_SEADINT_H
#include <irq.h>
/* /*
* Interrupts 0..7 are used for SEAD CPU interrupts * Interrupts 0..7 are used for SEAD CPU interrupts
*/ */
#define MIPSCPU_INT_BASE 0 #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE
#define MIPSCPU_INT_UART0 2 #define MIPSCPU_INT_UART0 2
#define MIPSCPU_INT_UART1 3 #define MIPSCPU_INT_UART1 3
......
...@@ -17,10 +17,11 @@ ...@@ -17,10 +17,11 @@
#ifndef _MIPS_SIMINT_H #ifndef _MIPS_SIMINT_H
#define _MIPS_SIMINT_H #define _MIPS_SIMINT_H
#include <irq.h>
#define SIM_INT_BASE 0 #define SIM_INT_BASE 0
#define MIPSCPU_INT_MB0 2 #define MIPSCPU_INT_MB0 2
#define MIPSCPU_INT_BASE 16 #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE
#define MIPS_CPU_TIMER_IRQ 7 #define MIPS_CPU_TIMER_IRQ 7
......
...@@ -6,9 +6,10 @@ ...@@ -6,9 +6,10 @@
#ifndef __ASM_RTLX_H #ifndef __ASM_RTLX_H
#define __ASM_RTLX_H_ #define __ASM_RTLX_H_
#include <irq.h>
#define LX_NODE_BASE 10 #define LX_NODE_BASE 10
#define MIPSCPU_INT_BASE 16
#define MIPS_CPU_RTLX_IRQ 0 #define MIPS_CPU_RTLX_IRQ 0
#define RTLX_VERSION 2 #define RTLX_VERSION 2
......
...@@ -21,15 +21,16 @@ ...@@ -21,15 +21,16 @@
* HAL2 driver). This will prevent many complications, trust me ;-) * HAL2 driver). This will prevent many complications, trust me ;-)
*/ */
#include <irq.h>
#include <asm/sgi/ioc.h> #include <asm/sgi/ioc.h>
#define SGINT_EISA 0 /* 16 EISA irq levels (Indigo2) */ #define SGINT_EISA 0 /* 16 EISA irq levels (Indigo2) */
#define SGINT_CPU 16 /* MIPS CPU define 8 interrupt sources */ #define SGINT_CPU MIPS_CPU_IRQ_BASE /* MIPS CPU define 8 interrupt sources */
#define SGINT_LOCAL0 24 /* 8 local0 irq levels */ #define SGINT_LOCAL0 (SGINT_CPU+8) /* 8 local0 irq levels */
#define SGINT_LOCAL1 32 /* 8 local1 irq levels */ #define SGINT_LOCAL1 (SGINT_CPU+16) /* 8 local1 irq levels */
#define SGINT_LOCAL2 40 /* 8 local2 vectored irq levels */ #define SGINT_LOCAL2 (SGINT_CPU+24) /* 8 local2 vectored irq levels */
#define SGINT_LOCAL3 48 /* 8 local3 vectored irq levels */ #define SGINT_LOCAL3 (SGINT_CPU+32) /* 8 local3 vectored irq levels */
#define SGINT_END 56 /* End of 'spaces' */ #define SGINT_END (SGINT_CPU+40) /* End of 'spaces' */
/* /*
* Individual interrupt definitions for the Indy and Indigo2 * Individual interrupt definitions for the Indy and Indigo2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment