ARM: S5PV310: Add EINT support
Subsystems (3)
cover ARM: S5PV310: Add EINT support
This patch adds the EINT support for S5PV310
[PATCH 1/3] ARM: S5P: Add GPIO2 memory map definition [PATCH 2/3] ARM: S5PV310: Add the definition for external interrupt [PATCH 3/3] ARM: S5PV310: Add external interrupt support
PATCH 1/3 ARM: S5P: Add GPIO2 memory map definition
This patch adds GPIO2 memory map definition for external interrupts
Signed-off by: Jongsun Han <[email protected]>
--- arch/arm/plat-s5p/include/plat/map-s5p.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/plat-s5p/include/plat/map-s5p.h +1 -0
@@ -15,6 +15,7 @@#define S5P_VA_CHIPID S3C_ADDR(0x00700000)#define S5P_VA_GPIO S3C_ADDR(0x00500000) +#define S5P_VA_GPIO2 S3C_ADDR(0x00510000)#define S5P_VA_SYSTIMER S3C_ADDR(0x01200000)#define S5P_VA_SROMC S3C_ADDR(0x01100000)#define S5P_VA_SYSRAM S3C_ADDR(0x01180000)
Signature · 1 line
1.6.3.3
PATCH 2/3 ARM: S5PV310: Add the definition for external interrupt
In reply to Jongsun HanThis patch add the definition for both IRQs and GPIO registers for external interrupt.
--- arch/arm/mach-s5pv310/include/mach/irqs.h | 26 +++++++++++++++- arch/arm/mach-s5pv310/include/mach/regs-gpio.h | 37 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-gpio.h
arch/arm/mach-s5pv310/include/mach/irqs.h +24 -2
@@ -78,10 +78,32 @@#define IRQ_ONENAND_AUDI COMBINER_IRQ(34, 0) +#define IRQ_EINT4 COMBINER_IRQ(37, 0) +#define IRQ_EINT5 COMBINER_IRQ(37, 1) +#define IRQ_EINT6 COMBINER_IRQ(37, 2) +#define IRQ_EINT7 COMBINER_IRQ(37, 3) +#define IRQ_EINT8 COMBINER_IRQ(38, 0) + +#define IRQ_EINT9 COMBINER_IRQ(38, 1) +#define IRQ_EINT10 COMBINER_IRQ(38, 2) +#define IRQ_EINT11 COMBINER_IRQ(38, 3) +#define IRQ_EINT12 COMBINER_IRQ(38, 4) +#define IRQ_EINT13 COMBINER_IRQ(38, 5) +#define IRQ_EINT14 COMBINER_IRQ(38, 6) +#define IRQ_EINT15 COMBINER_IRQ(38, 7) + +#define IRQ_EINT16_31 COMBINER_IRQ(39, 0) + +#define IRQ_EINT_BASE (IRQ_EINT16_31 + 1) +/* Set the default NR_IRQS */ +#define NR_IRQS (IRQ_EINT_BASE + 32) + +#define EINT_NUMBER (x) ((x) + IRQ_EINT_BASE) -#define NR_IRQS COMBINER_IRQ(MAX_COMBINER_NR, 0) +#define S5P_EINT_BASE1 EINT_NUMBER(0) +#define S5P_EINT_BASE2 EINT_NUMBER(16) -#define MAX_COMBINER_NR 39 +#define MAX_COMBINER_NR 40#endif /* __ASM_ARCH_IRQS_H */
arch/arm/mach-s5pv310/include/mach/regs-gpio.h new file +37 -0
@@ -0,0 +1,37 @@ +/* linux/arch/arm/mach-s5pv310/include/mach/regs-gpio.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV310 - 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 +* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_GPIO_H +#define __ASM_ARCH_REGS_GPIO_H __FILE__ + +#include <mach/map.h> + +#define S5PV310_EINT40CON (S5P_VA_GPIO2 + 0xE00) +#define S5P_EINT_CON (x) (S5PV310_EINT40CON + ((x) * 0x4)) + +#define S5PV310_EINT40FLTCON0 (S5P_VA_GPIO2 + 0xE80) +#define S5P_EINT_FLTCON (x) (S5PV310_EINT40FLTCON0 + ((x) * 0x4)) + +#define S5PV310_EINT40MASK (S5P_VA_GPIO2 + 0xF00) +#define S5P_EINT_MASK (x) (S5PV310_EINT40MASK + ((x) * 0x4)) + +#define S5PV310_EINT40PEND (S5P_VA_GPIO2 + 0xF40) +#define S5P_EINT_PEND (x) (S5PV310_EINT40PEND + ((x) * 0x4)) + +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define EINT_GPIO_0 (x) S5PV310_GPX0(x) +#define EINT_GPIO_1 (x) S5PV310_GPX1(x) +#define EINT_GPIO_2 (x) S5PV310_GPX2(x) +#define EINT_GPIO_3 (x) S5PV310_GPX3(x) + +#endif /* __ASM_ARCH_REGS_GPIO_H */
Signature · 1 line
1.6.3.3
PATCH 2/3 ARM: S5PV310: Add the definition for external interrupt
Quoted 2 lines · Jongsun Han
This patch add the definition for both IRQs and GPIO registers for
external
Quoted 37 lines
interrupt.
Signed-off-by Jongsun Han <[email protected]>--- arch/arm/mach-s5pv310/include/mach/irqs.h | 26 +++++++++++++++- arch/arm/mach-s5pv310/include/mach/regs-gpio.h | 37 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-gpio.harch/arm/mach- renamed from arch/arm/mach-s5pv310/include/mach/irqs.h +0
-0
s5pv310/include/mach/irqs.h
index e81332f..9faea58 100644arch/arm/mach-s5pv310/include/mach/irqs.h +18
-0@@ -78,10 +78,32 @@#define IRQ_ONENAND_AUDI COMBINER_IRQ(34, 0) +#define IRQ_EINT4 COMBINER_IRQ(37, 0) +#define IRQ_EINT5 COMBINER_IRQ(37, 1) +#define IRQ_EINT6 COMBINER_IRQ(37, 2) +#define IRQ_EINT7 COMBINER_IRQ(37, 3) +#define IRQ_EINT8 COMBINER_IRQ(38, 0) + +#define IRQ_EINT9 COMBINER_IRQ(38, 1) +#define IRQ_EINT10 COMBINER_IRQ(38, 2) +#define IRQ_EINT11 COMBINER_IRQ(38, 3) +#define IRQ_EINT12 COMBINER_IRQ(38, 4) +#define IRQ_EINT13 COMBINER_IRQ(38, 5) +#define IRQ_EINT14 COMBINER_IRQ(38, 6) +#define IRQ_EINT15 COMBINER_IRQ(38, 7) + +#define IRQ_EINT16_31 COMBINER_IRQ(39, 0) + +#define IRQ_EINT_BASE (IRQ_EINT16_31 + 1) +
arch/arm/mach-s5pv310/include/mach/irqs.h line 107
Quoted 10 lines
arch/arm/mach-s5pv310/include/mach/irqs.h +5
-1/* Set the default NR_IRQS */ +#define NR_IRQS (IRQ_EINT_BASE + 32) + +#define EINT_NUMBER (x) ((x) + IRQ_EINT_BASE) -#define NR_IRQS COMBINER_IRQ(MAX_COMBINER_NR, 0) +#define S5P_EINT_BASE1 EINT_NUMBER(0) +#define S5P_EINT_BASE2 EINT_NUMBER(16)
No need to add EINT_NUMBER(x) macro?
#define S5P_EINT_BASE1 (IRQ_EINT_BASE + 0)
#define S5P_EINT_BASE1 (IRQ_EINT_BASE + 16)
Quoted 4 lines
arch/arm/mach-s5pv310/include/mach/irqs.h +1
-1-#define MAX_COMBINER_NR 39 +#define MAX_COMBINER_NR 40#endif /*
__ASM_ARCH_IRQS_H*/
(snip)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 3/3 ARM: S5PV310: Add external interrupt support
In reply to Jongsun HanThis patch adds the external interrupt support.
All external interrupts are transferred to GIC through interrupt combiner.
--- arch/arm/mach-s5pv310/Makefile | 2 +- arch/arm/mach-s5pv310/irq-eint.c | 257 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-s5pv310/irq-eint.c
arch/arm/mach-s5pv310/Makefile +1 -1
@@ -13,7 +13,7 @@ obj- := # Core support for S5PV310 system obj-$(CONFIG_CPU_S5PV310) += cpu.o init.o clock.o irq-combiner.o -obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o +obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o irq-eint.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o
arch/arm/mach-s5pv310/irq-eint.c new file +257 -0
257 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 3/3 ARM: S5PV310: Add external interrupt support
Hello,
Quoted 156 lines · Jongsun Han
This patch adds the external interrupt support.
All external interrupts are transferred to GIC through interrupt combiner.Signed-off-by Jongsun Han <[email protected]>Signed-off-by Jongpill Lee <[email protected]>--- arch/arm/mach-s5pv310/Makefile | 2 +- arch/arm/mach-s5pv310/irq-eint.c | 257 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-s5pv310/irq-eint.carch/arm/mach-s5pv310/Makefile +1
-1@@ -13,7 +13,7 @@ obj- := # Core support for S5PV310 system obj-$(CONFIG_CPU_S5PV310) += cpu.o init.o clock.o irq-combiner.o -obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o +obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o irq-eint.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_SMP) += platsmp.o headsmp.oarch/arm/mach-s5pv310/irq-eint.c new file +126
-0@@ -0,0 +1,257 @@ +/* linux/arch/arm/mach-s5pv310/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV310 - 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 <plat/regs-irqtype.h> +#include <plat/pm.h> +#include <plat/cpu.h> +#include <plat/gpio-cfg.h> + +#include <mach/map.h> +#include <mach/regs-gpio.h> + +static DEFINE_SPINLOCK (eint_lock); + +static unsigned int s5pv310_get_irq_nr (unsigned int number) +{ +u32 ret =0 ; + +switch (number) { + case 0 ... 3: + ret = (number +IRQ_EINT0 ); +break ; + case 4 ... 7: + ret = (number + (IRQ_EINT4 -4 )); +break ; + case 8 ... 15: + ret = (number + (IRQ_EINT8 -8 )); +break ; +default : +printk (KERN_ERR "number available : %d\n" , number); + } + +return ret; +} + +static unsigned int s5pv310_irq_split (unsigned int number) +{ +u32 ret; +u32 test = number; + + ret =do_div (test,IRQ_EINT_BASE ); + +do_div (ret,8 ); + +return ret; +} + +static unsigned int s5pv310_irq_to_bit (unsigned int irq) +{ +u32 ret; +u32 tmp; + + tmp =do_div (irq,IRQ_EINT_BASE ); + + ret =do_div (tmp,8 ); + +return 1 << ret; +} + +static inline void s5pv310_irq_eint_mask (unsigned int irq) +{ +u32 mask; + +spin_lock (&eint_lock); + mask =__raw_readl (S5P_EINT_MASK (s5pv310_irq_split (irq))); + mask |=s5pv310_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); +} + +static void s5pv310_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + +spin_lock (&eint_lock); + mask =__raw_readl (S5P_EINT_MASK (s5pv310_irq_split (irq))); + mask &= ~(s5pv310_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); +} + +static inline void s5pv310_irq_eint_ack (unsigned int irq) +{ +spin_lock (&eint_lock); +__raw_writel (s5pv310_irq_to_bit (irq), +S5P_EINT_PEND (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); +} + +static void s5pv310_irq_eint_maskack (unsigned int irq) +{ +s5pv310_irq_eint_mask (irq); +s5pv310_irq_eint_ack (irq); +} + +static int s5pv310_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_IRQ_TYPE_EDGE_RISING ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_IRQ_TYPE_EDGE_FALLING ; +break ; +
arch/arm/mach-s5pv310/irq-eint.c line 135
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +9
-0+case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_IRQ_TYPE_EDGE_BOTH ; +break ; + +case IRQ_TYPE_LEVEL_LOW : +if (irq ==IRQ_EINT (5 )) + newvalue =S5P_IRQ_TYPE_LEVEL_HIGH ; +else + newvalue =S5P_IRQ_TYPE_LEVEL_LOW ;
This one looks like an ugle hack. What is it for?
Quoted 91 lines
arch/arm/mach-s5pv310/irq-eint.c new file +91
-0+break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_IRQ_TYPE_LEVEL_HIGH ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + +spin_lock (&eint_lock); + ctrl =__raw_readl (S5P_EINT_CON (s5pv310_irq_split (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); + +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 s5pv310_irq_eint = { + .name ="s5pv310-eint" , + .mask = s5pv310_irq_eint_mask, + .unmask = s5pv310_irq_eint_unmask, + .mask_ack = s5pv310_irq_eint_maskack, + .ack = s5pv310_irq_eint_ack, + .set_type = s5pv310_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5pv310_irq_demux_eint +* +* This function demuxes the IRQ from 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 s5pv310_irq_demux_eint (unsigned int start) +{ +unsigned int irq; + +u32 status =__raw_readl (S5P_EINT_PEND (s5pv310_irq_split (start))); +u32 mask =__raw_readl (S5P_EINT_MASK (s5pv310_irq_split (start))); + + status &= ~mask; + status &=0xff ; + +while (status) { + irq =fls (status) -1 ; +generic_handle_irq (irq + start); + status &= ~(1 << irq); + } +} + +static void s5pv310_irq_demux_eint16_31 (unsigned int irq,struct irq_desc *desc) +{ +s5pv310_irq_demux_eint (IRQ_EINT (16 )); +s5pv310_irq_demux_eint (IRQ_EINT (24 )); +} + +static void s5pv310_irq_eint0_15 (unsigned int irq,struct irq_desc *desc) +{ +u32 i; +struct irq_chip *chip =get_irq_chip (irq); + + chip->mask (irq); + +if (chip->ack) + chip->ack (irq);
arch/arm/mach-s5pv310/irq-eint.c line 236
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+ +for (i =0 ; i <=15 ; i++) { +if (irq ==s5pv310_get_irq_nr (i)) { +generic_handle_irq (IRQ_EINT (i)); +break ; + } + } + + chip->unmask (irq); +}
Am I right that this chained handler is just a simple proxy? If so is it really needed?
Quoted 11 lines
arch/arm/mach-s5pv310/irq-eint.c new file +11
-0+ +int __init s5pv310_init_irq_eint (void ) +{ +int irq; + +for (irq =0 ; irq <=31 ; irq++) { +set_irq_chip (IRQ_EINT (irq), &s5pv310_irq_eint); +set_irq_handler (IRQ_EINT (irq), handle_level_irq); +set_irq_flags (IRQ_EINT (irq),IRQF_VALID ); + } +
arch/arm/mach-s5pv310/irq-eint.c line 257
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+set_irq_chained_handler (IRQ_EINT16_31 , s5pv310_irq_demux_eint16_31); + +for (irq =0 ; irq <=15 ; irq++) +set_irq_chained_handler (s5pv310_get_irq_nr (irq), + s5pv310_irq_eint0_15); + +return 0 ; +} + +arch_initcall (s5pv310_init_irq_eint);
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH 3/3 ARM: S5PV310: Add external interrupt support
Quoted 165 lines · Jongsun Han
Quoted 9 lines
This patch adds the external interrupt support.
All external interrupts are transferred to GIC through interrupt combiner.Signed-off-by Jongsun Han <[email protected]>Signed-off-by Jongpill Lee <[email protected]>--- arch/arm/mach-s5pv310/Makefile | 2 +- arch/arm/mach-s5pv310/irq-eint.c | 257++++++++++++++++++++++++++++++++++++++
arch/arm/mach-s5pv310/irq-
Quoted 17 lines
2 files changed, 258 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-s5pv310/irq-eint.carch/arm/mach-s5pv310/Makefile +1
-1@@ -13,7 +13,7 @@ obj- := # Core support for S5PV310 system obj-$(CONFIG_CPU_S5PV310) += cpu.o init.o clock.o irq-combiner.o -obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o +obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o irq-eint.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_SMP) += platsmp.o headsmp.oarch/arm/mach-s5pv310/irq- renamed from arch/arm/mach-s5pv310/irq-eint.c +0
-0
eint.cQuoted 136 lines
new file mode 100644
index 0000000..5eb464barch/arm/mach-s5pv310/irq-eint.c new file +131
-0@@ -0,0 +1,257 @@ +/* linux/arch/arm/mach-s5pv310/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV310 - 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 <plat/regs-irqtype.h> +#include <plat/pm.h> +#include <plat/cpu.h> +#include <plat/gpio-cfg.h> + +#include <mach/map.h> +#include <mach/regs-gpio.h> + +static DEFINE_SPINLOCK (eint_lock); + +static unsigned int s5pv310_get_irq_nr (unsigned int number) +{ +u32 ret =0 ; + +switch (number) { + case 0 ... 3: + ret = (number +IRQ_EINT0 ); +break ; + case 4 ... 7: + ret = (number + (IRQ_EINT4 -4 )); +break ; + case 8 ... 15: + ret = (number + (IRQ_EINT8 -8 )); +break ; +default : +printk (KERN_ERR "number available : %d\n" , number); + } + +return ret; +} + +static unsigned int s5pv310_irq_split (unsigned int number) +{ +u32 ret; +u32 test = number; + + ret =do_div (test,IRQ_EINT_BASE ); + +do_div (ret,8 ); + +return ret; +} + +static unsigned int s5pv310_irq_to_bit (unsigned int irq) +{ +u32 ret; +u32 tmp; + + tmp =do_div (irq,IRQ_EINT_BASE ); + + ret =do_div (tmp,8 ); + +return 1 << ret; +} + +static inline void s5pv310_irq_eint_mask (unsigned int irq) +{ +u32 mask; + +spin_lock (&eint_lock); + mask =__raw_readl (S5P_EINT_MASK (s5pv310_irq_split (irq))); + mask |=s5pv310_irq_to_bit (irq); +__raw_writel (mask,S5P_EINT_MASK (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); +} + +static void s5pv310_irq_eint_unmask (unsigned int irq) +{ +u32 mask; + +spin_lock (&eint_lock); + mask =__raw_readl (S5P_EINT_MASK (s5pv310_irq_split (irq))); + mask &= ~(s5pv310_irq_to_bit (irq)); +__raw_writel (mask,S5P_EINT_MASK (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); +} + +static inline void s5pv310_irq_eint_ack (unsigned int irq) +{ +spin_lock (&eint_lock); +__raw_writel (s5pv310_irq_to_bit (irq), +S5P_EINT_PEND (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); +} + +static void s5pv310_irq_eint_maskack (unsigned int irq) +{ +s5pv310_irq_eint_mask (irq); +s5pv310_irq_eint_ack (irq); +} + +static int s5pv310_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_IRQ_TYPE_EDGE_RISING ; +break ; + +case IRQ_TYPE_EDGE_FALLING : + newvalue =S5P_IRQ_TYPE_EDGE_FALLING ; +break ; + +case IRQ_TYPE_EDGE_BOTH : + newvalue =S5P_IRQ_TYPE_EDGE_BOTH ; +break ; + +case IRQ_TYPE_LEVEL_LOW :
Quoted 7 lines
arch/arm/mach-s5pv310/irq-eint.c line 135
Quoted 4 lines
arch/arm/mach-s5pv310/irq-eint.c new file +4
-0+if (irq ==IRQ_EINT (5 )) + newvalue =S5P_IRQ_TYPE_LEVEL_HIGH ; +else + newvalue =S5P_IRQ_TYPE_LEVEL_LOW ;This one looks like an ugle hack. What is it for?
Hi,Marek
It's dummy code.
I'll make patch
Quoted 98 lines
Quoted 67 lines
arch/arm/mach-s5pv310/irq-eint.c new file +67
-0+break ; + +case IRQ_TYPE_LEVEL_HIGH : + newvalue =S5P_IRQ_TYPE_LEVEL_HIGH ; +break ; + +default : +printk (KERN_ERR "No such irq type %d" , type); +return -EINVAL ; + } + + shift = (offs &0x7 ) *4 ; + mask =0x7 << shift; + +spin_lock (&eint_lock); + ctrl =__raw_readl (S5P_EINT_CON (s5pv310_irq_split (irq))); + ctrl &= ~mask; + ctrl |= newvalue << shift; +__raw_writel (ctrl,S5P_EINT_CON (s5pv310_irq_split (irq))); +spin_unlock (&eint_lock); + +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 s5pv310_irq_eint = { + .name ="s5pv310-eint" , + .mask = s5pv310_irq_eint_mask, + .unmask = s5pv310_irq_eint_unmask, + .mask_ack = s5pv310_irq_eint_maskack, + .ack = s5pv310_irq_eint_ack, + .set_type = s5pv310_irq_eint_set_type, +#ifdef CONFIG_PM + .set_wake = s3c_irqext_wake, +#endif +}; + +/* s5pv310_irq_demux_eint +* +* This function demuxes the IRQ from 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 s5pv310_irq_demux_eint (unsigned int start) +{ +unsigned int irq; + +u32 status =__raw_readl (S5P_EINT_PEND (s5pv310_irq_split (start))); +u32 mask =__raw_readl (S5P_EINT_MASK (s5pv310_irq_split (start))); + + status &= ~mask;arch/arm/mach-s5pv310/irq-eint.c
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+ status &=0xff ; + +while (status) { + irq =fls (status) -1 ; +generic_handle_irq (irq + start); + status &= ~(1 << irq); + } +} + +static void s5pv310_irq_demux_eint16_31(unsigned int irq, struct irq_desc*desc)
Quoted 20 lines
arch/arm/mach-s5pv310/irq-eint.c new file +20
-0+{ +s5pv310_irq_demux_eint (IRQ_EINT (16 )); +s5pv310_irq_demux_eint (IRQ_EINT (24 )); +} + +static void s5pv310_irq_eint0_15 (unsigned int irq,struct irq_desc *desc) +{ +u32 i; +struct irq_chip *chip =get_irq_chip (irq); + + chip->mask (irq); + +if (chip->ack) + chip->ack (irq); + +for (i =0 ; i <=15 ; i++) { +if (irq ==s5pv310_get_irq_nr (i)) { +generic_handle_irq (IRQ_EINT (i)); +break ; + }
Quoted 9 lines
arch/arm/mach-s5pv310/irq-eint.c line 236
Quoted 4 lines
arch/arm/mach-s5pv310/irq-eint.c new file +4
-0+ } + + chip->unmask (irq); +}Am I right that this chained handler is just a simple proxy? If so is it really
needed?
No,
this chained handler calls gic ack function and then eint ack fuction is called handle_level_irq.
Quoted 32 lines
Quoted 11 lines
arch/arm/mach-s5pv310/irq-eint.c new file +11
-0+ +int __init s5pv310_init_irq_eint (void ) +{ +int irq; + +for (irq =0 ; irq <=31 ; irq++) { +set_irq_chip (IRQ_EINT (irq), &s5pv310_irq_eint); +set_irq_handler (IRQ_EINT (irq), handle_level_irq); +set_irq_flags (IRQ_EINT (irq),IRQF_VALID ); + } +arch/arm/mach-s5pv310/irq-eint.c line 257
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+set_irq_chained_handler (IRQ_EINT16_31 , s5pv310_irq_demux_eint16_31); + +for (irq =0 ; irq <=15 ; irq++) +set_irq_chained_handler (s5pv310_get_irq_nr (irq), + s5pv310_irq_eint0_15); + +return 0 ; +} + +arch_initcall (s5pv310_init_irq_eint);Best regards
--
Marek Szyprowski
Samsung Poland R&D Center_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 3/3 ARM: S5PV310: Add external interrupt support
In reply to Jongsun HanQuoted 13 lines · Jongsun Han
arch/arm/mach-s5pv310/irq-eint.c new file +13
-0+static unsigned int s5pv310_irq_split (unsigned int number) +{ +u32 ret; +u32 test = number; + + ret =do_div (test,IRQ_EINT_BASE ); + +do_div (ret,8 ); + +return ret; +} + +static unsigned int s5pv310_irq_to_bit (unsigned int irq)
arch/arm/mach-s5pv310/irq-eint.c line 73
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+{ +u32 ret; +u32 tmp; + + tmp =do_div (irq,IRQ_EINT_BASE ); + + ret =do_div (tmp,8 ); + +return 1 << ret; +}
These are a silly use of do_div(). do_div() is for 64-bit modulus/division, not 32-bit. If you want to do 32-bit, then use the normal C maths.
What the above equates to is:
tmp = irq % IRQ_EINT_BASE;
ret = tmp % 8;However, I don't think you want to do modulus operations there at all. What I think you actually want is:
return 1 << ((irq - IRQ_EINT_BASE) % 7);
noting that the compiler will optimize this to a subtract and bit-wise and operation.
For the former:
return ((irq - IRQ_EINT_BASE) / 8);
noting that the compiler will optimize this to a subtract and shift.
PATCH 3/3 ARM: S5PV310: Add external interrupt support
In reply to Jongsun HanQuoted 6 lines · Jongsun Han
This patch adds the external interrupt support.
All external interrupts are transferred to GIC through interrupt combiner.Signed-off-by Jongsun Han <[email protected]>Signed-off-by Jongpill Lee <[email protected]>
Review
Quoted 8 lines
--- arch/arm/mach-s5pv310/Makefile | 2 +- arch/arm/mach-s5pv310/irq-eint.c | 257 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-s5pv310/irq-eint.c(quoted diff) +0
-0
b/arch/arm/mach-s5pv310/Makefile
Review
Quoted 13 lines
index d17c8c7..7b91a9b 100644
arch/arm/mach-s5pv310/Makefile +1
-1@@ -13,7 +13,7 @@ obj- := # Core support for S5PV310 system obj-$(CONFIG_CPU_S5PV310) += cpu.o init.o clock.o irq-combiner.o -obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o +obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o irq-eint.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o(quoted diff) +0
-0
b/arch/arm/mach-s5pv310/irq-eint.c
Quoted 15 lines
new file mode 100644
index 0000000..5eb464barch/arm/mach-s5pv310/irq-eint.c new file +10
-0@@ -0,0 +1,257 @@ +/* linux/arch/arm/mach-s5pv310/irq-eint.c +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com +* +* S5PV310 - 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.
arch/arm/mach-s5pv310/irq-eint.c line 20
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+*/ + +#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 <plat/regs-irqtype.h>
We need really this?
arch/arm/mach-s5pv310/irq-eint.c line 25
Quoted 5 lines
arch/arm/mach-s5pv310/irq-eint.c new file +5
-0+#include <plat/pm.h> +#include <plat/cpu.h> +#include <plat/gpio-cfg.h> + +#include <mach/map.h>
No need...?
Quoted 26 lines
arch/arm/mach-s5pv310/irq-eint.c new file +26
-0+#include <mach/regs-gpio.h> + +static DEFINE_SPINLOCK (eint_lock); + +static unsigned int s5pv310_get_irq_nr (unsigned int number) +{ +u32 ret =0 ; + +switch (number) { + case 0 ... 3: + ret = (number +IRQ_EINT0 ); +break ; + case 4 ... 7: + ret = (number + (IRQ_EINT4 -4 )); +break ; + case 8 ... 15: + ret = (number + (IRQ_EINT8 -8 )); +break ; +default : +printk (KERN_ERR "number available : %d\n" , number); + } + +return ret; +} + +static unsigned int s5pv310_irq_split (unsigned int number)
arch/arm/mach-s5pv310/irq-eint.c line 61
Quoted 10 lines
arch/arm/mach-s5pv310/irq-eint.c new file +10
-0+{ +u32 ret; +u32 test = number; + + ret =do_div (test,IRQ_EINT_BASE ); + +do_div (ret,8 ); + +return ret; +}
How about just use same method like other S5PC100 or S5PV210...I mean you can use macro here instead s5pv310_irq_split()
See the plat-s5p/irq-eint.c and mach/regs-gpio.h.
arch/arm/mach-s5pv310/irq-eint.c line 73
Quoted 12 lines
arch/arm/mach-s5pv310/irq-eint.c new file +12
-0+ +static unsigned int s5pv310_irq_to_bit (unsigned int irq) +{ +u32 ret; +u32 tmp; + + tmp =do_div (irq,IRQ_EINT_BASE ); + + ret =do_div (tmp,8 ); + +return 1 << ret; +}
Same...
(snip)
Hmm...
I think, we need to re-think about to use common s5p eint functions for this.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.