Skip to content

S
Simple PCIe FMC carrier SPEC
Commit a4fb74d9 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

spec: specific IRQ handler looks like generic ones 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent e2a76cff
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
kernel/spec-irq.c
View file @ a4fb74d9
...@@ -266,8 +266,9 @@ static struct irq_domain_ops spec_irq_gpio_domain_ops = { ...@@ -266,8 +266,9 @@ static struct irq_domain_ops spec_irq_gpio_domain_ops = {
/** /**
* Handle IRQ from the GPIO block * Handle IRQ from the GPIO block
*/ */
static irqreturn_t spec_irq_gpio_handler(int irq, struct spec_dev *spec) static irqreturn_t spec_irq_gpio_handler(int irq, void *arg)
{ {
struct spec_dev *spec = arg;
struct irq_desc *desc; struct irq_desc *desc;
unsigned int cascade_irq; unsigned int cascade_irq;
uint32_t gpio_int_status; uint32_t gpio_int_status;
...@@ -295,9 +296,13 @@ static irqreturn_t spec_irq_gpio_handler(int irq, struct spec_dev *spec) ...@@ -295,9 +296,13 @@ static irqreturn_t spec_irq_gpio_handler(int irq, struct spec_dev *spec)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t spec_irq_sw_handler(int irq, struct spec_dev *spec, uint32_t int_stat) static irqreturn_t spec_irq_sw_handler(int irq, void *arg)
{ {
struct spec_dev *spec = arg;
uint32_t int_stat;
/* Ack the interrupts */ /* Ack the interrupts */
int_stat = gennum_readl(spec, GNINT_STAT);
gennum_writel(spec, 0x0000, GNINT_STAT); gennum_writel(spec, 0x0000, GNINT_STAT);
complete(&spec->compl); complete(&spec->compl);
...@@ -328,7 +333,7 @@ static irqreturn_t spec_irq_handler_threaded(int irq, void *arg) ...@@ -328,7 +333,7 @@ static irqreturn_t spec_irq_handler_threaded(int irq, void *arg)
if (int_stat & GNINT_STAT_GPIO) if (int_stat & GNINT_STAT_GPIO)
ret = spec_irq_gpio_handler(irq, spec); ret = spec_irq_gpio_handler(irq, spec);
if (int_stat & GNINT_STAT_SW_ALL) if (int_stat & GNINT_STAT_SW_ALL)
ret = spec_irq_sw_handler(irq, spec, int_stat); ret = spec_irq_sw_handler(irq, spec);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
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