ARM: irqchip: mxs: prepare driver for HW with different offsets
Subsystems (2)
PATCH 1/2 ARM: irqchip: mxs: prepare driver for HW with different offsets
Some HW has similar functionality but different register offsets. Make sure we can change offsets dynamically.
--- drivers/irqchip/irq-mxs.c | 55 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-)
drivers/irqchip/irq-mxs.c +42 -13
@@ -28,18 +28,39 @@#include <linux/stmp_device.h> #include <asm/exception.h> +/* +* this device provide 4 offsets for each register: +* 0x0 - plain read write mode +* 0x4 - set mode, OR logic. +* 0x8 - clr mode, XOR logic. +* 0xc - togle mode. +*/ +#define SET_REG 4 +#define CLR_REG 8 +#define HW_ICOLL_VECTOR 0x0000#define HW_ICOLL_LEVELACK 0x0010#define HW_ICOLL_CTRL 0x0020#define HW_ICOLL_STAT_OFFSET 0x0070 -#define HW_ICOLL_INTERRUPTn_SET (n) (0x0124 + (n) * 0x10) -#define HW_ICOLL_INTERRUPTn_CLR (n) (0x0128 + (n) * 0x10) -#define BM_ICOLL_INTERRUPTn_ENABLE 0x00000004 +#define HW_ICOLL_INTERRUPT0 0x0120 +#define HW_ICOLL_INTERRUPTn (n) ((n) * 0x10) +#define BM_ICOLL_INTR_ENABLE BIT(2)#define BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 0x1#define ICOLL_NUM_IRQS 128 -static void __iomem *icoll_base; +struct icoll_priv { +void __iomem *vector; +void __iomem *levelack; +void __iomem *ctrl; +void __iomem *stat; +void __iomem *intr; +/* number of interrupts per register */ +int intr_per_reg; +void __iomem *clear; +}; + +static struct icoll_priv icoll_priv;static struct irq_domain *icoll_domain;static void icoll_ack_irq (struct irq_data *d)
@@ -50,19 +71,19 @@ static void icoll_ack_irq(struct irq_data *d)* BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 unconditionally. */ __raw_writel (BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 , - icoll_base +HW_ICOLL_LEVELACK ); + icoll_priv.levelack); }static void icoll_mask_irq (struct irq_data *d) { -__raw_writel (BM_ICOLL_INTERRUPTn_ENABLE, - icoll_base +HW_ICOLL_INTERRUPTn_CLR (d->hwirq)); +__raw_writel (BM_ICOLL_INTR_ENABLE , + icoll_priv.intr +CLR_REG +HW_ICOLL_INTERRUPTn (d->hwirq)); }static void icoll_unmask_irq (struct irq_data *d) { -__raw_writel (BM_ICOLL_INTERRUPTn_ENABLE, - icoll_base +HW_ICOLL_INTERRUPTn_SET (d->hwirq)); +__raw_writel (BM_ICOLL_INTR_ENABLE , + icoll_priv.intr +SET_REG +HW_ICOLL_INTERRUPTn (d->hwirq)); }static struct irq_chip mxs_icoll_chip = {
@@ -75,8 +96,8 @@ asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs) {u32 irqnr; - irqnr =__raw_readl (icoll_base +HW_ICOLL_STAT_OFFSET ); -__raw_writel (irqnr, icoll_base +HW_ICOLL_VECTOR ); + irqnr =__raw_readl (icoll_priv.stat); +__raw_writel (irqnr, icoll_priv.vector);handle_domain_irq (icoll_domain, irqnr, regs); }
@@ -97,14 +118,22 @@ static const struct irq_domain_ops icoll_irq_domain_ops = {static int __init icoll_of_init (struct device_node *np,struct device_node *interrupt_parent) { - icoll_base =of_iomap (np,0 ); +void __iomem *icoll_base =of_iomap (np,0 );WARN_ON (!icoll_base); + icoll_priv.vector = icoll_base +HW_ICOLL_VECTOR ; + icoll_priv.levelack = icoll_base +HW_ICOLL_LEVELACK ; + icoll_priv.ctrl = icoll_base +HW_ICOLL_CTRL ; + icoll_priv.stat = icoll_base +HW_ICOLL_STAT_OFFSET ; + icoll_priv.intr = icoll_base +HW_ICOLL_INTERRUPT0 ; + icoll_priv.intr_per_reg =1 ; + icoll_priv.clear =NULL ; +/* * Interrupt Collector reset, which initializes the priority * for each irq to level 0. */ -stmp_reset_block (icoll_base +HW_ICOLL_CTRL ); +stmp_reset_block (icoll_priv.ctrl); icoll_domain =irq_domain_add_linear (np,ICOLL_NUM_IRQS , &icoll_irq_domain_ops,NULL );
Signature · 1 line
2.5.0
PATCH 2/2 ARM: irqchip: mxs: add Alpascale ASM9260 support
Freescale iMX23/iMX28 and Alphascale ASM9260 have similar interrupt collectors. It makes easy to reuse irq-mxs code for ASM9260. Differences between this devices are fallowing:
- different register offsets
- different count of intterupt lines per register
- ASM9260 don't provide reset bit
- ASM9260 don't support FIQ.
--- drivers/irqchip/Kconfig | 5 ++ drivers/irqchip/Makefile | 2 +- drivers/irqchip/alphascale_asm9260-icoll.h | 109 +++++++++++++++++++++++++++++ drivers/irqchip/irq-mxs.c | 106 +++++++++++++++++++++++++--- 4 files changed, 213 insertions(+), 9 deletions(-) create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h
drivers/irqchip/Kconfig +5 -0
@@ -187,3 +187,8 @@ config IMX_GPCV2 select IRQ_DOMAIN help Enables the wakeup IRQs for IMX platforms with GPCv2 block + +config IRQ_MXS + def_bool y if MACH_ASM9260 || ARCH_MXS + select IRQ_DOMAIN + select STMP_DEVICE
drivers/irqchip/Makefile +1 -1
@@ -6,7 +6,7 @@ obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_ARCH_HIP04) += irq-hip04.o obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o -obj-$(CONFIG_ARCH_MXS) += irq-mxs.o +obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o
drivers/irqchip/alphascale_asm9260-icoll.h new file +109 -0
109 lines not on this page · raw message
drivers/irqchip/irq-mxs.c +98 -8
149 lines not on this page · raw message
Signature · 1 line
2.5.0
Re: [PATCH 2/2] ARM: irqchip: mxs: add Alpascale ASM9260 support
Quoted 46 lines · Oleksij Rempel
static struct
icoll_privicoll_priv;
static structirq_domain*icoll_domain;drivers/irqchip/irq-mxs.c +29
-4+static DEFINE_RAW_SPINLOCK (icoll_lock); + +/* calculate bit offset depending on number of intterupt per register */ +static u32 icoll_intr_bitshift (struct irq_data *d,u32 bit) +{ +/* +* We expect intr_per_reg to be 4 or 1, it means +* "n" will be 3 or 0. +*/ +int n = icoll_priv.intr_per_reg -1 ; + +/* +* If n = 0, "bit" is never shifted. +* If n = 3, mask lower part of hwirq to convert it +* in 0, 1, 2 or 3 and then multiply it by 8 (or shift by 3) +*/ +return bit << ((d->hwirq & n) << n); +} + +/* calculate mem offset depending on number of intterupt per register */ +static void __iomem *icoll_intr_reg (struct irq_data *d) +{ +int n = icoll_priv.intr_per_reg >>1 ; + +/* offset = hwirq / intr_per_reg * 0x10 */ +return icoll_priv.intr + ((d->hwirq >> n) *0x10 ); +}static void icoll_ack_irq (struct irq_data *d) {@@ -76,14 +107,21 @@ static void icoll_ack_irq(struct irq_data *d)static void icoll_mask_irq (struct irq_data *d) { -__raw_writel (BM_ICOLL_INTR_ENABLE , - icoll_priv.intr +CLR_REG +HW_ICOLL_INTERRUPTn (d->hwirq)); +__raw_writel (icoll_intr_bitshift (d,BM_ICOLL_INTR_ENABLE ), +icoll_intr_reg (d) +CLR_REG ); }static void icoll_unmask_irq (struct irq_data *d) { -__raw_writel (BM_ICOLL_INTR_ENABLE , - icoll_priv.intr +SET_REG +HW_ICOLL_INTERRUPTn (d->hwirq));
drivers/irqchip/irq-mxs.c static void icoll_ack_irq(struct irq_data *d) · line 125
Quoted 10 lines
drivers/irqchip/irq-mxs.c +9
-0+raw_spin_lock (&icoll_lock); +if (icoll_priv.clear) +__raw_writel (ASM9260_BM_CLEAR_BIT (d->hwirq), + icoll_priv.clear + +ASM9260_HW_ICOLL_CLEARn (d->hwirq)); + +__raw_writel (icoll_intr_bitshift (d,BM_ICOLL_INTR_ENABLE ), +icoll_intr_reg (d) +SET_REG ); +raw_spin_unlock (&icoll_lock); }
I don't think this is a brilliant idea. You burden the existing users with that bit shift mask machinery, an extra conditional and the spinlock in the unmask path.
You can simply implement a seperate pair of callbacks and assign them at setup time.
Btw, why is that spinlock only in unmask()?
Quoted 39 lines
drivers/irqchip/irq-mxs.c +24
-2static struct irq_chip mxs_icoll_chip = {@@ -115,12 +153,34 @@ static const struct irq_domain_ops icoll_irq_domain_ops = { .xlate = irq_domain_xlate_onecell, }; +static void __init icoll_add_domain (struct device_node *np, +int num) +{ + icoll_domain =irq_domain_add_linear (np, num, + &icoll_irq_domain_ops,NULL ); + +if (!icoll_domain) +panic ("%s: unable add irq domain" , np->full_name); +irq_set_default_host (icoll_domain); +set_handle_irq (icoll_handle_irq); +} + +static void __iomem *__init icoll_init_iobase (struct device_node *np) +{ +void __iomem *icoll_base; + + icoll_base =of_io_request_and_map (np,0 , np->name); +if (!icoll_base) +panic ("%s: unable to map resource" , np->full_name); +return icoll_base; +} +static int __init icoll_of_init (struct device_node *np,struct device_node *interrupt_parent) { -void __iomem *icoll_base =of_iomap (np,0 ); -WARN_ON (!icoll_base); +void __iomem *icoll_base; + icoll_base =icoll_init_iobase (np); icoll_priv.vector = icoll_base +HW_ICOLL_VECTOR ; icoll_priv.levelack = icoll_base +HW_ICOLL_LEVELACK ; icoll_priv.ctrl = icoll_base +HW_ICOLL_CTRL ;
drivers/irqchip/irq-mxs.c static int __init icoll_of_init(struct device_node *np, · line 201
Quoted 9 lines
drivers/irqchip/irq-mxs.c +2
-2@@ -135,8 +195,38 @@ static int __init icoll_of_init(struct device_node *np,*/ stmp_reset_block (icoll_priv.ctrl); - icoll_domain =irq_domain_add_linear (np,ICOLL_NUM_IRQS , - &icoll_irq_domain_ops,NULL ); +icoll_add_domain (np,ICOLL_NUM_IRQS ); +return icoll_domain ?0 : -ENODEV ; }
That part of the patch should move into the preparatory patch. It has nothing to do with asm9260.
Thanks,
tglx