Skip to content

Commit

Permalink
powerpc: platforms/85xx irq_data conversion.
Browse files Browse the repository at this point in the history 
Signed-off-by: Lennert Buytenhek <[email protected]>
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
  • Loading branch information
@buytenh @ozbenh
buytenh authored and ozbenh committed Mar 10, 2011
1 parent e4891eb commit 712d5d7
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 26 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/85xx/ksi8560.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ static void machine_restart(char *cmd)

static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
int cascade_irq;

while ((cascade_irq = cpm2_get_irq()) >= 0)
generic_handle_irq(cascade_irq);

desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
}

static void __init ksi8560_pic_init(void)
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/85xx/mpc85xx_ads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,

static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
int cascade_irq;

while ((cascade_irq = cpm2_get_irq()) >= 0)
generic_handle_irq(cascade_irq);

desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
}

#endif /* CONFIG_CPM2 */
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/85xx/mpc85xx_ds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@
#ifdef CONFIG_PPC_I8259
static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
unsigned int cascade_irq = i8259_irq();

if (cascade_irq != NO_IRQ) {
generic_handle_irq(cascade_irq);
}
desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
}
#endif /* CONFIG_PPC_I8259 */

Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/85xx/sbc8560.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@

static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
int cascade_irq;

while ((cascade_irq = cpm2_get_irq()) >= 0)
generic_handle_irq(cascade_irq);

desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
}

#endif /* CONFIG_CPM2 */
Expand Down
40 changes: 20 additions & 20 deletions arch/powerpc/platforms/85xx/socrates_fpga_pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)

void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
unsigned int cascade_irq;

/*
Expand All @@ -103,17 +104,16 @@ void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)

if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq);
desc->chip->eoi(irq);

chip->irq_eoi(&desc->irq_data);
}

static void socrates_fpga_pic_ack(unsigned int virq)
static void socrates_fpga_pic_ack(struct irq_data *d)
{
unsigned long flags;
unsigned int hwirq, irq_line;
uint32_t mask;

hwirq = socrates_fpga_irq_to_hw(virq);
hwirq = socrates_fpga_irq_to_hw(d->irq);

irq_line = fpga_irqs[hwirq].irq_line;
raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
Expand All @@ -124,14 +124,14 @@ static void socrates_fpga_pic_ack(unsigned int virq)
raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
}

static void socrates_fpga_pic_mask(unsigned int virq)
static void socrates_fpga_pic_mask(struct irq_data *d)
{
unsigned long flags;
unsigned int hwirq;
int irq_line;
u32 mask;

hwirq = socrates_fpga_irq_to_hw(virq);
hwirq = socrates_fpga_irq_to_hw(d->irq);

irq_line = fpga_irqs[hwirq].irq_line;
raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
Expand All @@ -142,14 +142,14 @@ static void socrates_fpga_pic_mask(unsigned int virq)
raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
}

static void socrates_fpga_pic_mask_ack(unsigned int virq)
static void socrates_fpga_pic_mask_ack(struct irq_data *d)
{
unsigned long flags;
unsigned int hwirq;
int irq_line;
u32 mask;

hwirq = socrates_fpga_irq_to_hw(virq);
hwirq = socrates_fpga_irq_to_hw(d->irq);

irq_line = fpga_irqs[hwirq].irq_line;
raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
Expand All @@ -161,14 +161,14 @@ static void socrates_fpga_pic_mask_ack(unsigned int virq)
raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
}

static void socrates_fpga_pic_unmask(unsigned int virq)
static void socrates_fpga_pic_unmask(struct irq_data *d)
{
unsigned long flags;
unsigned int hwirq;
int irq_line;
u32 mask;

hwirq = socrates_fpga_irq_to_hw(virq);
hwirq = socrates_fpga_irq_to_hw(d->irq);

irq_line = fpga_irqs[hwirq].irq_line;
raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
Expand All @@ -179,14 +179,14 @@ static void socrates_fpga_pic_unmask(unsigned int virq)
raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
}

static void socrates_fpga_pic_eoi(unsigned int virq)
static void socrates_fpga_pic_eoi(struct irq_data *d)
{
unsigned long flags;
unsigned int hwirq;
int irq_line;
u32 mask;

hwirq = socrates_fpga_irq_to_hw(virq);
hwirq = socrates_fpga_irq_to_hw(d->irq);

irq_line = fpga_irqs[hwirq].irq_line;
raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
Expand All @@ -197,15 +197,15 @@ static void socrates_fpga_pic_eoi(unsigned int virq)
raw_spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
}

static int socrates_fpga_pic_set_type(unsigned int virq,
static int socrates_fpga_pic_set_type(struct irq_data *d,
unsigned int flow_type)
{
unsigned long flags;
unsigned int hwirq;
int polarity;
u32 mask;

hwirq = socrates_fpga_irq_to_hw(virq);
hwirq = socrates_fpga_irq_to_hw(d->irq);

if (fpga_irqs[hwirq].type != IRQ_TYPE_NONE)
return -EINVAL;
Expand Down Expand Up @@ -233,12 +233,12 @@ static int socrates_fpga_pic_set_type(unsigned int virq,

static struct irq_chip socrates_fpga_pic_chip = {
.name = "FPGA-PIC",
.ack = socrates_fpga_pic_ack,
.mask = socrates_fpga_pic_mask,
.mask_ack = socrates_fpga_pic_mask_ack,
.unmask = socrates_fpga_pic_unmask,
.eoi = socrates_fpga_pic_eoi,
.set_type = socrates_fpga_pic_set_type,
.irq_ack = socrates_fpga_pic_ack,
.irq_mask = socrates_fpga_pic_mask,
.irq_mask_ack = socrates_fpga_pic_mask_ack,
.irq_unmask = socrates_fpga_pic_unmask,
.irq_eoi = socrates_fpga_pic_eoi,
.irq_set_type = socrates_fpga_pic_set_type,
};

static int socrates_fpga_pic_host_map(struct irq_host *h, unsigned int virq,
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/85xx/stx_gp3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@

static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
int cascade_irq;

while ((cascade_irq = cpm2_get_irq()) >= 0)
generic_handle_irq(cascade_irq);

desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
}
#endif /* CONFIG_CPM2 */

Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/85xx/tqm85xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@

static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = get_irq_desc_chip(desc);
int cascade_irq;

while ((cascade_irq = cpm2_get_irq()) >= 0)
generic_handle_irq(cascade_irq);

desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
}
#endif /* CONFIG_CPM2 */

Expand Down

0 comments on commit 712d5d7

Please sign in to comment.