Skip to content

L
linux
Commit 4d2796f8 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ralf Baechle
Browse files
Options

MIPS: IP32: Convert to new irq_chip functions 

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2204/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 301218df
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 92 deletions
arch/mips/sgi-ip32/ip32-irq.c
View file @ 4d2796f8
...@@ -130,70 +130,48 @@ static struct irqaction cpuerr_irq = { ...@@ -130,70 +130,48 @@ static struct irqaction cpuerr_irq = {
static uint64_t crime_mask; static uint64_t crime_mask;
static inline void crime_enable_irq(unsigned int irq) static inline void crime_enable_irq(struct irq_data *d)
{ {
unsigned int bit = irq - CRIME_IRQ_BASE; unsigned int bit = d->irq - CRIME_IRQ_BASE;
crime_mask |= 1 << bit; crime_mask |= 1 << bit;
crime->imask = crime_mask; crime->imask = crime_mask;
} }
static inline void crime_disable_irq(unsigned int irq) static inline void crime_disable_irq(struct irq_data *d)
{ {
unsigned int bit = irq - CRIME_IRQ_BASE; unsigned int bit = d->irq - CRIME_IRQ_BASE;
crime_mask &= ~(1 << bit); crime_mask &= ~(1 << bit);
crime->imask = crime_mask; crime->imask = crime_mask;
flush_crime_bus(); flush_crime_bus();
} }
static void crime_level_mask_and_ack_irq(unsigned int irq)
{
crime_disable_irq(irq);
}
static void crime_level_end_irq(unsigned int irq)
{
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
crime_enable_irq(irq);
}
static struct irq_chip crime_level_interrupt = { static struct irq_chip crime_level_interrupt = {
.name = "IP32 CRIME", .name = "IP32 CRIME",
.ack = crime_level_mask_and_ack_irq, .irq_mask = crime_disable_irq,
.mask = crime_disable_irq, .irq_unmask = crime_enable_irq,
.mask_ack = crime_level_mask_and_ack_irq,
.unmask = crime_enable_irq,
.end = crime_level_end_irq,
}; };
static void crime_edge_mask_and_ack_irq(unsigned int irq) static void crime_edge_mask_and_ack_irq(struct irq_data *d)
{ {
unsigned int bit = irq - CRIME_IRQ_BASE; unsigned int bit = d->irq - CRIME_IRQ_BASE;
uint64_t crime_int; uint64_t crime_int;
/* Edge triggered interrupts must be cleared. */ /* Edge triggered interrupts must be cleared. */
crime_int = crime->hard_int; crime_int = crime->hard_int;
crime_int &= ~(1 << bit); crime_int &= ~(1 << bit);
crime->hard_int = crime_int; crime->hard_int = crime_int;
crime_disable_irq(irq); crime_disable_irq(d);
}
static void crime_edge_end_irq(unsigned int irq)
{
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
crime_enable_irq(irq);
} }
static struct irq_chip crime_edge_interrupt = { static struct irq_chip crime_edge_interrupt = {
.name = "IP32 CRIME", .name = "IP32 CRIME",
.ack = crime_edge_mask_and_ack_irq, .irq_ack = crime_edge_mask_and_ack_irq,
.mask = crime_disable_irq, .irq_mask = crime_disable_irq,
.mask_ack = crime_edge_mask_and_ack_irq, .irq_mask_ack = crime_edge_mask_and_ack_irq,
.unmask = crime_enable_irq, .irq_unmask = crime_enable_irq,
.end = crime_edge_end_irq,
}; };
/* /*
...@@ -204,37 +182,28 @@ static struct irq_chip crime_edge_interrupt = { ...@@ -204,37 +182,28 @@ static struct irq_chip crime_edge_interrupt = {
static unsigned long macepci_mask; static unsigned long macepci_mask;
static void enable_macepci_irq(unsigned int irq) static void enable_macepci_irq(struct irq_data *d)
{ {
macepci_mask |= MACEPCI_CONTROL_INT(irq - MACEPCI_SCSI0_IRQ); macepci_mask |= MACEPCI_CONTROL_INT(d->irq - MACEPCI_SCSI0_IRQ);
mace->pci.control = macepci_mask; mace->pci.control = macepci_mask;
crime_mask |= 1 << (irq - CRIME_IRQ_BASE); crime_mask |= 1 << (d->irq - CRIME_IRQ_BASE);
crime->imask = crime_mask; crime->imask = crime_mask;
} }
static void disable_macepci_irq(unsigned int irq) static void disable_macepci_irq(struct irq_data *d)
{ {
crime_mask &= ~(1 << (irq - CRIME_IRQ_BASE)); crime_mask &= ~(1 << (d->irq - CRIME_IRQ_BASE));
crime->imask = crime_mask; crime->imask = crime_mask;
flush_crime_bus(); flush_crime_bus();
macepci_mask &= ~MACEPCI_CONTROL_INT(irq - MACEPCI_SCSI0_IRQ); macepci_mask &= ~MACEPCI_CONTROL_INT(d->irq - MACEPCI_SCSI0_IRQ);
mace->pci.control = macepci_mask; mace->pci.control = macepci_mask;
flush_mace_bus(); flush_mace_bus();
} }
static void end_macepci_irq(unsigned int irq)
{
if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
enable_macepci_irq(irq);
}
static struct irq_chip ip32_macepci_interrupt = { static struct irq_chip ip32_macepci_interrupt = {
.name = "IP32 MACE PCI", .name = "IP32 MACE PCI",
.ack = disable_macepci_irq, .irq_mask = disable_macepci_irq,
.mask = disable_macepci_irq, .irq_unmask = enable_macepci_irq,
.mask_ack = disable_macepci_irq,
.unmask = enable_macepci_irq,
.end = end_macepci_irq,
}; };
/* This is used for MACE ISA interrupts. That means bits 4-6 in the /* This is used for MACE ISA interrupts. That means bits 4-6 in the
...@@ -276,13 +245,13 @@ static struct irq_chip ip32_macepci_interrupt = { ...@@ -276,13 +245,13 @@ static struct irq_chip ip32_macepci_interrupt = {
static unsigned long maceisa_mask; static unsigned long maceisa_mask;
static void enable_maceisa_irq(unsigned int irq) static void enable_maceisa_irq(struct irq_data *d)
{ {
unsigned int crime_int = 0; unsigned int crime_int = 0;
pr_debug("maceisa enable: %u\n", irq); pr_debug("maceisa enable: %u\n", d->irq);
switch (irq) { switch (d->irq) {
case MACEISA_AUDIO_SW_IRQ ... MACEISA_AUDIO3_MERR_IRQ: case MACEISA_AUDIO_SW_IRQ ... MACEISA_AUDIO3_MERR_IRQ:
crime_int = MACE_AUDIO_INT; crime_int = MACE_AUDIO_INT;
break; break;
...@@ -296,15 +265,15 @@ static void enable_maceisa_irq(unsigned int irq) ...@@ -296,15 +265,15 @@ static void enable_maceisa_irq(unsigned int irq)
pr_debug("crime_int %08x enabled\n", crime_int); pr_debug("crime_int %08x enabled\n", crime_int);
crime_mask |= crime_int; crime_mask |= crime_int;
crime->imask = crime_mask; crime->imask = crime_mask;
maceisa_mask |= 1 << (irq - MACEISA_AUDIO_SW_IRQ); maceisa_mask |= 1 << (d->irq - MACEISA_AUDIO_SW_IRQ);
mace->perif.ctrl.imask = maceisa_mask; mace->perif.ctrl.imask = maceisa_mask;
} }
static void disable_maceisa_irq(unsigned int irq) static void disable_maceisa_irq(struct irq_data *d)
{ {
unsigned int crime_int = 0; unsigned int crime_int = 0;
maceisa_mask &= ~(1 << (irq - MACEISA_AUDIO_SW_IRQ)); maceisa_mask &= ~(1 << (d->irq - MACEISA_AUDIO_SW_IRQ));
if (!(maceisa_mask & MACEISA_AUDIO_INT)) if (!(maceisa_mask & MACEISA_AUDIO_INT))
crime_int |= MACE_AUDIO_INT; crime_int |= MACE_AUDIO_INT;
if (!(maceisa_mask & MACEISA_MISC_INT)) if (!(maceisa_mask & MACEISA_MISC_INT))
...@@ -318,76 +287,57 @@ static void disable_maceisa_irq(unsigned int irq) ...@@ -318,76 +287,57 @@ static void disable_maceisa_irq(unsigned int irq)
flush_mace_bus(); flush_mace_bus();
} }
static void mask_and_ack_maceisa_irq(unsigned int irq) static void mask_and_ack_maceisa_irq(struct irq_data *d)
{ {
unsigned long mace_int; unsigned long mace_int;
/* edge triggered */ /* edge triggered */
mace_int = mace->perif.ctrl.istat; mace_int = mace->perif.ctrl.istat;
mace_int &= ~(1 << (irq - MACEISA_AUDIO_SW_IRQ)); mace_int &= ~(1 << (d->irq - MACEISA_AUDIO_SW_IRQ));
mace->perif.ctrl.istat = mace_int; mace->perif.ctrl.istat = mace_int;
disable_maceisa_irq(irq); disable_maceisa_irq(d);
}
static void end_maceisa_irq(unsigned irq)
{
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
enable_maceisa_irq(irq);
} }
static struct irq_chip ip32_maceisa_level_interrupt = { static struct irq_chip ip32_maceisa_level_interrupt = {
.name = "IP32 MACE ISA", .name = "IP32 MACE ISA",
.ack = disable_maceisa_irq, .irq_mask = disable_maceisa_irq,
.mask = disable_maceisa_irq, .irq_unmask = enable_maceisa_irq,
.mask_ack = disable_maceisa_irq,
.unmask = enable_maceisa_irq,
.end = end_maceisa_irq,
}; };
static struct irq_chip ip32_maceisa_edge_interrupt = { static struct irq_chip ip32_maceisa_edge_interrupt = {
.name = "IP32 MACE ISA", .name = "IP32 MACE ISA",
.ack = mask_and_ack_maceisa_irq, .irq_ack = mask_and_ack_maceisa_irq,
.mask = disable_maceisa_irq, .irq_mask = disable_maceisa_irq,
.mask_ack = mask_and_ack_maceisa_irq, .irq_mask_ack = mask_and_ack_maceisa_irq,
.unmask = enable_maceisa_irq, .irq_unmask = enable_maceisa_irq,
.end = end_maceisa_irq,
}; };
/* This is used for regular non-ISA, non-PCI MACE interrupts. That means /* This is used for regular non-ISA, non-PCI MACE interrupts. That means
* bits 0-3 and 7 in the CRIME register. * bits 0-3 and 7 in the CRIME register.
*/ */
static void enable_mace_irq(unsigned int irq) static void enable_mace_irq(struct irq_data *d)
{ {
unsigned int bit = irq - CRIME_IRQ_BASE; unsigned int bit = d->irq - CRIME_IRQ_BASE;
crime_mask |= (1 << bit); crime_mask |= (1 << bit);
crime->imask = crime_mask; crime->imask = crime_mask;
} }
static void disable_mace_irq(unsigned int irq) static void disable_mace_irq(struct irq_data *d)
{ {
unsigned int bit = irq - CRIME_IRQ_BASE; unsigned int bit = d->irq - CRIME_IRQ_BASE;
crime_mask &= ~(1 << bit); crime_mask &= ~(1 << bit);
crime->imask = crime_mask; crime->imask = crime_mask;
flush_crime_bus(); flush_crime_bus();
} }
static void end_mace_irq(unsigned int irq)
{
if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
enable_mace_irq(irq);
}
static struct irq_chip ip32_mace_interrupt = { static struct irq_chip ip32_mace_interrupt = {
.name = "IP32 MACE", .name = "IP32 MACE",
.ack = disable_mace_irq, .irq_mask = disable_mace_irq,
.mask = disable_mace_irq, .irq_unmask = enable_mace_irq,
.mask_ack = disable_mace_irq,
.unmask = enable_mace_irq,
.end = end_mace_irq,
}; };
static void ip32_unknown_interrupt(void) static void ip32_unknown_interrupt(void)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7