[tip:irq/core] irqchip/renesas-irqc: Move over to nested generic chip

[tip-bot for Magnus Damm]

Commit-ID:  99c221df33fbfa1b30e15dee879eb0a9ae1be353
Gitweb: http://git.kernel.org/tip/99c221df33fbfa1b30e15dee879eb0a9ae1be353
Author: Magnus Damm 
AuthorDate: Mon, 28 Sep 2015 18:42:37 +0900
Committer:  Thomas Gleixner 
CommitDate: Tue, 29 Sep 2015 20:41:00 +0200

irqchip/renesas-irqc: Move over to nested generic chip

Convert the IRQC driver to rely on GENERIC_IRQ_CHIP and
set IRQ_GC_INIT_NESTED_LOCK to enable nested locking.

Signed-off-by: Magnus Damm 
Cc: ja...@lakedaemon.net
Cc: geert+rene...@glider.be
Cc: ho...@verge.net.au
Cc: Magnus Damm 
Link: 
http://lkml.kernel.org/r/20150928094237.32552.83434.sendpatchset@little-apple
Signed-off-by: Thomas Gleixner 
---
 drivers/irqchip/Kconfig|  1 +
 drivers/irqchip/irq-renesas-irqc.c | 86 +-
 2 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 27b52c8..67d8027 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -123,6 +123,7 @@ config RENESAS_INTC_IRQPIN
 
 config RENESAS_IRQC
bool
+   select GENERIC_IRQ_CHIP
select IRQ_DOMAIN
 
 config ST_IRQCHIP
diff --git a/drivers/irqchip/irq-renesas-irqc.c 
b/drivers/irqchip/irq-renesas-irqc.c
index 35bf97b..52304b1 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -62,33 +62,20 @@ struct irqc_priv {
struct irqc_irq irq[IRQC_IRQ_MAX];
unsigned int number_of_irqs;
struct platform_device *pdev;
-   struct irq_chip irq_chip;
+   struct irq_chip_generic *gc;
struct irq_domain *irq_domain;
struct clk *clk;
 };
 
-static void irqc_dbg(struct irqc_irq *i, char *str)
-{
-   dev_dbg(>p->pdev->dev, "%s (%d:%d)\n",
-   str, i->requested_irq, i->hw_irq);
-}
-
-static void irqc_irq_enable(struct irq_data *d)
+static struct irqc_priv *irq_data_to_priv(struct irq_data *data)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
-   int hw_irq = irqd_to_hwirq(d);
-
-   irqc_dbg(>irq[hw_irq], "enable");
-   iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_SET);
+   return data->domain->host_data;
 }
 
-static void irqc_irq_disable(struct irq_data *d)
+static void irqc_dbg(struct irqc_irq *i, char *str)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
-   int hw_irq = irqd_to_hwirq(d);
-
-   irqc_dbg(>irq[hw_irq], "disable");
-   iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS);
+   dev_dbg(>p->pdev->dev, "%s (%d:%d)\n",
+   str, i->requested_irq, i->hw_irq);
 }
 
 static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
@@ -101,7 +88,7 @@ static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
 
 static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
+   struct irqc_priv *p = irq_data_to_priv(d);
int hw_irq = irqd_to_hwirq(d);
unsigned char value = irqc_sense[type & IRQ_TYPE_SENSE_MASK];
u32 tmp;
@@ -120,7 +107,7 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned 
int type)
 
 static int irqc_irq_set_wake(struct irq_data *d, unsigned int on)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
+   struct irqc_priv *p = irq_data_to_priv(d);
int hw_irq = irqd_to_hwirq(d);
 
irq_set_irq_wake(p->irq[hw_irq].requested_irq, on);
@@ -153,35 +140,11 @@ static irqreturn_t irqc_irq_handler(int irq, void *dev_id)
return IRQ_NONE;
 }
 
-/*
- * This lock class tells lockdep that IRQC irqs are in a different
- * category than their parents, so it won't report false recursion.
- */
-static struct lock_class_key irqc_irq_lock_class;
-
-static int irqc_irq_domain_map(struct irq_domain *h, unsigned int virq,
-  irq_hw_number_t hw)
-{
-   struct irqc_priv *p = h->host_data;
-
-   irqc_dbg(>irq[hw], "map");
-   irq_set_chip_data(virq, h->host_data);
-   irq_set_lockdep_class(virq, _irq_lock_class);
-   irq_set_chip_and_handler(virq, >irq_chip, handle_level_irq);
-   return 0;
-}
-
-static const struct irq_domain_ops irqc_irq_domain_ops = {
-   .map= irqc_irq_domain_map,
-   .xlate  = irq_domain_xlate_twocell,
-};
-
 static int irqc_probe(struct platform_device *pdev)
 {
struct irqc_priv *p;
struct resource *io;
struct resource *irq;
-   struct irq_chip *irq_chip;
const char *name = dev_name(>dev);
int ret;
int k;
@@ -241,40 +204,51 @@ static int irqc_probe(struct platform_device *pdev)
 
p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */
 
-   irq_chip = >irq_chip;
-   irq_chip->name = name;
-   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->irq_set_wake = irqc_irq_set_wake;
-   irq_chip->flags = 

[tip:irq/core] irqchip/renesas-irqc: Move over to nested generic chip

[tip-bot for Magnus Damm]

Commit-ID:  99c221df33fbfa1b30e15dee879eb0a9ae1be353
Gitweb: http://git.kernel.org/tip/99c221df33fbfa1b30e15dee879eb0a9ae1be353
Author: Magnus Damm 
AuthorDate: Mon, 28 Sep 2015 18:42:37 +0900
Committer:  Thomas Gleixner 
CommitDate: Tue, 29 Sep 2015 20:41:00 +0200

irqchip/renesas-irqc: Move over to nested generic chip

Convert the IRQC driver to rely on GENERIC_IRQ_CHIP and
set IRQ_GC_INIT_NESTED_LOCK to enable nested locking.

Signed-off-by: Magnus Damm 
Cc: ja...@lakedaemon.net
Cc: geert+rene...@glider.be
Cc: ho...@verge.net.au
Cc: Magnus Damm 
Link: 
http://lkml.kernel.org/r/20150928094237.32552.83434.sendpatchset@little-apple
Signed-off-by: Thomas Gleixner 
---
 drivers/irqchip/Kconfig|  1 +
 drivers/irqchip/irq-renesas-irqc.c | 86 +-
 2 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 27b52c8..67d8027 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -123,6 +123,7 @@ config RENESAS_INTC_IRQPIN
 
 config RENESAS_IRQC
bool
+   select GENERIC_IRQ_CHIP
select IRQ_DOMAIN
 
 config ST_IRQCHIP
diff --git a/drivers/irqchip/irq-renesas-irqc.c 
b/drivers/irqchip/irq-renesas-irqc.c
index 35bf97b..52304b1 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -62,33 +62,20 @@ struct irqc_priv {
struct irqc_irq irq[IRQC_IRQ_MAX];
unsigned int number_of_irqs;
struct platform_device *pdev;
-   struct irq_chip irq_chip;
+   struct irq_chip_generic *gc;
struct irq_domain *irq_domain;
struct clk *clk;
 };
 
-static void irqc_dbg(struct irqc_irq *i, char *str)
-{
-   dev_dbg(>p->pdev->dev, "%s (%d:%d)\n",
-   str, i->requested_irq, i->hw_irq);
-}
-
-static void irqc_irq_enable(struct irq_data *d)
+static struct irqc_priv *irq_data_to_priv(struct irq_data *data)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
-   int hw_irq = irqd_to_hwirq(d);
-
-   irqc_dbg(>irq[hw_irq], "enable");
-   iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_SET);
+   return data->domain->host_data;
 }
 
-static void irqc_irq_disable(struct irq_data *d)
+static void irqc_dbg(struct irqc_irq *i, char *str)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
-   int hw_irq = irqd_to_hwirq(d);
-
-   irqc_dbg(>irq[hw_irq], "disable");
-   iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS);
+   dev_dbg(>p->pdev->dev, "%s (%d:%d)\n",
+   str, i->requested_irq, i->hw_irq);
 }
 
 static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
@@ -101,7 +88,7 @@ static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
 
 static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
+   struct irqc_priv *p = irq_data_to_priv(d);
int hw_irq = irqd_to_hwirq(d);
unsigned char value = irqc_sense[type & IRQ_TYPE_SENSE_MASK];
u32 tmp;
@@ -120,7 +107,7 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned 
int type)
 
 static int irqc_irq_set_wake(struct irq_data *d, unsigned int on)
 {
-   struct irqc_priv *p = irq_data_get_irq_chip_data(d);
+   struct irqc_priv *p = irq_data_to_priv(d);
int hw_irq = irqd_to_hwirq(d);
 
irq_set_irq_wake(p->irq[hw_irq].requested_irq, on);
@@ -153,35 +140,11 @@ static irqreturn_t irqc_irq_handler(int irq, void *dev_id)
return IRQ_NONE;
 }
 
-/*
- * This lock class tells lockdep that IRQC irqs are in a different
- * category than their parents, so it won't report false recursion.
- */
-static struct lock_class_key irqc_irq_lock_class;
-
-static int irqc_irq_domain_map(struct irq_domain *h, unsigned int virq,
-  irq_hw_number_t hw)
-{
-   struct irqc_priv *p = h->host_data;
-
-   irqc_dbg(>irq[hw], "map");
-   irq_set_chip_data(virq, h->host_data);
-   irq_set_lockdep_class(virq, _irq_lock_class);
-   irq_set_chip_and_handler(virq, >irq_chip, handle_level_irq);
-   return 0;
-}
-
-static const struct irq_domain_ops irqc_irq_domain_ops = {
-   .map= irqc_irq_domain_map,
-   .xlate  = irq_domain_xlate_twocell,
-};
-
 static int irqc_probe(struct platform_device *pdev)
 {
struct irqc_priv *p;
struct resource *io;
struct resource *irq;
-   struct irq_chip *irq_chip;
const char *name = dev_name(>dev);
int ret;
int k;
@@ -241,40 +204,51 @@ static int irqc_probe(struct platform_device *pdev)
 
p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */
 
-   irq_chip = >irq_chip;
-   irq_chip->name = name;
-   irq_chip->irq_mask = irqc_irq_disable;
-   irq_chip->irq_unmask = irqc_irq_enable;
-