| Message ID | 1413888020-8790-6-git-send-email-linux@rempel-privat.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Oleksij, Shawn, Sascha, Top of thread is here: https://lkml.kernel.org/r/1413888020-8790-1-git-send-email-linux@rempel-privat.de On Tue, Oct 21, 2014 at 12:40:16PM +0200, Oleksij Rempel wrote: > 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. > > Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> > --- > drivers/irqchip/Kconfig | 9 +++ > drivers/irqchip/Makefile | 2 +- > drivers/irqchip/alphascale_asm9260-icoll.h | 109 +++++++++++++++++++++++++++++ > drivers/irqchip/irq-mxs.c | 105 ++++++++++++++++++++++++--- > 4 files changed, 216 insertions(+), 9 deletions(-) > create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h ... > diff --git a/drivers/irqchip/alphascale_asm9260-icoll.h b/drivers/irqchip/alphascale_asm9260-icoll.h > new file mode 100644 > index 0000000..5cec108 > --- /dev/null > +++ b/drivers/irqchip/alphascale_asm9260-icoll.h > @@ -0,0 +1,109 @@ > +/* > + * Copyright (C) 2014 Oleksij Rempel <linux@rempel-privat.de> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#ifndef _ALPHASCALE_ASM9260_ICOLL_H > +#define _ALPHASCALE_ASM9260_ICOLL_H > + > +#define ASM9260_NUM_IRQS 64 > +/* > + * 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 ASM9260_HW_ICOLL_VECTOR 0x0000 > +/* > + * bits 31:2 > + * This register presents the vector address for the interrupt currently > + * active on the CPU IRQ input. Writing to this register notifies the > + * interrupt collector that the interrupt service routine for the current > + * interrupt has been entered. > + * The exception trap should have a LDPC instruction from this address: > + * LDPC ASM9260_HW_ICOLL_VECTOR_ADDR; IRQ exception at 0xffff0018 > + */ > + > +/* > + * The Interrupt Collector Level Acknowledge Register is used by software to > + * indicate the completion of an interrupt on a specific level. > + * This register is written at the very end of an interrupt service routine. If > + * nesting is used then the CPU irq must be turned on before writing to this > + * register to avoid a race condition in the CPU interrupt hardware. > + */ > +#define ASM9260_HW_ICOLL_LEVELACK 0x0010 > +#define ASM9260_BM_LEVELn(nr) BIT(nr) > + > +#define ASM9260_HW_ICOLL_CTRL 0x0020 > +/* > + * ASM9260_BM_CTRL_SFTRST and ASM9260_BM_CTRL_CLKGATE are not available on > + * asm9260. > + */ > +#define ASM9260_BM_CTRL_SFTRST BIT(31) > +#define ASM9260_BM_CTRL_CLKGATE BIT(30) > +/* disable interrupt level nesting */ > +#define ASM9260_BM_CTRL_NO_NESTING BIT(19) > +/* > + * Set this bit to one enable the RISC32-style read side effect associated with > + * the vector address register. In this mode, interrupt in-service is signaled > + * by the read of the ASM9260_HW_ICOLL_VECTOR register to acquire the interrupt > + * vector address. Set this bit to zero for normal operation, in which the ISR > + * signals in-service explicitly by means of a write to the > + * ASM9260_HW_ICOLL_VECTOR register. > + * 0 - Must Write to Vector register to go in-service. > + * 1 - Go in-service as a read side effect > + */ > +#define ASM9260_BM_CTRL_ARM_RSE_MODE BIT(18) > +#define ASM9260_BM_CTRL_IRQ_ENABLE BIT(16) > + > +#define ASM9260_HW_ICOLL_STAT_OFFSET 0x0030 > +/* > + * bits 5:0 > + * Vector number of current interrupt. Multiply by 4 and add to vector base > + * address to obtain the value in ASM9260_HW_ICOLL_VECTOR. > + */ > + > +/* > + * RAW0 and RAW1 provides a read-only view of the raw interrupt request lines > + * coming from various parts of the chip. Its purpose is to improve diagnostic > + * observability. > + */ > +#define ASM9260_HW_ICOLL_RAW0 0x0040 > +#define ASM9260_HW_ICOLL_RAW1 0x0050 > + > +#define ASM9260_HW_ICOLL_INTERRUPT0 0x0060 > +#define ASM9260_HW_ICOLL_INTERRUPTn(n) (0x0060 + ((n) >> 2) * 0x10) > +/* > + * WARNING: Modifying the priority of an enabled interrupt may result in > + * undefined behavior. > + */ > +#define ASM9260_BM_INT_PRIORITY_MASK 0x3 > +#define ASM9260_BM_INT_ENABLE BIT(2) > +#define ASM9260_BM_INT_SOFTIRQ BIT(3) > + > +#define ASM9260_BM_ICOLL_INTERRUPTn_SHIFT(n) (((n) & 0x3) << 3) > +#define ASM9260_BM_ICOLL_INTERRUPTn_ENABLE(n) (1 << (2 + \ > + ASM9260_BM_ICOLL_INTERRUPTn_SHIFT(n))) > + > +#define ASM9260_HW_ICOLL_VBASE 0x0160 > +/* > + * bits 31:2 > + * This bitfield holds the upper 30 bits of the base address of the vector > + * table. > + */ > + > +#define ASM9260_HW_ICOLL_CLEAR0 0x01d0 > +#define ASM9260_HW_ICOLL_CLEAR1 0x01e0 > +#define ASM9260_HW_ICOLL_CLEARn(n) (((n >> 5) * 0x10) \ > + + SET_REG) > +#define ASM9260_BM_CLEAR_BIT(n) BIT(n & 0x1f) > + > +/* Scratchpad */ > +#define ASM9260_HW_ICOLL_UNDEF_VECTOR 0x01f0 > +#endif > diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c > index 681125d..8c5c3d2 100644 > --- a/drivers/irqchip/irq-mxs.c > +++ b/drivers/irqchip/irq-mxs.c > @@ -1,5 +1,7 @@ > /* > * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. > + * Copyright (C) 2014 Oleksij Rempel <linux@rempel-privat.de> > + * Add Alphascale ASM9260 support. > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by > @@ -28,6 +30,7 @@ > #include <asm/exception.h> > > #include "irqchip.h" > +#include "alphascale_asm9260-icoll.h" > > /* > * this device provide 4 offsets for each register: > @@ -63,6 +66,33 @@ struct icoll_priv { > > static struct icoll_priv icoll_priv; > static struct irq_domain *icoll_domain; > +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) > { > @@ -77,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)); > + 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); > } Before I consider merging this, I'd like to see an Ack from the i.MX maintainers that they're ok with these changes. Particularly the blocks I've quoted above. thx, Jason.
Thanks Jason for pointing me the thread. On Tue, Oct 21, 2014 at 12:40:16PM +0200, Oleksij Rempel wrote: > 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. > > Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> > --- > drivers/irqchip/Kconfig | 9 +++ > drivers/irqchip/Makefile | 2 +- > drivers/irqchip/alphascale_asm9260-icoll.h | 109 +++++++++++++++++++++++++++++ > drivers/irqchip/irq-mxs.c | 105 ++++++++++++++++++++++++--- > 4 files changed, 216 insertions(+), 9 deletions(-) > create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > index b8632bf..10470cb 100644 > --- a/drivers/irqchip/Kconfig > +++ b/drivers/irqchip/Kconfig > @@ -113,3 +113,12 @@ config IRQ_CROSSBAR > The primary irqchip invokes the crossbar's callback which inturn allocates > a free irq and configures the IP. Thus the peripheral interrupts are > routed to one of the free irqchip interrupt lines. > + > +config IRQ_MXS > + bool "MXS interrupt controller" > + select IRQ_DOMAIN > + select STMP_DEVICE > + default y if MACH_ASM9260 || CONFIG_ARCH_MXS s/CONFIG_ARCH_MXS/ARCH_MXS Even with this change, the 'default y' doesn't seem to work for me. > + help > + Support for interrupt controller present in Freescale iMX23/iMX28 and > + Alphascale ASM9260 SoCs. ... > diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c > index 681125d..8c5c3d2 100644 > --- a/drivers/irqchip/irq-mxs.c > +++ b/drivers/irqchip/irq-mxs.c > @@ -1,5 +1,7 @@ > /* > * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. > + * Copyright (C) 2014 Oleksij Rempel <linux@rempel-privat.de> > + * Add Alphascale ASM9260 support. > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by > @@ -28,6 +30,7 @@ > #include <asm/exception.h> > > #include "irqchip.h" > +#include "alphascale_asm9260-icoll.h" > > /* > * this device provide 4 offsets for each register: > @@ -63,6 +66,33 @@ struct icoll_priv { > > static struct icoll_priv icoll_priv; > static struct irq_domain *icoll_domain; > +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) > { > @@ -77,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)); > + 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); > } > > static struct irq_chip mxs_icoll_chip = { > @@ -116,12 +153,34 @@ static 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); LD kernel/built-in.o ../drivers/irqchip/irq-mxs.c: In function ‘icoll_init_iobase’: ../drivers/irqchip/irq-mxs.c:172:2: warning: passing argument 3 of ‘of_io_request_and_map’ discards ‘const’ qualifier from pointer target type [enabled by default] In file included from ../drivers/irqchip/irq-mxs.c:27:0: ../include/linux/of_address.h:108:15: note: expected ‘char *’ but argument is of type ‘const char *’ Shawn > + 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; > @@ -136,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; > } > IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init); > + > +static int __init asm9260_of_init(struct device_node *np, > + struct device_node *interrupt_parent) > +{ > + void __iomem *icoll_base; > + int i; > + > + icoll_base = icoll_init_iobase(np); > + icoll_priv.vector = icoll_base + ASM9260_HW_ICOLL_VECTOR; > + icoll_priv.levelack = icoll_base + ASM9260_HW_ICOLL_LEVELACK; > + icoll_priv.ctrl = icoll_base + ASM9260_HW_ICOLL_CTRL; > + icoll_priv.stat = icoll_base + ASM9260_HW_ICOLL_STAT_OFFSET; > + icoll_priv.intr = icoll_base + ASM9260_HW_ICOLL_INTERRUPT0; > + icoll_priv.intr_per_reg = 4; > + icoll_priv.clear = icoll_base + ASM9260_HW_ICOLL_CLEAR0; > + > + writel_relaxed(ASM9260_BM_CTRL_IRQ_ENABLE, > + icoll_priv.ctrl); > + /* > + * ASM9260 don't provide reset bit. So, we need to set level 0 > + * manually. > + */ > + for (i = 0; i < 16 * 0x10; i += 0x10) > + writel(0, icoll_priv.intr + i); > + > + icoll_add_domain(np, ASM9260_NUM_IRQS); > + > + return icoll_domain ? 0 : -ENODEV; > +} > +IRQCHIP_DECLARE(asm9260, "alphascale,asm9260-icoll", asm9260_of_init); > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Tue, Nov 04, 2014 at 09:03:23PM +0800, Shawn Guo wrote: > Thanks Jason for pointing me the thread. > > On Tue, Oct 21, 2014 at 12:40:16PM +0200, Oleksij Rempel wrote: > > +config IRQ_MXS > > + bool "MXS interrupt controller" > > + select IRQ_DOMAIN > > + select STMP_DEVICE > > + default y if MACH_ASM9260 || CONFIG_ARCH_MXS > > s/CONFIG_ARCH_MXS/ARCH_MXS > > Even with this change, the 'default y' doesn't seem to work for me. The only way an option follows its default is if it doesn't have a visible prompt. So: config IRQ_MXS def_bool y if MACH_ASM9260 || ARCH_MXS select IRQ_DOMAIN select STMP_DEVICE will cause it to always be defined to 'y' if either of those options are enabled. Otherwise, if it has a visible prompt, it follows (in order of precedence) whatever the user specifies, the configuration file, or the Kconfig specified default, or 'n'. (Each limited by selects and dependencies.) Is there a particular reason why the option is being offered for user selection?
Am 04.11.2014 um 14:13 schrieb Russell King - ARM Linux: > On Tue, Nov 04, 2014 at 09:03:23PM +0800, Shawn Guo wrote: >> Thanks Jason for pointing me the thread. >> >> On Tue, Oct 21, 2014 at 12:40:16PM +0200, Oleksij Rempel wrote: >>> +config IRQ_MXS >>> + bool "MXS interrupt controller" >>> + select IRQ_DOMAIN >>> + select STMP_DEVICE >>> + default y if MACH_ASM9260 || CONFIG_ARCH_MXS >> >> s/CONFIG_ARCH_MXS/ARCH_MXS >> >> Even with this change, the 'default y' doesn't seem to work for me. > > The only way an option follows its default is if it doesn't have a visible > prompt. So: > > config IRQ_MXS > def_bool y if MACH_ASM9260 || ARCH_MXS > select IRQ_DOMAIN > select STMP_DEVICE > > will cause it to always be defined to 'y' if either of those options are > enabled. Otherwise, if it has a visible prompt, it follows (in order of > precedence) whatever the user specifies, the configuration file, or the > Kconfig specified default, or 'n'. (Each limited by selects and > dependencies.) Ok, will fix it. > Is there a particular reason why the option is being offered for user > selection? no.
Am 04.11.2014 um 14:03 schrieb Shawn Guo: > Thanks Jason for pointing me the thread. > > On Tue, Oct 21, 2014 at 12:40:16PM +0200, Oleksij Rempel wrote: >> 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. >> >> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> >> --- >> drivers/irqchip/Kconfig | 9 +++ >> drivers/irqchip/Makefile | 2 +- >> drivers/irqchip/alphascale_asm9260-icoll.h | 109 +++++++++++++++++++++++++++++ >> drivers/irqchip/irq-mxs.c | 105 ++++++++++++++++++++++++--- >> 4 files changed, 216 insertions(+), 9 deletions(-) >> create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h >> >> diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig >> index b8632bf..10470cb 100644 >> --- a/drivers/irqchip/Kconfig >> +++ b/drivers/irqchip/Kconfig >> @@ -113,3 +113,12 @@ config IRQ_CROSSBAR >> The primary irqchip invokes the crossbar's callback which inturn allocates >> a free irq and configures the IP. Thus the peripheral interrupts are >> routed to one of the free irqchip interrupt lines. >> + >> +config IRQ_MXS >> + bool "MXS interrupt controller" >> + select IRQ_DOMAIN >> + select STMP_DEVICE >> + default y if MACH_ASM9260 || CONFIG_ARCH_MXS > > s/CONFIG_ARCH_MXS/ARCH_MXS Right, thank you. > Even with this change, the 'default y' doesn't seem to work for me. hm... According to this lines it should work: -obj-$(CONFIG_ARCH_MXS) += irq-mxs.o +obj-$(CONFIG_IRQ_MXS) += irq-mxs.o >> + help >> + Support for interrupt controller present in Freescale iMX23/iMX28 and >> + Alphascale ASM9260 SoCs. > > ... > >> diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c >> index 681125d..8c5c3d2 100644 >> --- a/drivers/irqchip/irq-mxs.c >> +++ b/drivers/irqchip/irq-mxs.c >> @@ -1,5 +1,7 @@ >> /* >> * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. >> + * Copyright (C) 2014 Oleksij Rempel <linux@rempel-privat.de> >> + * Add Alphascale ASM9260 support. >> * >> * This program is free software; you can redistribute it and/or modify >> * it under the terms of the GNU General Public License as published by >> @@ -28,6 +30,7 @@ >> #include <asm/exception.h> >> >> #include "irqchip.h" >> +#include "alphascale_asm9260-icoll.h" >> >> /* >> * this device provide 4 offsets for each register: >> @@ -63,6 +66,33 @@ struct icoll_priv { >> >> static struct icoll_priv icoll_priv; >> static struct irq_domain *icoll_domain; >> +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) >> { >> @@ -77,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)); >> + 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); >> } >> >> static struct irq_chip mxs_icoll_chip = { >> @@ -116,12 +153,34 @@ static 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); > > LD kernel/built-in.o > ../drivers/irqchip/irq-mxs.c: In function ‘icoll_init_iobase’: > ../drivers/irqchip/irq-mxs.c:172:2: warning: passing argument 3 of ‘of_io_request_and_map’ discards ‘const’ qualifier from pointer target type [enabled by default] > In file included from ../drivers/irqchip/irq-mxs.c:27:0: > ../include/linux/of_address.h:108:15: note: expected ‘char *’ but argument is of type ‘const char *’ I reported this issue. It should be fixed in of_io_request_and_map. >> + 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; >> @@ -136,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; >> } >> IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init); >> + >> +static int __init asm9260_of_init(struct device_node *np, >> + struct device_node *interrupt_parent) >> +{ >> + void __iomem *icoll_base; >> + int i; >> + >> + icoll_base = icoll_init_iobase(np); >> + icoll_priv.vector = icoll_base + ASM9260_HW_ICOLL_VECTOR; >> + icoll_priv.levelack = icoll_base + ASM9260_HW_ICOLL_LEVELACK; >> + icoll_priv.ctrl = icoll_base + ASM9260_HW_ICOLL_CTRL; >> + icoll_priv.stat = icoll_base + ASM9260_HW_ICOLL_STAT_OFFSET; >> + icoll_priv.intr = icoll_base + ASM9260_HW_ICOLL_INTERRUPT0; >> + icoll_priv.intr_per_reg = 4; >> + icoll_priv.clear = icoll_base + ASM9260_HW_ICOLL_CLEAR0; >> + >> + writel_relaxed(ASM9260_BM_CTRL_IRQ_ENABLE, >> + icoll_priv.ctrl); >> + /* >> + * ASM9260 don't provide reset bit. So, we need to set level 0 >> + * manually. >> + */ >> + for (i = 0; i < 16 * 0x10; i += 0x10) >> + writel(0, icoll_priv.intr + i); >> + >> + icoll_add_domain(np, ASM9260_NUM_IRQS); >> + >> + return icoll_domain ? 0 : -ENODEV; >> +} >> +IRQCHIP_DECLARE(asm9260, "alphascale,asm9260-icoll", asm9260_of_init); >> -- >> 1.9.1 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index b8632bf..10470cb 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -113,3 +113,12 @@ config IRQ_CROSSBAR The primary irqchip invokes the crossbar's callback which inturn allocates a free irq and configures the IP. Thus the peripheral interrupts are routed to one of the free irqchip interrupt lines. + +config IRQ_MXS + bool "MXS interrupt controller" + select IRQ_DOMAIN + select STMP_DEVICE + default y if MACH_ASM9260 || CONFIG_ARCH_MXS + help + Support for interrupt controller present in Freescale iMX23/iMX28 and + Alphascale ASM9260 SoCs. diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 73052ba..89c7042 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.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_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o obj-$(CONFIG_METAG) += irq-metag-ext.o diff --git a/drivers/irqchip/alphascale_asm9260-icoll.h b/drivers/irqchip/alphascale_asm9260-icoll.h new file mode 100644 index 0000000..5cec108 --- /dev/null +++ b/drivers/irqchip/alphascale_asm9260-icoll.h @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2014 Oleksij Rempel <linux@rempel-privat.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef _ALPHASCALE_ASM9260_ICOLL_H +#define _ALPHASCALE_ASM9260_ICOLL_H + +#define ASM9260_NUM_IRQS 64 +/* + * 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 ASM9260_HW_ICOLL_VECTOR 0x0000 +/* + * bits 31:2 + * This register presents the vector address for the interrupt currently + * active on the CPU IRQ input. Writing to this register notifies the + * interrupt collector that the interrupt service routine for the current + * interrupt has been entered. + * The exception trap should have a LDPC instruction from this address: + * LDPC ASM9260_HW_ICOLL_VECTOR_ADDR; IRQ exception at 0xffff0018 + */ + +/* + * The Interrupt Collector Level Acknowledge Register is used by software to + * indicate the completion of an interrupt on a specific level. + * This register is written at the very end of an interrupt service routine. If + * nesting is used then the CPU irq must be turned on before writing to this + * register to avoid a race condition in the CPU interrupt hardware. + */ +#define ASM9260_HW_ICOLL_LEVELACK 0x0010 +#define ASM9260_BM_LEVELn(nr) BIT(nr) + +#define ASM9260_HW_ICOLL_CTRL 0x0020 +/* + * ASM9260_BM_CTRL_SFTRST and ASM9260_BM_CTRL_CLKGATE are not available on + * asm9260. + */ +#define ASM9260_BM_CTRL_SFTRST BIT(31) +#define ASM9260_BM_CTRL_CLKGATE BIT(30) +/* disable interrupt level nesting */ +#define ASM9260_BM_CTRL_NO_NESTING BIT(19) +/* + * Set this bit to one enable the RISC32-style read side effect associated with + * the vector address register. In this mode, interrupt in-service is signaled + * by the read of the ASM9260_HW_ICOLL_VECTOR register to acquire the interrupt + * vector address. Set this bit to zero for normal operation, in which the ISR + * signals in-service explicitly by means of a write to the + * ASM9260_HW_ICOLL_VECTOR register. + * 0 - Must Write to Vector register to go in-service. + * 1 - Go in-service as a read side effect + */ +#define ASM9260_BM_CTRL_ARM_RSE_MODE BIT(18) +#define ASM9260_BM_CTRL_IRQ_ENABLE BIT(16) + +#define ASM9260_HW_ICOLL_STAT_OFFSET 0x0030 +/* + * bits 5:0 + * Vector number of current interrupt. Multiply by 4 and add to vector base + * address to obtain the value in ASM9260_HW_ICOLL_VECTOR. + */ + +/* + * RAW0 and RAW1 provides a read-only view of the raw interrupt request lines + * coming from various parts of the chip. Its purpose is to improve diagnostic + * observability. + */ +#define ASM9260_HW_ICOLL_RAW0 0x0040 +#define ASM9260_HW_ICOLL_RAW1 0x0050 + +#define ASM9260_HW_ICOLL_INTERRUPT0 0x0060 +#define ASM9260_HW_ICOLL_INTERRUPTn(n) (0x0060 + ((n) >> 2) * 0x10) +/* + * WARNING: Modifying the priority of an enabled interrupt may result in + * undefined behavior. + */ +#define ASM9260_BM_INT_PRIORITY_MASK 0x3 +#define ASM9260_BM_INT_ENABLE BIT(2) +#define ASM9260_BM_INT_SOFTIRQ BIT(3) + +#define ASM9260_BM_ICOLL_INTERRUPTn_SHIFT(n) (((n) & 0x3) << 3) +#define ASM9260_BM_ICOLL_INTERRUPTn_ENABLE(n) (1 << (2 + \ + ASM9260_BM_ICOLL_INTERRUPTn_SHIFT(n))) + +#define ASM9260_HW_ICOLL_VBASE 0x0160 +/* + * bits 31:2 + * This bitfield holds the upper 30 bits of the base address of the vector + * table. + */ + +#define ASM9260_HW_ICOLL_CLEAR0 0x01d0 +#define ASM9260_HW_ICOLL_CLEAR1 0x01e0 +#define ASM9260_HW_ICOLL_CLEARn(n) (((n >> 5) * 0x10) \ + + SET_REG) +#define ASM9260_BM_CLEAR_BIT(n) BIT(n & 0x1f) + +/* Scratchpad */ +#define ASM9260_HW_ICOLL_UNDEF_VECTOR 0x01f0 +#endif diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index 681125d..8c5c3d2 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -1,5 +1,7 @@ /* * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2014 Oleksij Rempel <linux@rempel-privat.de> + * Add Alphascale ASM9260 support. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +30,7 @@ #include <asm/exception.h> #include "irqchip.h" +#include "alphascale_asm9260-icoll.h" /* * this device provide 4 offsets for each register: @@ -63,6 +66,33 @@ struct icoll_priv { static struct icoll_priv icoll_priv; static struct irq_domain *icoll_domain; +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) { @@ -77,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)); + 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); } static struct irq_chip mxs_icoll_chip = { @@ -116,12 +153,34 @@ static 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; @@ -136,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; } IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init); + +static int __init asm9260_of_init(struct device_node *np, + struct device_node *interrupt_parent) +{ + void __iomem *icoll_base; + int i; + + icoll_base = icoll_init_iobase(np); + icoll_priv.vector = icoll_base + ASM9260_HW_ICOLL_VECTOR; + icoll_priv.levelack = icoll_base + ASM9260_HW_ICOLL_LEVELACK; + icoll_priv.ctrl = icoll_base + ASM9260_HW_ICOLL_CTRL; + icoll_priv.stat = icoll_base + ASM9260_HW_ICOLL_STAT_OFFSET; + icoll_priv.intr = icoll_base + ASM9260_HW_ICOLL_INTERRUPT0; + icoll_priv.intr_per_reg = 4; + icoll_priv.clear = icoll_base + ASM9260_HW_ICOLL_CLEAR0; + + writel_relaxed(ASM9260_BM_CTRL_IRQ_ENABLE, + icoll_priv.ctrl); + /* + * ASM9260 don't provide reset bit. So, we need to set level 0 + * manually. + */ + for (i = 0; i < 16 * 0x10; i += 0x10) + writel(0, icoll_priv.intr + i); + + icoll_add_domain(np, ASM9260_NUM_IRQS); + + return icoll_domain ? 0 : -ENODEV; +} +IRQCHIP_DECLARE(asm9260, "alphascale,asm9260-icoll", asm9260_of_init);
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. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> --- drivers/irqchip/Kconfig | 9 +++ drivers/irqchip/Makefile | 2 +- drivers/irqchip/alphascale_asm9260-icoll.h | 109 +++++++++++++++++++++++++++++ drivers/irqchip/irq-mxs.c | 105 ++++++++++++++++++++++++--- 4 files changed, 216 insertions(+), 9 deletions(-) create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h