Skip to contentSkip to conversation

ARM: imx: drop support for irq priorisation

PATCH New Uwe Kleine-König 3 participants 5 messages Nov 4, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: imx: drop support for irq priorisation

The code for irq priorisation support doesn't have any in-tree users and the Kconfig description does wrong promises because nowadays irq handlers are called with irqs disabled, so no high prioritized irq can interrupt a lower prioritized handler.

---
 arch/arm/mach-imx/Kconfig      | 10 ----------
 arch/arm/mach-imx/avic.c       | 25 -------------------------
 arch/arm/mach-imx/irq-common.h |  1 -
 3 files changed, 36 deletions(-)
arch/arm/mach-imx/Kconfig +0 -10
index 15c9ae3..9431729 100644
@@ -20,16 +20,6 @@ config ARCH_MXC
 menu "Freescale i.MX support"
 	depends on ARCH_MXC
 
-config MXC_IRQ_PRIOR
-	bool "Use IRQ priority"
-	help
-	  Select this if you want to use prioritized IRQ handling.
-	  This feature prevents higher priority ISR to be interrupted
-	  by lower priority IRQ.
-	  This may be useful in embedded applications, where are strong
-	  requirements for timing.
-	  Say N here, unless you have a specialized requirement.
-
 config MXC_TZIC
 	bool
 
arch/arm/mach-imx/avic.c +0 -25
index e163ec7..8d1df2e 100644
@@ -54,28 +54,6 @@
 static void __iomem *avic_base;
 static struct irq_domain *domain;
 
-#ifdef CONFIG_MXC_IRQ_PRIOR
-static int avic_irq_set_priority(unsigned char irq, unsigned char prio)
-{
-	struct irq_data *d = irq_get_irq_data(irq);
-	unsigned int temp;
-	unsigned int mask = 0x0F << irq % 8 * 4;
-
-	irq = d->hwirq;
-
-	if (irq >= AVIC_NUM_IRQS)
-		return -EINVAL;
-
-	temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
-	temp &= ~mask;
-	temp |= prio & mask;
-
-	__raw_writel(temp, avic_base + AVIC_NIPRIORITY(irq / 8));
-
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_FIQ
 static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 {
@@ -102,9 +80,6 @@ static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 
 
 static struct mxc_extra_irq avic_extra_irq = {
-#ifdef CONFIG_MXC_IRQ_PRIOR
-	.set_priority = avic_irq_set_priority,
-#endif
 #ifdef CONFIG_FIQ
 	.set_irq_fiq = avic_set_irq_fiq,
 #endif
arch/arm/mach-imx/irq-common.h +0 -1
index 5b2dabb..6e3175d 100644
@@ -24,7 +24,6 @@
 
 struct mxc_extra_irq
 {
-	int (*set_priority)(unsigned char irq, unsigned char prio);
 	int (*set_irq_fiq)(unsigned int irq, unsigned int type);
 };
 
Signature · 1 line
1.8.4.rc3
maintainer
#1 lore raw

PATCH 1/1 ARM: imx: drop support for irq priorisation

Quoted 6 lines · Uwe Kleine-K?nig

The code for irq priorisation support doesn't have any in-tree users and the Kconfig description does wrong promises because nowadays irq handlers are called with irqs disabled, so no high prioritized irq can interrupt a lower prioritized handler.

Sascha

Quoted 86 lines
---
 arch/arm/mach-imx/Kconfig      | 10 ----------
 arch/arm/mach-imx/avic.c       | 25 -------------------------
 arch/arm/mach-imx/irq-common.h |  1 -
 3 files changed, 36 deletions(-)
arch/arm/mach-imx/Kconfig +0 -10
index 15c9ae3..9431729 100644
@@ -20,16 +20,6 @@ config ARCH_MXC
 menu "Freescale i.MX support"
 	depends on ARCH_MXC
 
-config MXC_IRQ_PRIOR
-	bool "Use IRQ priority"
-	help
-	  Select this if you want to use prioritized IRQ handling.
-	  This feature prevents higher priority ISR to be interrupted
-	  by lower priority IRQ.
-	  This may be useful in embedded applications, where are strong
-	  requirements for timing.
-	  Say N here, unless you have a specialized requirement.
-
 config MXC_TZIC
 	bool
 
arch/arm/mach-imx/avic.c +0 -25
index e163ec7..8d1df2e 100644
@@ -54,28 +54,6 @@
 static void __iomem *avic_base;
 static struct irq_domain *domain;
 
-#ifdef CONFIG_MXC_IRQ_PRIOR
-static int avic_irq_set_priority(unsigned char irq, unsigned char prio)
-{
-	struct irq_data *d = irq_get_irq_data(irq);
-	unsigned int temp;
-	unsigned int mask = 0x0F << irq % 8 * 4;
-
-	irq = d->hwirq;
-
-	if (irq >= AVIC_NUM_IRQS)
-		return -EINVAL;
-
-	temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
-	temp &= ~mask;
-	temp |= prio & mask;
-
-	__raw_writel(temp, avic_base + AVIC_NIPRIORITY(irq / 8));
-
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_FIQ
 static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 {
@@ -102,9 +80,6 @@ static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 
 
 static struct mxc_extra_irq avic_extra_irq = {
-#ifdef CONFIG_MXC_IRQ_PRIOR
-	.set_priority = avic_irq_set_priority,
-#endif
 #ifdef CONFIG_FIQ
 	.set_irq_fiq = avic_set_irq_fiq,
 #endif
arch/arm/mach-imx/irq-common.h +0 -1
index 5b2dabb..6e3175d 100644
@@ -24,7 +24,6 @@
 
 struct mxc_extra_irq
 {
-	int (*set_priority)(unsigned char irq, unsigned char prio);
 	int (*set_irq_fiq)(unsigned int irq, unsigned int type);
 };
 
Signature · 1 line
1.8.4.rc3
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#2 lore raw

PATCH 1/1 ARM: imx: drop support for irq priorisation

Hello Shawn,

I didn't add you to the list of recipents for this patch after consulting the MAINTAINERS file. Sascha now told me that it's probably you who takes this patch?! I suggest to fix MAINTAINERS accordingly. Maybe just merge the entries "ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" and "ARM/FREESCALE IMX6"?

Best regards
Uwe

Quoted 105 lines · Sascha Hauer
Quoted 6 lines · Uwe Kleine-K?nig

The code for irq priorisation support doesn't have any in-tree users and the Kconfig description does wrong promises because nowadays irq handlers are called with irqs disabled, so no high prioritized irq can interrupt a lower prioritized handler.

Sascha

Quoted 86 lines
---
 arch/arm/mach-imx/Kconfig      | 10 ----------
 arch/arm/mach-imx/avic.c       | 25 -------------------------
 arch/arm/mach-imx/irq-common.h |  1 -
 3 files changed, 36 deletions(-)
arch/arm/mach-imx/Kconfig +0 -10
index 15c9ae3..9431729 100644
@@ -20,16 +20,6 @@ config ARCH_MXC
 menu "Freescale i.MX support"
 	depends on ARCH_MXC
 
-config MXC_IRQ_PRIOR
-	bool "Use IRQ priority"
-	help
-	  Select this if you want to use prioritized IRQ handling.
-	  This feature prevents higher priority ISR to be interrupted
-	  by lower priority IRQ.
-	  This may be useful in embedded applications, where are strong
-	  requirements for timing.
-	  Say N here, unless you have a specialized requirement.
-
 config MXC_TZIC
 	bool
 
arch/arm/mach-imx/avic.c +0 -25
index e163ec7..8d1df2e 100644
@@ -54,28 +54,6 @@
 static void __iomem *avic_base;
 static struct irq_domain *domain;
 
-#ifdef CONFIG_MXC_IRQ_PRIOR
-static int avic_irq_set_priority(unsigned char irq, unsigned char prio)
-{
-	struct irq_data *d = irq_get_irq_data(irq);
-	unsigned int temp;
-	unsigned int mask = 0x0F << irq % 8 * 4;
-
-	irq = d->hwirq;
-
-	if (irq >= AVIC_NUM_IRQS)
-		return -EINVAL;
-
-	temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
-	temp &= ~mask;
-	temp |= prio & mask;
-
-	__raw_writel(temp, avic_base + AVIC_NIPRIORITY(irq / 8));
-
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_FIQ
 static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 {
@@ -102,9 +80,6 @@ static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 
 
 static struct mxc_extra_irq avic_extra_irq = {
-#ifdef CONFIG_MXC_IRQ_PRIOR
-	.set_priority = avic_irq_set_priority,
-#endif
 #ifdef CONFIG_FIQ
 	.set_irq_fiq = avic_set_irq_fiq,
 #endif
arch/arm/mach-imx/irq-common.h +0 -1
index 5b2dabb..6e3175d 100644
@@ -24,7 +24,6 @@
 
 struct mxc_extra_irq
 {
-	int (*set_priority)(unsigned char irq, unsigned char prio);
 	int (*set_irq_fiq)(unsigned int irq, unsigned int type);
 };
 
Signature · 1 line
1.8.4.rc3
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/1 ARM: imx: drop support for irq priorisation

Hi Uwe,

Quoted 5 lines · Uwe Kleine-K?nig

Hello Shawn,

I didn't add you to the list of recipents for this patch after consulting the MAINTAINERS file. Sascha now told me that it's probably you who takes this patch?!

Ah, yes. I've been helping collect i.MX patches for a couple of cycles with Sascha's nod.

Quoted 3 lines

I suggest to fix MAINTAINERS accordingly.
Maybe just merge the entries "ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" and "ARM/FREESCALE IMX6"?

Yea, that should help me handle i.MX patches more quickly. If you send a patch for it, I would suggest merge MXS entry into IMX one as well, and add "F: arch/arm/boot/dts/imx*" line.

Shawn

Applied
#4 lore raw

PATCH 1/1 ARM: imx: drop support for irq priorisation

In reply to Uwe Kleine-König
Quoted 6 lines · Uwe Kleine-K?nig

The code for irq priorisation support doesn't have any in-tree users and the Kconfig description does wrong promises because nowadays irq handlers are called with irqs disabled, so no high prioritized irq can interrupt a lower prioritized handler.

Applied, thanks.