Skip to contentSkip to conversation

plat-orion gpio regression for edge-sensitive on mv78xx0

PATCH New Joey Oravec 3 participants 5 messages Jun 29, 2011 – Jul 3, 2011

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

Nicolas, Lennert -

I just tested linux kernel 3.0-rc5 today. There were some major changes to arch/arm/plat-orion/gpio.c and I think they introduced a bug for edge sensitive interrupts. I have not tested any other types yet. This new version of the code specifies

ct->chip.irq_ack = irq_gc_ack;

But it looks like kernel/irq/generic-chip.c generates a positive mask (1 to clear) and the MV78200 wants the opposite (0 to clear). The result is that the interrupt never gets ACKed and the handler will keep getting called.

-joey

#1 lore raw

Hi,

Quoted 6 lines · Joey Oravec

Nicolas, Lennert -

I just tested linux kernel 3.0-rc5 today. There were some major changes to arch/arm/plat-orion/gpio.c and I think they introduced a bug for edge sensitive interrupts. I have not tested any other types yet. This new version of the code specifies

As level interrupts don't need to be acked, it should be ok.

Quoted 7 lines

ct->chip.irq_ack = irq_gc_ack;

But it looks like kernel/irq/generic-chip.c generates a positive mask (1 to clear) and the MV78200 wants the opposite (0 to clear). The result is that the interrupt never gets ACKed and the handler will keep getting called.

Maybe we could introduce some irq_gc_ack{_set_bit,_clear_bit} variants (as for the mask functions) ?

As an another option, we could define an Orion specific irq_ack function.

I don't know what is the better choice for rc5.

Regards,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110630/b77176e8/attachment.sig>

#2 lore raw

PATCH 1/1 genirq: replace irq_gc_ack with {set,clr}_bit variants

From: Simon Guinot <[email protected]>

This patch fix the edge GPIO interrupts support for Orion based SoCs. For this devices, edge interrupt acknowledgement is done by clearing a cause register. Replace irq_gc_ack with {set,clr}_bit variants allows to address such cases.

Tested on Network Space v2.

---
 arch/arm/mach-davinci/irq.c      |    2 +-
 arch/arm/plat-orion/gpio.c       |    2 +-
 arch/arm/plat-s5p/irq-gpioint.c  |    2 +-
 arch/arm/plat-samsung/irq-uart.c |    2 +-
 include/linux/irq.h              |    3 ++-
 kernel/irq/generic-chip.c        |   18 ++++++++++++++++--
 6 files changed, 22 insertions(+), 7 deletions(-)
arch/arm/mach-davinci/irq.c +1 -1
index bfe68ec..d8c1af0 100644
@@ -53,7 +53,7 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
 
 	gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_set_bit;
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 
arch/arm/plat-orion/gpio.c +1 -1
index 5b4fffa..41ab97e 100644
@@ -432,7 +432,7 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
 	ct->regs.mask = ochip->mask_offset + GPIO_EDGE_MASK_OFF;
 	ct->regs.ack = GPIO_EDGE_CAUSE_OFF;
 	ct->type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_clr_bit;
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 	ct->chip.irq_set_type = gpio_irq_set_type;
arch/arm/plat-s5p/irq-gpioint.c +1 -1
index 135abda..327ab9f 100644
@@ -152,7 +152,7 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip)
 	if (!gc)
 		return -ENOMEM;
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_set_bit;
 	ct->chip.irq_mask = irq_gc_mask_set_bit;
 	ct->chip.irq_unmask = irq_gc_mask_clr_bit;
 	ct->chip.irq_set_type = s5p_gpioint_set_type,
arch/arm/plat-samsung/irq-uart.c +1 -1
index 32582c0..0e46588 100644
@@ -55,7 +55,7 @@ static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq)
 	gc = irq_alloc_generic_chip("s3c-uart", 1, uirq->base_irq, reg_base,
 				    handle_level_irq);
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_set_bit;
 	ct->chip.irq_mask = irq_gc_mask_set_bit;
 	ct->chip.irq_unmask = irq_gc_mask_clr_bit;
 	ct->regs.ack = S3C64XX_UINTP;
include/linux/irq.h +2 -1
index 8b45384..baa397e 100644
@@ -676,7 +676,8 @@ void irq_gc_mask_disable_reg(struct irq_data *d);
 void irq_gc_mask_set_bit(struct irq_data *d);
 void irq_gc_mask_clr_bit(struct irq_data *d);
 void irq_gc_unmask_enable_reg(struct irq_data *d);
-void irq_gc_ack(struct irq_data *d);
+void irq_gc_ack_set_bit(struct irq_data *d);
+void irq_gc_ack_clr_bit(struct irq_data *d);
 void irq_gc_mask_disable_reg_and_ack(struct irq_data *d);
 void irq_gc_eoi(struct irq_data *d);
 int irq_gc_set_wake(struct irq_data *d, unsigned int on);
kernel/irq/generic-chip.c +16 -2
index 31a9db7..3a2cab4 100644
@@ -101,10 +101,10 @@ void irq_gc_unmask_enable_reg(struct irq_data *d)
 }
 
 /**
- * irq_gc_ack - Ack pending interrupt
+ * irq_gc_ack_set_bit - Ack pending interrupt via setting bit
  * @d: irq_data
  */
-void irq_gc_ack(struct irq_data *d)
+void irq_gc_ack_set_bit(struct irq_data *d)
 {
 	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
 	u32 mask = 1 << (d->irq - gc->irq_base);
@@ -115,6 +115,20 @@ void irq_gc_ack(struct irq_data *d)
 }
 
 /**
+ * irq_gc_ack_clr_bit - Ack pending interrupt via clearing bit
+ * @d: irq_data
+ */
+void irq_gc_ack_clr_bit(struct irq_data *d)
+{
+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+	u32 mask = ~(1 << (d->irq - gc->irq_base));
+
+	irq_gc_lock(gc);
+	irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack);
+	irq_gc_unlock(gc);
+}
+
+/**
  * irq_gc_mask_disable_reg_and_ack- Mask and ack pending interrupt
  * @d: irq_data
  */
Signature · 1 line
1.7.5.1
#3 lore raw

PATCH 1/1 genirq: replace irq_gc_ack with {set,clr}_bit variants

Hi Thomas, Nicolas, Lennert and Saeed,

Quoted 11 lines · Simon Guinot

From: Simon Guinot <[email protected]>

This patch fix the edge GPIO interrupts support for Orion based SoCs. For this devices, edge interrupt acknowledgement is done by clearing a cause register. Replace irq_gc_ack with {set,clr}_bit variants allows to address such cases.

Tested on Network Space v2.

Quoted 8 lines
---
 arch/arm/mach-davinci/irq.c      |    2 +-
 arch/arm/plat-orion/gpio.c       |    2 +-
 arch/arm/plat-s5p/irq-gpioint.c  |    2 +-
 arch/arm/plat-samsung/irq-uart.c |    2 +-
 include/linux/irq.h              |    3 ++-
 kernel/irq/generic-chip.c        |   18 ++++++++++++++++--
 6 files changed, 22 insertions(+), 7 deletions(-)

Please, give me your feedbacks about this patch.

Fix this bug for the 3.0 release could be a good thing.

Regards,

Simon

Quoted 113 lines
arch/arm/mach-davinci/irq.c +1 -1
index bfe68ec..d8c1af0 100644
@@ -53,7 +53,7 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
 
 	gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_set_bit;
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 
arch/arm/plat-orion/gpio.c +1 -1
index 5b4fffa..41ab97e 100644
@@ -432,7 +432,7 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
 	ct->regs.mask = ochip->mask_offset + GPIO_EDGE_MASK_OFF;
 	ct->regs.ack = GPIO_EDGE_CAUSE_OFF;
 	ct->type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_clr_bit;
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 	ct->chip.irq_set_type = gpio_irq_set_type;
arch/arm/plat-s5p/irq-gpioint.c +1 -1
index 135abda..327ab9f 100644
@@ -152,7 +152,7 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip)
 	if (!gc)
 		return -ENOMEM;
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_set_bit;
 	ct->chip.irq_mask = irq_gc_mask_set_bit;
 	ct->chip.irq_unmask = irq_gc_mask_clr_bit;
 	ct->chip.irq_set_type = s5p_gpioint_set_type,
arch/arm/plat-samsung/irq-uart.c +1 -1
index 32582c0..0e46588 100644
@@ -55,7 +55,7 @@ static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq)
 	gc = irq_alloc_generic_chip("s3c-uart", 1, uirq->base_irq, reg_base,
 				    handle_level_irq);
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack;
+	ct->chip.irq_ack = irq_gc_ack_set_bit;
 	ct->chip.irq_mask = irq_gc_mask_set_bit;
 	ct->chip.irq_unmask = irq_gc_mask_clr_bit;
 	ct->regs.ack = S3C64XX_UINTP;
include/linux/irq.h +2 -1
index 8b45384..baa397e 100644
@@ -676,7 +676,8 @@ void irq_gc_mask_disable_reg(struct irq_data *d);
 void irq_gc_mask_set_bit(struct irq_data *d);
 void irq_gc_mask_clr_bit(struct irq_data *d);
 void irq_gc_unmask_enable_reg(struct irq_data *d);
-void irq_gc_ack(struct irq_data *d);
+void irq_gc_ack_set_bit(struct irq_data *d);
+void irq_gc_ack_clr_bit(struct irq_data *d);
 void irq_gc_mask_disable_reg_and_ack(struct irq_data *d);
 void irq_gc_eoi(struct irq_data *d);
 int irq_gc_set_wake(struct irq_data *d, unsigned int on);
kernel/irq/generic-chip.c +16 -2
index 31a9db7..3a2cab4 100644
@@ -101,10 +101,10 @@ void irq_gc_unmask_enable_reg(struct irq_data *d)
 }
 
 /**
- * irq_gc_ack - Ack pending interrupt
+ * irq_gc_ack_set_bit - Ack pending interrupt via setting bit
  * @d: irq_data
  */
-void irq_gc_ack(struct irq_data *d)
+void irq_gc_ack_set_bit(struct irq_data *d)
 {
 	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
 	u32 mask = 1 << (d->irq - gc->irq_base);
@@ -115,6 +115,20 @@ void irq_gc_ack(struct irq_data *d)
 }
 
 /**
+ * irq_gc_ack_clr_bit - Ack pending interrupt via clearing bit
+ * @d: irq_data
+ */
+void irq_gc_ack_clr_bit(struct irq_data *d)
+{
+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+	u32 mask = ~(1 << (d->irq - gc->irq_base));
+
+	irq_gc_lock(gc);
+	irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack);
+	irq_gc_unlock(gc);
+}
+
+/**
  * irq_gc_mask_disable_reg_and_ack- Mask and ack pending interrupt
  * @d: irq_data
  */
Signature · 7 lines
1.7.5.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110702/bca7bfba/attachment-0001.sig>

#4 lore raw

PATCH 1/1 genirq: replace irq_gc_ack with {set,clr}_bit variants

Quoted 6 lines · Simon Guinot

Hi Thomas, Nicolas, Lennert and Saeed,

Quoted 3 lines · Simon Guinot

From: Simon Guinot <[email protected]>

This patch fix the edge GPIO interrupts support for Orion based SoCs.

well, thet patch seems to touch non orion based SoCs (davinci, samsung).

Quoted 4 lines
Quoted 4 lines

For this devices, edge interrupt acknowledgement is done by clearing a cause register. Replace irq_gc_ack with {set,clr}_bit variants allows to address such cases.

saeed