ARM: S5PV210: Add Ext interrupt support.
Subsystems (3)
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.c
arch/arm/mach-s5pv210/Kconfig +1 -0
@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU support
arch/arm/mach-s5pv210/include/mach/irqs.h +11 -20
@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)
@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1) -#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) + +#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)#endif /* ASM_ARCH_IRQS_H */
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +44 -0
44 lines not on this page · raw message
arch/arm/plat-s5p/Kconfig +5 -0
@@ -23,3 +23,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_EXT_INT + bool + help + Use the external interrupts (other than GPIO interrupts.)
arch/arm/plat-s5p/Makefile +1 -0
@@ -16,4 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-y += setup-i2c0.o
arch/arm/plat-s5p/irq-eint.c new file +213 -0
213 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
Quoted 3 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
ok, merged onto for-2635/s5p-general.
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
In reply to Kukjin KimHello,
Quoted 60 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
Signed-off-by Jongpill Lee <[email protected]>Signed-off-by Pannaga Bhushan <[email protected]>Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.carch/arm/mach-s5pv210/Kconfig +1
-0@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU supportarch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/irqs.h +0
-0
s5pv210/include/mach/irqs.h
index 62c5175..3a9e42e 100644arch/arm/mach-s5pv210/include/mach/irqs.h +0
-16@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)
arch/arm/mach-s5pv210/include/mach/irqs.h line 140
Quoted 8 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +1
-3@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1) -#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x)
ok
arch/arm/mach-s5pv210/include/mach/irqs.h line 123
Quoted 1 line
arch/arm/mach-s5pv210/include/mach/irqs.h +1
-0+#define EINT_MODE S3C_GPIO_SFN(0xf)
IMHO the irq.h is not the right place for this define
arch/arm/mach-s5pv210/include/mach/irqs.h line 131
Quoted 9 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +5
-1+ +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) +
ok
arch/arm/mach-s5pv210/include/mach/irqs.h line 135
Quoted 4 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +4
-0+#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)
Again, gpio.h would be much better for these.
Quoted 1 line
...
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
In reply to Kukjin KimHello,
Quoted 62 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
Signed-off-by Jongpill Lee <[email protected]>Signed-off-by Pannaga Bhushan <[email protected]>Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.carch/arm/mach-s5pv210/Kconfig +1
-0@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU supportarch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/irqs.h +0
-0
s5pv210/include/mach/irqs.h
index 62c5175..3a9e42e 100644arch/arm/mach-s5pv210/include/mach/irqs.h +0
-16@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31)
arch/arm/mach-s5pv210/include/mach/irqs.h line 126
Quoted 10 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +5
-3-#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1) -#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))
Is there any reason for loosing 16 irq numbers? In this macro EINT(16-31) irqs are mapped to the range from S5P_EINT_16_31_BASE+16 to S5P_EINT_16_31_BASE+31, while the range from S5P_EINT_16_31_BASE to S5P_EINT_16_31_BASE+15 is not used at all.
Quoted 27 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +6
-1/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) + +#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)#endif /* ASM_ARCH_IRQS_H */ arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +9
-0@@ -0,0 +1,44 @@ +/* linux/arch/arm/mach-s5pv210/include/mach/regs-gpio.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV210 - GPIO (including EINT) register definitions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as
arch/arm/mach-s5pv210/include/mach/regs-gpio.h line 19
Quoted 10 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +10
-0+* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_GPIO_H +#define __ASM_ARCH_REGS_GPIO_H __FILE__ + +#include <mach/map.h> + +#define S5PV210_EINT30CON (S5P_VA_GPIO + 0xE00) +#define S5P_EINT_CON (x) (S5PV210_EINT30CON + ((x) *
0x4))
Quoted 217 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +11
-0+ +#define S5PV210_EINT30FLTCON0 (S5P_VA_GPIO + 0xE80) +#define S5P_EINT_FLTCON (x) (S5PV210_EINT30FLTCON0 + ((x) * 0x4)) + +#define S5PV210_EINT30MASK (S5P_VA_GPIO + 0xF00) +#define S5P_EINT_MASK (x) (S5PV210_EINT30MASK + ((x) * 0x4)) + +#define S5PV210_EINT30PEND (S5P_VA_GPIO + 0xF40) +#define S5P_EINT_PEND (x) (S5PV210_EINT30PEND + ((x) * 0x4)) + +#define eint_offset (irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0))\
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +14
-0+ : ((irq) - S5P_EINT_16_31_BASE)) + +#define EINT_REG_NR (x) (eint_offset(x) >> 3) + +#define eint_irq_to_bit (irq) (1 << (eint_offset(irq) & 0x7)) + +/* values for S5P_EXTINT0 */ +#define S5P_EXTINT_LOWLEV (0x00) +#define S5P_EXTINT_HILEV (0x01) +#define S5P_EXTINT_FALLEDGE (0x02) +#define S5P_EXTINT_RISEEDGE (0x03) +#define S5P_EXTINT_BOTHEDGE (0x04) + +#endif /* __ASM_ARCH_REGS_GPIO_H */ arch/arm/plat-s5p/Kconfig +5
-0@@ -23,3 +23,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_EXT_INT + bool + help + Use the external interrupts (other than GPIO interrupts.)arch/arm/plat-s5p/Makefile +1
-0@@ -16,4 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-y += setup-i2c0.oarch/arm/plat-s5p/irq-eint.c new file +157
-0@@ -0,0 +1,213 @@ +/* linux/arch/arm/plat-s5p/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5P - IRQ EINT support +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/sysdev.h> +#include <linux/gpio.h> + +#include <asm/hardware/vic.h> + +#include <plat/regs-irqtype.h> + +#include <mach/map.h> +#include <plat/cpu.h> +#include <plat/pm.h> + +#include <plat/gpio-cfg.h> +#include <mach/regs-gpio.h> + +static inline void s5p_irq_eint_mask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask |=eint_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask &= ~(eint_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static inline void s5p_irq_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_maskack (unsigned int irq) +{ +/* compiler should in-line these */ +s5p_irq_eint_mask (irq); +s5p_irq_eint_ack (irq); +} + +static int s5p_irq_eint_set_type (unsigned int irq,unsigned int type) +{ +int offs =eint_offset (irq); +int shift; +u32 ctrl, mask; +u32 newvalue =0 ; + +switch (type) { +case IRQ_TYPE_EDGE_RISING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_EXTINT_BOTHEDGE ; +break ; + +case IRQ_TYPE_LEVEL_LOW : + newvalue =S5P_EXTINT_LOWLEV ; +break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_EXTINT_HILEV ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + + ctrl =__raw_readl (S5P_EINT_CON (EINT_REG_NR (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (EINT_REG_NR (irq))); + +if ((0 <= offs) && (offs <8 )) +s3c_gpio_cfgpin (EINT_GPIO_0 (offs &0x7 ),EINT_MODE ); + +else if ((8 <= offs) && (offs <16 )) +s3c_gpio_cfgpin (EINT_GPIO_1 (offs &0x7 ),EINT_MODE ); + +else if ((16 <= offs) && (offs <24 )) +s3c_gpio_cfgpin (EINT_GPIO_2 (offs &0x7 ),EINT_MODE ); + +else if ((24 <= offs) && (offs <32 )) +s3c_gpio_cfgpin (EINT_GPIO_3 (offs &0x7 ),EINT_MODE ); + +else +printk (KERN_ERR "No such irq number %d" , offs); + +return 0 ; +} + +static struct irq_chip s5p_irq_eint = { + .name ="s5p-eint" , + .mask = s5p_irq_eint_mask, + .unmask = s5p_irq_eint_unmask, + .mask_ack = s5p_irq_eint_maskack, + .ack = s5p_irq_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5p_irq_demux_eint +* +* This function demuxes the IRQ from the group0 external interrupts, +* from EINTs 16 to 31. It is designed to be inlined into the specific +* handler s5p_irq_demux_eintX_Y. +* +* Each EINT pend/mask registers handle eight of them. +*/ +static inline void s5p_irq_demux_eint (unsigned int start) +{ +u32 status; +u32 mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (start))); +unsigned int irq; + + status =__raw_readl (S5P_EINT_PEND (EINT_REG_NR (start))); + status &= ~mask; + status &=0xff ; + +while (status) { + irq =fls (status); +generic_handle_irq (irq -1 + start); + status &= ~(1 << irq); + } +} + +static void s5p_irq_demux_eint16_31(unsigned int irq, struct irq_desc*desc)
arch/arm/plat-s5p/irq-eint.c new file +4
-0+{ +s5p_irq_demux_eint (IRQ_EINT (16 )); +s5p_irq_demux_eint (IRQ_EINT (24 )); +}
arch/arm/plat-s5p/irq-eint.c line 171
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +10
-0+ +static inline void s5p_irq_vic_eint_mask (unsigned int irq) +{ +s5p_irq_eint_mask (irq); +} + +static void s5p_irq_vic_eint_unmask (unsigned int irq) +{ +s5p_irq_eint_unmask (irq); +}
I've tested this code on SMDKC100 and it does not work without masking/unmasking the irqs directly in VIC. The following code works fine:
static inline void s5p_irq_vic_eint_mask(unsigned int irq)
{
void __iomem *base = get_irq_chip_data(irq);
s5p_irq_eint_mask(irq);
writel(1<<eint_offset(irq), base + VIC_INT_ENABLE_CLEAR);
}static void s5p_irq_vic_eint_unmask(unsigned int irq)
{
void __iomem *base = get_irq_chip_data(irq);
s5p_irq_eint_unmask(irq);
writel(1<<eint_offset(irq), base + VIC_INT_ENABLE);
}Quoted 33 lines
arch/arm/plat-s5p/irq-eint.c new file +33
-0+ +static inline void s5p_irq_vic_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_vic_eint_maskack (unsigned int irq) +{ +s5p_irq_vic_eint_mask (irq); +s5p_irq_vic_eint_ack (irq); +} + +static struct irq_chip s5p_irq_vic_eint = { + .name ="s5p_vic_eint" , + .mask = s5p_irq_vic_eint_mask, + .unmask = s5p_irq_vic_eint_unmask, + .mask_ack = s5p_irq_vic_eint_maskack, + .ack = s5p_irq_vic_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +int __init s5p_init_irq_eint (void ) +{ +int irq; + +for (irq =IRQ_EINT (0 ); irq <=IRQ_EINT (15 ); irq++) +set_irq_chip (irq, &s5p_irq_vic_eint); + +for (irq =IRQ_EINT (16 ); irq <=IRQ_EINT (31 ); irq++) { +set_irq_chip (irq, &s5p_irq_eint);
arch/arm/plat-s5p/irq-eint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +9
-1+set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } + +set_irq_chained_handler (IRQ_EINT16_31 , s5p_irq_demux_eint16_31); +return 0 ; +} + +arch_initcall (s5p_init_irq_eint); --
I've also have problems with chained external interrupts from range 16-31. Once the interrupt is raised it is raised constantly in endless loop. I still didn't manage to figure what causes this problem. All register writes seems to be the same as with my older version, which worked fine.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
Quoted 70 lines · Marek Szyprowski
Hello,
Quoted 66 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
Signed-off-by Jongpill Lee <[email protected]>Signed-off-by Pannaga Bhushan <[email protected]>Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.carch/arm/mach-s5pv210/Kconfig +1
-0@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU supportarch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/irqs.h +0
-0
s5pv210/include/mach/irqs.h
index 62c5175..3a9e42e 100644arch/arm/mach-s5pv210/include/mach/irqs.h +1
-17@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1)
Quoted 11 lines
arch/arm/mach-s5pv210/include/mach/irqs.h line 126
Quoted 6 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +4
-2-#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))Is there any reason for loosing 16 irq numbers? In this macro EINT(16-31) irqs are mapped to the range from S5P_EINT_16_31_BASE+16 to S5P_EINT_16_31_BASE+31, while the range from
S5P_EINT_16_31_BASEto S5P_EINT_16_31_BASE+15 is not used at all.
I think my comments abotu simplifying this where probabyl wrong...
Let's put the -16 back into the S5P_EINT_16_31_BASE range.
Quoted 339 lines
Quoted 27 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +6
-1/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) + +#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)#endif /* ASM_ARCH_IRQS_H */ arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +9
-0@@ -0,0 +1,44 @@ +/* linux/arch/arm/mach-s5pv210/include/mach/regs-gpio.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV210 - GPIO (including EINT) register definitions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as arch/arm/mach-s5pv210/include/mach/regs-gpio.h line 19
Quoted 10 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +10
-0+* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_GPIO_H +#define __ASM_ARCH_REGS_GPIO_H __FILE__ + +#include <mach/map.h> + +#define S5PV210_EINT30CON (S5P_VA_GPIO + 0xE00) +#define S5P_EINT_CON (x) (S5PV210_EINT30CON + ((x) *
0x4))Quoted 217 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +11
-0+ +#define S5PV210_EINT30FLTCON0 (S5P_VA_GPIO + 0xE80) +#define S5P_EINT_FLTCON (x) (S5PV210_EINT30FLTCON0 + ((x) * 0x4)) + +#define S5PV210_EINT30MASK (S5P_VA_GPIO + 0xF00) +#define S5P_EINT_MASK (x) (S5PV210_EINT30MASK + ((x) * 0x4)) + +#define S5PV210_EINT30PEND (S5P_VA_GPIO + 0xF40) +#define S5P_EINT_PEND (x) (S5PV210_EINT30PEND + ((x) * 0x4)) + +#define eint_offset (irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0))\
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +14
-0+ : ((irq) - S5P_EINT_16_31_BASE)) + +#define EINT_REG_NR (x) (eint_offset(x) >> 3) + +#define eint_irq_to_bit (irq) (1 << (eint_offset(irq) & 0x7)) + +/* values for S5P_EXTINT0 */ +#define S5P_EXTINT_LOWLEV (0x00) +#define S5P_EXTINT_HILEV (0x01) +#define S5P_EXTINT_FALLEDGE (0x02) +#define S5P_EXTINT_RISEEDGE (0x03) +#define S5P_EXTINT_BOTHEDGE (0x04) + +#endif /* __ASM_ARCH_REGS_GPIO_H */ arch/arm/plat-s5p/Kconfig +5
-0@@ -23,3 +23,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_EXT_INT + bool + help + Use the external interrupts (other than GPIO interrupts.)arch/arm/plat-s5p/Makefile +1
-0@@ -16,4 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-y += setup-i2c0.oarch/arm/plat-s5p/irq-eint.c new file +157
-0@@ -0,0 +1,213 @@ +/* linux/arch/arm/plat-s5p/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5P - IRQ EINT support +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/sysdev.h> +#include <linux/gpio.h> + +#include <asm/hardware/vic.h> + +#include <plat/regs-irqtype.h> + +#include <mach/map.h> +#include <plat/cpu.h> +#include <plat/pm.h> + +#include <plat/gpio-cfg.h> +#include <mach/regs-gpio.h> + +static inline void s5p_irq_eint_mask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask |=eint_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask &= ~(eint_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static inline void s5p_irq_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_maskack (unsigned int irq) +{ +/* compiler should in-line these */ +s5p_irq_eint_mask (irq); +s5p_irq_eint_ack (irq); +} + +static int s5p_irq_eint_set_type (unsigned int irq,unsigned int type) +{ +int offs =eint_offset (irq); +int shift; +u32 ctrl, mask; +u32 newvalue =0 ; + +switch (type) { +case IRQ_TYPE_EDGE_RISING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_EXTINT_BOTHEDGE ; +break ; + +case IRQ_TYPE_LEVEL_LOW : + newvalue =S5P_EXTINT_LOWLEV ; +break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_EXTINT_HILEV ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + + ctrl =__raw_readl (S5P_EINT_CON (EINT_REG_NR (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (EINT_REG_NR (irq))); + +if ((0 <= offs) && (offs <8 )) +s3c_gpio_cfgpin (EINT_GPIO_0 (offs &0x7 ),EINT_MODE ); + +else if ((8 <= offs) && (offs <16 )) +s3c_gpio_cfgpin (EINT_GPIO_1 (offs &0x7 ),EINT_MODE ); + +else if ((16 <= offs) && (offs <24 )) +s3c_gpio_cfgpin (EINT_GPIO_2 (offs &0x7 ),EINT_MODE ); + +else if ((24 <= offs) && (offs <32 )) +s3c_gpio_cfgpin (EINT_GPIO_3 (offs &0x7 ),EINT_MODE ); + +else +printk (KERN_ERR "No such irq number %d" , offs); + +return 0 ; +} + +static struct irq_chip s5p_irq_eint = { + .name ="s5p-eint" , + .mask = s5p_irq_eint_mask, + .unmask = s5p_irq_eint_unmask, + .mask_ack = s5p_irq_eint_maskack, + .ack = s5p_irq_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5p_irq_demux_eint +* +* This function demuxes the IRQ from the group0 external interrupts, +* from EINTs 16 to 31. It is designed to be inlined into the specific +* handler s5p_irq_demux_eintX_Y. +* +* Each EINT pend/mask registers handle eight of them. +*/ +static inline void s5p_irq_demux_eint (unsigned int start) +{ +u32 status; +u32 mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (start))); +unsigned int irq; + + status =__raw_readl (S5P_EINT_PEND (EINT_REG_NR (start))); + status &= ~mask; + status &=0xff ; + +while (status) { + irq =fls (status); +generic_handle_irq (irq -1 + start); + status &= ~(1 << irq); + } +} + +static void s5p_irq_demux_eint16_31(unsigned int irq, struct irq_desc*desc)
arch/arm/plat-s5p/irq-eint.c new file +4
-0+{ +s5p_irq_demux_eint (IRQ_EINT (16 )); +s5p_irq_demux_eint (IRQ_EINT (24 )); +}arch/arm/plat-s5p/irq-eint.c line 171
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +10
-0+ +static inline void s5p_irq_vic_eint_mask (unsigned int irq) +{ +s5p_irq_eint_mask (irq); +} + +static void s5p_irq_vic_eint_unmask (unsigned int irq) +{ +s5p_irq_eint_unmask (irq); +}I've tested this code on SMDKC100 and it does not work without masking/unmasking the irqs directly in VIC. The following code works fine:
static inline void
s5p_irq_vic_eint_mask(unsigned int irq){ void __iomem *base = get_irq_chip_data(irq); s5p_irq_eint_mask(irq); writel(1<<eint_offset(irq), base + VIC_INT_ENABLE_CLEAR); }static void
s5p_irq_vic_eint_unmask(unsigned int irq){ void __iomem *base = get_irq_chip_data(irq); s5p_irq_eint_unmask(irq); writel(1<<eint_offset(irq), base + VIC_INT_ENABLE); }Quoted 33 lines
arch/arm/plat-s5p/irq-eint.c new file +33
-0+ +static inline void s5p_irq_vic_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_vic_eint_maskack (unsigned int irq) +{ +s5p_irq_vic_eint_mask (irq); +s5p_irq_vic_eint_ack (irq); +} + +static struct irq_chip s5p_irq_vic_eint = { + .name ="s5p_vic_eint" , + .mask = s5p_irq_vic_eint_mask, + .unmask = s5p_irq_vic_eint_unmask, + .mask_ack = s5p_irq_vic_eint_maskack, + .ack = s5p_irq_vic_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +int __init s5p_init_irq_eint (void ) +{ +int irq; + +for (irq =IRQ_EINT (0 ); irq <=IRQ_EINT (15 ); irq++) +set_irq_chip (irq, &s5p_irq_vic_eint); + +for (irq =IRQ_EINT (16 ); irq <=IRQ_EINT (31 ); irq++) { +set_irq_chip (irq, &s5p_irq_eint);arch/arm/plat-s5p/irq-eint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +9
-1+set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } + +set_irq_chained_handler (IRQ_EINT16_31 , s5p_irq_demux_eint16_31); +return 0 ; +} + +arch_initcall (s5p_init_irq_eint); --I've also have problems with chained external interrupts from range 16-31. Once the interrupt is raised it is raised constantly in endless loop. I still didn't manage to figure what causes this problem. All register writes seems to be the same as with my older version, which worked fine.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
Signature · 5 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
Quoted 83 lines · Ben Dooks
Quoted 70 lines · Marek Szyprowski
Hello,
Quoted 66 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
Signed-off-by Jongpill Lee <[email protected]>Signed-off-by Pannaga Bhushan <[email protected]>Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.carch/arm/mach-s5pv210/Kconfig +1
-0@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU supportarch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/irqs.h +0
-0
s5pv210/include/mach/irqs.h
index 62c5175..3a9e42e 100644arch/arm/mach-s5pv210/include/mach/irqs.h +1
-17@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1)Quoted 11 lines
arch/arm/mach-s5pv210/include/mach/irqs.h line 126
Quoted 6 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +4
-2-#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))Is there any reason for loosing 16 irq numbers? In this macro EINT(16-31) irqs are mapped to the range from S5P_EINT_16_31_BASE+16 to S5P_EINT_16_31_BASE+31, while the range from
S5P_EINT_16_31_BASEto S5P_EINT_16_31_BASE+15 is not used at all.
Quoted 3 lines
I think my comments abotu simplifying this where probabyl wrong...
Let's put the -16 back into the
S5P_EINT_16_31_BASErange.
also, can we get as much of the EINT definitions into the <plat/irqs.h> file in arch/arm/plat-s5p/include/plat/irqs.h. I think the IRQ_EINT definition easily fits there, with a S5P_EINT_16_31_BASE definition left in <mach/irqs.h>.
Quoted 351 lines
Quoted 339 lines
Quoted 27 lines
arch/arm/mach-s5pv210/include/mach/irqs.h +6
-1/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) + +#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)#endif /* ASM_ARCH_IRQS_H */ arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +9
-0@@ -0,0 +1,44 @@ +/* linux/arch/arm/mach-s5pv210/include/mach/regs-gpio.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV210 - GPIO (including EINT) register definitions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as arch/arm/mach-s5pv210/include/mach/regs-gpio.h line 19
Quoted 10 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +10
-0+* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_GPIO_H +#define __ASM_ARCH_REGS_GPIO_H __FILE__ + +#include <mach/map.h> + +#define S5PV210_EINT30CON (S5P_VA_GPIO + 0xE00) +#define S5P_EINT_CON (x) (S5PV210_EINT30CON + ((x) *
0x4))Quoted 217 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +11
-0+ +#define S5PV210_EINT30FLTCON0 (S5P_VA_GPIO + 0xE80) +#define S5P_EINT_FLTCON (x) (S5PV210_EINT30FLTCON0 + ((x) * 0x4)) + +#define S5PV210_EINT30MASK (S5P_VA_GPIO + 0xF00) +#define S5P_EINT_MASK (x) (S5PV210_EINT30MASK + ((x) * 0x4)) + +#define S5PV210_EINT30PEND (S5P_VA_GPIO + 0xF40) +#define S5P_EINT_PEND (x) (S5PV210_EINT30PEND + ((x) * 0x4)) + +#define eint_offset (irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0))\
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +14
-0+ : ((irq) - S5P_EINT_16_31_BASE)) + +#define EINT_REG_NR (x) (eint_offset(x) >> 3) + +#define eint_irq_to_bit (irq) (1 << (eint_offset(irq) & 0x7)) + +/* values for S5P_EXTINT0 */ +#define S5P_EXTINT_LOWLEV (0x00) +#define S5P_EXTINT_HILEV (0x01) +#define S5P_EXTINT_FALLEDGE (0x02) +#define S5P_EXTINT_RISEEDGE (0x03) +#define S5P_EXTINT_BOTHEDGE (0x04) + +#endif /* __ASM_ARCH_REGS_GPIO_H */ arch/arm/plat-s5p/Kconfig +5
-0@@ -23,3 +23,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_EXT_INT + bool + help + Use the external interrupts (other than GPIO interrupts.)arch/arm/plat-s5p/Makefile +1
-0@@ -16,4 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-y += setup-i2c0.oarch/arm/plat-s5p/irq-eint.c new file +157
-0@@ -0,0 +1,213 @@ +/* linux/arch/arm/plat-s5p/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5P - IRQ EINT support +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/sysdev.h> +#include <linux/gpio.h> + +#include <asm/hardware/vic.h> + +#include <plat/regs-irqtype.h> + +#include <mach/map.h> +#include <plat/cpu.h> +#include <plat/pm.h> + +#include <plat/gpio-cfg.h> +#include <mach/regs-gpio.h> + +static inline void s5p_irq_eint_mask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask |=eint_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask &= ~(eint_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static inline void s5p_irq_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_maskack (unsigned int irq) +{ +/* compiler should in-line these */ +s5p_irq_eint_mask (irq); +s5p_irq_eint_ack (irq); +} + +static int s5p_irq_eint_set_type (unsigned int irq,unsigned int type) +{ +int offs =eint_offset (irq); +int shift; +u32 ctrl, mask; +u32 newvalue =0 ; + +switch (type) { +case IRQ_TYPE_EDGE_RISING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_EXTINT_BOTHEDGE ; +break ; + +case IRQ_TYPE_LEVEL_LOW : + newvalue =S5P_EXTINT_LOWLEV ; +break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_EXTINT_HILEV ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + + ctrl =__raw_readl (S5P_EINT_CON (EINT_REG_NR (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (EINT_REG_NR (irq))); + +if ((0 <= offs) && (offs <8 )) +s3c_gpio_cfgpin (EINT_GPIO_0 (offs &0x7 ),EINT_MODE ); + +else if ((8 <= offs) && (offs <16 )) +s3c_gpio_cfgpin (EINT_GPIO_1 (offs &0x7 ),EINT_MODE ); + +else if ((16 <= offs) && (offs <24 )) +s3c_gpio_cfgpin (EINT_GPIO_2 (offs &0x7 ),EINT_MODE ); + +else if ((24 <= offs) && (offs <32 )) +s3c_gpio_cfgpin (EINT_GPIO_3 (offs &0x7 ),EINT_MODE ); + +else +printk (KERN_ERR "No such irq number %d" , offs); + +return 0 ; +} + +static struct irq_chip s5p_irq_eint = { + .name ="s5p-eint" , + .mask = s5p_irq_eint_mask, + .unmask = s5p_irq_eint_unmask, + .mask_ack = s5p_irq_eint_maskack, + .ack = s5p_irq_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5p_irq_demux_eint +* +* This function demuxes the IRQ from the group0 external interrupts, +* from EINTs 16 to 31. It is designed to be inlined into the specific +* handler s5p_irq_demux_eintX_Y. +* +* Each EINT pend/mask registers handle eight of them. +*/ +static inline void s5p_irq_demux_eint (unsigned int start) +{ +u32 status; +u32 mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (start))); +unsigned int irq; + + status =__raw_readl (S5P_EINT_PEND (EINT_REG_NR (start))); + status &= ~mask; + status &=0xff ; + +while (status) { + irq =fls (status); +generic_handle_irq (irq -1 + start); + status &= ~(1 << irq); + } +} + +static void s5p_irq_demux_eint16_31(unsigned int irq, struct irq_desc*desc)
arch/arm/plat-s5p/irq-eint.c new file +4
-0+{ +s5p_irq_demux_eint (IRQ_EINT (16 )); +s5p_irq_demux_eint (IRQ_EINT (24 )); +}arch/arm/plat-s5p/irq-eint.c line 171
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +10
-0+ +static inline void s5p_irq_vic_eint_mask (unsigned int irq) +{ +s5p_irq_eint_mask (irq); +} + +static void s5p_irq_vic_eint_unmask (unsigned int irq) +{ +s5p_irq_eint_unmask (irq); +}I've tested this code on SMDKC100 and it does not work without masking/unmasking the irqs directly in VIC. The following code works fine:
static inline void
s5p_irq_vic_eint_mask(unsigned int irq){ void __iomem *base = get_irq_chip_data(irq); s5p_irq_eint_mask(irq); writel(1<<eint_offset(irq), base + VIC_INT_ENABLE_CLEAR); }static void
s5p_irq_vic_eint_unmask(unsigned int irq){ void __iomem *base = get_irq_chip_data(irq); s5p_irq_eint_unmask(irq); writel(1<<eint_offset(irq), base + VIC_INT_ENABLE); }Quoted 33 lines
arch/arm/plat-s5p/irq-eint.c new file +33
-0+ +static inline void s5p_irq_vic_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_vic_eint_maskack (unsigned int irq) +{ +s5p_irq_vic_eint_mask (irq); +s5p_irq_vic_eint_ack (irq); +} + +static struct irq_chip s5p_irq_vic_eint = { + .name ="s5p_vic_eint" , + .mask = s5p_irq_vic_eint_mask, + .unmask = s5p_irq_vic_eint_unmask, + .mask_ack = s5p_irq_vic_eint_maskack, + .ack = s5p_irq_vic_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +int __init s5p_init_irq_eint (void ) +{ +int irq; + +for (irq =IRQ_EINT (0 ); irq <=IRQ_EINT (15 ); irq++) +set_irq_chip (irq, &s5p_irq_vic_eint); + +for (irq =IRQ_EINT (16 ); irq <=IRQ_EINT (31 ); irq++) { +set_irq_chip (irq, &s5p_irq_eint);arch/arm/plat-s5p/irq-eint.c
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +9
-1+set_irq_handler (irq, handle_level_irq); +set_irq_flags (irq,IRQF_VALID ); + } + +set_irq_chained_handler (IRQ_EINT16_31 , s5p_irq_demux_eint16_31); +return 0 ; +} + +arch_initcall (s5p_init_irq_eint); --I've also have problems with chained external interrupts from range 16-31. Once the interrupt is raised it is raised constantly in endless loop. I still didn't manage to figure what causes this problem. All register writes seems to be the same as with my older version, which worked fine.
Best regards
--
Marek Szyprowski
Samsung Poland R&D CenterSignature · 10 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
In reply to Kukjin KimHello,
Quoted 100 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
Signed-off-by Jongpill Lee <[email protected]>Signed-off-by Pannaga Bhushan <[email protected]>Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.carch/arm/mach-s5pv210/Kconfig +1
-0@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU supportarch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/irqs.h +0
-0
s5pv210/include/mach/irqs.h
index 62c5175..3a9e42e 100644arch/arm/mach-s5pv210/include/mach/irqs.h +11
-20@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1) -#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) + +#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)#endif /* ASM_ARCH_IRQS_H */ arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +9
-0@@ -0,0 +1,44 @@ +/* linux/arch/arm/mach-s5pv210/include/mach/regs-gpio.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV210 - GPIO (including EINT) register definitions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as
arch/arm/mach-s5pv210/include/mach/regs-gpio.h line 19
Quoted 10 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +10
-0+* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_GPIO_H +#define __ASM_ARCH_REGS_GPIO_H __FILE__ + +#include <mach/map.h> + +#define S5PV210_EINT30CON (S5P_VA_GPIO + 0xE00) +#define S5P_EINT_CON (x) (S5PV210_EINT30CON + ((x) *
0x4))
Quoted 199 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +11
-0+ +#define S5PV210_EINT30FLTCON0 (S5P_VA_GPIO + 0xE80) +#define S5P_EINT_FLTCON (x) (S5PV210_EINT30FLTCON0 + ((x) * 0x4)) + +#define S5PV210_EINT30MASK (S5P_VA_GPIO + 0xF00) +#define S5P_EINT_MASK (x) (S5PV210_EINT30MASK + ((x) * 0x4)) + +#define S5PV210_EINT30PEND (S5P_VA_GPIO + 0xF40) +#define S5P_EINT_PEND (x) (S5PV210_EINT30PEND + ((x) * 0x4)) + +#define eint_offset (irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0))\
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +14
-0+ : ((irq) - S5P_EINT_16_31_BASE)) + +#define EINT_REG_NR (x) (eint_offset(x) >> 3) + +#define eint_irq_to_bit (irq) (1 << (eint_offset(irq) & 0x7)) + +/* values for S5P_EXTINT0 */ +#define S5P_EXTINT_LOWLEV (0x00) +#define S5P_EXTINT_HILEV (0x01) +#define S5P_EXTINT_FALLEDGE (0x02) +#define S5P_EXTINT_RISEEDGE (0x03) +#define S5P_EXTINT_BOTHEDGE (0x04) + +#endif /* __ASM_ARCH_REGS_GPIO_H */ arch/arm/plat-s5p/Kconfig +5
-0@@ -23,3 +23,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_EXT_INT + bool + help + Use the external interrupts (other than GPIO interrupts.)arch/arm/plat-s5p/Makefile +1
-0@@ -16,4 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-y += setup-i2c0.oarch/arm/plat-s5p/irq-eint.c new file +144
-0@@ -0,0 +1,213 @@ +/* linux/arch/arm/plat-s5p/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5P - IRQ EINT support +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/sysdev.h> +#include <linux/gpio.h> + +#include <asm/hardware/vic.h> + +#include <plat/regs-irqtype.h> + +#include <mach/map.h> +#include <plat/cpu.h> +#include <plat/pm.h> + +#include <plat/gpio-cfg.h> +#include <mach/regs-gpio.h> + +static inline void s5p_irq_eint_mask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask |=eint_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask &= ~(eint_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static inline void s5p_irq_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_maskack (unsigned int irq) +{ +/* compiler should in-line these */ +s5p_irq_eint_mask (irq); +s5p_irq_eint_ack (irq); +} + +static int s5p_irq_eint_set_type (unsigned int irq,unsigned int type) +{ +int offs =eint_offset (irq); +int shift; +u32 ctrl, mask; +u32 newvalue =0 ; + +switch (type) { +case IRQ_TYPE_EDGE_RISING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_EXTINT_BOTHEDGE ; +break ; + +case IRQ_TYPE_LEVEL_LOW : + newvalue =S5P_EXTINT_LOWLEV ; +break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_EXTINT_HILEV ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + + ctrl =__raw_readl (S5P_EINT_CON (EINT_REG_NR (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (EINT_REG_NR (irq))); + +if ((0 <= offs) && (offs <8 )) +s3c_gpio_cfgpin (EINT_GPIO_0 (offs &0x7 ),EINT_MODE ); + +else if ((8 <= offs) && (offs <16 )) +s3c_gpio_cfgpin (EINT_GPIO_1 (offs &0x7 ),EINT_MODE ); + +else if ((16 <= offs) && (offs <24 )) +s3c_gpio_cfgpin (EINT_GPIO_2 (offs &0x7 ),EINT_MODE ); + +else if ((24 <= offs) && (offs <32 )) +s3c_gpio_cfgpin (EINT_GPIO_3 (offs &0x7 ),EINT_MODE ); + +else +printk (KERN_ERR "No such irq number %d" , offs); + +return 0 ; +} + +static struct irq_chip s5p_irq_eint = { + .name ="s5p-eint" , + .mask = s5p_irq_eint_mask, + .unmask = s5p_irq_eint_unmask, + .mask_ack = s5p_irq_eint_maskack, + .ack = s5p_irq_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5p_irq_demux_eint +* +* This function demuxes the IRQ from the group0 external interrupts, +* from EINTs 16 to 31. It is designed to be inlined into the specific +* handler s5p_irq_demux_eintX_Y. +* +* Each EINT pend/mask registers handle eight of them. +*/ +static inline void s5p_irq_demux_eint (unsigned int start) +{ +u32 status; +u32 mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (start))); +unsigned int irq;
arch/arm/plat-s5p/irq-eint.c line 154
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +10
-0+ + status =__raw_readl (S5P_EINT_PEND (EINT_REG_NR (start))); + status &= ~mask; + status &=0xff ; + +while (status) { + irq =fls (status); +generic_handle_irq (irq -1 + start); + status &= ~(1 << irq); + }
I've found the problem with chained external interrupts. In the above loop there is a typical off-by-one bug. The correct code is:
while (status) {
irq = fls(status);
generic_handle_irq(irq - 1 + start);
status &= ~(1 << (irq-1));
} The pending interrupt bit was never cleared resulting in the endless loop.
I wonder if anyone tested that code before submitting to the mailing list...
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH v6 1/1 ARM: S5PV210: Add Ext interrupt support.
Quoted 328 lines · Marek Szyprowski
Hello,
Quoted 100 lines · Kukjin Kim
From: Jongpill Lee <[email protected]>
Add support for external interrupts on S5PV210.
Signed-off-by Jongpill Lee <[email protected]>Signed-off-by Pannaga Bhushan <[email protected]>Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/include/mach/irqs.h | 31 ++--- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 44 +++++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/irq-eint.c | 213 ++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h create mode 100644 arch/arm/plat-s5p/irq-eint.carch/arm/mach-s5pv210/Kconfig +1
-0@@ -12,6 +12,7 @@ if ARCH_S5PV210 config CPU_S5PV210 bool select PLAT_S5P + select S5P_EXT_INT help Enable S5PV210 CPU supportarch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/irqs.h +0
-0
s5pv210/include/mach/irqs.h
index 62c5175..3a9e42e 100644arch/arm/mach-s5pv210/include/mach/irqs.h +11
-20@@ -17,22 +17,6 @@/* VIC0: System, DMA, Timer */ -#define IRQ_EINT0 S5P_IRQ_VIC0(0) -#define IRQ_EINT1 S5P_IRQ_VIC0(1) -#define IRQ_EINT2 S5P_IRQ_VIC0(2) -#define IRQ_EINT3 S5P_IRQ_VIC0(3) -#define IRQ_EINT4 S5P_IRQ_VIC0(4) -#define IRQ_EINT5 S5P_IRQ_VIC0(5) -#define IRQ_EINT6 S5P_IRQ_VIC0(6) -#define IRQ_EINT7 S5P_IRQ_VIC0(7) -#define IRQ_EINT8 S5P_IRQ_VIC0(8) -#define IRQ_EINT9 S5P_IRQ_VIC0(9) -#define IRQ_EINT10 S5P_IRQ_VIC0(10) -#define IRQ_EINT11 S5P_IRQ_VIC0(11) -#define IRQ_EINT12 S5P_IRQ_VIC0(12) -#define IRQ_EINT13 S5P_IRQ_VIC0(13) -#define IRQ_EINT14 S5P_IRQ_VIC0(14) -#define IRQ_EINT15 S5P_IRQ_VIC0(15)#define IRQ_EINT16_31 S5P_IRQ_VIC0(16)#define IRQ_BATF S5P_IRQ_VIC0(17)#define IRQ_MDMA S5P_IRQ_VIC0(18)@@ -134,13 +118,20 @@#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)#define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1) +#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1) -#define S5P_EINT (x) ((x) + S5P_IRQ_EINT_BASE) -#define IRQ_EINT (x) S5P_EINT(x) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define IRQ_EINT (x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ + : ((x) + S5P_EINT_16_31_BASE))/* Set the default NR_IRQS */ -#define NR_IRQS (IRQ_EINT(31) + 1) +#define NR_IRQS (IRQ_EINT(31) + 1) + +#define EINT_GPIO_0 (x) S5PV210_GPH0(x) +#define EINT_GPIO_1 (x) S5PV210_GPH1(x) +#define EINT_GPIO_2 (x) S5PV210_GPH2(x) +#define EINT_GPIO_3 (x) S5PV210_GPH3(x)#endif /* ASM_ARCH_IRQS_H */ arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +9
-0@@ -0,0 +1,44 @@ +/* linux/arch/arm/mach-s5pv210/include/mach/regs-gpio.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV210 - GPIO (including EINT) register definitions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as arch/arm/mach-s5pv210/include/mach/regs-gpio.h line 19
Quoted 10 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +10
-0+* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_GPIO_H +#define __ASM_ARCH_REGS_GPIO_H __FILE__ + +#include <mach/map.h> + +#define S5PV210_EINT30CON (S5P_VA_GPIO + 0xE00) +#define S5P_EINT_CON (x) (S5PV210_EINT30CON + ((x) *
0x4))Quoted 199 lines
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +11
-0+ +#define S5PV210_EINT30FLTCON0 (S5P_VA_GPIO + 0xE80) +#define S5P_EINT_FLTCON (x) (S5PV210_EINT30FLTCON0 + ((x) * 0x4)) + +#define S5PV210_EINT30MASK (S5P_VA_GPIO + 0xF00) +#define S5P_EINT_MASK (x) (S5PV210_EINT30MASK + ((x) * 0x4)) + +#define S5PV210_EINT30PEND (S5P_VA_GPIO + 0xF40) +#define S5P_EINT_PEND (x) (S5PV210_EINT30PEND + ((x) * 0x4)) + +#define eint_offset (irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0))\
arch/arm/mach-s5pv210/include/mach/regs-gpio.h new file +14
-0+ : ((irq) - S5P_EINT_16_31_BASE)) + +#define EINT_REG_NR (x) (eint_offset(x) >> 3) + +#define eint_irq_to_bit (irq) (1 << (eint_offset(irq) & 0x7)) + +/* values for S5P_EXTINT0 */ +#define S5P_EXTINT_LOWLEV (0x00) +#define S5P_EXTINT_HILEV (0x01) +#define S5P_EXTINT_FALLEDGE (0x02) +#define S5P_EXTINT_RISEEDGE (0x03) +#define S5P_EXTINT_BOTHEDGE (0x04) + +#endif /* __ASM_ARCH_REGS_GPIO_H */ arch/arm/plat-s5p/Kconfig +5
-0@@ -23,3 +23,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_EXT_INT + bool + help + Use the external interrupts (other than GPIO interrupts.)arch/arm/plat-s5p/Makefile +1
-0@@ -16,4 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-y += setup-i2c0.oarch/arm/plat-s5p/irq-eint.c new file +144
-0@@ -0,0 +1,213 @@ +/* linux/arch/arm/plat-s5p/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5P - IRQ EINT support +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/io.h> +#include <linux/sysdev.h> +#include <linux/gpio.h> + +#include <asm/hardware/vic.h> + +#include <plat/regs-irqtype.h> + +#include <mach/map.h> +#include <plat/cpu.h> +#include <plat/pm.h> + +#include <plat/gpio-cfg.h> +#include <mach/regs-gpio.h> + +static inline void s5p_irq_eint_mask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask |=eint_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + + mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (irq))); + mask &= ~(eint_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (EINT_REG_NR (irq))); +} + +static inline void s5p_irq_eint_ack (unsigned int irq) +{ +__raw_writel (eint_irq_to_bit (irq),S5P_EINT_PEND (EINT_REG_NR (irq))); +} + +static void s5p_irq_eint_maskack (unsigned int irq) +{ +/* compiler should in-line these */ +s5p_irq_eint_mask (irq); +s5p_irq_eint_ack (irq); +} + +static int s5p_irq_eint_set_type (unsigned int irq,unsigned int type) +{ +int offs =eint_offset (irq); +int shift; +u32 ctrl, mask; +u32 newvalue =0 ; + +switch (type) { +case IRQ_TYPE_EDGE_RISING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_EXTINT_RISEEDGE ; +break ; + +case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_EXTINT_BOTHEDGE ; +break ; + +case IRQ_TYPE_LEVEL_LOW : + newvalue =S5P_EXTINT_LOWLEV ; +break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_EXTINT_HILEV ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + + ctrl =__raw_readl (S5P_EINT_CON (EINT_REG_NR (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (EINT_REG_NR (irq))); + +if ((0 <= offs) && (offs <8 )) +s3c_gpio_cfgpin (EINT_GPIO_0 (offs &0x7 ),EINT_MODE ); + +else if ((8 <= offs) && (offs <16 )) +s3c_gpio_cfgpin (EINT_GPIO_1 (offs &0x7 ),EINT_MODE ); + +else if ((16 <= offs) && (offs <24 )) +s3c_gpio_cfgpin (EINT_GPIO_2 (offs &0x7 ),EINT_MODE ); + +else if ((24 <= offs) && (offs <32 )) +s3c_gpio_cfgpin (EINT_GPIO_3 (offs &0x7 ),EINT_MODE ); + +else +printk (KERN_ERR "No such irq number %d" , offs); + +return 0 ; +} + +static struct irq_chip s5p_irq_eint = { + .name ="s5p-eint" , + .mask = s5p_irq_eint_mask, + .unmask = s5p_irq_eint_unmask, + .mask_ack = s5p_irq_eint_maskack, + .ack = s5p_irq_eint_ack, + .set_type = s5p_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5p_irq_demux_eint +* +* This function demuxes the IRQ from the group0 external interrupts, +* from EINTs 16 to 31. It is designed to be inlined into the specific +* handler s5p_irq_demux_eintX_Y. +* +* Each EINT pend/mask registers handle eight of them. +*/ +static inline void s5p_irq_demux_eint (unsigned int start) +{ +u32 status; +u32 mask =__raw_readl (S5P_EINT_MASK (EINT_REG_NR (start))); +unsigned int irq;arch/arm/plat-s5p/irq-eint.c line 154
Quoted 10 lines
arch/arm/plat-s5p/irq-eint.c new file +10
-0+ + status =__raw_readl (S5P_EINT_PEND (EINT_REG_NR (start))); + status &= ~mask; + status &=0xff ; + +while (status) { + irq =fls (status); +generic_handle_irq (irq -1 + start); + status &= ~(1 << irq); + }I've found the problem with chained external interrupts. In the above loop there is a typical off-by-one bug. The correct code is:
Quoted 5 lines
while (status) {
irq = fls(status);
generic_handle_irq(irq - 1 + start);
status &= ~(1 << (irq-1));
} or irq = fls(status) - 1;
Quoted 3 lines
The pending interrupt bit was never cleared resulting in the endless loop.
I wonder if anyone tested that code before submitting to the mailing list...
One has to hope that code is given at-least a simple test before being sent... this is why assembling a -next tree and getting it tested before submission si always a good idea.
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.