* [GIT PULL 0/3] Renesas ARM based SoC IRQC Driver Updates for v3.14
@ 2013-12-24 6:05 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi Kevin, Hi Olof, Hi Arnd,
please consider these Renesas ARM based SoC IRQC driver updates for v3.14.
The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
for you to fetch changes up to ce70af18801fd8dac6e9f85308294948916e84d6:
irq-renesas-irqc: simplify irq_set_type() method (2013-12-23 09:27:17 +0900)
----------------------------------------------------------------
Renesas ARM based SoC IRQC Driver Updates for v3.14
* Simplify irq_set_type() method
* Enable mask on suspend
* Use lazy disable
----------------------------------------------------------------
Magnus Damm (2):
irqchip: renesas-irqc: Use lazy disable
irqchip: renesas-irqc: Enable mask on suspend
Sergei Shtylyov (1):
irq-renesas-irqc: simplify irq_set_type() method
drivers/irqchip/irq-renesas-irqc.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/3] irqchip: renesas-irqc: Use lazy disable
2013-12-24 6:05 ` Simon Horman
@ 2013-12-24 6:06 ` Simon Horman
-1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Set the ->irq_enable() and ->irq_disable() methods to NULL
to enable lazy disable of interrupts. This by itself provides
some level of optimization, but is mainly enabled as ground
work for future Suspend-to-RAM wake up support.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/irqchip/irq-renesas-irqc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 2f404ba..8fdd7d6 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -212,8 +212,6 @@ static int irqc_probe(struct platform_device *pdev)
irq_chip->name = name;
irq_chip->irq_mask = irqc_irq_disable;
irq_chip->irq_unmask = irqc_irq_enable;
- irq_chip->irq_enable = irqc_irq_enable;
- irq_chip->irq_disable = irqc_irq_disable;
irq_chip->irq_set_type = irqc_irq_set_type;
irq_chip->flags = IRQCHIP_SKIP_SET_WAKE;
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/3] irqchip: renesas-irqc: Use lazy disable
@ 2013-12-24 6:06 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Set the ->irq_enable() and ->irq_disable() methods to NULL
to enable lazy disable of interrupts. This by itself provides
some level of optimization, but is mainly enabled as ground
work for future Suspend-to-RAM wake up support.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/irqchip/irq-renesas-irqc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 2f404ba..8fdd7d6 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -212,8 +212,6 @@ static int irqc_probe(struct platform_device *pdev)
irq_chip->name = name;
irq_chip->irq_mask = irqc_irq_disable;
irq_chip->irq_unmask = irqc_irq_enable;
- irq_chip->irq_enable = irqc_irq_enable;
- irq_chip->irq_disable = irqc_irq_disable;
irq_chip->irq_set_type = irqc_irq_set_type;
irq_chip->flags = IRQCHIP_SKIP_SET_WAKE;
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] irqchip: renesas-irqc: Enable mask on suspend
2013-12-24 6:05 ` Simon Horman
@ 2013-12-24 6:06 ` Simon Horman
-1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Now when lazy interrupt disable has been enabled in the driver
then extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells
the core that only IRQs marked as wakeups need to stay enabled
during Suspend-to-RAM.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/irqchip/irq-renesas-irqc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 8fdd7d6..082d95c 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -213,7 +213,7 @@ static int irqc_probe(struct platform_device *pdev)
irq_chip->irq_mask = irqc_irq_disable;
irq_chip->irq_unmask = irqc_irq_enable;
irq_chip->irq_set_type = irqc_irq_set_type;
- irq_chip->flags = IRQCHIP_SKIP_SET_WAKE;
+ irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
p->number_of_irqs,
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] irqchip: renesas-irqc: Enable mask on suspend
@ 2013-12-24 6:06 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Now when lazy interrupt disable has been enabled in the driver
then extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells
the core that only IRQs marked as wakeups need to stay enabled
during Suspend-to-RAM.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/irqchip/irq-renesas-irqc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 8fdd7d6..082d95c 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -213,7 +213,7 @@ static int irqc_probe(struct platform_device *pdev)
irq_chip->irq_mask = irqc_irq_disable;
irq_chip->irq_unmask = irqc_irq_enable;
irq_chip->irq_set_type = irqc_irq_set_type;
- irq_chip->flags = IRQCHIP_SKIP_SET_WAKE;
+ irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
p->number_of_irqs,
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] irq-renesas-irqc: simplify irq_set_type() method
2013-12-24 6:05 ` Simon Horman
@ 2013-12-24 6:06 ` Simon Horman
-1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Value 0 of the sense selection field of CONFIG_n register means "disable event
detection" and serves in irqc_sense[] for marking the invalid values of the IRQ
type (by just omitting initializers). There is no need for INTC_IRQ_SENSE_VALID
and hence INTC_IRQ_SENSE() as all field values matching to the valid IRQ types
are non-zero anyway.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/irqchip/irq-renesas-irqc.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 082d95c..8777065 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -81,15 +81,12 @@ static void irqc_irq_disable(struct irq_data *d)
iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS);
}
-#define INTC_IRQ_SENSE_VALID 0x10
-#define INTC_IRQ_SENSE(x) (x + INTC_IRQ_SENSE_VALID)
-
static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
- [IRQ_TYPE_LEVEL_LOW] = INTC_IRQ_SENSE(0x01),
- [IRQ_TYPE_LEVEL_HIGH] = INTC_IRQ_SENSE(0x02),
- [IRQ_TYPE_EDGE_FALLING] = INTC_IRQ_SENSE(0x04), /* Synchronous */
- [IRQ_TYPE_EDGE_RISING] = INTC_IRQ_SENSE(0x08), /* Synchronous */
- [IRQ_TYPE_EDGE_BOTH] = INTC_IRQ_SENSE(0x0c), /* Synchronous */
+ [IRQ_TYPE_LEVEL_LOW] = 0x01,
+ [IRQ_TYPE_LEVEL_HIGH] = 0x02,
+ [IRQ_TYPE_EDGE_FALLING] = 0x04, /* Synchronous */
+ [IRQ_TYPE_EDGE_RISING] = 0x08, /* Synchronous */
+ [IRQ_TYPE_EDGE_BOTH] = 0x0c, /* Synchronous */
};
static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
@@ -101,12 +98,12 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
irqc_dbg(&p->irq[hw_irq], "sense");
- if (!(value & INTC_IRQ_SENSE_VALID))
+ if (!value)
return -EINVAL;
tmp = ioread32(p->iomem + IRQC_CONFIG(hw_irq));
tmp &= ~0x3f;
- tmp |= value ^ INTC_IRQ_SENSE_VALID;
+ tmp |= value;
iowrite32(tmp, p->iomem + IRQC_CONFIG(hw_irq));
return 0;
}
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/3] irq-renesas-irqc: simplify irq_set_type() method
@ 2013-12-24 6:06 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-24 6:06 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Value 0 of the sense selection field of CONFIG_n register means "disable event
detection" and serves in irqc_sense[] for marking the invalid values of the IRQ
type (by just omitting initializers). There is no need for INTC_IRQ_SENSE_VALID
and hence INTC_IRQ_SENSE() as all field values matching to the valid IRQ types
are non-zero anyway.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/irqchip/irq-renesas-irqc.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 082d95c..8777065 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -81,15 +81,12 @@ static void irqc_irq_disable(struct irq_data *d)
iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS);
}
-#define INTC_IRQ_SENSE_VALID 0x10
-#define INTC_IRQ_SENSE(x) (x + INTC_IRQ_SENSE_VALID)
-
static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
- [IRQ_TYPE_LEVEL_LOW] = INTC_IRQ_SENSE(0x01),
- [IRQ_TYPE_LEVEL_HIGH] = INTC_IRQ_SENSE(0x02),
- [IRQ_TYPE_EDGE_FALLING] = INTC_IRQ_SENSE(0x04), /* Synchronous */
- [IRQ_TYPE_EDGE_RISING] = INTC_IRQ_SENSE(0x08), /* Synchronous */
- [IRQ_TYPE_EDGE_BOTH] = INTC_IRQ_SENSE(0x0c), /* Synchronous */
+ [IRQ_TYPE_LEVEL_LOW] = 0x01,
+ [IRQ_TYPE_LEVEL_HIGH] = 0x02,
+ [IRQ_TYPE_EDGE_FALLING] = 0x04, /* Synchronous */
+ [IRQ_TYPE_EDGE_RISING] = 0x08, /* Synchronous */
+ [IRQ_TYPE_EDGE_BOTH] = 0x0c, /* Synchronous */
};
static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
@@ -101,12 +98,12 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
irqc_dbg(&p->irq[hw_irq], "sense");
- if (!(value & INTC_IRQ_SENSE_VALID))
+ if (!value)
return -EINVAL;
tmp = ioread32(p->iomem + IRQC_CONFIG(hw_irq));
tmp &= ~0x3f;
- tmp |= value ^ INTC_IRQ_SENSE_VALID;
+ tmp |= value;
iowrite32(tmp, p->iomem + IRQC_CONFIG(hw_irq));
return 0;
}
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [GIT PULL 0/3] Renesas ARM based SoC IRQC Driver Updates for v3.14
2013-12-24 6:05 ` Simon Horman
@ 2013-12-29 21:29 ` Olof Johansson
-1 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2013-12-29 21:29 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 24, 2013 at 03:05:46PM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
>
> please consider these Renesas ARM based SoC IRQC driver updates for v3.14.
>
> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
>
> Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
>
> for you to fetch changes up to ce70af18801fd8dac6e9f85308294948916e84d6:
>
> irq-renesas-irqc: simplify irq_set_type() method (2013-12-23 09:27:17 +0900)
Pulled, thanks. These look mostly like trivial changes so I'm guessing Thomas
will be fine with it going though our tree.
> ----------------------------------------------------------------
> Renesas ARM based SoC IRQC Driver Updates for v3.14
>
> * Simplify irq_set_type() method
> * Enable mask on suspend
> * Use lazy disable
>
> ----------------------------------------------------------------
> Magnus Damm (2):
> irqchip: renesas-irqc: Use lazy disable
> irqchip: renesas-irqc: Enable mask on suspend
>
> Sergei Shtylyov (1):
> irq-renesas-irqc: simplify irq_set_type() method
Small nit: I've been giving some others reminders to keep consistent
commit messages per platform/subsystem. Same here.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL 0/3] Renesas ARM based SoC IRQC Driver Updates for v3.14
@ 2013-12-29 21:29 ` Olof Johansson
0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2013-12-29 21:29 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 24, 2013 at 03:05:46PM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
>
> please consider these Renesas ARM based SoC IRQC driver updates for v3.14.
>
> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
>
> Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
>
> for you to fetch changes up to ce70af18801fd8dac6e9f85308294948916e84d6:
>
> irq-renesas-irqc: simplify irq_set_type() method (2013-12-23 09:27:17 +0900)
Pulled, thanks. These look mostly like trivial changes so I'm guessing Thomas
will be fine with it going though our tree.
> ----------------------------------------------------------------
> Renesas ARM based SoC IRQC Driver Updates for v3.14
>
> * Simplify irq_set_type() method
> * Enable mask on suspend
> * Use lazy disable
>
> ----------------------------------------------------------------
> Magnus Damm (2):
> irqchip: renesas-irqc: Use lazy disable
> irqchip: renesas-irqc: Enable mask on suspend
>
> Sergei Shtylyov (1):
> irq-renesas-irqc: simplify irq_set_type() method
Small nit: I've been giving some others reminders to keep consistent
commit messages per platform/subsystem. Same here.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL 0/3] Renesas ARM based SoC IRQC Driver Updates for v3.14
2013-12-29 21:29 ` Olof Johansson
@ 2013-12-30 0:32 ` Simon Horman
-1 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-30 0:32 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Dec 29, 2013 at 01:29:09PM -0800, Olof Johansson wrote:
> On Tue, Dec 24, 2013 at 03:05:46PM +0900, Simon Horman wrote:
> > Hi Kevin, Hi Olof, Hi Arnd,
> >
> > please consider these Renesas ARM based SoC IRQC driver updates for v3.14.
> >
> > The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
> >
> > Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
> >
> > for you to fetch changes up to ce70af18801fd8dac6e9f85308294948916e84d6:
> >
> > irq-renesas-irqc: simplify irq_set_type() method (2013-12-23 09:27:17 +0900)
>
> Pulled, thanks. These look mostly like trivial changes so I'm guessing Thomas
> will be fine with it going though our tree.
>
> > ----------------------------------------------------------------
> > Renesas ARM based SoC IRQC Driver Updates for v3.14
> >
> > * Simplify irq_set_type() method
> > * Enable mask on suspend
> > * Use lazy disable
> >
> > ----------------------------------------------------------------
> > Magnus Damm (2):
> > irqchip: renesas-irqc: Use lazy disable
> > irqchip: renesas-irqc: Enable mask on suspend
> >
> > Sergei Shtylyov (1):
> > irq-renesas-irqc: simplify irq_set_type() method
>
> Small nit: I've been giving some others reminders to keep consistent
> commit messages per platform/subsystem. Same here.
Thanks, I'll be more attentive to that.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL 0/3] Renesas ARM based SoC IRQC Driver Updates for v3.14
@ 2013-12-30 0:32 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-12-30 0:32 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Dec 29, 2013 at 01:29:09PM -0800, Olof Johansson wrote:
> On Tue, Dec 24, 2013 at 03:05:46PM +0900, Simon Horman wrote:
> > Hi Kevin, Hi Olof, Hi Arnd,
> >
> > please consider these Renesas ARM based SoC IRQC driver updates for v3.14.
> >
> > The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
> >
> > Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
> >
> > for you to fetch changes up to ce70af18801fd8dac6e9f85308294948916e84d6:
> >
> > irq-renesas-irqc: simplify irq_set_type() method (2013-12-23 09:27:17 +0900)
>
> Pulled, thanks. These look mostly like trivial changes so I'm guessing Thomas
> will be fine with it going though our tree.
>
> > ----------------------------------------------------------------
> > Renesas ARM based SoC IRQC Driver Updates for v3.14
> >
> > * Simplify irq_set_type() method
> > * Enable mask on suspend
> > * Use lazy disable
> >
> > ----------------------------------------------------------------
> > Magnus Damm (2):
> > irqchip: renesas-irqc: Use lazy disable
> > irqchip: renesas-irqc: Enable mask on suspend
> >
> > Sergei Shtylyov (1):
> > irq-renesas-irqc: simplify irq_set_type() method
>
> Small nit: I've been giving some others reminders to keep consistent
> commit messages per platform/subsystem. Same here.
Thanks, I'll be more attentive to that.
^ permalink raw reply [flat|nested] 12+ messages in thread