microblaze: Fix level/edge irq sensibility

PATCH In review Michal Simek 2 participants 5 messages Mar 30, 2011 Microblaze architecture

Share & tools

Michal Simek

author maintainer

2011-03-30 11:24 UTC #0 lore raw

PATCH v2 1/1 microblaze: Fix level/edge irq sensibility

Patches:
"microblaze: Convert to new irq function names"
sha (4adc192ec7d977c74c750320f289af9d61c1caca)
and
"microblaze: Use generic show_interrupts()"
sha(9d61c18b25726306c9231428c17db42e3ff29ba7)

should also setup edge/level in irq_set_chip_and_handler_name name parameter.

Error log:
~ # cat /proc/interrupts
CPU0

  2:          2  Xilinx INTC-Xilinx INTC  eth0
  3:          2  Xilinx INTC-Xilinx INTC  eth0
  4:        241  Xilinx INTC-Xilinx INTC  timer
  6:        108  Xilinx INTC-Xilinx INTC  serial

Fixed:
~ # cat /proc/interrupts
CPU0

  2:          2  Xilinx INTC-level     eth0
  3:          2  Xilinx INTC-level     eth0
  4:        238  Xilinx INTC-edge      timer
  6:        108  Xilinx INTC-level     serial

Signed-off-by Michal Simek <[email protected]>

---

v2: Fix exchanged edge and level

---
 arch/microblaze/kernel/intc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/microblaze/kernel/intc.c +2 -2

index 5ba7e16..c88f066 100644
@@ -158,11 +158,11 @@ void __init init_IRQ(void)
 	for (i = 0; i < nr_irq; ++i) {
 		if (intr_type & (0x00000001 << i)) {
 			irq_set_chip_and_handler_name(i, &intc_dev,
-				handle_edge_irq, intc_dev.name);
+				handle_edge_irq, "edge");
 			irq_clear_status_flags(i, IRQ_LEVEL);
 		} else {
 			irq_set_chip_and_handler_name(i, &intc_dev,
-				handle_level_irq, intc_dev.name);
+				handle_level_irq, "level");
 			irq_set_status_flags(i, IRQ_LEVEL);
 		}
 	}

Signature · 1 line

1.5.5.6

Thomas Gleixner

2011-03-30 12:03 UTC #1 lore raw

Quoted 21 lines · Michal Simek

Patches:
"microblaze: Convert to new irq function names"
sha (4adc192ec7d977c74c750320f289af9d61c1caca)
and
"microblaze: Use generic show_interrupts()"
sha(9d61c18b25726306c9231428c17db42e3ff29ba7)
should also setup edge/level in irq_set_chip_and_handler_name name parameter.
Error log:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-Xilinx INTC  eth0
  3:          2  Xilinx INTC-Xilinx INTC  eth0
  4:        241  Xilinx INTC-Xilinx INTC  timer
  6:        108  Xilinx INTC-Xilinx INTC  serial
Fixed:
~ # cat /proc/interrupts
CPU0

Quoted 6 lines

  2:          2  Xilinx INTC-level     eth0
  3:          2  Xilinx INTC-level     eth0
  4:        238  Xilinx INTC-edge      timer
  6:        108  Xilinx INTC-level     serial

Signed-off-by Michal Simek <[email protected]>

Should I pick that up for the urgent fixes ?

Quoted 29 lines

---

v2: Fix exchanged edge and level

---
 arch/microblaze/kernel/intc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/microblaze/kernel/intc.c +2 -2

index 5ba7e16..c88f066 100644
@@ -158,11 +158,11 @@ void __init init_IRQ(void)
 	for (i = 0; i < nr_irq; ++i) {
 		if (intr_type & (0x00000001 << i)) {
 			irq_set_chip_and_handler_name(i, &intc_dev,
-				handle_edge_irq, intc_dev.name);
+				handle_edge_irq, "edge");
 			irq_clear_status_flags(i, IRQ_LEVEL);
 		} else {
 			irq_set_chip_and_handler_name(i, &intc_dev,
-				handle_level_irq, intc_dev.name);
+				handle_level_irq, "level");
 			irq_set_status_flags(i, IRQ_LEVEL);
 		}
 	}

Signature · 1 line

1.5.5.6

Michal Simek

author maintainer

2011-03-30 12:06 UTC #2 lore raw

Quoted 28 lines · Thomas Gleixner

Quoted 26 lines · Michal Simek
Patches:
"microblaze: Convert to new irq function names"
sha (4adc192ec7d977c74c750320f289af9d61c1caca)
and
"microblaze: Use generic show_interrupts()"
sha(9d61c18b25726306c9231428c17db42e3ff29ba7)
should also setup edge/level in irq_set_chip_and_handler_name name parameter.
Error log:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-Xilinx INTC  eth0
  3:          2  Xilinx INTC-Xilinx INTC  eth0
  4:        241  Xilinx INTC-Xilinx INTC  timer
  6:        108  Xilinx INTC-Xilinx INTC  serial
Fixed:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-level     eth0
  3:          2  Xilinx INTC-level     eth0
  4:        238  Xilinx INTC-edge      timer
  6:        108  Xilinx INTC-level     serial

Quoted 3 lines

Quoted 1 line
Signed-off-by Michal Simek <[email protected]>
Should I pick that up for the urgent fixes ?

No you shouldn't. It can go through my tree. You can give me ACK if you like.

Michal

Signature · 4 lines

Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

Thomas Gleixner

Acked-by

2011-03-30 12:08 UTC #3 lore raw

Quoted 29 lines · Michal Simek

Quoted 28 lines · Thomas Gleixner
Quoted 26 lines · Michal Simek
Patches:
"microblaze: Convert to new irq function names"
sha (4adc192ec7d977c74c750320f289af9d61c1caca)
and
"microblaze: Use generic show_interrupts()"
sha(9d61c18b25726306c9231428c17db42e3ff29ba7)
should also setup edge/level in irq_set_chip_and_handler_name name parameter.
Error log:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-Xilinx INTC  eth0
  3:          2  Xilinx INTC-Xilinx INTC  eth0
  4:        241  Xilinx INTC-Xilinx INTC  timer
  6:        108  Xilinx INTC-Xilinx INTC  serial
Fixed:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-level     eth0
  3:          2  Xilinx INTC-level     eth0
  4:        238  Xilinx INTC-edge      timer
  6:        108  Xilinx INTC-level     serial

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
Signed-off-by Michal Simek <[email protected]>
Should I pick that up for the urgent fixes ?
No you shouldn't. It can go through my tree.
You can give me ACK if you like.

Here you go:

Acked-by Thomas Gleixner <[email protected]>

Michal Simek

author maintainer

2011-03-30 12:09 UTC #4 lore raw

Quoted 31 lines · Thomas Gleixner

Quoted 29 lines · Michal Simek
Quoted 28 lines · Thomas Gleixner
Quoted 26 lines · Michal Simek
Patches:
"microblaze: Convert to new irq function names"
sha (4adc192ec7d977c74c750320f289af9d61c1caca)
and
"microblaze: Use generic show_interrupts()"
sha(9d61c18b25726306c9231428c17db42e3ff29ba7)
should also setup edge/level in irq_set_chip_and_handler_name name parameter.
Error log:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-Xilinx INTC  eth0
  3:          2  Xilinx INTC-Xilinx INTC  eth0
  4:        241  Xilinx INTC-Xilinx INTC  timer
  6:        108  Xilinx INTC-Xilinx INTC  serial
Fixed:
~ # cat /proc/interrupts
CPU0
  2:          2  Xilinx INTC-level     eth0
  3:          2  Xilinx INTC-level     eth0
  4:        238  Xilinx INTC-edge      timer
  6:        108  Xilinx INTC-level     serial

Quoted 8 lines

Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Michal Simek <[email protected]>
Should I pick that up for the urgent fixes ?
No you shouldn't. It can go through my tree.
You can give me ACK if you like.
Here you go:
Acked-by Thomas Gleixner <[email protected]>

Thanks,
Michal

Signature · 4 lines

Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian