Skip to contentSkip to conversation

ARM: sa1100: implement irq driver as proper irqchip driver

PATCH In review Dmitry Eremin-Solenikov 2 participants 8 messages Jan 30, 2015 – Feb 5, 2015

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

v2 cover ARM: sa1100: implement irq driver as proper irqchip driver

Hello,

This is a second attempt to move Intel StrongARM SA-11x0 IRQ driver to drivers/irqchip/ place.

Changes since V1:

- Added soc/sa1100/pwer.h header containing sa11x0_*_set_wake() prototypes.

- Removed spinlock from mask/unmask functions

- Minor whitespace changes.

The patches are based on my previous sa1100 patches that can be found in Russell's for-next branch or in linux-next tree.

----------------------------------------------------------------
Dmitry Eremin-Solenikov (5):
ARM: sa1100: add platform functions to handle PWER settings
ARM: sa1100: use sa11x0_sc_set_wake() in irq driver
ARM: sa1100: use ioremapped memory to access SC registers
irqchip: add sa1100 driver
ARM: sa1100: drop irq driver

 arch/arm/mach-sa1100/Makefile                      |  2 +-
 arch/arm/mach-sa1100/generic.c                     | 37 ++++++++++
 drivers/irqchip/Makefile                           |  1 +
 .../irq.c => drivers/irqchip/irq-sa11x0.c          | 82 +++++++++++-----------
 include/linux/irqchip/irq-sa11x0.h                 | 16 +++++
 include/soc/sa1100/pwer.h                          | 15 ++++
 6 files changed, 110 insertions(+), 43 deletions(-)
 rename arch/arm/mach-sa1100/irq.c => drivers/irqchip/irq-sa11x0.c (66%)
 create mode 100644 include/linux/irqchip/irq-sa11x0.h
 create mode 100644 include/soc/sa1100/pwer.h
#1 lore raw

PATCH v2 1/5 ARM: sa1100: add platform functions to handle PWER settings

PWER settings logically belongs neither to GPIO nor to system IRQ code. Add special functions to handle PWER (for GPIO and for system IRQs) from platform code.

---
 arch/arm/mach-sa1100/generic.c | 24 ++++++++++++++++++++++++
 include/soc/sa1100/pwer.h      | 15 +++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 include/soc/sa1100/pwer.h
arch/arm/mach-sa1100/generic.c +24 -0
index 40e0d86..c651f6e 100644
@@ -23,6 +23,8 @@
 
 #include <video/sa1100fb.h>
 
+#include <soc/sa1100/pwer.h>
+
 #include <asm/div64.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
@@ -416,3 +418,25 @@ void sa1110_mb_enable(void)
 	local_irq_restore(flags);
 }
 
+int sa11x0_gpio_set_wake(unsigned int gpio, unsigned int on)
+{
+	if (on)
+		PWER |= BIT(gpio);
+	else
+		PWER &= ~BIT(gpio);
+
+	return 0;
+}
+
+int sa11x0_sc_set_wake(unsigned int irq, unsigned int on)
+{
+	if (BIT(irq) != IC_RTCAlrm)
+		return -EINVAL;
+
+	if (on)
+		PWER |= PWER_RTC;
+	else
+		PWER &= ~PWER_RTC;
+
+	return 0;
+}
include/soc/sa1100/pwer.h new file +15 -0
new file mode 100644
index 0000000..15a545b
@@ -0,0 +1,15 @@
+#ifndef SOC_SA1100_PWER_H
+#define SOC_SA1100_PWER_H
+
+/*
+ * Copyright (C) 2015, Dmitry Eremin-Solenikov
+ *
+ * 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.
+ */
+
+int sa11x0_gpio_set_wake(unsigned int gpio, unsigned int on);
+int sa11x0_sc_set_wake(unsigned int irq, unsigned int on);
+
+#endif
Signature · 1 line
2.1.4
#2 lore raw

PATCH v2 2/5 ARM: sa1100: use sa11x0_sc_set_wake() in irq driver

In reply to Dmitry Eremin-Solenikov

Use new function controlling PWER register in IRQ driver.

---
 arch/arm/mach-sa1100/irq.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
arch/arm/mach-sa1100/irq.c +3 -11
index 65aebfa..6afaa33 100644
@@ -18,6 +18,8 @@
 #include <linux/ioport.h>
 #include <linux/syscore_ops.h>
 
+#include <soc/sa1100/pwer.h>
+
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <asm/mach/irq.h>
@@ -40,19 +42,9 @@ static void sa1100_unmask_irq(struct irq_data *d)
 	ICMR |= BIT(d->hwirq);
 }
 
-/*
- * Apart form GPIOs, only the RTC alarm can be a wakeup event.
- */
 static int sa1100_set_wake(struct irq_data *d, unsigned int on)
 {
-	if (BIT(d->hwirq) == IC_RTCAlrm) {
-		if (on)
-			PWER |= PWER_RTC;
-		else
-			PWER &= ~PWER_RTC;
-		return 0;
-	}
-	return -EINVAL;
+	return sa11x0_sc_set_wake(d->hwirq, on);
 }
 
 static struct irq_chip sa1100_normal_chip = {
Signature · 1 line
2.1.4
#3 lore raw

PATCH v2 3/5 ARM: sa1100: use ioremapped memory to access SC registers

In reply to Dmitry Eremin-Solenikov

Use ioremap() and readl/writel_relaxed() to access IRQ controller registers.

---
 arch/arm/mach-sa1100/irq.c | 52 ++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 18 deletions(-)
arch/arm/mach-sa1100/irq.c +34 -18
index 6afaa33..08f929e 100644
@@ -20,13 +20,19 @@
 
 #include <soc/sa1100/pwer.h>
 
-#include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <asm/mach/irq.h>
 #include <asm/exception.h>
 
 #include "generic.h"
 
+#define ICIP	0x00  /* IC IRQ Pending reg. */
+#define ICMR	0x04  /* IC Mask Reg.        */
+#define ICLR	0x08  /* IC Level Reg.       */
+#define ICCR	0x0C  /* IC Control Reg.     */
+#define ICFP	0x10  /* IC FIQ Pending reg. */
+#define ICPR	0x20  /* IC Pending Reg.     */
+
+static void __iomem *iobase;
 
 /*
  * We don't need to ACK IRQs on the SA1100 unless they're GPIOs
@@ -34,12 +40,20 @@
  */
 static void sa1100_mask_irq(struct irq_data *d)
 {
-	ICMR &= ~BIT(d->hwirq);
+	u32 reg;
+
+	reg = readl_relaxed(iobase + ICMR);
+	reg &= ~BIT(d->hwirq);
+	writel_relaxed(reg, iobase + ICMR);
 }
 
 static void sa1100_unmask_irq(struct irq_data *d)
 {
-	ICMR |= BIT(d->hwirq);
+	u32 reg;
+
+	reg = readl_relaxed(iobase + ICMR);
+	reg |= BIT(d->hwirq);
+	writel_relaxed(reg, iobase + ICMR);
 }
 
 static int sa1100_set_wake(struct irq_data *d, unsigned int on)
@@ -87,16 +101,14 @@ static int sa1100irq_suspend(void)
 	struct sa1100irq_state *st = &sa1100irq_state;
 
 	st->saved = 1;
-	st->icmr = ICMR;
-	st->iclr = ICLR;
-	st->iccr = ICCR;
+	st->icmr = readl_relaxed(iobase + ICMR);
+	st->iclr = readl_relaxed(iobase + ICLR);
+	st->iccr = readl_relaxed(iobase + ICCR);
 
 	/*
 	 * Disable all GPIO-based interrupts.
 	 */
-	ICMR &= ~(IC_GPIO11_27|IC_GPIO10|IC_GPIO9|IC_GPIO8|IC_GPIO7|
-		  IC_GPIO6|IC_GPIO5|IC_GPIO4|IC_GPIO3|IC_GPIO2|
-		  IC_GPIO1|IC_GPIO0);
+	writel_relaxed(st->icmr & 0xfffff000, iobase + ICMR);
 
 	return 0;
 }
@@ -106,10 +118,10 @@ static void sa1100irq_resume(void)
 	struct sa1100irq_state *st = &sa1100irq_state;
 
 	if (st->saved) {
-		ICCR = st->iccr;
-		ICLR = st->iclr;
+		writel_relaxed(st->iccr, iobase + ICCR);
+		writel_relaxed(st->iclr, iobase + ICLR);
 
-		ICMR = st->icmr;
+		writel_relaxed(st->icmr, iobase + ICMR);
 	}
 }
 
@@ -132,8 +144,8 @@ sa1100_handle_irq(struct pt_regs *regs)
 	uint32_t icip, icmr, mask;
 
 	do {
-		icip = (ICIP);
-		icmr = (ICMR);
+		icip = readl_relaxed(iobase + ICIP);
+		icmr = readl_relaxed(iobase + ICMR);
 		mask = icip & icmr;
 
 		if (mask == 0)
@@ -148,17 +160,21 @@ void __init sa1100_init_irq(void)
 {
 	request_resource(&iomem_resource, &irq_resource);
 
+	iobase = ioremap(irq_resource.start, SZ_64K);
+	if (WARN_ON(!iobase))
+		return;
+
 	/* disable all IRQs */
-	ICMR = 0;
+	writel_relaxed(0, iobase + ICMR);
 
 	/* all IRQs are IRQ, not FIQ */
-	ICLR = 0;
+	writel_relaxed(0, iobase + ICLR);
 
 	/*
 	 * Whatever the doc says, this has to be set for the wait-on-irq
 	 * instruction to work... on a SA1100 rev 9 at least.
 	 */
-	ICCR = 1;
+	writel_relaxed(1, iobase + ICCR);
 
 	sa1100_normal_irqdomain = irq_domain_add_simple(NULL,
 			32, IRQ_GPIO0_SC,
Signature · 1 line
2.1.4
#4 lore raw

PATCH v2 4/5 irqchip: add sa1100 driver

In reply to Dmitry Eremin-Solenikov

Add an irqchip driver for Intel StrongARM SA-11x0 family of chips. For now it is just a copy of the current arch/arm/mach-sa1100/irq.c driver.

---
 drivers/irqchip/Makefile           |   1 +
 drivers/irqchip/irq-sa11x0.c       | 176 +++++++++++++++++++++++++++++++++++++
 include/linux/irqchip/irq-sa11x0.h |  16 ++++
 3 files changed, 193 insertions(+)
 create mode 100644 drivers/irqchip/irq-sa11x0.c
 create mode 100644 include/linux/irqchip/irq-sa11x0.h
drivers/irqchip/Makefile +1 -0
index 9516a32..b0d1dde 100644
@@ -42,3 +42,4 @@ obj-$(CONFIG_BRCMSTB_L2_IRQ)		+= irq-brcmstb-l2.o
 obj-$(CONFIG_KEYSTONE_IRQ)		+= irq-keystone.o
 obj-$(CONFIG_MIPS_GIC)			+= irq-mips-gic.o
 obj-$(CONFIG_ARCH_MEDIATEK)		+= irq-mtk-sysirq.o
+obj-$(CONFIG_ARCH_SA1100)		+= irq-sa11x0.o
drivers/irqchip/irq-sa11x0.c new file +176 -0

176 lines not on this page · raw message

include/linux/irqchip/irq-sa11x0.h new file +16 -0
new file mode 100644
index 0000000..2f66eca
@@ -0,0 +1,16 @@
+/*
+ * Generic IRQ handling for the SA11x0.
+ *
+ * Copyright (C) 1999-2001 Nicolas Pitre
+ *
+ * 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 __INCLUDE_LINUX_IRQCHIP_IRQ_SA11x0_H
+#define __INCLUDE_LINUX_IRQCHIP_IRQ_SA11x0_H
+
+void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start);
+
+#endif
Signature · 1 line
2.1.4
#5 lore raw

PATCH v2 5/5 ARM: sa1100: drop irq driver

In reply to Dmitry Eremin-Solenikov

Drop irq driver for sa1100 in favour of irqchip driver replacement.

---
 arch/arm/mach-sa1100/Makefile  |   2 +-
 arch/arm/mach-sa1100/generic.c |  13 +++
 arch/arm/mach-sa1100/irq.c     | 186 -----------------------------------------
 3 files changed, 14 insertions(+), 187 deletions(-)
 delete mode 100644 arch/arm/mach-sa1100/irq.c
arch/arm/mach-sa1100/Makefile +1 -1
index 61ff91e..ebc4d58 100644
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := clock.o generic.o irq.o #nmi-oopser.o
+obj-y := clock.o generic.o #nmi-oopser.o
 
 # Specific board support
 obj-$(CONFIG_SA1100_ASSABET)		+= assabet.o
arch/arm/mach-sa1100/generic.c +13 -0
index c651f6e..345e63f 100644
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
+#include <linux/irqchip/irq-sa11x0.h>
 
 #include <video/sa1100fb.h>
 
@@ -377,6 +378,18 @@ void __init sa1100_timer_init(void)
 	pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x90000000), 3686400);
 }
 
+static struct resource irq_resource =
+	DEFINE_RES_MEM_NAMED(0x90050000, SZ_64K, "irqs");
+
+void __init sa1100_init_irq(void)
+{
+	request_resource(&iomem_resource, &irq_resource);
+
+	sa11x0_init_irq_nodt(IRQ_GPIO0_SC, irq_resource.start);
+
+	sa1100_init_gpio();
+}
+
 /*
  * Disable the memory bus request/grant signals on the SA1110 to
  * ensure that we don't receive spurious memory requests.  We set
arch/arm/mach-sa1100/irq.c deleted +0 -186

186 lines not on this page · raw message

Signature · 1 line
2.1.4
Tested-by on the v2 series
#6 lore raw
In reply to Dmitry Eremin-Solenikov
Quoted 10 lines · Dmitry Eremin-Solenikov

Hello,

This is a second attempt to move Intel StrongARM SA-11x0 IRQ driver to drivers/irqchip/ place.

Changes since V1:

- Added soc/sa1100/pwer.h header containing sa11x0_*_set_wake() prototypes.

Quoted 6 lines

- Removed spinlock from mask/unmask functions

- Minor whitespace changes.

The patches are based on my previous sa1100 patches that can be found in Russell's for-next branch or in linux-next tree.

I have applied it and tested on the Compaq iPaq h3600:

Very nice to see the SC and GPIO offsets in /proc/interrupts and very clean code, good work!

Yours,
Linus Walleij

#7 lore raw

Hello,

2015-02-04 15:19 GMT+03:00 Linus Walleij <[email protected]>:

Quoted 13 lines
Quoted 10 lines · Dmitry Eremin-Solenikov

This is a second attempt to move Intel StrongARM SA-11x0 IRQ driver to drivers/irqchip/ place.

Changes since V1:

- Added soc/sa1100/pwer.h header containing sa11x0_*_set_wake() prototypes.

- Removed spinlock from mask/unmask functions

Quoted 7 lines
Quoted 4 lines

- Minor whitespace changes.

The patches are based on my previous sa1100 patches that can be found in Russell's for-next branch or in linux-next tree.

I have applied it and tested on the Compaq iPaq h3600:

Thank you. I'll probably wait for a couple more days for more feedback. Especially from IRQ CHIP maintainers.

Thomas, Jason: any feedback on this version? If no, can you ack it so that the patches can be merged through Russell's tree? If so, I can maybe squash last two patches, so that the new driver will be tied to old one through git internals?

Russell:any comments from your side?

Quoted 3 lines

Very nice to see the SC and GPIO offsets in /proc/interrupts and very clean code, good work!

Signature · 2 lines
With best wishes
Dmitry