mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 06:43:09 +00:00
[MIPS] IP32: Fix build by conversion to irq_cpu.c.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
parent
65a6ec0d72
commit
dd67b1556e
@ -410,6 +410,7 @@ config SGI_IP32
|
||||
select BOOT_ELF32
|
||||
select DMA_NONCOHERENT
|
||||
select HW_HAS_PCI
|
||||
select IRQ_CPU
|
||||
select R5000_CPU_SCACHE
|
||||
select RM7000_CPU_SCACHE
|
||||
select SYS_HAS_CPU_R5000
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
#include <linux/random.h>
|
||||
#include <linux/sched.h>
|
||||
|
||||
#include <asm/irq_cpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/signal.h>
|
||||
#include <asm/system.h>
|
||||
@ -46,7 +47,8 @@ static void inline flush_mace_bus(void)
|
||||
#define DBG(x...)
|
||||
#endif
|
||||
|
||||
/* O2 irq map
|
||||
/*
|
||||
* O2 irq map
|
||||
*
|
||||
* IP0 -> software (ignored)
|
||||
* IP1 -> software (ignored)
|
||||
@ -55,60 +57,60 @@ static void inline flush_mace_bus(void)
|
||||
* IP4 -> (irq2) X unknown
|
||||
* IP5 -> (irq3) X unknown
|
||||
* IP6 -> (irq4) X unknown
|
||||
* IP7 -> (irq5) 0 CPU count/compare timer (system timer)
|
||||
* IP7 -> (irq5) 7 CPU count/compare timer (system timer)
|
||||
*
|
||||
* crime: (C)
|
||||
*
|
||||
* CRIME_INT_STAT 31:0:
|
||||
*
|
||||
* 0 -> 1 Video in 1
|
||||
* 1 -> 2 Video in 2
|
||||
* 2 -> 3 Video out
|
||||
* 3 -> 4 Mace ethernet
|
||||
* 0 -> 8 Video in 1
|
||||
* 1 -> 9 Video in 2
|
||||
* 2 -> 10 Video out
|
||||
* 3 -> 11 Mace ethernet
|
||||
* 4 -> S SuperIO sub-interrupt
|
||||
* 5 -> M Miscellaneous sub-interrupt
|
||||
* 6 -> A Audio sub-interrupt
|
||||
* 7 -> 8 PCI bridge errors
|
||||
* 8 -> 9 PCI SCSI aic7xxx 0
|
||||
* 9 -> 10 PCI SCSI aic7xxx 1
|
||||
* 10 -> 11 PCI slot 0
|
||||
* 11 -> 12 unused (PCI slot 1)
|
||||
* 12 -> 13 unused (PCI slot 2)
|
||||
* 13 -> 14 unused (PCI shared 0)
|
||||
* 14 -> 15 unused (PCI shared 1)
|
||||
* 15 -> 16 unused (PCI shared 2)
|
||||
* 16 -> 17 GBE0 (E)
|
||||
* 17 -> 18 GBE1 (E)
|
||||
* 18 -> 19 GBE2 (E)
|
||||
* 19 -> 20 GBE3 (E)
|
||||
* 20 -> 21 CPU errors
|
||||
* 21 -> 22 Memory errors
|
||||
* 22 -> 23 RE empty edge (E)
|
||||
* 23 -> 24 RE full edge (E)
|
||||
* 24 -> 25 RE idle edge (E)
|
||||
* 25 -> 26 RE empty level
|
||||
* 26 -> 27 RE full level
|
||||
* 27 -> 28 RE idle level
|
||||
* 28 -> 29 unused (software 0) (E)
|
||||
* 29 -> 30 unused (software 1) (E)
|
||||
* 30 -> 31 unused (software 2) - crime 1.5 CPU SysCorError (E)
|
||||
* 31 -> 32 VICE
|
||||
* 7 -> 15 PCI bridge errors
|
||||
* 8 -> 16 PCI SCSI aic7xxx 0
|
||||
* 9 -> 17 PCI SCSI aic7xxx 1
|
||||
* 10 -> 18 PCI slot 0
|
||||
* 11 -> 19 unused (PCI slot 1)
|
||||
* 12 -> 20 unused (PCI slot 2)
|
||||
* 13 -> 21 unused (PCI shared 0)
|
||||
* 14 -> 22 unused (PCI shared 1)
|
||||
* 15 -> 23 unused (PCI shared 2)
|
||||
* 16 -> 24 GBE0 (E)
|
||||
* 17 -> 25 GBE1 (E)
|
||||
* 18 -> 26 GBE2 (E)
|
||||
* 19 -> 27 GBE3 (E)
|
||||
* 20 -> 28 CPU errors
|
||||
* 21 -> 29 Memory errors
|
||||
* 22 -> 30 RE empty edge (E)
|
||||
* 23 -> 31 RE full edge (E)
|
||||
* 24 -> 32 RE idle edge (E)
|
||||
* 25 -> 33 RE empty level
|
||||
* 26 -> 34 RE full level
|
||||
* 27 -> 35 RE idle level
|
||||
* 28 -> 36 unused (software 0) (E)
|
||||
* 29 -> 37 unused (software 1) (E)
|
||||
* 30 -> 38 unused (software 2) - crime 1.5 CPU SysCorError (E)
|
||||
* 31 -> 39 VICE
|
||||
*
|
||||
* S, M, A: Use the MACE ISA interrupt register
|
||||
* MACE_ISA_INT_STAT 31:0
|
||||
*
|
||||
* 0-7 -> 33-40 Audio
|
||||
* 8 -> 41 RTC
|
||||
* 9 -> 42 Keyboard
|
||||
* 0-7 -> 40-47 Audio
|
||||
* 8 -> 48 RTC
|
||||
* 9 -> 49 Keyboard
|
||||
* 10 -> X Keyboard polled
|
||||
* 11 -> 44 Mouse
|
||||
* 11 -> 51 Mouse
|
||||
* 12 -> X Mouse polled
|
||||
* 13-15 -> 46-48 Count/compare timers
|
||||
* 16-19 -> 49-52 Parallel (16 E)
|
||||
* 20-25 -> 53-58 Serial 1 (22 E)
|
||||
* 26-31 -> 59-64 Serial 2 (28 E)
|
||||
* 13-15 -> 53-55 Count/compare timers
|
||||
* 16-19 -> 56-59 Parallel (16 E)
|
||||
* 20-25 -> 60-62 Serial 1 (22 E)
|
||||
* 26-31 -> 66-71 Serial 2 (28 E)
|
||||
*
|
||||
* Note that this means IRQs 5-7, 43, and 45 do not exist. This is a
|
||||
* Note that this means IRQs 12-14, 50, and 52 do not exist. This is a
|
||||
* different IRQ map than IRIX uses, but that's OK as Linux irq handling
|
||||
* is quite different anyway.
|
||||
*/
|
||||
@ -130,36 +132,6 @@ struct irqaction cpuerr_irq = {
|
||||
.name = "CRIME CPU error",
|
||||
};
|
||||
|
||||
/*
|
||||
* For interrupts wired from a single device to the CPU. Only the clock
|
||||
* uses this it seems, which is IRQ 0 and IP7.
|
||||
*/
|
||||
|
||||
static void enable_cpu_irq(unsigned int irq)
|
||||
{
|
||||
set_c0_status(STATUSF_IP7);
|
||||
}
|
||||
|
||||
static void disable_cpu_irq(unsigned int irq)
|
||||
{
|
||||
clear_c0_status(STATUSF_IP7);
|
||||
}
|
||||
|
||||
static void end_cpu_irq(unsigned int irq)
|
||||
{
|
||||
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
|
||||
enable_cpu_irq(irq);
|
||||
}
|
||||
|
||||
static struct irq_chip ip32_cpu_interrupt = {
|
||||
.name = "IP32 CPU",
|
||||
.ack = disable_cpu_irq,
|
||||
.mask = disable_cpu_irq,
|
||||
.mask_ack = disable_cpu_irq,
|
||||
.unmask = enable_cpu_irq,
|
||||
.end = end_cpu_irq,
|
||||
};
|
||||
|
||||
/*
|
||||
* This is for pure CRIME interrupts - ie not MACE. The advantage?
|
||||
* We get to split the register in half and do faster lookups.
|
||||
@ -422,15 +394,23 @@ static void ip32_irq0(void)
|
||||
uint64_t crime_int;
|
||||
int irq = 0;
|
||||
|
||||
/*
|
||||
* Sanity check interrupt numbering enum.
|
||||
* MACE got 32 interrupts and there are 32 MACE ISA interrupts daisy
|
||||
* chained.
|
||||
*/
|
||||
BUILD_BUG_ON(CRIME_VICE_IRQ - MACE_VID_IN1_IRQ != 31);
|
||||
BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31);
|
||||
|
||||
crime_int = crime->istat & crime_mask;
|
||||
irq = __ffs(crime_int);
|
||||
irq = MACE_VID_IN1_IRQ + __ffs(crime_int);
|
||||
crime_int = 1 << irq;
|
||||
|
||||
if (crime_int & CRIME_MACEISA_INT_MASK) {
|
||||
unsigned long mace_int = mace->perif.ctrl.istat;
|
||||
irq = __ffs(mace_int & maceisa_mask) + 32;
|
||||
irq = __ffs(mace_int & maceisa_mask) + MACEISA_AUDIO_SW_IRQ;
|
||||
}
|
||||
irq++;
|
||||
|
||||
DBG("*irq %u*\n", irq);
|
||||
do_IRQ(irq);
|
||||
}
|
||||
@ -457,7 +437,7 @@ static void ip32_irq4(void)
|
||||
|
||||
static void ip32_irq5(void)
|
||||
{
|
||||
do_IRQ(IP32_R4K_TIMER_IRQ);
|
||||
do_IRQ(MIPS_CPU_IRQ_BASE + 7);
|
||||
}
|
||||
|
||||
asmlinkage void plat_irq_dispatch(void)
|
||||
@ -490,21 +470,25 @@ void __init arch_init_irq(void)
|
||||
mace->perif.ctrl.istat = 0;
|
||||
mace->perif.ctrl.imask = 0;
|
||||
|
||||
for (irq = 0; irq <= IP32_IRQ_MAX; irq++) {
|
||||
struct irq_chip *controller;
|
||||
mips_cpu_irq_init();
|
||||
for (irq = MIPS_CPU_IRQ_BASE + 8; irq <= IP32_IRQ_MAX; irq++) {
|
||||
struct irq_chip *chip;
|
||||
|
||||
if (irq == IP32_R4K_TIMER_IRQ)
|
||||
controller = &ip32_cpu_interrupt;
|
||||
else if (irq <= MACE_PCI_BRIDGE_IRQ && irq >= MACE_VID_IN1_IRQ)
|
||||
controller = &ip32_mace_interrupt;
|
||||
else if (irq <= MACEPCI_SHARED2_IRQ && irq >= MACEPCI_SCSI0_IRQ)
|
||||
controller = &ip32_macepci_interrupt;
|
||||
else if (irq <= CRIME_VICE_IRQ && irq >= CRIME_GBE0_IRQ)
|
||||
controller = &ip32_crime_interrupt;
|
||||
else
|
||||
controller = &ip32_maceisa_interrupt;
|
||||
switch (irq) {
|
||||
case MACE_VID_IN1_IRQ ... MACE_PCI_BRIDGE_IRQ:
|
||||
chip = &ip32_mace_interrupt;
|
||||
break;
|
||||
case MACEPCI_SCSI0_IRQ ... MACEPCI_SHARED2_IRQ:
|
||||
chip = &ip32_macepci_interrupt;
|
||||
break;
|
||||
case CRIME_GBE0_IRQ ... CRIME_VICE_IRQ:
|
||||
chip = &ip32_crime_interrupt;
|
||||
break;
|
||||
default:
|
||||
chip = &ip32_maceisa_interrupt;
|
||||
}
|
||||
|
||||
set_irq_chip(irq, controller);
|
||||
set_irq_chip(irq, chip);
|
||||
}
|
||||
setup_irq(CRIME_MEMERR_IRQ, &memerr_irq);
|
||||
setup_irq(CRIME_CPUERR_IRQ, &cpuerr_irq);
|
||||
|
||||
@ -83,7 +83,7 @@ void __init plat_time_init(void)
|
||||
void __init plat_timer_setup(struct irqaction *irq)
|
||||
{
|
||||
irq->handler = no_action;
|
||||
setup_irq(IP32_R4K_TIMER_IRQ, irq);
|
||||
setup_irq(MIPS_CPU_IRQ_BASE + 7, irq);
|
||||
}
|
||||
|
||||
void __init plat_mem_setup(void)
|
||||
|
||||
@ -9,86 +9,104 @@
|
||||
#ifndef __ASM_IP32_INTS_H
|
||||
#define __ASM_IP32_INTS_H
|
||||
|
||||
#include <asm/irq.h>
|
||||
|
||||
/*
|
||||
* This list reflects the assignment of interrupt numbers to
|
||||
* interrupting events. Order is fairly irrelevant to handling
|
||||
* priority. This differs from irix.
|
||||
*/
|
||||
|
||||
/* CPU */
|
||||
#define IP32_R4K_TIMER_IRQ 0
|
||||
enum ip32_irq_no {
|
||||
/*
|
||||
* CPU interrupts are 0 ... 7
|
||||
*/
|
||||
|
||||
/* MACE */
|
||||
#define MACE_VID_IN1_IRQ 1
|
||||
#define MACE_VID_IN2_IRQ 2
|
||||
#define MACE_VID_OUT_IRQ 3
|
||||
#define MACE_ETHERNET_IRQ 4
|
||||
/* SUPERIO, MISC, and AUDIO are MACEISA */
|
||||
#define MACE_PCI_BRIDGE_IRQ 8
|
||||
/*
|
||||
* MACE
|
||||
*/
|
||||
MACE_VID_IN1_IRQ = MIPS_CPU_IRQ_BASE + 8,
|
||||
MACE_VID_IN2_IRQ,
|
||||
MACE_VID_OUT_IRQ,
|
||||
MACE_ETHERNET_IRQ,
|
||||
/* SUPERIO, MISC, and AUDIO are MACEISA */
|
||||
__MACE_SUPERIO,
|
||||
__MACE_MISC,
|
||||
__MACE_AUDIO,
|
||||
MACE_PCI_BRIDGE_IRQ,
|
||||
|
||||
/* MACEPCI */
|
||||
#define MACEPCI_SCSI0_IRQ 9
|
||||
#define MACEPCI_SCSI1_IRQ 10
|
||||
#define MACEPCI_SLOT0_IRQ 11
|
||||
#define MACEPCI_SLOT1_IRQ 12
|
||||
#define MACEPCI_SLOT2_IRQ 13
|
||||
#define MACEPCI_SHARED0_IRQ 14
|
||||
#define MACEPCI_SHARED1_IRQ 15
|
||||
#define MACEPCI_SHARED2_IRQ 16
|
||||
/*
|
||||
* MACEPCI
|
||||
*/
|
||||
MACEPCI_SCSI0_IRQ,
|
||||
MACEPCI_SCSI1_IRQ,
|
||||
MACEPCI_SLOT0_IRQ,
|
||||
MACEPCI_SLOT1_IRQ,
|
||||
MACEPCI_SLOT2_IRQ,
|
||||
MACEPCI_SHARED0_IRQ,
|
||||
MACEPCI_SHARED1_IRQ,
|
||||
MACEPCI_SHARED2_IRQ,
|
||||
|
||||
/* CRIME */
|
||||
#define CRIME_GBE0_IRQ 17
|
||||
#define CRIME_GBE1_IRQ 18
|
||||
#define CRIME_GBE2_IRQ 19
|
||||
#define CRIME_GBE3_IRQ 20
|
||||
#define CRIME_CPUERR_IRQ 21
|
||||
#define CRIME_MEMERR_IRQ 22
|
||||
#define CRIME_RE_EMPTY_E_IRQ 23
|
||||
#define CRIME_RE_FULL_E_IRQ 24
|
||||
#define CRIME_RE_IDLE_E_IRQ 25
|
||||
#define CRIME_RE_EMPTY_L_IRQ 26
|
||||
#define CRIME_RE_FULL_L_IRQ 27
|
||||
#define CRIME_RE_IDLE_L_IRQ 28
|
||||
#define CRIME_SOFT0_IRQ 29
|
||||
#define CRIME_SOFT1_IRQ 30
|
||||
#define CRIME_SOFT2_IRQ 31
|
||||
#define CRIME_SYSCORERR_IRQ CRIME_SOFT2_IRQ
|
||||
#define CRIME_VICE_IRQ 32
|
||||
/*
|
||||
* CRIME
|
||||
*/
|
||||
CRIME_GBE0_IRQ,
|
||||
CRIME_GBE1_IRQ,
|
||||
CRIME_GBE2_IRQ,
|
||||
CRIME_GBE3_IRQ,
|
||||
CRIME_CPUERR_IRQ,
|
||||
CRIME_MEMERR_IRQ,
|
||||
CRIME_RE_EMPTY_E_IRQ,
|
||||
CRIME_RE_FULL_E_IRQ,
|
||||
CRIME_RE_IDLE_E_IRQ,
|
||||
CRIME_RE_EMPTY_L_IRQ,
|
||||
CRIME_RE_FULL_L_IRQ,
|
||||
CRIME_RE_IDLE_L_IRQ,
|
||||
CRIME_SOFT0_IRQ,
|
||||
CRIME_SOFT1_IRQ,
|
||||
CRIME_SOFT2_IRQ,
|
||||
CRIME_SYSCORERR_IRQ = CRIME_SOFT2_IRQ,
|
||||
CRIME_VICE_IRQ,
|
||||
|
||||
/* MACEISA */
|
||||
#define MACEISA_AUDIO_SW_IRQ 33
|
||||
#define MACEISA_AUDIO_SC_IRQ 34
|
||||
#define MACEISA_AUDIO1_DMAT_IRQ 35
|
||||
#define MACEISA_AUDIO1_OF_IRQ 36
|
||||
#define MACEISA_AUDIO2_DMAT_IRQ 37
|
||||
#define MACEISA_AUDIO2_MERR_IRQ 38
|
||||
#define MACEISA_AUDIO3_DMAT_IRQ 39
|
||||
#define MACEISA_AUDIO3_MERR_IRQ 40
|
||||
#define MACEISA_RTC_IRQ 41
|
||||
#define MACEISA_KEYB_IRQ 42
|
||||
/* MACEISA_KEYB_POLL is not an IRQ */
|
||||
#define MACEISA_MOUSE_IRQ 44
|
||||
/* MACEISA_MOUSE_POLL is not an IRQ */
|
||||
#define MACEISA_TIMER0_IRQ 46
|
||||
#define MACEISA_TIMER1_IRQ 47
|
||||
#define MACEISA_TIMER2_IRQ 48
|
||||
#define MACEISA_PARALLEL_IRQ 49
|
||||
#define MACEISA_PAR_CTXA_IRQ 50
|
||||
#define MACEISA_PAR_CTXB_IRQ 51
|
||||
#define MACEISA_PAR_MERR_IRQ 52
|
||||
#define MACEISA_SERIAL1_IRQ 53
|
||||
#define MACEISA_SERIAL1_TDMAT_IRQ 54
|
||||
#define MACEISA_SERIAL1_TDMAPR_IRQ 55
|
||||
#define MACEISA_SERIAL1_TDMAME_IRQ 56
|
||||
#define MACEISA_SERIAL1_RDMAT_IRQ 57
|
||||
#define MACEISA_SERIAL1_RDMAOR_IRQ 58
|
||||
#define MACEISA_SERIAL2_IRQ 59
|
||||
#define MACEISA_SERIAL2_TDMAT_IRQ 60
|
||||
#define MACEISA_SERIAL2_TDMAPR_IRQ 61
|
||||
#define MACEISA_SERIAL2_TDMAME_IRQ 62
|
||||
#define MACEISA_SERIAL2_RDMAT_IRQ 63
|
||||
#define MACEISA_SERIAL2_RDMAOR_IRQ 64
|
||||
/*
|
||||
* MACEISA
|
||||
*/
|
||||
MACEISA_AUDIO_SW_IRQ,
|
||||
MACEISA_AUDIO_SC_IRQ,
|
||||
MACEISA_AUDIO1_DMAT_IRQ,
|
||||
MACEISA_AUDIO1_OF_IRQ,
|
||||
MACEISA_AUDIO2_DMAT_IRQ,
|
||||
MACEISA_AUDIO2_MERR_IRQ,
|
||||
MACEISA_AUDIO3_DMAT_IRQ,
|
||||
MACEISA_AUDIO3_MERR_IRQ,
|
||||
MACEISA_RTC_IRQ,
|
||||
MACEISA_KEYB_IRQ,
|
||||
/* MACEISA_KEYB_POLL is not an IRQ */
|
||||
__MACEISA_KEYB_POLL,
|
||||
MACEISA_MOUSE_IRQ,
|
||||
/* MACEISA_MOUSE_POLL is not an IRQ */
|
||||
__MACEISA_MOUSE_POLL,
|
||||
MACEISA_TIMER0_IRQ,
|
||||
MACEISA_TIMER1_IRQ,
|
||||
MACEISA_TIMER2_IRQ,
|
||||
MACEISA_PARALLEL_IRQ,
|
||||
MACEISA_PAR_CTXA_IRQ,
|
||||
MACEISA_PAR_CTXB_IRQ,
|
||||
MACEISA_PAR_MERR_IRQ,
|
||||
MACEISA_SERIAL1_IRQ,
|
||||
MACEISA_SERIAL1_TDMAT_IRQ,
|
||||
MACEISA_SERIAL1_TDMAPR_IRQ,
|
||||
MACEISA_SERIAL1_TDMAME_IRQ,
|
||||
MACEISA_SERIAL1_RDMAT_IRQ,
|
||||
MACEISA_SERIAL1_RDMAOR_IRQ,
|
||||
MACEISA_SERIAL2_IRQ,
|
||||
MACEISA_SERIAL2_TDMAT_IRQ,
|
||||
MACEISA_SERIAL2_TDMAPR_IRQ,
|
||||
MACEISA_SERIAL2_TDMAME_IRQ,
|
||||
MACEISA_SERIAL2_RDMAT_IRQ,
|
||||
MACEISA_SERIAL2_RDMAOR_IRQ,
|
||||
|
||||
#define IP32_IRQ_MAX MACEISA_SERIAL2_RDMAOR_IRQ
|
||||
IP32_IRQ_MAX = MACEISA_SERIAL2_RDMAOR_IRQ
|
||||
};
|
||||
|
||||
#endif /* __ASM_IP32_INTS_H */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user