2013-04-29 14:04:53

by Maxime Ripard

Subject: [PATCH] mxs: icoll: Add function to register an interrupt as FIQ source

MXS, unlike other ARM platforms, has no way to make a FIQ from an
interrupt from a driver, without poking directly into the icoll.

Add an exported function to do this.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-mxs/icoll.c | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/arch/arm/mach-mxs/icoll.c b/arch/arm/mach-mxs/icoll.c
index 8fb23af..1bb16da 100644
--- a/arch/arm/mach-mxs/icoll.c
+++ b/arch/arm/mach-mxs/icoll.c
@@ -16,6 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

+#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/irq.h>
@@ -34,6 +35,7 @@
#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 BM_ICOLL_INTERRUPTn_FIQ_ENABLE 0x00000010
#define BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 0x1

#define ICOLL_NUM_IRQS 128
@@ -41,6 +43,15 @@
static void __iomem *icoll_base = MXS_IO_ADDRESS(MXS_ICOLL_BASE_ADDR);
static struct irq_domain *icoll_domain;

+void mxs_icoll_set_irq_fiq(unsigned int irq)
+{
+ struct irq_data *d = irq_get_irq_data(irq);
+
+ __raw_writel(BM_ICOLL_INTERRUPTn_FIQ_ENABLE,
+ icoll_base + HW_ICOLL_INTERRUPTn_SET(d->hwirq));
+}
+EXPORT_SYMBOL(mxs_icoll_set_irq_fiq);
+
static void icoll_ack_irq(struct irq_data *d)
{
/*
--
1.8.1.2

2013-05-02 02:39:19

by Shawn Guo

Subject: Re: [PATCH] mxs: icoll: Add function to register an interrupt as FIQ source

On Mon, Apr 29, 2013 at 03:58:37PM +0200, Maxime Ripard wrote:
> MXS, unlike other ARM platforms,

How are other ARM platforms handling that?

> has no way to make a FIQ from an
> interrupt from a driver, without poking directly into the icoll.
>
> Add an exported function to do this.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-mxs/icoll.c | 11 +++++++++++

This will become drivers/irqchip/irq-mxs.c after the merge window.

Shawn

> 1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm/mach-mxs/icoll.c b/arch/arm/mach-mxs/icoll.c
> index 8fb23af..1bb16da 100644
> --- a/arch/arm/mach-mxs/icoll.c
> +++ b/arch/arm/mach-mxs/icoll.c
> @@ -16,6 +16,7 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
>
> +#include <linux/export.h>
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/irq.h>
> @@ -34,6 +35,7 @@
> #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 BM_ICOLL_INTERRUPTn_FIQ_ENABLE 0x00000010
> #define BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 0x1
>
> #define ICOLL_NUM_IRQS 128
> @@ -41,6 +43,15 @@
> static void __iomem *icoll_base = MXS_IO_ADDRESS(MXS_ICOLL_BASE_ADDR);
> static struct irq_domain *icoll_domain;
>
> +void mxs_icoll_set_irq_fiq(unsigned int irq)
> +{
> + struct irq_data *d = irq_get_irq_data(irq);
> +
> + __raw_writel(BM_ICOLL_INTERRUPTn_FIQ_ENABLE,
> + icoll_base + HW_ICOLL_INTERRUPTn_SET(d->hwirq));
> +}
> +EXPORT_SYMBOL(mxs_icoll_set_irq_fiq);
> +
> static void icoll_ack_irq(struct irq_data *d)
> {
> /*
> --
> 1.8.1.2
>

2013-05-02 08:35:28

by Maxime Ripard

Subject: Re: [PATCH] mxs: icoll: Add function to register an interrupt as FIQ source

Hi Shawn,

Le 02/05/2013 04:39, Shawn Guo a ?crit :
> On Mon, Apr 29, 2013 at 03:58:37PM +0200, Maxime Ripard wrote:
>> MXS, unlike other ARM platforms,
>
> How are other ARM platforms handling that?

Just like that. You can look at mxc_set_irq_fiq in
arch/arm/mach-imx/irq-common.c or s3c24xx_set_fiq in
arch/arm/mach-s3c24xx/irq.c

I've also thought about declaring a IRQ type and using the .irq_set_type
to register an interrupt as a FIQ source, but since FIQ are
ARM-specific, it's probably a bad idea.

>> has no way to make a FIQ from an
>> interrupt from a driver, without poking directly into the icoll.
>>
>> Add an exported function to do this.
>>
>> Signed-off-by: Maxime Ripard <[email protected]>
>> ---
>> arch/arm/mach-mxs/icoll.c | 11 +++++++++++
>
> This will become drivers/irqchip/irq-mxs.c after the merge window.

Ok, I'll rebase and repost then.

Thanks,
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com